sync
This commit is contained in:
		| @@ -146,7 +146,8 @@ | ||||
|         } | ||||
|  | ||||
|         .adjust-content table td.label { | ||||
|             width: 130px; | ||||
|             width: unset; | ||||
|             min-width: 130px; | ||||
|             text-align: right; | ||||
|             padding-right: 10px; | ||||
|             line-height: 30px; | ||||
| @@ -189,22 +190,6 @@ | ||||
|             border: 1px solid #a9a9a9; | ||||
|         } | ||||
|  | ||||
|         .subtitle { | ||||
|             margin: 20px 40px 5px 0px; | ||||
|             font-size: 16px; | ||||
|             color: gray; | ||||
|         } | ||||
|  | ||||
|             .subtitle span { | ||||
|                 margin-left: 10px; | ||||
|             } | ||||
|  | ||||
|             .subtitle hr { | ||||
|                 background-color: #d8d8d8; | ||||
|                 border: none; | ||||
|                 height: 1px; | ||||
|             } | ||||
|  | ||||
|         .divattp { | ||||
|             width: 200px; | ||||
|             margin-right: 10px; | ||||
| @@ -393,25 +378,10 @@ | ||||
|     </style> | ||||
|     <script src="<%=GetFileUrlWithVersion("../Maintenance/js/inputdatactr.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("../js/jquery.datetimepicker.full.js")%>"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("../js/editableselect.js")%>"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("../js/controls.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("../js/assetselector.js")%>" type="text/javascript"></script> | ||||
|  | ||||
|     <script src="<%=GetFileUrlWithVersion("js/assetother.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/assetpm.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/attribute.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/attachment.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/rental.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adjustment.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adj_odometer.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adj_enginehours.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adj_location.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adj_idlehours.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adj_fuelused.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/adj_fuelremaining.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/attachmentinfo.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/mergeasset.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/deviceparinglogs.js")%>" type="text/javascript"></script> | ||||
|     <script src="<%=GetFileUrlWithVersion("js/addasset.min.js")%>" type="text/javascript"></script> | ||||
|     <script type="text/javascript">      | ||||
|         var currentdate = "<%=CurrentDate %>"; | ||||
|         var IsDealer = <%=IsDealer ?"true":"false"%>; | ||||
| @@ -551,7 +521,6 @@ | ||||
|             $('#lblOdometer').attr("title", ""); | ||||
|  | ||||
|             $('#dialog_customstatus').val('0'); | ||||
|             $('#dialog_undercarriagehours').val(''); | ||||
|             $('#dialog_AquisitionType').val(''); | ||||
|             $('#dialog_iconfilename').val(''); | ||||
|  | ||||
| @@ -582,7 +551,7 @@ | ||||
|             setPreviewAttachment(); | ||||
|  | ||||
|             if (allMachines) { | ||||
|                 var machine = allMachines[indexInEdit].Values; | ||||
|                 var machine = allMachines[indexInEdit]; | ||||
|                 machineid = machine.ID; | ||||
|  | ||||
|                 if (allMachines.length <= 1) { | ||||
| @@ -693,7 +662,6 @@ | ||||
|                 $('#lblOdometer').attr("title", "As of: " + asset.OdometerDateTimeStr + " (UTC)"); | ||||
|  | ||||
|             $('#dialog_customstatus').val(asset.CustomStatus); | ||||
|             $('#dialog_undercarriagehours').val(asset.UnderCarriageHours); | ||||
|             $('#dialog_AquisitionType').val(asset.AquisitionType); | ||||
|             $('#dialog_iconfilename').val(asset.IconFileName); | ||||
|  | ||||
| @@ -812,6 +780,9 @@ | ||||
|                     var dropdown = $('#dialog_typeforaddmodel').data('dropdown'); | ||||
|                     dropdown.setSource(machinetypes); | ||||
|  | ||||
|                     if (assetinfo) | ||||
|                         $('#dialog_type').dropdownVal(assetinfo.TypeID); | ||||
|  | ||||
|                     //$("#dialog_typeforaddmodel").empty(); | ||||
|                     //for (var i = 0; i < data.length; i++) { | ||||
|                     //    var kv = data[i]; | ||||
| @@ -990,20 +961,23 @@ | ||||
|  | ||||
|         function getAssetInput() { | ||||
|             var jsids = []; | ||||
|             for (var i = 0; i < grid_jobsitedt.source.length; i++) { | ||||
|                 var js = grid_jobsitedt.source[i].Values; | ||||
|             var tempsource = grid_jobsitedt.source; | ||||
|             for (var i = 0; i < tempsource.length; i++) { | ||||
|                 var js = tempsource[i]; | ||||
|                 if (js.OnSite) | ||||
|                     jsids.push(js.ID); | ||||
|             } | ||||
|             var cids = []; | ||||
|             for (var i = 0; i < grid_contactdt.source.length; i++) { | ||||
|                 var contact = grid_contactdt.source[i].Values; | ||||
|             var tempsource1 = grid_contactdt.source; | ||||
|             for (var i = 0; i < tempsource1.length; i++) { | ||||
|                 var contact = tempsource1[i]; | ||||
|                 if (contact.Assigned) | ||||
|                     cids.push(contact.IID); | ||||
|             } | ||||
|             var groupids = []; | ||||
|             for (var i = 0; i < grid_assetgroups.source.length; i++) { | ||||
|                 var group = grid_assetgroups.source[i].Values; | ||||
|             var tempsource2 = grid_assetgroups.source; | ||||
|             for (var i = 0; i < tempsource2.length; i++) { | ||||
|                 var group = tempsource2[i]; | ||||
|                 if (group.Selected) | ||||
|                     groupids.push(group.GroupID); | ||||
|             } | ||||
| @@ -1025,7 +999,6 @@ | ||||
|                 'ODOMeter': $('#dialog_odometer').val(), | ||||
|                 'OdometerUnits': $('#dialog_sel_odometeruom').val(), | ||||
|                 'CustomStatus': $('#dialog_customstatus').val(), | ||||
|                 'UnderCarriageHours': $('#dialog_undercarriagehours').val(), | ||||
|                 'OnSiteJobsiteIDs': jsids, | ||||
|                 'ContactIDs': cids, | ||||
|                 'MachineGroupIDs': groupids, | ||||
| @@ -1092,13 +1065,6 @@ | ||||
|                 item.OdometerUnits = ""; | ||||
|             } | ||||
|  | ||||
|             if (item.UnderCarriageHours !== "" && isNaN(item.UnderCarriageHours)) { | ||||
|                 showAlert(GetTextByKey("P_MA_UNDERCARRIAGEREPLACEMENTINTERVALFORMATERROR", 'Undercarriage Replacement Interval format error.'), alerttitle); | ||||
|                 return false; | ||||
|             } | ||||
|             if (item.UnderCarriageHours === "" || item.UnderCarriageHours === 0) | ||||
|                 item.UnderCarriageHours = null; | ||||
|  | ||||
|             var rentalid = $('#tab_rentalconnect').data('rentalid'); | ||||
|             if (rentalid === "") | ||||
|                 rentalid = -1; | ||||
| @@ -1123,7 +1089,7 @@ | ||||
|             //var atts = grid_attachmentdt.source; | ||||
|             //if (atts && atts.length > 0) { | ||||
|             //    for (var i = 0; i < atts.length; i++) { | ||||
|             //        var att = atts[i].Values; | ||||
|             //        var att = atts[i]; | ||||
|             //        var kv = { "key": att.ID, "Value": att.VisibleOnWorkOrder }; | ||||
|             //        visibleonworkorders.push(kv); | ||||
|             //    } | ||||
| @@ -1146,7 +1112,6 @@ | ||||
|                 && asset.Description == input.Description | ||||
|                 //&& asset.EngineHours == input.EngineHours | ||||
|                 //&& asset.ODOMeter == input.ODOMeter | ||||
|                 && (asset.UnderCarriageHours == null ? 0 : asset.UnderCarriageHours) == (input.UnderCarriageHours < 0 ? 0 : input.UnderCarriageHours) | ||||
|                 && asset.AquisitionType == input.AquisitionType | ||||
|                 && asset.CostCenter == input.CostCenter | ||||
|                 && asset.Hidden == input.Hidden | ||||
| @@ -1233,7 +1198,7 @@ | ||||
|                 $('#dialog_oldmake').text(asset.MakeName); | ||||
|                 $('#dialog_oldmodel').text(asset.ModelName); | ||||
|                 $('#dialog_oldeqclass').text(asset.EQClass); | ||||
|                 $('#dialog_oldtype').text(asset.Type); | ||||
|                 $('#dialog_oldtype').text(asset.TypeName); | ||||
|                 $('#dialog_olddescription').val(asset.Description); | ||||
|                 $('#dialog_oldenginehours').text(asset.EngineHours ? asset.EngineHours : ""); | ||||
|                 $('#dialog_oldodometer').text(asset.Odometer ? asset.Odometer : ""); | ||||
| @@ -1419,7 +1384,7 @@ | ||||
|             dialogSelectMergeAssets.onOK = function (source, selectedIndex) { | ||||
|                 var selectedAsset = null; | ||||
|                 if (selectedIndex >= 0) | ||||
|                     selectedAsset = source[selectedIndex].Values; | ||||
|                     selectedAsset = source[selectedIndex]; | ||||
|  | ||||
|                 if (selectedAsset != null) { | ||||
|                     mergeassetid = selectedAsset.Id; | ||||
| @@ -1581,8 +1546,6 @@ | ||||
|  | ||||
|                 $("#assetgrouplist").css("height", $(window).height() - $("#assetgrouplist").offset().top - 10); | ||||
|                 grid_assetgroups && grid_assetgroups.resize(); | ||||
|  | ||||
|                 $("#adocumentsDiv").css("height", $(window).height() - $("#adocumentsDiv").offset().top - 240); | ||||
|             }).resize(); | ||||
|         }); | ||||
|  | ||||
| @@ -1609,8 +1572,11 @@ | ||||
|  | ||||
|         function autoheight(grid) { | ||||
|             var height = 28 + 27;//28为Header高度,27为预留高度 | ||||
|             if (grid && grid.source && grid.source.length > 0) | ||||
|                 height += grid.source.length * 27; | ||||
|             if (!grid) return height; | ||||
|  | ||||
|             var tempsource = grid.source; | ||||
|             if (tempsource && tempsource.length > 0) | ||||
|                 height += tempsource.length * 27; | ||||
|  | ||||
|             return height; | ||||
|         } | ||||
| @@ -1686,8 +1652,8 @@ | ||||
|             <span class="sbutton iconsave" onclick="OnSave(1,0);" data-lgid="P_MA_SAVE1">Save and Exit</span> | ||||
|             <span class="sbutton iconexit" onclick="OnExit(0);" data-lgid="P_MA_SAVE2">Exit Without Saving</span> | ||||
|             <%if (IsSupperAdmin && !IsDealer) | ||||
|                 { %><span class="sbutton iconmerge" id="btnmerge" onclick="OnMergeAsset();" data-lgid="P_MA_XXXXX">Merge Asset</span> | ||||
|             <span class="sbutton icondelete" id="btndelete" onclick="OnDeleteAsset(-1);" data-lgid="P_MA_XXXXX">Delete Asset</span> | ||||
|                 { %><span class="sbutton iconmerge" id="btnmerge" onclick="OnMergeAsset();" data-lgid="P_MA_MERGEASSET">Merge Asset</span> | ||||
|             <span class="sbutton icondelete" id="btndelete" onclick="OnDeleteAsset(-1);" data-lgid="P_MA_DELETEASSET">Delete Asset</span> | ||||
|             <%} %> | ||||
|             <span class="sbutton iconprevious" id="btnNext" onclick="OnPrevious();" style="display: none;" data-lgid="P_MA_PREVIOUS">Previous</span> | ||||
|             <span class="sbutton iconnext" id="btnPrevious" onclick="OnNext();" style="display: none;" data-lgid="P_MA_NEXT">Next</span> | ||||
| @@ -1783,21 +1749,15 @@ | ||||
|                         </td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
|                         <td class="label" data-lgid="P_MA_XXXXXX_COLON">Availability</td> | ||||
|                         <td class="label" data-lgid="P_MA_AVAILABILITY">Availability</td> | ||||
|                         <td> | ||||
|                             <select id="dialog_customstatus" tabindex="18" style="width: 204px; height: 22px;"> | ||||
|                                 <option value="0" data-lgid="P_MA_XXXXXX">In Use</option> | ||||
|                                 <option value="1" data-lgid="P_MA_XXXXXX">Available</option> | ||||
|                                 <option value="2" data-lgid="P_MA_XXXXXX">Standby</option> | ||||
|                                 <option value="10" data-lgid="P_MA_XXXXXX">Down</option> | ||||
|                                 <option value="0" data-lgid="P_MA_INUSE">In Use</option> | ||||
|                                 <option value="1" data-lgid="P_MA_AVAILABLE">Available</option> | ||||
|                                 <option value="2" data-lgid="P_MA_STANDBY">Standby</option> | ||||
|                                 <option value="10" data-lgid="P_MA_DOWN">Down</option> | ||||
|                             </select></td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
|                         <td class="label" data-lgid="P_MA_URINTERVAL_COLON">Undercarriage Replacement<br /> | ||||
|                             Interval (Hours):</td> | ||||
|                         <td> | ||||
|                             <input type="text" id="dialog_undercarriagehours" maxlength="12" tabindex="30" autocomplete="off" /></td> | ||||
|                     </tr> | ||||
|                     <tr> | ||||
|                         <td class="label" data-lgid="P_MA_ACQUISITIONTYPE_COLON">Acquisition Type:</td> | ||||
|                         <td> | ||||
| @@ -1847,7 +1807,7 @@ | ||||
|                         <li id="li_rentalconnect" data-href="tab_rentalconnect" data-lgid="P_MA_RENTALCONNECT">Rental Connect</li> | ||||
|                         <li id="li_attachment" data-href="tab_attachment" onclick="reshowaddidocgrid('attachment');" data-lgid="P_MA_ADDITIONALDOCUMENTATION">Additional Documentation</li> | ||||
|                         <li id="li_audit" data-href="tab_audit" onclick="reshowaddidocgrid('audit');" data-lgid="P_MA_TELEMATICADJUSTMENTS">Telematic Adjustments</li> | ||||
|                         <li id="li_devicepairinginfo" data-href="tab_devicepairinginfo" data-lgid="P_MD_XXX">Pairing Info</li> | ||||
|                         <li id="li_devicepairinginfo" data-href="tab_devicepairinginfo" data-lgid="P_MA_PAIRINGINFO">Pairing Info</li> | ||||
|                     </ul> | ||||
|                     <div id="tab_jobsiteforeman" data-page="tab_jobsiteforeman"> | ||||
|                         <table> | ||||
| @@ -2062,29 +2022,6 @@ | ||||
|                     <div id="tab_attachment" data-page="tab_attachment" style="display: none;"> | ||||
|                         <span class="sbutton iconadd" id="btnAdd" onclick="openAddDocument();" data-lgid="P_MA_ADD" data-title-lgid="P_MA_ADDITIONALDOCUMENTATION"></span> | ||||
|                         <div id="documentlist" style="max-height: 500px; margin-top: 5px;"> | ||||
|                             <div> | ||||
|                                 <table id="tbdocuments" class="main_table" style="width: 980px; table-layout: fixed;"> | ||||
|                                     <thead> | ||||
|                                         <tr> | ||||
|                                             <th style="width: 120px" sort="Name" data-lgid="P_MA_NAME">Name</th> | ||||
|                                             <th style="width: 100px;" sort="AddedBy" data-lgid="P_MA_UPLOADEDBY">Uploaded By</th> | ||||
|                                             <th style="width: 80px;" sort="VisibleOnWorkOrder" data-lgid="P_MA_VISIBLEONWORKORDER">Visible On Work Order?</th> | ||||
|                                             <th style="width: 80px;" sort="VisibleOnMap" data-lgid="P_MA_VISIBLEONMAP">Visible On Map?</th> | ||||
|                                             <th style="width: 80px;" sort="VisibleOnMobile" data-lgid="P_MA_VISIBLEONMOBILE">Visible On Mobile?</th> | ||||
|                                             <th style="width: 100px;" sort="AddedOnLocalStr" data-lgid="P_MA_ADDEDON">Added On</th> | ||||
|                                             <th style="width: 200px;" sort="Description" data-lgid="P_MA_DESCRIPTION">Desctiption</th> | ||||
|                                             <th style="width: 80px;"></th> | ||||
|                                         </tr> | ||||
|                                     </thead> | ||||
|                                 </table> | ||||
|                             </div> | ||||
|  | ||||
|                             <div id="adocumentsDiv" class="content_div " style="width: 1000px;"> | ||||
|                                 <table class="main_table" style="width: 980px; table-layout: fixed;"> | ||||
|                                     <tbody id="tbody_documents"> | ||||
|                                     </tbody> | ||||
|                                 </table> | ||||
|                             </div> | ||||
|                         </div> | ||||
|                     </div> | ||||
|  | ||||
| @@ -2245,7 +2182,7 @@ | ||||
|                         <textarea id="dialogadjust_notes" maxlength="500" tabindex="107" style="width: 420px; height: 100px; margin-top: 3px;"></textarea></td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td data-lgid="P_MA_XXXXXX" colspan="2">The most recent reading, based on adjustment above:</td> | ||||
|                     <td data-lgid="P_MA_THEMOSTRECENTREADINGBASEDONADJUSTMENTABOVE" colspan="2">The most recent reading, based on adjustment above:</td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" colspan="2"> | ||||
| @@ -2253,7 +2190,7 @@ | ||||
|                     </td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td data-lgid="P_MA_XXXXXX" colspan="2">The 24 hours following the user provided date:</td> | ||||
|                     <td data-lgid="P_MA_THE24HOURSFOLLOWINGTHEUSERPROVIDEDDATE" colspan="2">The 24 hours following the user provided date:</td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" colspan="2"> | ||||
| @@ -2268,7 +2205,9 @@ | ||||
|             <input type="button" onclick="OnPreviewOdometer();" value="Preview" data-lgid="P_MA_PREVIEW" tabindex="108" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="adjustodomask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="adjustodomask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_adjustenginehours" style="display: none; width: 940px;"> | ||||
| @@ -2305,7 +2244,7 @@ | ||||
|                         <textarea id="dialogenginehours_Notes" maxlength="500" tabindex="126" style="width: 420px; height: 100px; margin-top: 3px;"></textarea></td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td data-lgid="P_MA_XXXXXX" colspan="2">The most recent reading, based on adjustment above:</td> | ||||
|                     <td data-lgid="P_MA_THEMOSTRECENTREADINGBASEDONADJUSTMENTABOVE" colspan="2">The most recent reading, based on adjustment above:</td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" colspan="2"> | ||||
| @@ -2313,7 +2252,7 @@ | ||||
|                     </td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td data-lgid="P_MA_XXXXXX" colspan="2">The 24 hours following the user provided date:</td> | ||||
|                     <td data-lgid="P_MA_THE24HOURSFOLLOWINGTHEUSERPROVIDEDDATE" colspan="2">The 24 hours following the user provided date:</td> | ||||
|                 </tr> | ||||
|                 <tr> | ||||
|                     <td class="label" colspan="2"> | ||||
| @@ -2328,12 +2267,14 @@ | ||||
|             <input type="button" onclick="OnPreviewEngineHours();" value="Preview" data-lgid="P_MA_PREVIEW" tabindex="127" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="adjustenginehoursmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="adjustenginehoursmask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|  | ||||
|     <div class="dialog" id="dialog_setprimary" style="display: none; width: 400px;"> | ||||
|         <div class="dialog-title"><span class="title">Set As Primary</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-title"><span class="title" data-lgid="P_MA_SETASPRIMARY">Set As Primary</span><em class="dialog-close"></em></div> | ||||
|         <div class="dialog-content"> | ||||
|             <table style="line-height: 25px;"> | ||||
|                 <tr> | ||||
| @@ -2399,7 +2340,9 @@ | ||||
|             <input type="button" onclick="OnAddOdometer();" value="Submit" data-lgid="P_MA_SUBMIT" tabindex="158" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="addodomask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="addodomask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|  | ||||
| @@ -2443,7 +2386,9 @@ | ||||
|             <input type="button" onclick="OnAddEngineHours();" value="Submit" data-lgid="P_MA_SUBMIT" tabindex="177" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="addenginehoursmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="addenginehoursmask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|  | ||||
| @@ -2474,7 +2419,9 @@ | ||||
|             <input type="button" onclick="OnSaveMake();" value="OK" data-lgid="P_MA_OK" tabindex="301" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="addmakemask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="addmakemask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_addmodel" style="display: none; width: 360px;"> | ||||
| @@ -2506,7 +2453,9 @@ | ||||
|             <input type="button" onclick="OnSaveModel();" value="OK" data-lgid="P_MA_OK" tabindex="404" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="addmodelmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="addmodelmask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_assetduplicates" style="display: none; min-width: 540px;"> | ||||
| @@ -2697,12 +2646,14 @@ | ||||
|             <input type="button" value="Ignore and Create Asset" data-lgid="P_MA_IGNOREANDCREATEASSET" onclick="OnIgnoreDuplicate();" style="width: 150px;" tabindex="500" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="assetdupmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="assetdupmask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|     <div class="dialog" id="dialog_mergeasset" style="display: none; min-width: 540px;"> | ||||
|         <div class="dialog-title"> | ||||
|             <span class="title" style="float: left;" data-lgid="P_MA_XXX">Merge Asset</span> | ||||
|             <span class="title" style="float: left;" data-lgid="P_MA_MERGEASSET">Merge Asset</span> | ||||
|             <em class="dialog-close"></em> | ||||
|         </div> | ||||
|         <div class="clear"></div> | ||||
| @@ -2785,7 +2736,7 @@ | ||||
|                                     <td><span id="dialog_merge_newaddedby"></span></td> | ||||
|                                 </tr> | ||||
|                                 <tr> | ||||
|                                     <td class="label label1" data-lgid="P_MA_XXX">Telematic Datasources:</td> | ||||
|                                     <td class="label label1" data-lgid="P_MA_TELEMATICDATASOURCES_COLON">Telematic Datasources:</td> | ||||
|                                     <td> | ||||
|                                         <div id="dialog_merge_newdatasource" style="height: 80px; overflow: auto;"></div> | ||||
|                                     </td> | ||||
| @@ -2876,7 +2827,7 @@ | ||||
|                                     <td><span id="dialog_merge_oldaddedby"></span></td> | ||||
|                                 </tr> | ||||
|                                 <tr> | ||||
|                                     <td class="label label1" data-lgid="P_MA_XXX">Telematic Datasources:</td> | ||||
|                                     <td class="label label1" data-lgid="P_MA_TELEMATICDATASOURCES_COLON">Telematic Datasources:</td> | ||||
|                                     <td> | ||||
|                                         <div id="dialog_merge_olddatasource" style="height: 80px; overflow: auto;"></div> | ||||
|                                     </td> | ||||
| @@ -2896,7 +2847,9 @@ | ||||
|             <input type="button" value="Cancel" data-lgid="P_MA_CANCEL" class="dialog-close" tabindex="501" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="mergeassetmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="mergeassetmask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|  | ||||
| @@ -2962,6 +2915,8 @@ | ||||
|             <input type="button" onclick="OnSaveDocument();" value="Save" data-lgid="P_MA_SAVE" tabindex="400" /> | ||||
|             <div class="clear"></div> | ||||
|         </div> | ||||
|         <div id="adddocumentmask" class="maskbg" style="display: none;"><div class="loading c-spin"></div></div> | ||||
|         <div id="adddocumentmask" class="maskbg" style="display: none;"> | ||||
|             <div class="loading c-spin"></div> | ||||
|         </div> | ||||
|     </div> | ||||
| </asp:Content> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user