Fix: Javascript Bugs

jQuery v1.9 migrations; Isotope Update

Disco.BI/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0219.1605")]
-[assembly: AssemblyFileVersion("1.2.0219.1605")]
+[assembly: AssemblyVersion("1.2.0219.1854")]
+[assembly: AssemblyFileVersion("1.2.0219.1854")]

Disco.Client/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0219.1551")]
-[assembly: AssemblyFileVersion("1.2.0219.1551")]
+[assembly: AssemblyVersion("1.2.0219.1813")]
+[assembly: AssemblyFileVersion("1.2.0219.1813")]

Disco.ClientBootstrapper/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0219.1551")]
-[assembly: AssemblyFileVersion("1.2.0219.1551")]
+[assembly: AssemblyVersion("1.2.0219.1813")]
+[assembly: AssemblyFileVersion("1.2.0219.1813")]

Disco.Data/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0219.1605")]
-[assembly: AssemblyFileVersion("1.2.0219.1605")]
+[assembly: AssemblyVersion("1.2.0219.1854")]
+[assembly: AssemblyFileVersion("1.2.0219.1854")]

Disco.Models/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0219.1605")]
-[assembly: AssemblyFileVersion("1.2.0219.1605")]
+[assembly: AssemblyVersion("1.2.0219.1854")]
+[assembly: AssemblyFileVersion("1.2.0219.1854")]

Disco.Services/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0219.1605")]
-[assembly: AssemblyFileVersion("1.2.0219.1605")]
+[assembly: AssemblyVersion("1.2.0219.1854")]
+[assembly: AssemblyFileVersion("1.2.0219.1854")]

Disco.Web.Extensions/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0219.1605")]
-[assembly: AssemblyFileVersion("1.2.0219.1605")]
+[assembly: AssemblyVersion("1.2.0219.1854")]
+[assembly: AssemblyFileVersion("1.2.0219.1854")]

Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml

@@ -161,10 +161,10 @@
                         componentRow.find('input').attr('disabled', false).removeClass('updating');
                         if (d.Result == 'OK') {
                             $dialogUpdateJobTypes = $('#dialogUpdateJobTypes');
-                            $dialogUpdateJobTypes.find('input:checked').each(function () { $(this).attr('checked', false) });
+                            $dialogUpdateJobTypes.find('input:checked').each(function () { $(this).prop('checked', false) });
                             for (var i = 0; i < d.Component.JobSubTypes.length; i++) {
                                 var sjt = d.Component.JobSubTypes[i];
-                                $dialogUpdateJobTypes.find('#SubTypes_' + sjt).attr('checked', true);
+                                $dialogUpdateJobTypes.find('#SubTypes_' + sjt).prop('checked', true);
                             }
                             $('#CheckboxBulkSelect_dialogUpdateJobTypes').checkboxBulkSelect('update');
                             var buttons = $dialogUpdateJobTypes.dialog("option", "buttons");
@@ -247,10 +247,11 @@
 
         $('#CheckboxBulkSelect_dialogUpdateJobTypes').checkboxBulkSelect({ parentSelector: 'div' });
 
-        $deviceComponents.find('input').live('change', updateComponent).focus(function () { $(this).select() });
-        $deviceComponents.find('span.remove').live('click', removeComponent);
-        $deviceComponents.find('span.edit').live('click', editComponentJobTypes);
+        $deviceComponents.on('change', 'input', updateComponent);
+        $deviceComponents.on('focus', 'input', function () { $(this).select(); });
 
+        $deviceComponents.on('click', 'span.remove', removeComponent);
+        $deviceComponents.on('click', 'span.edit', editComponentJobTypes);
     });
 </script>
 <div id="dialogUpdateJobTypes" title="Update Job Types">

Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs

@@ -305,10 +305,10 @@ WriteLiteral("\',\r\n                    dataType: \'json\',\r\n
 "d(\'input\').attr(\'disabled\', false).removeClass(\'updating\');\r\n                   " +
 "     if (d.Result == \'OK\') {\r\n                            $dialogUpdateJobTypes " +
 "= $(\'#dialogUpdateJobTypes\');\r\n                            $dialogUpdateJobTypes" +
-".find(\'input:checked\').each(function () { $(this).attr(\'checked\', false) });\r\n  " +
+".find(\'input:checked\').each(function () { $(this).prop(\'checked\', false) });\r\n  " +
 "                          for (var i = 0; i < d.Component.JobSubTypes.length; i+" +
 "+) {\r\n                                var sjt = d.Component.JobSubTypes[i];\r\n   " +
-"                             $dialogUpdateJobTypes.find(\'#SubTypes_\' + sjt).attr" +
+"                             $dialogUpdateJobTypes.find(\'#SubTypes_\' + sjt).prop" +
 "(\'checked\', true);\r\n                            }\r\n                            $" +
 "(\'#CheckboxBulkSelect_dialogUpdateJobTypes\').checkboxBulkSelect(\'update\');\r\n    " +
 "                        var buttons = $dialogUpdateJobTypes.dialog(\"option\", \"bu" +
@@ -364,11 +364,11 @@ WriteLiteral("\',\r\n                                    dataType: \'json\',\r\n
 "\r\n                },\r\n                Cancel: function () {\r\n                   " +
 " $(this).dialog(\"close\");\r\n                }\r\n            }\r\n        });\r\n\r\n    " +
 "    $(\'#CheckboxBulkSelect_dialogUpdateJobTypes\').checkboxBulkSelect({ parentSel" +
-"ector: \'div\' });\r\n\r\n        $deviceComponents.find(\'input\').live(\'change\', updat" +
-"eComponent).focus(function () { $(this).select() });\r\n        $deviceComponents." +
-"find(\'span.remove\').live(\'click\', removeComponent);\r\n        $deviceComponents.f" +
-"ind(\'span.edit\').live(\'click\', editComponentJobTypes);\r\n\r\n    });\r\n</script>\r\n<d" +
-"iv");
+"ector: \'div\' });\r\n\r\n        $deviceComponents.on(\'change\', \'input\', updateCompon" +
+"ent);\r\n        $deviceComponents.on(\'focus\', \'input\', function () { $(this).sele" +
+"ct(); });\r\n\r\n        $deviceComponents.on(\'click\', \'span.remove\', removeComponen" +
+"t);\r\n        $deviceComponents.on(\'click\', \'span.edit\', editComponentJobTypes);\r" +
+"\n    });\r\n</script>\r\n<div");
 
 WriteLiteral(" id=\"dialogUpdateJobTypes\"");
 
@@ -379,7 +379,7 @@ WriteLiteral(">\r\n    <div>\r\n        <h2>\r\n            Hardware Non-Warrant
 WriteLiteral("        ");
 
             
-            #line 260 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
+            #line 261 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
    Write(CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2));
 
             

Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml

@@ -311,7 +311,7 @@
             // Init Persistent Connection
             liveConnection = $.connection('@(Url.Content("~/API/Logging/Notifications"))');
             liveConnection.received(parseLog);
-            liveConnection.error(function (e) { alert('Live-Log Error: ' + e) });
+            liveConnection.error(function (e) { if (e.status != 200) alert('Live-Log Error: ' + e.statusText + ': ' + e.responseText); });
             isLive = true;
             liveConnection.start(function () {
                 liveConnection.send('/addToGroups:@(Disco.BI.DocumentTemplateBI.Importer.DocumentImporterLog.Current.LiveLogGroupName)');

Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.generated.cs

@@ -464,7 +464,7 @@ WriteLiteral(@"',
             #line hidden
 WriteLiteral(@"');
             liveConnection.received(parseLog);
-            liveConnection.error(function (e) { alert('Live-Log Error: ' + e) });
+            liveConnection.error(function (e) { if (e.status != 200) alert('Live-Log Error: ' + e.statusText + ': ' + e.responseText); });
             isLive = true;
             liveConnection.start(function () {
                 liveConnection.send('/addToGroups:");

Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml

@@ -139,10 +139,10 @@
                                 $trJobTypes.hide();
                                 $trJobTypeActions.hide();
                                 $jobTypes.filter(':checked').each(function () {
-                                    $(this).attr('checked', false);
+                                    $(this).prop('checked', false);
                                 });
                                 $('.jobSubTypes').hide().find('input[type="checkbox"]:checked').each(function () {
-                                    $(this).attr('checked', false);
+                                    $(this).prop('checked', false);
                                 });
                             }
                         }

Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs

@@ -292,10 +292,10 @@ WriteLiteral("\',\r\n                                dataType: \'json\',\r\n
 "\n                            } else {\r\n                                $trJobTyp" +
 "es.hide();\r\n                                $trJobTypeActions.hide();\r\n         " +
 "                       $jobTypes.filter(\':checked\').each(function () {\r\n        " +
-"                            $(this).attr(\'checked\', false);\r\n                   " +
+"                            $(this).prop(\'checked\', false);\r\n                   " +
 "             });\r\n                                $(\'.jobSubTypes\').hide().find(" +
 "\'input[type=\"checkbox\"]:checked\').each(function () {\r\n                          " +
-"          $(this).attr(\'checked\', false);\r\n                                });\r\n" +
+"          $(this).prop(\'checked\', false);\r\n                                });\r\n" +
 "                            }\r\n                        }\r\n\r\n                    " +
 "    function jobTypesChange() {\r\n                            $(\'.jobSubTypes\').h" +
 "ide();\r\n                            $jobTypes.filter(\':checked\').each(function (" +

Disco.Web/Areas/Config/Views/Enrolment/Status.cshtml

@@ -360,7 +360,7 @@
             // Init Persistent Connection
             liveConnection = $.connection('@(Url.Content("~/API/Logging/Notifications"))');
             liveConnection.received(parseLog);
-            liveConnection.error(function (e) { alert('Live-Log Error: ' + e) });
+            liveConnection.error(function (e) { if (e.status != 200) alert('Live-Log Error: ' + e.statusText + ': ' + e.responseText); });
             liveConnection.start(function () {
                 liveConnection.send('/addToGroups:@(Disco.BI.DeviceBI.EnrolmentLog.Current.LiveLogGroupName)');
             });

Disco.Web/Areas/Config/Views/Enrolment/Status.generated.cs

@@ -520,9 +520,11 @@ WriteLiteral(@"',
             
             #line default
             #line hidden
-WriteLiteral("\');\r\n            liveConnection.received(parseLog);\r\n            liveConnection.e" +
-"rror(function (e) { alert(\'Live-Log Error: \' + e) });\r\n            liveConnectio" +
-"n.start(function () {\r\n                liveConnection.send(\'/addToGroups:");
+WriteLiteral(@"');
+            liveConnection.received(parseLog);
+            liveConnection.error(function (e) { if (e.status != 200) alert('Live-Log Error: ' + e.statusText + ': ' + e.responseText); });
+            liveConnection.start(function () {
+                liveConnection.send('/addToGroups:");
 
             
             #line 365 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"

Disco.Web/Areas/Config/Views/Logging/Index.cshtml

@@ -108,14 +108,14 @@
                 moduleId.change(function () {
                     // Unselect All
                     logModuleEventTypes.slideUp();
-                    logModuleEventTypeCheckboxes.filter(':checked').attr('checked', false);
+                    logModuleEventTypeCheckboxes.filter(':checked').prop('checked', false);
                     var selectedModule = moduleId.val();
                     if (selectedModule) {
                         trLogModuleEventTypes.show();
                         var selectedModuleEventTypes = logModuleEventTypes.filter('[data-logmoduleid="' + selectedModule + '"]');
                         if (selectedModuleEventTypes.length > 0) {
                             var selectedModuleEventTypeCheckboxes = selectedModuleEventTypes.find('input[type="checkbox"]');
-                            selectedModuleEventTypeCheckboxes.attr('checked', true);
+                            selectedModuleEventTypeCheckboxes.prop('checked', true);
                             trLogModuleEventTypes.show();
                             selectedModuleEventTypes.slideDown();
                         } else {
@@ -132,7 +132,7 @@
                         var selectedModuleEventTypes = logModuleEventTypes.filter('[data-logmoduleid="' + selectedModule + '"]');
                         if (selectedModuleEventTypes.length > 0) {
                             var selectedModuleEventTypeCheckboxes = selectedModuleEventTypes.find('input[type="checkbox"]');
-                            selectedModuleEventTypeCheckboxes.attr('checked', true);
+                            selectedModuleEventTypeCheckboxes.prop('checked', true);
                         }
                     }
                     return false;
@@ -143,7 +143,7 @@
                         var selectedModuleEventTypes = logModuleEventTypes.filter('[data-logmoduleid="' + selectedModule + '"]');
                         if (selectedModuleEventTypes.length > 0) {
                             var selectedModuleEventTypeCheckboxes = selectedModuleEventTypes.find('input[type="checkbox"]');
-                            selectedModuleEventTypeCheckboxes.attr('checked', false);
+                            selectedModuleEventTypeCheckboxes.prop('checked', false);
                         }
                     }
                     return false;

Disco.Web/Areas/Config/Views/Logging/Index.generated.cs

@@ -326,14 +326,14 @@ WriteLiteral(">\r\n            $(function () {\r\n                var filterStar
 "leEventTypeCheckboxes = logModuleEventTypes.find(\'input[type=\"checkbox\"]\');\r\n\r\n " +
 "               moduleId.change(function () {\r\n                    // Unselect Al" +
 "l\r\n                    logModuleEventTypes.slideUp();\r\n                    logMo" +
-"duleEventTypeCheckboxes.filter(\':checked\').attr(\'checked\', false);\r\n            " +
+"duleEventTypeCheckboxes.filter(\':checked\').prop(\'checked\', false);\r\n            " +
 "        var selectedModule = moduleId.val();\r\n                    if (selectedMo" +
 "dule) {\r\n                        trLogModuleEventTypes.show();\r\n                " +
 "        var selectedModuleEventTypes = logModuleEventTypes.filter(\'[data-logmodu" +
 "leid=\"\' + selectedModule + \'\"]\');\r\n                        if (selectedModuleEve" +
 "ntTypes.length > 0) {\r\n                            var selectedModuleEventTypeCh" +
 "eckboxes = selectedModuleEventTypes.find(\'input[type=\"checkbox\"]\');\r\n           " +
-"                 selectedModuleEventTypeCheckboxes.attr(\'checked\', true);\r\n     " +
+"                 selectedModuleEventTypeCheckboxes.prop(\'checked\', true);\r\n     " +
 "                       trLogModuleEventTypes.show();\r\n                          " +
 "  selectedModuleEventTypes.slideDown();\r\n                        } else {\r\n     " +
 "                       trLogModuleEventTypes.hide();\r\n                        }\r" +
@@ -345,7 +345,7 @@ WriteLiteral(">\r\n            $(function () {\r\n                var filterStar
 "+ selectedModule + \'\"]\');\r\n                        if (selectedModuleEventTypes." +
 "length > 0) {\r\n                            var selectedModuleEventTypeCheckboxes" +
 " = selectedModuleEventTypes.find(\'input[type=\"checkbox\"]\');\r\n                   " +
-"         selectedModuleEventTypeCheckboxes.attr(\'checked\', true);\r\n             " +
+"         selectedModuleEventTypeCheckboxes.prop(\'checked\', true);\r\n             " +
 "           }\r\n                    }\r\n                    return false;\r\n        " +
 "        });\r\n                $(\'#eventTypesSelectNone\').click(function () {\r\n   " +
 "                 var selectedModule = moduleId.val();\r\n                    if (s" +
@@ -354,7 +354,7 @@ WriteLiteral(">\r\n            $(function () {\r\n                var filterStar
 "             if (selectedModuleEventTypes.length > 0) {\r\n                       " +
 "     var selectedModuleEventTypeCheckboxes = selectedModuleEventTypes.find(\'inpu" +
 "t[type=\"checkbox\"]\');\r\n                            selectedModuleEventTypeCheckb" +
-"oxes.attr(\'checked\', false);\r\n                        }\r\n                    }\r\n" +
+"oxes.prop(\'checked\', false);\r\n                        }\r\n                    }\r\n" +
 "                    return false;\r\n                });\r\n\r\n            });\r\n     " +
 "   </script>\r\n    </div>\r\n");
 

Disco.Web/Areas/Config/Views/Logging/TaskStatus.cshtml

@@ -242,7 +242,7 @@
         function updateWithLive() {
             liveConnection = $.connection('@(Url.Content("~/API/Logging/TaskStatusNotifications"))');
             liveConnection.received(update_Received);
-            liveConnection.error(function (e) { alert('Live-Status Error: ' + e) });
+            liveConnection.error(function (e) { if (e.status != 200) alert('Live-Status Error: ' + e.statusText + ': ' + e.responseText); });
             liveConnection.start(function () {
                 liveConnection.send('/addToGroups:' + sessionId);
                 updateWithAjax();

Disco.Web/Areas/Config/Views/Logging/TaskStatus.generated.cs

@@ -294,7 +294,7 @@ WriteLiteral("\';\r\n\r\n        var view = $(\'#scheduledTaskStatus\');\r\n
             #line hidden
 WriteLiteral(@"');
             liveConnection.received(update_Received);
-            liveConnection.error(function (e) { alert('Live-Status Error: ' + e) });
+            liveConnection.error(function (e) { if (e.status != 200) alert('Live-Status Error: ' + e.statusText + ': ' + e.responseText); });
             liveConnection.start(function () {
                 liveConnection.send('/addToGroups:' + sessionId);
                 updateWithAjax();

Disco.Web/Areas/Config/Views/Plugins/Index.cshtml

@@ -101,7 +101,7 @@
                             }
                         },
                         Cancel: function () {
-                            uninstallPluginData.removeAttr('checked');
+                            uninstallPluginData.prop('checked', false);
                             $('#uninstallPluginDataAlert').hide();
                             $(this).dialog("close");
                         }
@@ -125,7 +125,7 @@
                             $(this).dialog("disable");
                         },
                         Cancel: function () {
-                            uninstallPluginData.removeAttr('checked');
+                            uninstallPluginData.prop('checked', false);
                             $('#uninstallPluginDataAlert').hide();
                             $(this).dialog("close");
                         }

Disco.Web/Areas/Config/Views/Plugins/Index.generated.cs

@@ -383,33 +383,33 @@ WriteLiteral("/\';\r\n                var uninstallPlugin, uninstallPluginData,
 "stallPluginDataConfirm.hide();\r\n\r\n                                $dialogConfirm" +
 ".dialog(\'open\');\r\n                                $(this).dialog(\"close\");\r\n    " +
 "                        }\r\n                        },\r\n                        C" +
-"ancel: function () {\r\n                            uninstallPluginData.removeAttr" +
-"(\'checked\');\r\n                            $(\'#uninstallPluginDataAlert\').hide();" +
-"\r\n                            $(this).dialog(\"close\");\r\n                        " +
-"}\r\n                    }\r\n                });\r\n\r\n                $dialogConfirm " +
-"= $(\'#dialogUninstallPluginConfirm\').dialog({\r\n                    resizable: fa" +
-"lse,\r\n                    modal: true,\r\n                    width: 350,\r\n       " +
+"ancel: function () {\r\n                            uninstallPluginData.prop(\'chec" +
+"ked\', false);\r\n                            $(\'#uninstallPluginDataAlert\').hide()" +
+";\r\n                            $(this).dialog(\"close\");\r\n                       " +
+" }\r\n                    }\r\n                });\r\n\r\n                $dialogConfirm" +
+" = $(\'#dialogUninstallPluginConfirm\').dialog({\r\n                    resizable: f" +
+"alse,\r\n                    modal: true,\r\n                    width: 350,\r\n      " +
 "              autoOpen: false,\r\n                    buttons: {\r\n                " +
-"       \"Confirm Uninstall\": function () {\r\n                            var url =" +
-" uninstallUrl + pluginId;\r\n                            if (pluginUninstallData)\r" +
-"\n                                url += \'?UninstallData=true\'\r\n                 " +
-"           else\r\n                                url += \'?UninstallData=false\'\r\n" +
-"\r\n                            window.location.href = url;\r\n                     " +
+"        \"Confirm Uninstall\": function () {\r\n                            var url " +
+"= uninstallUrl + pluginId;\r\n                            if (pluginUninstallData)" +
+"\r\n                                url += \'?UninstallData=true\'\r\n                " +
+"            else\r\n                                url += \'?UninstallData=false\'\r" +
+"\n\r\n                            window.location.href = url;\r\n                    " +
 "        $(this).dialog(\"disable\");\r\n                        },\r\n                " +
-"       Cancel: function () {\r\n                            uninstallPluginData.re" +
-"moveAttr(\'checked\');\r\n                            $(\'#uninstallPluginDataAlert\')" +
-".hide();\r\n                            $(this).dialog(\"close\");\r\n                " +
-"        }\r\n                    }\r\n                });\r\n\r\n                uninsta" +
-"llPlugin = $(\'#uninstallPlugin\');\r\n                uninstallPluginData = $(\'#uni" +
-"nstallPluginData\');\r\n                uninstallPluginConfirm = $(\'#uninstallPlugi" +
-"nConfirm\');\r\n                uninstallPluginDataConfirm = $(\'#uninstallPluginDat" +
-"aConfirm\');\r\n\r\n                $(\'#buttonUninstall\').click(function () {\r\n      " +
+"        Cancel: function () {\r\n                            uninstallPluginData.p" +
+"rop(\'checked\', false);\r\n                            $(\'#uninstallPluginDataAlert" +
+"\').hide();\r\n                            $(this).dialog(\"close\");\r\n              " +
+"          }\r\n                    }\r\n                });\r\n\r\n                unins" +
+"tallPlugin = $(\'#uninstallPlugin\');\r\n                uninstallPluginData = $(\'#u" +
+"ninstallPluginData\');\r\n                uninstallPluginConfirm = $(\'#uninstallPlu" +
+"ginConfirm\');\r\n                uninstallPluginDataConfirm = $(\'#uninstallPluginD" +
+"ataConfirm\');\r\n\r\n                $(\'#buttonUninstall\').click(function () {\r\n    " +
 "                $dialog.dialog(\'open\');\r\n                    return false;\r\n    " +
-"          });\r\n\r\n                $(\'#uninstallPluginData\').change(function () {\r" +
-"\n                    if ($(this).is(\':checked\')) {\r\n                        $(\'#" +
-"uninstallPluginDataAlert\').slideDown();\r\n                    } else {\r\n         " +
-"               $(\'#uninstallPluginDataAlert\').slideUp();\r\n                    }\r" +
-"\n                });\r\n            });\r\n        </script>\r\n");
+"            });\r\n\r\n                $(\'#uninstallPluginData\').change(function () " +
+"{\r\n                    if ($(this).is(\':checked\')) {\r\n                        $(" +
+"\'#uninstallPluginDataAlert\').slideDown();\r\n                    } else {\r\n       " +
+"                 $(\'#uninstallPluginDataAlert\').slideUp();\r\n                    " +
+"}\r\n                });\r\n            });\r\n        </script>\r\n");
 
             
             #line 154 "..\..\Areas\Config\Views\Plugins\Index.cshtml"

Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml

@@ -8,17 +8,13 @@
     <table class="logEventsViewport">
         <thead>
             <tr>
-                <th class="icon">
-                    &nbsp;
+                <th class="icon">&nbsp;
                 </th>
-                <th class="timestamp">
-                    Date/Time
+                <th class="timestamp">Date/Time
                 </th>
-                <th class="eventType">
-                    Event Type
+                <th class="eventType">Event Type
                 </th>
-                <th class="message">
-                    Message
+                <th class="message">Message
                 </th>
             </tr>
         </thead>
@@ -31,15 +27,11 @@
         <table class="logEventsViewport" data-bind="visible: EventLogs().length > 0" style="display: none">
             <tbody data-bind="foreach: EventLogs">
                 <tr>
-                    <td class="icon" data-bind="css: {information: EventTypeSeverity == 0, warning: EventTypeSeverity == 1, error: EventTypeSeverity == 2}">
-                        &nbsp;
-                    </td>
-                    <td class="timestamp" data-bind="text: FormattedTimestamp">
-                    </td>
-                    <td class="eventType" data-bind="text: EventTypeName, attr: {title: ModuleDescription}">
-                    </td>
-                    <td class="message" data-bind="text: FormattedMessage, attr: {title: $parent.LogArguments($data)}">
+                    <td class="icon" data-bind="css: {information: EventTypeSeverity == 0, warning: EventTypeSeverity == 1, error: EventTypeSeverity == 2}">&nbsp;
                     </td>
+                    <td class="timestamp" data-bind="text: FormattedTimestamp"></td>
+                    <td class="eventType" data-bind="text: EventTypeName, attr: {title: ModuleDescription}"></td>
+                    <td class="message" data-bind="text: FormattedMessage, attr: {title: $parent.LogArguments($data)}"></td>
                 </tr>
             </tbody>
         </table>
@@ -123,7 +115,7 @@
 
                     liveConnection = $.connection('@(Url.Content("~/API/Logging/Notifications"))');
                     liveConnection.received(logReceived);
-                    liveConnection.error(function(e){alert('Live-Log Error: '+e)});
+                    liveConnection.error(function(e){if (e.status != 200) alert('Live-Log Error: '+e.statusText +': '+e.responseText);});
                     liveConnection.start(function(){
                         if (logModuleLiveGroupName){
                             liveConnection.send('/addToGroups:' + logModuleLiveGroupName);

Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs

@@ -73,38 +73,38 @@ WriteLiteral(">\r\n        <thead>\r\n            <tr>\r\n                <th");
 
 WriteLiteral(" class=\"icon\"");
 
-WriteLiteral(">\r\n                    &nbsp;\r\n                </th>\r\n                <th");
+WriteLiteral(">&nbsp;\r\n                </th>\r\n                <th");
 
 WriteLiteral(" class=\"timestamp\"");
 
-WriteLiteral(">\r\n                    Date/Time\r\n                </th>\r\n                <th");
+WriteLiteral(">Date/Time\r\n                </th>\r\n                <th");
 
 WriteLiteral(" class=\"eventType\"");
 
-WriteLiteral(">\r\n                    Event Type\r\n                </th>\r\n                <th");
+WriteLiteral(">Event Type\r\n                </th>\r\n                <th");
 
 WriteLiteral(" class=\"message\"");
 
-WriteLiteral(">\r\n                    Message\r\n                </th>\r\n            </tr>\r\n       " +
-" </thead>\r\n    </table>\r\n    <div");
+WriteLiteral(">Message\r\n                </th>\r\n            </tr>\r\n        </thead>\r\n    </table" +
+">\r\n    <div");
 
 WriteLiteral(" class=\"logEventsViewportContainer\"");
 
-WriteAttribute("style", Tuple.Create(" style=\"", 840), Tuple.Create("\"", 1050)
+WriteAttribute("style", Tuple.Create(" style=\"", 752), Tuple.Create("\"", 962)
             
-            #line 26 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
-, Tuple.Create(Tuple.Create("", 848), Tuple.Create<System.Object, System.Int32>(Model.ViewPortWidth.HasValue ? string.Format("width:{0}px;", Model.ViewPortWidth.Value) : null
+            #line 22 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+, Tuple.Create(Tuple.Create("", 760), Tuple.Create<System.Object, System.Int32>(Model.ViewPortWidth.HasValue ? string.Format("width:{0}px;", Model.ViewPortWidth.Value) : null
             
             #line default
             #line hidden
-, 848), false)
+, 760), false)
             
-            #line 26 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
-                                                                      , Tuple.Create(Tuple.Create("", 945), Tuple.Create<System.Object, System.Int32>(Model.ViewPortHeight.HasValue ? string.Format("height:{0}px;", Model.ViewPortHeight.Value - 18) : null
+            #line 22 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+                                                                      , Tuple.Create(Tuple.Create("", 857), Tuple.Create<System.Object, System.Int32>(Model.ViewPortHeight.HasValue ? string.Format("height:{0}px;", Model.ViewPortHeight.Value - 18) : null
             
             #line default
             #line hidden
-, 945), false)
+, 857), false)
 );
 
 WriteLiteral(">\r\n        <div");
@@ -134,36 +134,35 @@ WriteLiteral(" class=\"icon\"");
 WriteLiteral(" data-bind=\"css: {information: EventTypeSeverity == 0, warning: EventTypeSeverity" +
 " == 1, error: EventTypeSeverity == 2}\"");
 
-WriteLiteral(">\r\n                        &nbsp;\r\n                    </td>\r\n                   " +
-" <td");
+WriteLiteral(">&nbsp;\r\n                    </td>\r\n                    <td");
 
 WriteLiteral(" class=\"timestamp\"");
 
 WriteLiteral(" data-bind=\"text: FormattedTimestamp\"");
 
-WriteLiteral(">\r\n                    </td>\r\n                    <td");
+WriteLiteral("></td>\r\n                    <td");
 
 WriteLiteral(" class=\"eventType\"");
 
 WriteLiteral(" data-bind=\"text: EventTypeName, attr: {title: ModuleDescription}\"");
 
-WriteLiteral(">\r\n                    </td>\r\n                    <td");
+WriteLiteral("></td>\r\n                    <td");
 
 WriteLiteral(" class=\"message\"");
 
 WriteLiteral(" data-bind=\"text: FormattedMessage, attr: {title: $parent.LogArguments($data)}\"");
 
-WriteLiteral(">\r\n                    </td>\r\n                </tr>\r\n            </tbody>\r\n      " +
-"  </table>\r\n    </div>\r\n");
+WriteLiteral("></td>\r\n                </tr>\r\n            </tbody>\r\n        </table>\r\n    </div>" +
+"\r\n");
 
             
-            #line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 39 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 39 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
       
         var serializer = new System.Web.Script.Serialization.JavaScriptSerializer();
         var eventTypesFilterJson = (Model.EventTypesFilter != null) ? serializer.Serialize(Model.EventTypesFilter.Select(et => et.Id).ToArray()) : "null";
@@ -178,7 +177,7 @@ WriteLiteral(" type=\"text/javascript\"");
 WriteLiteral(">\r\n        $(function () {\r\n            var logEventsHost = $(\'LogEvents_");
 
             
-            #line 53 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 45 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                          Write(uniqueId);
 
             
@@ -187,7 +186,7 @@ WriteLiteral(">\r\n        $(function () {\r\n            var logEventsHost = $(
 WriteLiteral("\');\r\n            var logModuleId = \'");
 
             
-            #line 54 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 46 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                            Write(Model.ModuleFilter != null ? Model.ModuleFilter.ModuleId.ToString() : null);
 
             
@@ -196,7 +195,7 @@ WriteLiteral("\');\r\n            var logModuleId = \'");
 WriteLiteral("\';\r\n            var logModuleLiveGroupName = \'");
 
             
-            #line 55 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                       Write(Model.ModuleFilter != null ? Model.ModuleFilter.LiveLogGroupName : Disco.Services.Logging.LogContext.LiveLogAllEventsGroupName);
 
             
@@ -205,7 +204,7 @@ WriteLiteral("\';\r\n            var logModuleLiveGroupName = \'");
 WriteLiteral("\';\r\n            var logEventTypeFiltered = ");
 
             
-            #line 56 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 48 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                    Write(eventTypesFilterJson);
 
             
@@ -214,7 +213,7 @@ WriteLiteral("\';\r\n            var logEventTypeFiltered = ");
 WriteLiteral(";\r\n            var logStartFiler = ");
 
             
-            #line 57 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 49 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                             Write(AjaxHelpers.JsonDate(Model.StartFilter));
 
             
@@ -223,7 +222,7 @@ WriteLiteral(";\r\n            var logStartFiler = ");
 WriteLiteral(";\r\n            var logEndFiler = ");
 
             
-            #line 58 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 50 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                           Write(AjaxHelpers.JsonDate(Model.EndFilter));
 
             
@@ -232,7 +231,7 @@ WriteLiteral(";\r\n            var logEndFiler = ");
 WriteLiteral(";\r\n            var logTakeFiler = \'");
 
             
-            #line 59 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 51 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                             Write(Model.TakeFilter);
 
             
@@ -242,7 +241,7 @@ WriteLiteral("\';\r\n            var liveConnection = null;\r\n            var l
 "tion = \'");
 
             
-            #line 61 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 53 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                          Write(Model.JavascriptLiveEventFunctionName);
 
             
@@ -251,7 +250,7 @@ WriteLiteral("\';\r\n            var liveConnection = null;\r\n            var l
 WriteLiteral("\';\r\n            var useLive = (\'True\'===\'");
 
             
-            #line 62 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 54 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                  Write(Model.IsLive);
 
             
@@ -294,7 +293,7 @@ WriteLiteral(@"');
                     url: '");
 
             
-            #line 96 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 88 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                       Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
 
             
@@ -331,7 +330,7 @@ WriteLiteral(@"',
                     liveConnection = $.connection('");
 
             
-            #line 124 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 116 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                                Write(Url.Content("~/API/Logging/Notifications"));
 
             
@@ -339,7 +338,7 @@ WriteLiteral(@"',
             #line hidden
 WriteLiteral(@"');
                     liveConnection.received(logReceived);
-                    liveConnection.error(function(e){alert('Live-Log Error: '+e)});
+                    liveConnection.error(function(e){if (e.status != 200) alert('Live-Log Error: '+e.statusText +': '+e.responseText);});
                     liveConnection.start(function(){
                         if (logModuleLiveGroupName){
                             liveConnection.send('/addToGroups:' + logModuleLiveGroupName);

Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.js

@@ -19,11 +19,10 @@
         $('#buttonCreateJob').click(function () {
             var $this = $(this);
             var href = $this.attr('href');
-            var iframe = $('<iframe>').attr({ 'src': href }).width('100%').height('100%').css('border', 'none');
-            createJobDialog = $('<div>').attr('id', 'createJobDialog').width('100%').height('100%')
-                .appendTo(document)
-                .append(iframe)
-                .dialog({
+            
+            createJobDialog = $('<div>').attr('id', 'createJobDialog').width('100%').height('100%').appendTo(document.body);
+
+            createJobDialog.dialog({
                 resizable: false,
                 draggable: false,
                 modal: true,
@@ -38,6 +37,9 @@
                 },
                 buttons: {}
             });
+
+            var iframe = $('<iframe>').attr({ 'src': href }).width('100%').height('100%').css('border', 'none').appendTo(createJobDialog);
+
             createJobDialog[0].discoDialogMethods = dialogMethods;
 
             return false;

Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.min.js

@@ -1,2 +1,2 @@
-(function(n,t,i){n(function(){var r=null,u={close:function(){r.dialog("close")},setButtons:function(n){r&&r.dialog("option","buttons",n)}};n("#buttonCreateJob").click(function(){var f=n(this),e=f.attr("href"),o=n("<iframe>").attr({src:e}).width("100%").height("100%").css("border","none");return r=n("<div>").attr("id","createJobDialog").width("100%").height("100%").appendTo(i).append(o).dialog({resizable:!1,draggable:!1,modal:!0,autoOpen:!0,title:"Create Job",width:850,height:n(t).height()-50,close:function(){r.find("iframe").attr("src","about:blank"),r.dialog("destroy").remove(),r=null},buttons:{}}),r[0].discoDialogMethods=u,!1})})})($,window,document);
+(function(n,t,i){n(function(){var r=null,u={close:function(){r.dialog("close")},setButtons:function(n){r&&r.dialog("option","buttons",n)}};n("#buttonCreateJob").click(function(){var f=n(this),e=f.attr("href"),o;return r=n("<div>").attr("id","createJobDialog").width("100%").height("100%").appendTo(i.body),r.dialog({resizable:!1,draggable:!1,modal:!0,autoOpen:!0,title:"Create Job",width:850,height:n(t).height()-50,close:function(){r.find("iframe").attr("src","about:blank"),r.dialog("destroy").remove(),r=null},buttons:{}}),o=n("<iframe>").attr({src:e}).width("100%").height("100%").css("border","none").appendTo(r),r[0].discoDialogMethods=u,!1})})})($,window,document);
 //@ sourceMappingURL=Disco-CreateJob.min.js.map

Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.min.js.map

@@ -2,7 +2,7 @@
 "version":3,
 "file":"Disco-CreateJob.min.js",
 "lineCount":1,
-"mappings":"CAGC,QAAS,CAACA,CAAC,CAAEC,CAAM,CAAEC,CAAZ,CAAsB,CAC5BF,CAAC,CAAC,QAAS,CAAA,CAAG,CACV,IAAIG,EAAkB,KAClBC,EAAgB,CAChB,KAAK,CAAEC,QAAS,CAAA,CAAG,CACfF,CAAeG,OAAO,CAAC,OAAD,CADP,CAElB,CACD,UAAU,CAAEC,QAAS,CAACC,CAAD,CAAU,CACvBL,C,EACAA,CAAeG,OAAO,CAAC,QAAQ,CAAE,SAAS,CAAEE,CAAtB,CAFC,CAJf,CADM,CAY1BR,CAAC,CAAC,kBAAD,CAAoBS,MAAM,CAAC,QAAS,CAAA,CAAG,CACpC,IAAIC,EAAQV,CAAC,CAAC,IAAD,EACTW,EAAOD,CAAKE,KAAK,CAAC,MAAD,EACjBC,EAASb,CAAC,CAAC,UAAD,CAAYY,KAAK,CAAC,CAAE,GAAK,CAAED,CAAT,CAAD,CAAiBG,MAAM,CAAC,MAAD,CAAQC,OAAO,CAAC,MAAD,CAAQC,IAAI,CAAC,QAAQ,CAAE,MAAX,CAF9D,CAuBnB,OApBAb,CAAgB,CAAEH,CAAC,CAAC,OAAD,CAASY,KAAK,CAAC,IAAI,CAAE,iBAAP,CAAyBE,MAAM,CAAC,MAAD,CAAQC,OAAO,CAAC,MAAD,CAC3EE,SAAS,CAACf,CAAD,CACTgB,OAAO,CAACL,CAAD,CACPP,OAAO,CAAC,CACJ,SAAS,CAAE,CAAA,CAAK,CAChB,SAAS,CAAE,CAAA,CAAK,CAChB,KAAK,CAAE,CAAA,CAAI,CACX,QAAQ,CAAE,CAAA,CAAI,CACd,KAAK,CAAE,YAAY,CACnB,KAAK,CAAE,GAAG,CACV,MAAM,CAAEN,CAAC,CAACC,CAAD,CAAQc,OAAO,CAAA,CAAG,CAAE,EAAE,CAC/B,KAAK,CAAEV,QAAS,CAAA,CAAG,CACfF,CAAegB,KAAK,CAAC,QAAD,CAAUP,KAAK,CAAC,KAAK,CAAE,aAAR,CAAsB,CACzDT,CAAeG,OAAO,CAAC,SAAD,CAAWc,OAAO,CAAA,CAAE,CAC1CjB,CAAgB,CAAE,IAHH,CAIlB,CACD,OAAO,CAAE,CAAA,CAbL,CAAD,CAcL,CACNA,CAAgB,CAAA,CAAA,CAAEkB,mBAAoB,CAAEjB,CAAa,CAE9C,CAAA,CAxB6B,CAAb,CAbjB,CAAb,CAD2B,EAyC9B,CAACJ,CAAC,CAAEC,MAAM,CAAEC,QAAZ,CAAqB",
+"mappings":"CAGC,QAAS,CAACA,CAAC,CAAEC,CAAM,CAAEC,CAAZ,CAAsB,CAC5BF,CAAC,CAAC,QAAS,CAAA,CAAG,CACV,IAAIG,EAAkB,KAClBC,EAAgB,CAChB,KAAK,CAAEC,QAAS,CAAA,CAAG,CACfF,CAAeG,OAAO,CAAC,OAAD,CADP,CAElB,CACD,UAAU,CAAEC,QAAS,CAACC,CAAD,CAAU,CACvBL,C,EACAA,CAAeG,OAAO,CAAC,QAAQ,CAAE,SAAS,CAAEE,CAAtB,CAFC,CAJf,CADM,CAY1BR,CAAC,CAAC,kBAAD,CAAoBS,MAAM,CAAC,QAAS,CAAA,CAAG,CACpC,IAAIC,EAAQV,CAAC,CAAC,IAAD,EACTW,EAAOD,CAAKE,KAAK,CAAC,MAAD,EAoBjBC,CArBe,CAyBnB,OAtBAV,CAAgB,CAAEH,CAAC,CAAC,OAAD,CAASY,KAAK,CAAC,IAAI,CAAE,iBAAP,CAAyBE,MAAM,CAAC,MAAD,CAAQC,OAAO,CAAC,MAAD,CAAQC,SAAS,CAACd,CAAQe,KAAT,CAAe,CAE/Gd,CAAeG,OAAO,CAAC,CACnB,SAAS,CAAE,CAAA,CAAK,CAChB,SAAS,CAAE,CAAA,CAAK,CAChB,KAAK,CAAE,CAAA,CAAI,CACX,QAAQ,CAAE,CAAA,CAAI,CACd,KAAK,CAAE,YAAY,CACnB,KAAK,CAAE,GAAG,CACV,MAAM,CAAEN,CAAC,CAACC,CAAD,CAAQc,OAAO,CAAA,CAAG,CAAE,EAAE,CAC/B,KAAK,CAAEV,QAAS,CAAA,CAAG,CACfF,CAAee,KAAK,CAAC,QAAD,CAAUN,KAAK,CAAC,KAAK,CAAE,aAAR,CAAsB,CACzDT,CAAeG,OAAO,CAAC,SAAD,CAAWa,OAAO,CAAA,CAAE,CAC1ChB,CAAgB,CAAE,IAHH,CAIlB,CACD,OAAO,CAAE,CAAA,CAbU,CAAD,CAcpB,CAEEU,CAAO,CAAEb,CAAC,CAAC,UAAD,CAAYY,KAAK,CAAC,CAAE,GAAK,CAAED,CAAT,CAAD,CAAiBG,MAAM,CAAC,MAAD,CAAQC,OAAO,CAAC,MAAD,CAAQK,IAAI,CAAC,QAAQ,CAAE,MAAX,CAAkBJ,SAAS,CAACb,CAAD,C,CAE5GA,CAAgB,CAAA,CAAA,CAAEkB,mBAAoB,CAAEjB,CAAa,CAE9C,CAAA,CA1B6B,CAAb,CAbjB,CAAb,CAD2B,EA2C9B,CAACJ,CAAC,CAAEC,MAAM,CAAEC,QAAZ,CAAqB",
 "sources":["/ClientSource/Scripts/Modules/Disco-CreateJob/disco.createjob.js"],
-"names":["$","window","document","createJobDialog","dialogMethods","close","dialog","setButtons","buttons","click","$this","href","attr","iframe","width","height","css","appendTo","append","find","remove","discoDialogMethods"]
+"names":["$","window","document","createJobDialog","dialogMethods","close","dialog","setButtons","buttons","click","$this","href","attr","iframe","width","height","appendTo","body","find","remove","css","discoDialogMethods"]
 }

Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob/disco.createjob.js

@@ -18,11 +18,10 @@
         $('#buttonCreateJob').click(function () {
             var $this = $(this);
             var href = $this.attr('href');
-            var iframe = $('<iframe>').attr({ 'src': href }).width('100%').height('100%').css('border', 'none');
-            createJobDialog = $('<div>').attr('id', 'createJobDialog').width('100%').height('100%')
-                .appendTo(document)
-                .append(iframe)
-                .dialog({
+            
+            createJobDialog = $('<div>').attr('id', 'createJobDialog').width('100%').height('100%').appendTo(document.body);
+
+            createJobDialog.dialog({
                 resizable: false,
                 draggable: false,
                 modal: true,
@@ -37,6 +36,9 @@
                 },
                 buttons: {}
             });
+
+            var iframe = $('<iframe>').attr({ 'src': href }).width('100%').height('100%').css('border', 'none').appendTo(createJobDialog);
+
             createJobDialog[0].discoDialogMethods = dialogMethods;
 
             return false;

Disco.Web/ClientSource/Scripts/Modules/jQuery-Isotope.js

@@ -1,6 +1,6 @@
 ///#source 1 1 /ClientSource/Scripts/Modules/jQuery-Isotope/jquery.isotope.js
 /**
- * Isotope v1.5.19
+ * Isotope v1.5.25
  * An exquisite jQuery plugin for magical layouts
  * http://isotope.metafizzy.co
  *
@@ -261,8 +261,8 @@
         transitionEndEvent = {
             WebkitTransitionProperty: 'webkitTransitionEnd',  // webkit
             MozTransitionProperty: 'transitionend',
-            OTransitionProperty: 'oTransitionEnd',
-            transitionProperty: 'transitionEnd'
+            OTransitionProperty: 'oTransitionEnd otransitionend',
+            transitionProperty: 'transitionend'
         }[transitionProp];
 
         transitionDurProp = getStyleProperty('transitionDuration');
@@ -281,6 +281,7 @@
      */
 
     var $event = $.event,
+        dispatchMethod = $.event.handle ? 'handle' : 'dispatch',
         resizeTimeout;
 
     $event.special.smartresize = {
@@ -300,7 +301,7 @@
 
             if (resizeTimeout) { clearTimeout(resizeTimeout); }
             resizeTimeout = setTimeout(function () {
-                jQuery.event.handle.apply(context, args);
+                $event[dispatchMethod].apply(context, args);
             }, execAsap === "execAsap" ? 0 : 100);
         }
     };
@@ -347,7 +348,7 @@
         sortBy: 'original-order',
         sortAscending: true,
         resizesContainer: true,
-        transformsEnabled: !$.browser.opera, // disable transforms in Opera
+        transformsEnabled: true,
         itemPositionDataEnabled: false
     };
 
@@ -428,6 +429,11 @@
                 // base style for atoms
                 atomStyle = { position: 'absolute' };
 
+            // filter out text nodes
+            $atoms = $atoms.filter(function (i, atom) {
+                return atom.nodeType === 1;
+            });
+
             if (this.usingTransforms) {
                 atomStyle.left = 0;
                 atomStyle.top = 0;
@@ -805,11 +811,12 @@
 
         // removes elements from Isotope widget
         remove: function ($content, callback) {
-            // remove elements from Isotope instance in callback
-            var instance = this;
+            // remove elements immediately from Isotope instance
+            this.$allAtoms = this.$allAtoms.not($content);
+            this.$filteredAtoms = this.$filteredAtoms.not($content);
             // remove() as a callback, for after transition / animation
+            var instance = this;
             var removeContent = function () {
-                instance.$allAtoms = instance.$allAtoms.not($content);
                 $content.remove();
                 if (callback) {
                     callback.call(instance.element);
@@ -819,7 +826,6 @@
             if ($content.filter(':not(.' + this.options.hiddenClass + ')').length) {
                 // if any non-hidden content needs to be removed
                 this.styleQueue.push({ $el: $content, style: this.options.hiddenStyle });
-                this.$filteredAtoms = this.$filteredAtoms.not($content);
                 this._sort();
                 this.reLayout(removeContent);
             } else {

Disco.Web/ClientSource/Scripts/Modules/jQuery-Isotope/jquery.isotope.js

@@ -1,5 +1,5 @@
 /**
- * Isotope v1.5.19
+ * Isotope v1.5.25
  * An exquisite jQuery plugin for magical layouts
  * http://isotope.metafizzy.co
  *
@@ -260,8 +260,8 @@
         transitionEndEvent = {
             WebkitTransitionProperty: 'webkitTransitionEnd',  // webkit
             MozTransitionProperty: 'transitionend',
-            OTransitionProperty: 'oTransitionEnd',
-            transitionProperty: 'transitionEnd'
+            OTransitionProperty: 'oTransitionEnd otransitionend',
+            transitionProperty: 'transitionend'
         }[transitionProp];
 
         transitionDurProp = getStyleProperty('transitionDuration');
@@ -280,6 +280,7 @@
      */
 
     var $event = $.event,
+        dispatchMethod = $.event.handle ? 'handle' : 'dispatch',
         resizeTimeout;
 
     $event.special.smartresize = {
@@ -299,7 +300,7 @@
 
             if (resizeTimeout) { clearTimeout(resizeTimeout); }
             resizeTimeout = setTimeout(function () {
-                jQuery.event.handle.apply(context, args);
+                $event[dispatchMethod].apply(context, args);
             }, execAsap === "execAsap" ? 0 : 100);
         }
     };
@@ -346,7 +347,7 @@
         sortBy: 'original-order',
         sortAscending: true,
         resizesContainer: true,
-        transformsEnabled: !$.browser.opera, // disable transforms in Opera
+        transformsEnabled: true,
         itemPositionDataEnabled: false
     };
 
@@ -427,6 +428,11 @@
                 // base style for atoms
                 atomStyle = { position: 'absolute' };
 
+            // filter out text nodes
+            $atoms = $atoms.filter(function (i, atom) {
+                return atom.nodeType === 1;
+            });
+
             if (this.usingTransforms) {
                 atomStyle.left = 0;
                 atomStyle.top = 0;
@@ -804,11 +810,12 @@
 
         // removes elements from Isotope widget
         remove: function ($content, callback) {
-            // remove elements from Isotope instance in callback
-            var instance = this;
+            // remove elements immediately from Isotope instance
+            this.$allAtoms = this.$allAtoms.not($content);
+            this.$filteredAtoms = this.$filteredAtoms.not($content);
             // remove() as a callback, for after transition / animation
+            var instance = this;
             var removeContent = function () {
-                instance.$allAtoms = instance.$allAtoms.not($content);
                 $content.remove();
                 if (callback) {
                     callback.call(instance.element);
@@ -818,7 +825,6 @@
             if ($content.filter(':not(.' + this.options.hiddenClass + ')').length) {
                 // if any non-hidden content needs to be removed
                 this.styleQueue.push({ $el: $content, style: this.options.hiddenStyle });
-                this.$filteredAtoms = this.$filteredAtoms.not($content);
                 this._sort();
                 this.reLayout(removeContent);
             } else {

Disco.Web/ClientSource/Style/BundleSite.css

@@ -1463,6 +1463,11 @@ footer a:visited,
 footer a:active,
 #footer a:active {
   color: #777;
+}
+footer a:link,
+#footer a:link,
+footer a:active,
+#footer a:active {
   text-decoration: underline;
 }
 footer a:hover,

Disco.Web/ClientSource/Style/Device.css

@@ -1,15 +1,22 @@
-.tableData {
+.tableData {
   border: solid 1px #e8eef4;
   border-collapse: collapse;
 }
-.tableData td {
+.tableData > tbody > tr > td {
   border: solid 1px #e8eef4;
   background-color: #fff;
 }
-.tableData th {
+.tableData > tbody > tr:nth-child(odd) > td {
+  background-color: #fcfcfd;
+}
+.tableData > thead > tr > th,
+.tableData > tbody > tr > th {
   background-color: #e8eef4;
   border: solid 1px #e8eef4;
 }
+.tableData > tbody > tr:hover > td {
+  background-color: #e8eef4;
+}
 .tableDataDark {
   border: solid 1px #8db2d8;
   border-collapse: collapse;
@@ -97,11 +104,12 @@ table.deviceShow td.model {
 table.deviceShow td.model table td {
   text-align: center;
 }
-table.deviceShow #deviceBatchDetails {
+table.deviceShow #deviceBatchSummary {
   display: none;
   font-size: 0.9em;
 }
-table.deviceShow #deviceBatchEdit {
+table.deviceShow #deviceBatchDetails,
+table.deviceShow #deviceProfileDetails {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACQElEQVQ4EQXBT4uVVRwA4Od3znnn3pkmi4poFQRFNYuMoAyirAnqI7Rr20dxX7iUFkmLaNNCglaRGGRaQUSZCFLUwlD8MzN6733P+fU8cer02TOHh/dfnue+mnvXx9DnYYw0j05QS1GjmLaqxdZkqpWIxUM7yx/bVNvrx/ee37u/Wtn0ofdu3gzzPMyjE7RStFoc2922WExaqaZFc/Xa9dZ6xjMvvfCsu4dHNn2Y+9DnbrMeNqMTTKWordpeTJbLyaJVOztbrlz7+7l272jt8u9/2WxmBAEASEgiJACmWt05XGvbuw/n/jsnLCcEoCNQkIAAQNIH/3x+I9sYaXuLY/MN7qPN7D5Obrh7Dw2BBCRL1ssnQYtIPXHxlLHztfHf09p7X8l5Zfy0Lx6tDACMmYM39P0zQmo50hhoa2XvirzwFDBmlkN58Q9mAHTylxPGIHNotVVTo6+O+P4D+gElKI2D4/qFV4CxZnqEfkQtAqVUrQQxqPufAjBWYmtbff8LAAAAuaa2hTbG0OHyx/rRVR7cUt89Ix/cMS58xM4TAMCYWd/m7c9EDK2WYmp48Kf62mn9u5OMoC1xXX31LDMABnnpQ5JAK0EUcr0xvt0XuUtM5BCxNn54iwTA6MxdFJTQosRyQpz8RF0V2kwtoj4m3jxPVgBAsjVMhVCW7c7tm79+ee783qabQZLZpSCCJEqkJDMjSmQRWjHdvPHvb+3w4O43ly79fKuPXMuUSIxMMkEpNTOHzIwoJVvUjLAs1cX/AdqeHE5xuOGdAAAAAElFTkSuQmCC) /*Images/Actions/editForm.png*/;
 }
 a.unlocked16 {

Disco.Web/ClientSource/Style/Device.less

@@ -19,11 +19,11 @@ table.deviceShow
 			}
 		}
 	}
-	#deviceBatchDetails {
+	#deviceBatchSummary {
 		display: none;
 		font-size: 0.9em;
 	}
-	#deviceBatchEdit {
+	#deviceBatchDetails, #deviceProfileDetails {
 		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACQElEQVQ4EQXBT4uVVRwA4Od3znnn3pkmi4poFQRFNYuMoAyirAnqI7Rr20dxX7iUFkmLaNNCglaRGGRaQUSZCFLUwlD8MzN6733P+fU8cer02TOHh/dfnue+mnvXx9DnYYw0j05QS1GjmLaqxdZkqpWIxUM7yx/bVNvrx/ee37u/Wtn0ofdu3gzzPMyjE7RStFoc2922WExaqaZFc/Xa9dZ6xjMvvfCsu4dHNn2Y+9DnbrMeNqMTTKWordpeTJbLyaJVOztbrlz7+7l272jt8u9/2WxmBAEASEgiJACmWt05XGvbuw/n/jsnLCcEoCNQkIAAQNIH/3x+I9sYaXuLY/MN7qPN7D5Obrh7Dw2BBCRL1ssnQYtIPXHxlLHztfHf09p7X8l5Zfy0Lx6tDACMmYM39P0zQmo50hhoa2XvirzwFDBmlkN58Q9mAHTylxPGIHNotVVTo6+O+P4D+gElKI2D4/qFV4CxZnqEfkQtAqVUrQQxqPufAjBWYmtbff8LAAAAuaa2hTbG0OHyx/rRVR7cUt89Ix/cMS58xM4TAMCYWd/m7c9EDK2WYmp48Kf62mn9u5OMoC1xXX31LDMABnnpQ5JAK0EUcr0xvt0XuUtM5BCxNn54iwTA6MxdFJTQosRyQpz8RF0V2kwtoj4m3jxPVgBAsjVMhVCW7c7tm79+ee783qabQZLZpSCCJEqkJDMjSmQRWjHdvPHvb+3w4O43ly79fKuPXMuUSIxMMkEpNTOHzIwoJVvUjLAs1cX/AdqeHE5xuOGdAAAAAElFTkSuQmCC) /*Images/Actions/editForm.png*/;
 	}
 }

Disco.Web/ClientSource/Style/Job.css

@@ -146,11 +146,6 @@
 #Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_GenerateDocument_Container #Job_Show_GenerateDocument {
   padding: 0;
 }
-#Job_Show #Job_Show_Subjects #Job_Show_Job #Job_Show_GenerateDocument_Container #Job_Show_GenerateDocument_Status {
-  padding: 0;
-  display: none;
-  white-space: nowrap;
-}
 #Job_Show #Job_Show_Subjects #Job_Show_Device > div {
   padding-left: 102px;
   min-height: 100px;

Disco.Web/ClientSource/Style/Job.less

@@ -117,12 +117,6 @@
                 #Job_Show_GenerateDocument
                 {
 					padding: 0;
-                }
-				#Job_Show_GenerateDocument_Status
-                {
-					padding: 0;
-					display: none;
-					white-space: nowrap;
                 }
             }
         }

Disco.Web/ClientSource/Style/Site.css

@@ -285,6 +285,11 @@ footer a:visited,
 footer a:active,
 #footer a:active {
   color: #777;
+}
+footer a:link,
+#footer a:link,
+footer a:active,
+#footer a:active {
   text-decoration: underline;
 }
 footer a:hover,

Disco.Web/ClientSource/Style/Site.less

@@ -251,6 +251,9 @@ footer, #footer
         &:link, &:visited, &:active
         {
             color: #777;
+        }
+        &:link, &:active
+        {
             text-decoration: underline;
         }
 

Disco.Web/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.0219.1605")]
-[assembly: AssemblyFileVersion("1.2.0219.1605")]
+[assembly: AssemblyVersion("1.2.0219.1854")]
+[assembly: AssemblyFileVersion("1.2.0219.1854")]

Disco.Web/Views/Device/AddOffline.cshtml

@@ -102,7 +102,7 @@
                             $AssignedUserId.val(ui.item.Id).blur();
                             return false;
                         }
-                    }).data('autocomplete')._renderItem = function (ul, item) {
+                    }).data('ui-autocomplete')._renderItem = function (ul, item) {
                         return $("<li></li>")
                         .data("item.autocomplete", item)
                         .append("<a><strong>" + item.DisplayName + "</strong><br>" + item.Id + " (" + item.Type + ")</a>")

Disco.Web/Views/Device/AddOffline.generated.cs

@@ -280,7 +280,7 @@ WriteLiteral(@"',
                             $AssignedUserId.val(ui.item.Id).blur();
                             return false;
                         }
-                    }).data('autocomplete')._renderItem = function (ul, item) {
+                    }).data('ui-autocomplete')._renderItem = function (ul, item) {
                         return $(""<li></li>"")
                         .data(""item.autocomplete"", item)
                         .append(""<a><strong>"" + item.DisplayName + ""</strong><br>"" + item.Id + "" ("" + item.Type + "")</a>"")

Disco.Web/Views/Device/Show.cshtml

@@ -104,13 +104,13 @@
                     </th>
                     <td class="value">
                         @Html.DropDownListFor(m => m.Device.DeviceBatchId, Model.DeviceBatches)
-                        @AjaxHelpers.AjaxLoader() <span id="deviceBatchEdit" class="icon16" title="Edit">
-                        </span>
+                        @AjaxHelpers.AjaxLoader() <span id="deviceBatchDetails" class="icon16" title="Batch Details"></span>
                         <script type="text/javascript">
                             $(function () {
                                 var $DeviceBatchId = $('#Device_DeviceBatchId');
                                 var $DeviceBatchDetails = $('#deviceBatchDetails');
-                                var $DeviceBatchEdit = $('#deviceBatchEdit');
+                                var $DeviceBatchSummary = $('#deviceBatchSummary');
+                                var initUpdate = false;
                                 var jsonDate = function (json, unknownValue) {
                                     if (json && json.indexOf('') == 0) {
                                         return $.datepicker.formatDate('yy-mm-dd', new Date(parseInt(json.substr(6, json.length - 8))));
@@ -121,35 +121,41 @@
                                     $.getJSON('@(Url.Action(MVC.API.DeviceBatch.Index()))/' + deviceBatchId, function (response, result) {
                                         if (result == 'success') {
                                             if (response.Supplier)
-                                                $DeviceBatchDetails.find('.supplier').text(response.Supplier);
+                                                $DeviceBatchSummary.find('.supplier').text(response.Supplier);
                                             else
-                                                $DeviceBatchDetails.find('.supplier').text('Unknown');
+                                                $DeviceBatchSummary.find('.supplier').text('Unknown');
 
-                                            $DeviceBatchDetails.find('.purchaseDate').text(jsonDate(response.PurchaseDate, 'Unknown'));
-                                            $DeviceBatchDetails.find('.warrantyValidUntil').text(jsonDate(response.WarrantyValidUntil, 'Unknown'));
+                                            $DeviceBatchSummary.find('.purchaseDate').text(jsonDate(response.PurchaseDate, 'Unknown'));
+                                            $DeviceBatchSummary.find('.warrantyValidUntil').text(jsonDate(response.WarrantyValidUntil, 'Unknown'));
 
                                             if (response.InsuranceSupplier)
-                                                $DeviceBatchDetails.find('.insuranceSupplier').text(response.InsuranceSupplier);
+                                                $DeviceBatchSummary.find('.insuranceSupplier').text(response.InsuranceSupplier);
                                             else
-                                                $DeviceBatchDetails.find('.insuranceSupplier').text('Unknown');
+                                                $DeviceBatchSummary.find('.insuranceSupplier').text('Unknown');
 
-                                            $DeviceBatchDetails.find('.insuredUntil').text(jsonDate(response.InsuredUntil, 'Unknown'));
+                                            $DeviceBatchSummary.find('.insuredUntil').text(jsonDate(response.InsuredUntil, 'Unknown'));
 
-                                            $DeviceBatchDetails.slideDown('fast');
-                                            $DeviceBatchEdit.fadeIn();
+                                            if (initUpdate){
+                                                $DeviceBatchSummary.show();
+                                                $DeviceBatchDetails.show();
+                                                initUpdate = false;
+                                            }else{
+                                                $DeviceBatchSummary.slideDown('fast');
+                                                $DeviceBatchDetails.fadeIn();
+                                            }
                                         } else {
                                             alert('Unable to load Device Batch details:\n' + response);
                                         }
                                     });
                                 };
-                                $DeviceBatchEdit.click(function () {
+                                $DeviceBatchDetails.click(function () {
                                     window.location.href = '@(Url.Action(MVC.Config.DeviceBatch.Index(null)))/' + $DeviceBatchId.val();
                                 });
                                 $DeviceBatchId.change(function () {
                                     var $this = $(this);
                                     var $ajaxLoading = $this.next('.ajaxLoading').show();
+                                    $DeviceBatchSummary.hide();
                                     $DeviceBatchDetails.hide();
-                                    $DeviceBatchEdit.hide();
                                     var data = { DeviceBatchId: $this.val() };
                                     $.getJSON('@(Url.Action(MVC.API.Device.UpdateDeviceBatchId(Model.Device.SerialNumber)))', data, function (response, result) {
                                         if (result != 'success' || response != 'OK') {
@@ -162,12 +168,14 @@
                                         }
                                     });
                                 });
-                                $DeviceBatchEdit.hide();
-                                if ($DeviceBatchId.val())
+                                $DeviceBatchSummary.hide();
+                                if ($DeviceBatchId.val()){
+                                    initUpdate = true;
                                     updateDetails($DeviceBatchId.val());
+                                }
                             });
                         </script>
-                        <div id="deviceBatchDetails">
+                        <div id="deviceBatchSummary">
                             <table class="sub">
                                 <tr>
                                     <th style="width: 50px">
@@ -209,7 +217,7 @@
                         else
                         { 
                             @Html.DropDownListFor(m => m.Device.DeviceProfileId, Model.DeviceProfiles.ToSelectListItems(Model.Device.DeviceProfile))
-                            @AjaxHelpers.AjaxLoader()
+                            @AjaxHelpers.AjaxLoader()<span id="deviceProfileDetails" class="icon16" title="Profile Details"></span>
                             <script type="text/javascript">
                                 $(function () {
                                     $('#Device_DeviceProfileId').change(function () {
@@ -225,6 +233,9 @@
                                             }
                                         });
                                     });
+                                    $('#deviceProfileDetails').click(function(){
+                                        window.location.href = '@(Url.Action(MVC.Config.DeviceProfile.Index(null)))/' + $('#Device_DeviceProfileId').val();
+                                    });
                                 });
                             </script>
                         }
@@ -338,7 +349,7 @@
                                             return false;
                                         }
                                     })
-                                    .data('autocomplete')._renderItem = function (ul, item) {
+                                    .data('ui-autocomplete')._renderItem = function (ul, item) {
                                         return $("<li></li>")
                                             .data("item.autocomplete", item)
                                             .append("<a><strong>" + item.DisplayName + "</strong><br>" + item.Id + " (" + item.Type + ")</a>")

Disco.Web/Views/Device/Show.generated.cs

@@ -318,13 +318,13 @@ WriteLiteral("                        ");
             #line hidden
 WriteLiteral(" <span");
 
-WriteLiteral(" id=\"deviceBatchEdit\"");
+WriteLiteral(" id=\"deviceBatchDetails\"");
 
 WriteLiteral(" class=\"icon16\"");
 
-WriteLiteral(" title=\"Edit\"");
+WriteLiteral(" title=\"Batch Details\"");
 
-WriteLiteral(">\r\n                        </span>\r\n                        <script");
+WriteLiteral("></span>\r\n                        <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
@@ -332,7 +332,8 @@ WriteLiteral(@">
                             $(function () {
                                 var $DeviceBatchId = $('#Device_DeviceBatchId');
                                 var $DeviceBatchDetails = $('#deviceBatchDetails');
-                                var $DeviceBatchEdit = $('#deviceBatchEdit');
+                                var $DeviceBatchSummary = $('#deviceBatchSummary');
+                                var initUpdate = false;
                                 var jsonDate = function (json, unknownValue) {
                                     if (json && json.indexOf('') == 0) {
                                         return $.datepicker.formatDate('yy-mm-dd', new Date(parseInt(json.substr(6, json.length - 8))));
@@ -352,29 +353,34 @@ WriteLiteral(@">
 WriteLiteral("/\' + deviceBatchId, function (response, result) {\r\n                              " +
 "          if (result == \'success\') {\r\n                                          " +
 "  if (response.Supplier)\r\n                                                $Devic" +
-"eBatchDetails.find(\'.supplier\').text(response.Supplier);\r\n                      " +
+"eBatchSummary.find(\'.supplier\').text(response.Supplier);\r\n                      " +
 "                      else\r\n                                                $Dev" +
-"iceBatchDetails.find(\'.supplier\').text(\'Unknown\');\r\n\r\n                          " +
-"                  $DeviceBatchDetails.find(\'.purchaseDate\').text(jsonDate(respon" +
+"iceBatchSummary.find(\'.supplier\').text(\'Unknown\');\r\n\r\n                          " +
+"                  $DeviceBatchSummary.find(\'.purchaseDate\').text(jsonDate(respon" +
 "se.PurchaseDate, \'Unknown\'));\r\n                                            $Devi" +
-"ceBatchDetails.find(\'.warrantyValidUntil\').text(jsonDate(response.WarrantyValidU" +
+"ceBatchSummary.find(\'.warrantyValidUntil\').text(jsonDate(response.WarrantyValidU" +
 "ntil, \'Unknown\'));\r\n\r\n                                            if (response.I" +
-"nsuranceSupplier)\r\n                                                $DeviceBatchD" +
-"etails.find(\'.insuranceSupplier\').text(response.InsuranceSupplier);\r\n           " +
+"nsuranceSupplier)\r\n                                                $DeviceBatchS" +
+"ummary.find(\'.insuranceSupplier\').text(response.InsuranceSupplier);\r\n           " +
 "                                 else\r\n                                         " +
-"       $DeviceBatchDetails.find(\'.insuranceSupplier\').text(\'Unknown\');\r\n\r\n      " +
-"                                      $DeviceBatchDetails.find(\'.insuredUntil\')." +
+"       $DeviceBatchSummary.find(\'.insuranceSupplier\').text(\'Unknown\');\r\n\r\n      " +
+"                                      $DeviceBatchSummary.find(\'.insuredUntil\')." +
 "text(jsonDate(response.InsuredUntil, \'Unknown\'));\r\n\r\n                           " +
-"                 $DeviceBatchDetails.slideDown(\'fast\');\r\n                       " +
-"                     $DeviceBatchEdit.fadeIn();\r\n                               " +
-"         } else {\r\n                                            alert(\'Unable to " +
-"load Device Batch details:\\n\' + response);\r\n                                    " +
-"    }\r\n                                    });\r\n                                " +
-"};\r\n                                $DeviceBatchEdit.click(function () {\r\n      " +
+"                 if (initUpdate){\r\n                                             " +
+"   $DeviceBatchSummary.show();\r\n                                                " +
+"$DeviceBatchDetails.show();\r\n                                                ini" +
+"tUpdate = false;\r\n                                            }else{\r\n          " +
+"                                      $DeviceBatchSummary.slideDown(\'fast\');\r\n  " +
+"                                              $DeviceBatchDetails.fadeIn();\r\n   " +
+"                                         }\r\n                                    " +
+"    } else {\r\n                                            alert(\'Unable to load " +
+"Device Batch details:\\n\' + response);\r\n                                        }" +
+"\r\n                                    });\r\n                                };\r\n " +
+"                               $DeviceBatchDetails.click(function () {\r\n        " +
 "                            window.location.href = \'");
 
             
-            #line 146 "..\..\Views\Device\Show.cshtml"
+            #line 152 "..\..\Views\Device\Show.cshtml"
                                                         Write(Url.Action(MVC.Config.DeviceBatch.Index(null)));
 
             
@@ -385,13 +391,13 @@ WriteLiteral(@"/' + $DeviceBatchId.val();
                                 $DeviceBatchId.change(function () {
                                     var $this = $(this);
                                     var $ajaxLoading = $this.next('.ajaxLoading').show();
+                                    $DeviceBatchSummary.hide();
                                     $DeviceBatchDetails.hide();
-                                    $DeviceBatchEdit.hide();
                                     var data = { DeviceBatchId: $this.val() };
                                     $.getJSON('");
 
             
-            #line 154 "..\..\Views\Device\Show.cshtml"
+            #line 160 "..\..\Views\Device\Show.cshtml"
                                            Write(Url.Action(MVC.API.Device.UpdateDeviceBatchId(Model.Device.SerialNumber)));
 
             
@@ -408,14 +414,16 @@ WriteLiteral(@"', data, function (response, result) {
                                         }
                                     });
                                 });
-                                $DeviceBatchEdit.hide();
-                                if ($DeviceBatchId.val())
+                                $DeviceBatchSummary.hide();
+                                if ($DeviceBatchId.val()){
+                                    initUpdate = true;
                                     updateDetails($DeviceBatchId.val());
+                                }
                             });
                         </script>
                         <div");
 
-WriteLiteral(" id=\"deviceBatchDetails\"");
+WriteLiteral(" id=\"deviceBatchSummary\"");
 
 WriteLiteral(">\r\n                            <table");
 
@@ -483,13 +491,13 @@ WriteLiteral(" class=\"value\"");
 WriteLiteral(">\r\n");
 
             
-            #line 205 "..\..\Views\Device\Show.cshtml"
+            #line 213 "..\..\Views\Device\Show.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 205 "..\..\Views\Device\Show.cshtml"
+            #line 213 "..\..\Views\Device\Show.cshtml"
                          if (Model.Device.DecommissionedDate.HasValue)
                         {
                             
@@ -497,14 +505,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 207 "..\..\Views\Device\Show.cshtml"
+            #line 215 "..\..\Views\Device\Show.cshtml"
                        Write(Model.Device.DeviceProfile.ToString());
 
             
             #line default
             #line hidden
             
-            #line 207 "..\..\Views\Device\Show.cshtml"
+            #line 215 "..\..\Views\Device\Show.cshtml"
                                                                   
                         }
                         else
@@ -514,33 +522,36 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 211 "..\..\Views\Device\Show.cshtml"
+            #line 219 "..\..\Views\Device\Show.cshtml"
                        Write(Html.DropDownListFor(m => m.Device.DeviceProfileId, Model.DeviceProfiles.ToSelectListItems(Model.Device.DeviceProfile)));
 
             
             #line default
             #line hidden
             
-            #line 211 "..\..\Views\Device\Show.cshtml"
+            #line 219 "..\..\Views\Device\Show.cshtml"
                                                                                                                                                     
                             
             
             #line default
             #line hidden
             
-            #line 212 "..\..\Views\Device\Show.cshtml"
+            #line 220 "..\..\Views\Device\Show.cshtml"
                        Write(AjaxHelpers.AjaxLoader());
 
             
             #line default
             #line hidden
+WriteLiteral("<span");
 
-            #line 212 "..\..\Views\Device\Show.cshtml"
+WriteLiteral(" id=\"deviceProfileDetails\"");
 
+WriteLiteral(" class=\"icon16\"");
 
+WriteLiteral(" title=\"Profile Details\"");
+
+WriteLiteral("></span>\r\n");
 
-            #line default
-            #line hidden
 WriteLiteral("                            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
@@ -554,7 +565,7 @@ WriteLiteral(@">
                                         $.getJSON('");
 
             
-            #line 219 "..\..\Views\Device\Show.cshtml"
+            #line 227 "..\..\Views\Device\Show.cshtml"
                                                Write(Url.Action(MVC.API.Device.UpdateDeviceProfileId(Model.Device.SerialNumber)));
 
             
@@ -569,12 +580,21 @@ WriteLiteral(@"', data, function (response, result) {
                                             }
                                         });
                                     });
-                                });
-                            </script>
-");
+                                    $('#deviceProfileDetails').click(function(){
+                                        window.location.href = '");
 
             
-            #line 230 "..\..\Views\Device\Show.cshtml"
+            #line 237 "..\..\Views\Device\Show.cshtml"
+                                                            Write(Url.Action(MVC.Config.DeviceProfile.Index(null)));
+
+            
+            #line default
+            #line hidden
+WriteLiteral("/\' + $(\'#Device_DeviceProfileId\').val();\r\n                                    });" +
+"\r\n                                });\r\n                            </script>\r\n");
+
+            
+            #line 241 "..\..\Views\Device\Show.cshtml"
                         }
 
             
@@ -595,7 +615,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                        ");
 
             
-            #line 238 "..\..\Views\Device\Show.cshtml"
+            #line 249 "..\..\Views\Device\Show.cshtml"
                    Write(CommonHelpers.FriendlyDate(Model.Device.CreatedDate));
 
             
@@ -616,7 +636,7 @@ WriteLiteral(">\r\n                        First:\r\n");
 WriteLiteral("                        ");
 
             
-            #line 247 "..\..\Views\Device\Show.cshtml"
+            #line 258 "..\..\Views\Device\Show.cshtml"
                    Write(CommonHelpers.FriendlyDate(Model.Device.EnrolledDate));
 
             
@@ -625,13 +645,13 @@ WriteLiteral("                        ");
 WriteLiteral("\r\n");
 
             
-            #line 248 "..\..\Views\Device\Show.cshtml"
+            #line 259 "..\..\Views\Device\Show.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 248 "..\..\Views\Device\Show.cshtml"
+            #line 259 "..\..\Views\Device\Show.cshtml"
                          if (Model.Device.AllowUnauthenticatedEnrol)
                         {
 
@@ -642,14 +662,14 @@ WriteLiteral("                            <a");
 
 WriteLiteral(" class=\"unlocked16\"");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 14485), Tuple.Create("\"", 14593)
+WriteAttribute("href", Tuple.Create(" href=\"", 15388), Tuple.Create("\"", 15496)
             
-            #line 250 "..\..\Views\Device\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 14492), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, "false", true))
+            #line 261 "..\..\Views\Device\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 15395), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, "false", true))
             
             #line default
             #line hidden
-, 14492), false)
+, 15395), false)
 );
 
 WriteLiteral(" title=\"Unauthenticated Enrolment is Allowed\"");
@@ -657,7 +677,7 @@ WriteLiteral(" title=\"Unauthenticated Enrolment is Allowed\"");
 WriteLiteral(">\r\n                                &nbsp;</a>\r\n");
 
             
-            #line 252 "..\..\Views\Device\Show.cshtml"
+            #line 263 "..\..\Views\Device\Show.cshtml"
                         }
                         else
                         { 
@@ -669,14 +689,14 @@ WriteLiteral("                            <a");
 
 WriteLiteral(" class=\"locked16\"");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 14818), Tuple.Create("\"", 14925)
+WriteAttribute("href", Tuple.Create(" href=\"", 15721), Tuple.Create("\"", 15828)
             
-            #line 255 "..\..\Views\Device\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 14825), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, "true", true))
+            #line 266 "..\..\Views\Device\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 15728), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, "true", true))
             
             #line default
             #line hidden
-, 14825), false)
+, 15728), false)
 );
 
 WriteLiteral(" title=\"Unauthenticated Enrolment is Blocked\"");
@@ -684,7 +704,7 @@ WriteLiteral(" title=\"Unauthenticated Enrolment is Blocked\"");
 WriteLiteral(">\r\n                                &nbsp;</a>\r\n");
 
             
-            #line 257 "..\..\Views\Device\Show.cshtml"
+            #line 268 "..\..\Views\Device\Show.cshtml"
                         }
 
             
@@ -695,7 +715,7 @@ WriteLiteral("                        <br />\r\n                        Last:\r\
 WriteLiteral("                        ");
 
             
-            #line 260 "..\..\Views\Device\Show.cshtml"
+            #line 271 "..\..\Views\Device\Show.cshtml"
                    Write(CommonHelpers.FriendlyDate(Model.Device.LastEnrolDate));
 
             
@@ -716,7 +736,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                        ");
 
             
-            #line 268 "..\..\Views\Device\Show.cshtml"
+            #line 279 "..\..\Views\Device\Show.cshtml"
                    Write(CommonHelpers.FriendlyDate(Model.Device.DecommissionedDate));
 
             
@@ -741,7 +761,7 @@ WriteLiteral(" class=\"nowrap\"");
 WriteLiteral(">");
 
             
-            #line 276 "..\..\Views\Device\Show.cshtml"
+            #line 287 "..\..\Views\Device\Show.cshtml"
                                                                   Write(CommonHelpers.FriendlyDate(Model.Device.LastNetworkLogonDate));
 
             
@@ -750,13 +770,13 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n");
 
             
-            #line 277 "..\..\Views\Device\Show.cshtml"
+            #line 288 "..\..\Views\Device\Show.cshtml"
                         
             
             #line default
             #line hidden
             
-            #line 277 "..\..\Views\Device\Show.cshtml"
+            #line 288 "..\..\Views\Device\Show.cshtml"
                          if (!string.IsNullOrEmpty(Model.Device.ComputerName))
                         {
 
@@ -775,7 +795,7 @@ WriteLiteral(@">
                                     $.getJSON('");
 
             
-            #line 284 "..\..\Views\Device\Show.cshtml"
+            #line 295 "..\..\Views\Device\Show.cshtml"
                                            Write(Url.Action(MVC.API.Device.LastNetworkLogonDate(Model.Device.SerialNumber)));
 
             
@@ -795,7 +815,7 @@ WriteLiteral(@"', function (response, result) {
 ");
 
             
-            #line 295 "..\..\Views\Device\Show.cshtml"
+            #line 306 "..\..\Views\Device\Show.cshtml"
                         }
 
             
@@ -804,13 +824,13 @@ WriteLiteral(@"', function (response, result) {
 WriteLiteral("                    </td>\r\n                </tr>\r\n");
 
             
-            #line 298 "..\..\Views\Device\Show.cshtml"
+            #line 309 "..\..\Views\Device\Show.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 298 "..\..\Views\Device\Show.cshtml"
+            #line 309 "..\..\Views\Device\Show.cshtml"
                  if (!Model.Device.DecommissionedDate.HasValue)
                 {
 
@@ -831,7 +851,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                            ");
 
             
-            #line 305 "..\..\Views\Device\Show.cshtml"
+            #line 316 "..\..\Views\Device\Show.cshtml"
                        Write(Html.TextBoxFor(m => m.Device.AssignedUser, new { userId = Model.Device.AssignedUserId }));
 
             
@@ -842,7 +862,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                            ");
 
             
-            #line 306 "..\..\Views\Device\Show.cshtml"
+            #line 317 "..\..\Views\Device\Show.cshtml"
                        Write(AjaxHelpers.AjaxRemove());
 
             
@@ -853,7 +873,7 @@ WriteLiteral("\r\n");
 WriteLiteral("                            ");
 
             
-            #line 307 "..\..\Views\Device\Show.cshtml"
+            #line 318 "..\..\Views\Device\Show.cshtml"
                        Write(AjaxHelpers.AjaxLoader());
 
             
@@ -912,7 +932,7 @@ WriteLiteral(@">
                                         source: '");
 
             
-            #line 329 "..\..\Views\Device\Show.cshtml"
+            #line 340 "..\..\Views\Device\Show.cshtml"
                                              Write(Url.Action(MVC.API.User.UpstreamUsers()));
 
             
@@ -927,35 +947,35 @@ WriteLiteral("\',\r\n                                        minLength: 2,\r\n
 ");\r\n                                            $assignedUser.val(ui.item.Displa" +
 "yName + \' (\' + ui.item.Id + \')\');\r\n                                            r" +
 "eturn false;\r\n                                        }\r\n                       " +
-"             })\r\n                                    .data(\'autocomplete\')._rend" +
-"erItem = function (ul, item) {\r\n                                        return $" +
-"(\"<li></li>\")\r\n                                            .data(\"item.autocompl" +
-"ete\", item)\r\n                                            .append(\"<a><strong>\" +" +
-" item.DisplayName + \"</strong><br>\" + item.Id + \" (\" + item.Type + \")</a>\")\r\n   " +
+"             })\r\n                                    .data(\'ui-autocomplete\')._r" +
+"enderItem = function (ul, item) {\r\n                                        retur" +
+"n $(\"<li></li>\")\r\n                                            .data(\"item.autoco" +
+"mplete\", item)\r\n                                            .append(\"<a><strong>" +
+"\" + item.DisplayName + \"</strong><br>\" + item.Id + \" (\" + item.Type + \")</a>\")\r\n" +
 "                                            .appendTo(ul);\r\n                    " +
-"             };\r\n\r\n                                    var $dialogRemoveAssigned" +
-"User = $(\'#dialogRemoveAssignedUser\');\r\n                                $dialogR" +
-"emoveAssignedUser.dialog({\r\n                                    resizable: false" +
-",\r\n                                    height: 140,\r\n                           " +
-"         modal: true,\r\n                                    autoOpen: false,\r\n   " +
+"                };\r\n\r\n                                    var $dialogRemoveAssig" +
+"nedUser = $(\'#dialogRemoveAssignedUser\');\r\n                                $dial" +
+"ogRemoveAssignedUser.dialog({\r\n                                    resizable: fa" +
+"lse,\r\n                                    height: 140,\r\n                        " +
+"            modal: true,\r\n                                    autoOpen: false,\r\n" +
 "                                    buttons: {\r\n                                " +
-"     \"Remove\": function () {\r\n                                            update" +
-"AssignedUser(\'\');\r\n                                            $assignedUser.val" +
-"(\'\');\r\n                                            $dialogRemoveAssignedUser.dia" +
-"log(\"close\");\r\n                                        },\r\n                     " +
+"        \"Remove\": function () {\r\n                                            upd" +
+"ateAssignedUser(\'\');\r\n                                            $assignedUser." +
+"val(\'\');\r\n                                            $dialogRemoveAssignedUser." +
+"dialog(\"close\");\r\n                                        },\r\n                  " +
 "                      \"Cancel\": function () {\r\n                                 " +
 "           $dialogRemoveAssignedUser.dialog(\"close\");\r\n                         " +
 "               }\r\n                                    }\r\n                       " +
 "         });\r\n\r\n                                // Un-Assign User\r\n             " +
 "                   if ($assignedUser.val() != \'\')\r\n                             " +
-"    $ajaxRemove.show();\r\n                                $ajaxRemove.click(funct" +
-"ion () {\r\n                                    $dialogRemoveAssignedUser.dialog(\'" +
-"open\');\r\n                                    return false;\r\n                    " +
+"       $ajaxRemove.show();\r\n                                $ajaxRemove.click(fu" +
+"nction () {\r\n                                    $dialogRemoveAssignedUser.dialo" +
+"g(\'open\');\r\n                                    return false;\r\n                 " +
 "               });\r\n\r\n                                // History\r\n              " +
 "                  var deviceUserAssignmentCount = ");
 
             
-            #line 375 "..\..\Views\Device\Show.cshtml"
+            #line 386 "..\..\Views\Device\Show.cshtml"
                                                             Write(Model.Device.DeviceUserAssignments.Count);
 
             
@@ -986,7 +1006,7 @@ WriteLiteral(@";
                                     $.getJSON('");
 
             
-            #line 397 "..\..\Views\Device\Show.cshtml"
+            #line 408 "..\..\Views\Device\Show.cshtml"
                                            Write(Url.Action(MVC.API.Device.UpdateAssignedUserId(Model.Device.SerialNumber)));
 
             
@@ -1010,7 +1030,7 @@ WriteLiteral(@"', data, function (response, result) {
 ");
 
             
-            #line 412 "..\..\Views\Device\Show.cshtml"
+            #line 423 "..\..\Views\Device\Show.cshtml"
                 }
 
             
@@ -1020,14 +1040,14 @@ WriteLiteral("                <tr");
 
 WriteLiteral(" id=\"Device_AssignedUser_History_Host\"");
 
-WriteAttribute("style", Tuple.Create(" style=\"", 24609), Tuple.Create("\"", 24683)
+WriteAttribute("style", Tuple.Create(" style=\"", 25515), Tuple.Create("\"", 25589)
             
-            #line 413 "..\..\Views\Device\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 24617), Tuple.Create<System.Object, System.Int32>(Model.Device.DecommissionedDate.HasValue ? "" : "display: none"
+            #line 424 "..\..\Views\Device\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 25523), Tuple.Create<System.Object, System.Int32>(Model.Device.DecommissionedDate.HasValue ? "" : "display: none"
             
             #line default
             #line hidden
-, 24617), false)
+, 25523), false)
 );
 
 WriteLiteral(">\r\n                    <td");
@@ -1038,14 +1058,14 @@ WriteLiteral(">\r\n                        <div");
 
 WriteLiteral(" id=\"Device_AssignedUser_History\"");
 
-WriteAttribute("style", Tuple.Create(" style=\"", 24786), Tuple.Create("\"", 24860)
+WriteAttribute("style", Tuple.Create(" style=\"", 25692), Tuple.Create("\"", 25766)
             
-            #line 415 "..\..\Views\Device\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 24794), Tuple.Create<System.Object, System.Int32>(Model.Device.DecommissionedDate.HasValue ? "" : "display: none"
+            #line 426 "..\..\Views\Device\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 25700), Tuple.Create<System.Object, System.Int32>(Model.Device.DecommissionedDate.HasValue ? "" : "display: none"
             
             #line default
             #line hidden
-, 24794), false)
+, 25700), false)
 );
 
 WriteLiteral(">\r\n                            <h2>\r\n                                Assigned Use" +
@@ -1054,7 +1074,7 @@ WriteLiteral(">\r\n                            <h2>\r\n
 WriteLiteral("                            ");
 
             
-            #line 418 "..\..\Views\Device\Show.cshtml"
+            #line 429 "..\..\Views\Device\Show.cshtml"
                        Write(Html.Partial(MVC.Device.Views._DeviceUserAssignmentHistoryTable, Model.Device));
 
             
@@ -1077,7 +1097,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                        ");
 
             
-            #line 427 "..\..\Views\Device\Show.cshtml"
+            #line 438 "..\..\Views\Device\Show.cshtml"
                    Write(Html.DropDownList("DocumentTemplates", Model.DocumentTemplatesSelectListItems));
 
             
@@ -1091,7 +1111,7 @@ WriteLiteral(">\r\n                            $(function () {\r\n
 "ar generatePdfUrl = \'");
 
             
-            #line 430 "..\..\Views\Device\Show.cshtml"
+            #line 441 "..\..\Views\Device\Show.cshtml"
                                                  Write(Url.Action(MVC.API.Device.GeneratePdf(Model.Device.SerialNumber, null)));
 
             
@@ -1124,32 +1144,32 @@ WriteLiteral(">\r\n                        <img");
 
 WriteLiteral(" alt=\"Model Image\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 26515), Tuple.Create("\"", 26625)
+WriteAttribute("src", Tuple.Create(" src=\"", 27421), Tuple.Create("\"", 27531)
             
-            #line 449 "..\..\Views\Device\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 26521), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
+            #line 460 "..\..\Views\Device\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 27427), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
             
             #line default
             #line hidden
-, 26521), false)
+, 27427), false)
 );
 
 WriteLiteral(" />\r\n                        <h2>\r\n                            <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 26691), Tuple.Create("\"", 26769)
+WriteAttribute("href", Tuple.Create(" href=\"", 27597), Tuple.Create("\"", 27675)
             
-            #line 451 "..\..\Views\Device\Show.cshtml"
-, Tuple.Create(Tuple.Create("", 26698), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.DeviceModel.Index(Model.Device.DeviceModelId))
+            #line 462 "..\..\Views\Device\Show.cshtml"
+, Tuple.Create(Tuple.Create("", 27604), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Config.DeviceModel.Index(Model.Device.DeviceModelId))
             
             #line default
             #line hidden
-, 26698), false)
+, 27604), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 451 "..\..\Views\Device\Show.cshtml"
+            #line 462 "..\..\Views\Device\Show.cshtml"
                                                                                                          Write(Model.Device.DeviceModel.ToString());
 
             
@@ -1159,7 +1179,7 @@ WriteLiteral("</a></h2>\r\n                    </td>\r\n                </tr>\r\
 "\r\n        </td>\r\n    </tr>\r\n</table>\r\n<h2>\r\n    Certificates</h2>\r\n");
 
             
-            #line 460 "..\..\Views\Device\Show.cshtml"
+            #line 471 "..\..\Views\Device\Show.cshtml"
 Write(Html.Partial(MVC.Device.Views._CertificateTable, Model.Certificates));
 
             
@@ -1168,7 +1188,7 @@ Write(Html.Partial(MVC.Device.Views._CertificateTable, Model.Certificates));
 WriteLiteral("\r\n<h2>\r\n    Attachments</h2>\r\n");
 
             
-            #line 463 "..\..\Views\Device\Show.cshtml"
+            #line 474 "..\..\Views\Device\Show.cshtml"
 Write(Html.Partial(MVC.Device.Views.DeviceParts.Resources, Model));
 
             
@@ -1177,7 +1197,7 @@ Write(Html.Partial(MVC.Device.Views.DeviceParts.Resources, Model));
 WriteLiteral("\r\n<h2>\r\n    Jobs</h2>\r\n");
 
             
-            #line 466 "..\..\Views\Device\Show.cshtml"
+            #line 477 "..\..\Views\Device\Show.cshtml"
 Write(Html.Partial(MVC.Shared.Views._JobTable, Model.Jobs));
 
             
@@ -1186,7 +1206,7 @@ Write(Html.Partial(MVC.Shared.Views._JobTable, Model.Jobs));
 WriteLiteral("\r\n");
 
             
-            #line 467 "..\..\Views\Device\Show.cshtml"
+            #line 478 "..\..\Views\Device\Show.cshtml"
 Write(Html.Partial(MVC.Device.Views._DeviceActions, Model.Device));
 
             

Disco.Web/Views/Job/Create-Old.cshtml

@@ -1,58 +0,0 @@
-@model Disco.Web.Models.Job.CreateModel
-@{
-    ViewBag.Title = Html.ToBreadcrumb("Jobs", MVC.Job.Index(), "Create");
-}
-@using (Html.BeginForm(MVC.Job.Create(), FormMethod.Post))
-{
-    @Html.ValidationSummary(false)
-    @Html.HiddenFor(m => m.DeviceSerialNumber)
-    @Html.HiddenFor(m => m.UserId)
-    <div id="createDialog" class="form" style="width: 650px">
-        <table>
-            <tr>
-                <td colspan="2">
-                    @Html.Partial(MVC.Job.Views._CreateSubject, Model)
-                </td>
-            </tr>
-            <tr id="trJobType">
-                <th class="name">
-                    Type:
-                </th>
-                <td class="value">
-                    @CommonHelpers.RadioButtonList("Type", Model.JobTypes.ToSelectListItems(Model.Type), 2)
-                </td>
-            </tr>
-            @foreach (var jt in Model.JobTypes)
-            {
-                <tr id="trJobSubType@(jt.Id)" class="jobSubTypes">
-                    <th class="name">
-                        @jt.Description<br />
-                        Sub Types
-                    </th>
-                    <td class="value">
-                        @CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.Where(jst => jst.JobTypeId == jt.Id).ToList().ToSelectListItems(Model.SubTypes), 2)
-                    </td>
-                </tr>   
-            }
-        </table>
-        <p class="actions">
-            <input type="submit" class="button" value="Create" />
-        </p>
-        <script type="text/javascript">
-            $(function () {
-
-                $trJobType = $('#trJobType');
-                $jobTypes = $trJobType.find('input[type="radio"]');
-                $jobTypes.change(jobTypeChange);
-                jobTypeChange();
-
-                function jobTypeChange() {
-                    $('.jobSubTypes').hide();
-                    var jobType = $jobTypes.filter(':checked').val();
-                    $('#trJobSubType' + jobType).show();
-                }
-
-            });
-        </script>
-    </div>
-}

Disco.Web/Views/Job/Create.cshtml

@@ -203,16 +203,16 @@
             if ($('#DeviceSerialNumber').val()) {
                 switch ($deviceHeld.val()) {
                     case 'True':
-                        $('#createJob_DeviceHeld').attr('checked', 'checked');
-                        $('#createJob_DeviceNotHeld').attr('checked', null);
+                        $('#createJob_DeviceHeld').prop('checked', true);
+                        $('#createJob_DeviceNotHeld').prop('checked', false);
                         break;
                     case 'False':
-                        $('#createJob_DeviceHeld').attr('checked', null);
-                        $('#createJob_DeviceNotHeld').attr('checked', 'checked');
+                        $('#createJob_DeviceHeld').prop('checked', false);
+                        $('#createJob_DeviceNotHeld').prop('checked', true);
                         break;
                     default:
-                        $('#createJob_DeviceHeld').attr('checked', null);
-                        $('#createJob_DeviceNotHeld').attr('checked', null);
+                        $('#createJob_DeviceHeld').prop('checked', false);
+                        $('#createJob_DeviceNotHeld').prop('checked', false);
                         break;
                 }
                 $('#createJob_DeviceHeldContainer').find('input[type="radio"]').change(function () {
@@ -272,7 +272,7 @@
                         $quickLogContainer.hide();
                     else
                         $quickLogContainer.slideUp();
-                    $quickLog.attr('checked', null).change();
+                    $quickLog.prop('checked', false).change();
                 }
             }
 

Disco.Web/Views/Job/Create.generated.cs

@@ -538,59 +538,59 @@ WriteLiteral(">\r\n        $(function () {\r\n            var discoDialogMethods
 "          //#endregion\r\n\r\n            //#region DeviceHeld\r\n            var $dev" +
 "iceHeld = $(\'#DeviceHeld\');\r\n\r\n            if ($(\'#DeviceSerialNumber\').val()) {" +
 "\r\n                switch ($deviceHeld.val()) {\r\n                    case \'True\':" +
-"\r\n                        $(\'#createJob_DeviceHeld\').attr(\'checked\', \'checked\');" +
-"\r\n                        $(\'#createJob_DeviceNotHeld\').attr(\'checked\', null);\r\n" +
+"\r\n                        $(\'#createJob_DeviceHeld\').prop(\'checked\', true);\r\n   " +
+"                     $(\'#createJob_DeviceNotHeld\').prop(\'checked\', false);\r\n    " +
 "                    break;\r\n                    case \'False\':\r\n                 " +
-"           $(\'#createJob_DeviceHeld\').attr(\'checked\', null);\r\n                  " +
-"      $(\'#createJob_DeviceNotHeld\').attr(\'checked\', \'checked\');\r\n               " +
-"         break;\r\n                    default:\r\n                        $(\'#creat" +
-"eJob_DeviceHeld\').attr(\'checked\', null);\r\n                        $(\'#createJob_" +
-"DeviceNotHeld\').attr(\'checked\', null);\r\n                        break;\r\n        " +
-"        }\r\n                $(\'#createJob_DeviceHeldContainer\').find(\'input[type=" +
-"\"radio\"]\').change(function () {\r\n                    // Update Hidden Field with" +
-" Boolean Value\r\n                    // Set DeviceHeld\r\n                    var d" +
-"eviceHeldValue = \'\';\r\n                    if ($(\'#createJob_DeviceHeld\').is(\':ch" +
-"ecked\'))\r\n                        deviceHeldValue = \'True\';\r\n                   " +
-" if ($(\'#createJob_DeviceNotHeld\').is(\':checked\'))\r\n                        devi" +
-"ceHeldValue = \'False\';\r\n                    $deviceHeld.val(deviceHeldValue).cha" +
-"nge();\r\n                });\r\n            } else {\r\n                // No Device " +
-"Associated\r\n                $deviceHeld.val(\'False\');\r\n                $(\'#creat" +
-"eJob_DeviceHeldContainer\').hide();\r\n            }\r\n            //#endregion\r\n\r\n " +
-"           //#region QuickLog\r\n            var $quickLog = $(\'#createJob_QuickLo" +
-"g\');\r\n            var $quickLogContainer = $(\'#createJob_QuickLogContainer\');\r\n " +
-"           var $quickLogTaskTimeContainer = $(\'#createJob_QuickLogTaskTimeContai" +
-"ner\');\r\n            var $quickLogTaskTimes = $quickLogTaskTimeContainer.find(\'in" +
-"put[type=\"radio\"]\');\r\n            var $quickLogTaskTimeOtherMinutes = $(\'#create" +
-"Job_TaskTimeOtherMinutes\');\r\n            var $quickLogTaskTimeValidationMessage " +
-"= $quickLogTaskTimeContainer.find(\'[data-valmsg-for=\"QuickLogTaskTimeMinutes\"]\')" +
-";\r\n\r\n            $deviceHeld.change(validateQuickLog);\r\n            $jobTypes.ch" +
-"ange(validateQuickLog);\r\n            validateQuickLog();\r\n\r\n            function" +
-" validateQuickLog() {\r\n                var quickLogAllowed = false;\r\n\r\n         " +
-"       if ($deviceHeld.val() === \'True\') {\r\n                    quickLogAllowed " +
-"= false;\r\n                } else {\r\n                    var selectedType = $jobT" +
-"ypes.filter(\':checked\').val();\r\n                    switch (selectedType) {\r\n   " +
+"       $(\'#createJob_DeviceHeld\').prop(\'checked\', false);\r\n                     " +
+"   $(\'#createJob_DeviceNotHeld\').prop(\'checked\', true);\r\n                       " +
+" break;\r\n                    default:\r\n                        $(\'#createJob_Dev" +
+"iceHeld\').prop(\'checked\', false);\r\n                        $(\'#createJob_DeviceN" +
+"otHeld\').prop(\'checked\', false);\r\n                        break;\r\n              " +
+"  }\r\n                $(\'#createJob_DeviceHeldContainer\').find(\'input[type=\"radio" +
+"\"]\').change(function () {\r\n                    // Update Hidden Field with Boole" +
+"an Value\r\n                    // Set DeviceHeld\r\n                    var deviceH" +
+"eldValue = \'\';\r\n                    if ($(\'#createJob_DeviceHeld\').is(\':checked\'" +
+"))\r\n                        deviceHeldValue = \'True\';\r\n                    if ($" +
+"(\'#createJob_DeviceNotHeld\').is(\':checked\'))\r\n                        deviceHeld" +
+"Value = \'False\';\r\n                    $deviceHeld.val(deviceHeldValue).change();" +
+"\r\n                });\r\n            } else {\r\n                // No Device Associ" +
+"ated\r\n                $deviceHeld.val(\'False\');\r\n                $(\'#createJob_D" +
+"eviceHeldContainer\').hide();\r\n            }\r\n            //#endregion\r\n\r\n       " +
+"     //#region QuickLog\r\n            var $quickLog = $(\'#createJob_QuickLog\');\r\n" +
+"            var $quickLogContainer = $(\'#createJob_QuickLogContainer\');\r\n       " +
+"     var $quickLogTaskTimeContainer = $(\'#createJob_QuickLogTaskTimeContainer\');" +
+"\r\n            var $quickLogTaskTimes = $quickLogTaskTimeContainer.find(\'input[ty" +
+"pe=\"radio\"]\');\r\n            var $quickLogTaskTimeOtherMinutes = $(\'#createJob_Ta" +
+"skTimeOtherMinutes\');\r\n            var $quickLogTaskTimeValidationMessage = $qui" +
+"ckLogTaskTimeContainer.find(\'[data-valmsg-for=\"QuickLogTaskTimeMinutes\"]\');\r\n\r\n " +
+"           $deviceHeld.change(validateQuickLog);\r\n            $jobTypes.change(v" +
+"alidateQuickLog);\r\n            validateQuickLog();\r\n\r\n            function valid" +
+"ateQuickLog() {\r\n                var quickLogAllowed = false;\r\n\r\n               " +
+" if ($deviceHeld.val() === \'True\') {\r\n                    quickLogAllowed = fals" +
+"e;\r\n                } else {\r\n                    var selectedType = $jobTypes.f" +
+"ilter(\':checked\').val();\r\n                    switch (selectedType) {\r\n         " +
 "               case \'HMisc\':\r\n                        case \'SApp\':\r\n            " +
 "            case \'SImg\':\r\n                        case \'SOS\':\r\n                 " +
-"             case \'UMgmt\':\r\n                            quickLogAllowed = true;\r" +
-"\n                            break;\r\n                        default:\r\n         " +
-"                   quickLogAllowed = false;\r\n                            break;\r" +
-"\n                    }\r\n                }\r\n\r\n                if (quickLogAllowed" +
-") {\r\n                    $quickLogContainer.slideDown();\r\n                } else" +
-" {\r\n                    if (init)\r\n                        $quickLogContainer.hi" +
-"de();\r\n                    else\r\n                        $quickLogContainer.slid" +
-"eUp();\r\n                    $quickLog.attr(\'checked\', null).change();\r\n         " +
+"       case \'UMgmt\':\r\n                            quickLogAllowed = true;\r\n     " +
+"                       break;\r\n                        default:\r\n               " +
+"             quickLogAllowed = false;\r\n                            break;\r\n     " +
+"               }\r\n                }\r\n\r\n                if (quickLogAllowed) {\r\n " +
+"                   $quickLogContainer.slideDown();\r\n                } else {\r\n  " +
+"                  if (init)\r\n                        $quickLogContainer.hide();\r" +
+"\n                    else\r\n                        $quickLogContainer.slideUp();" +
+"\r\n                    $quickLog.prop(\'checked\', false).change();\r\n              " +
 "  }\r\n            }\r\n\r\n            $quickLog.change(function () {\r\n              " +
-"       if ($(this).is(\':checked\')) {\r\n                    $quickLogTaskTimeConta" +
-"iner.slideDown();\r\n                } else {\r\n                    $quickLogTaskTi" +
-"meContainer.slideUp();\r\n                }\r\n            });\r\n\r\n            $quick" +
-"LogTaskTimes.change(function () {\r\n                if ($quickLogTaskTimes.filter" +
-"(\':checked\').val() === \"\") {\r\n                    $(\'#createJob_TaskTimeOtherMin" +
-"utesContainer\').show();\r\n                    $quickLogTaskTimeOtherMinutes.attr(" +
-"\'disabled\', null).focus().select();\r\n                } else {\r\n                 " +
-"   $(\'#createJob_TaskTimeOtherMinutesContainer\').hide();\r\n                    $q" +
-"uickLogTaskTimeOtherMinutes.attr(\'disabled\', \'disabled\');\r\n                }\r\n  " +
-"          });\r\n            //#endregion\r\n\r\n            init = false;\r\n        })" +
-";\r\n    </script>\r\n</div>\r\n");
+"  if ($(this).is(\':checked\')) {\r\n                    $quickLogTaskTimeContainer." +
+"slideDown();\r\n                } else {\r\n                    $quickLogTaskTimeCon" +
+"tainer.slideUp();\r\n                }\r\n            });\r\n\r\n            $quickLogTa" +
+"skTimes.change(function () {\r\n                if ($quickLogTaskTimes.filter(\':ch" +
+"ecked\').val() === \"\") {\r\n                    $(\'#createJob_TaskTimeOtherMinutesC" +
+"ontainer\').show();\r\n                    $quickLogTaskTimeOtherMinutes.attr(\'disa" +
+"bled\', null).focus().select();\r\n                } else {\r\n                    $(" +
+"\'#createJob_TaskTimeOtherMinutesContainer\').hide();\r\n                    $quickL" +
+"ogTaskTimeOtherMinutes.attr(\'disabled\', \'disabled\');\r\n                }\r\n       " +
+"     });\r\n            //#endregion\r\n\r\n            init = false;\r\n        });\r\n  " +
+"  </script>\r\n</div>\r\n");
 
         }
     }

Disco.Web/Views/Job/JobParts/Components.cshtml

@@ -46,8 +46,11 @@
     $(function () {
         var $jobComponents = $('#jobComponents');
 
-        $jobComponents.find('input').live('change', updateComponent).focus(function () { $(this).select() }).filter('.cost');
-        $jobComponents.find('span.remove').live('click', removeComponent);
+        $jobComponents.on('change', 'input', updateComponent);
+        $jobComponents.on('focus', 'input', function () { $(this).select() });
+
+
+        $jobComponents.on('click', 'span.remove', removeComponent);
 
         $('#jobComponentsAdd').click(function () {
             var jc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="remove"></span></td></tr>');

Disco.Web/Views/Job/JobParts/Components.generated.cs

@@ -164,28 +164,29 @@ WriteLiteral("></span>\r\n        Are you sure?</p>\r\n</div>\r\n<script");
 WriteLiteral(" type=\"text/javascript\"");
 
 WriteLiteral(">\r\n    $(function () {\r\n        var $jobComponents = $(\'#jobComponents\');\r\n\r\n    " +
-"    $jobComponents.find(\'input\').live(\'change\', updateComponent).focus(function " +
-"() { $(this).select() }).filter(\'.cost\');\r\n        $jobComponents.find(\'span.rem" +
-"ove\').live(\'click\', removeComponent);\r\n\r\n        $(\'#jobComponentsAdd\').click(fu" +
-"nction () {\r\n            var jc = $(\'<tr><td><input type=\"text\" class=\"descripti" +
-"on\" /></td><td><input type=\"text\" class=\"cost\" /></td><td><span class=\"remove\"><" +
-"/span></td></tr>\');\r\n            jc.find(\'input\').focus(function () { $(this).se" +
-"lect() })\r\n            jc.insertBefore($jobComponents.find(\'tr\').last());\r\n     " +
-"       jc.find(\'input.description\').focus();\r\n            return false;\r\n       " +
-" });\r\n\r\n        $(\'#dialogRemoveComponent\').dialog({\r\n            resizable: fal" +
-"se,\r\n            height: 140,\r\n            modal: true,\r\n            autoOpen: f" +
-"alse\r\n        });\r\n\r\n        function removeComponent() {\r\n            var compo" +
-"nentRow = $(this).closest(\'tr\');\r\n            var id = componentRow.attr(\'data-j" +
-"obcomponentid\');\r\n            if (id) {\r\n                var data = { id: id };\r" +
-"\n\r\n                var $dialogRemoveComponent = $(\'#dialogRemoveComponent\');\r\n  " +
-"              $dialogRemoveComponent.dialog(\"enable\");\r\n                $dialogR" +
-"emoveComponent.dialog(\'option\', \'buttons\', {\r\n                    \"Remove\": func" +
-"tion () {\r\n                        $dialogRemoveComponent.dialog(\"disable\");\r\n  " +
-"                      $dialogRemoveComponent.dialog(\"option\", \"buttons\", null);\r" +
-"\n                        $.ajax({\r\n                            url: \'");
+"    $jobComponents.on(\'change\', \'input\', updateComponent);\r\n        $jobComponen" +
+"ts.on(\'focus\', \'input\', function () { $(this).select() });\r\n\r\n\r\n        $jobComp" +
+"onents.on(\'click\', \'span.remove\', removeComponent);\r\n\r\n        $(\'#jobComponents" +
+"Add\').click(function () {\r\n            var jc = $(\'<tr><td><input type=\"text\" cl" +
+"ass=\"description\" /></td><td><input type=\"text\" class=\"cost\" /></td><td><span cl" +
+"ass=\"remove\"></span></td></tr>\');\r\n            jc.find(\'input\').focus(function (" +
+") { $(this).select() })\r\n            jc.insertBefore($jobComponents.find(\'tr\').l" +
+"ast());\r\n            jc.find(\'input.description\').focus();\r\n            return f" +
+"alse;\r\n        });\r\n\r\n        $(\'#dialogRemoveComponent\').dialog({\r\n            " +
+"resizable: false,\r\n            height: 140,\r\n            modal: true,\r\n         " +
+"   autoOpen: false\r\n        });\r\n\r\n        function removeComponent() {\r\n       " +
+"     var componentRow = $(this).closest(\'tr\');\r\n            var id = componentRo" +
+"w.attr(\'data-jobcomponentid\');\r\n            if (id) {\r\n                var data " +
+"= { id: id };\r\n\r\n                var $dialogRemoveComponent = $(\'#dialogRemoveCo" +
+"mponent\');\r\n                $dialogRemoveComponent.dialog(\"enable\");\r\n          " +
+"      $dialogRemoveComponent.dialog(\'option\', \'buttons\', {\r\n                    " +
+"\"Remove\": function () {\r\n                        $dialogRemoveComponent.dialog(\"" +
+"disable\");\r\n                        $dialogRemoveComponent.dialog(\"option\", \"but" +
+"tons\", null);\r\n                        $.ajax({\r\n                            url" +
+": \'");
 
             
-            #line 80 "..\..\Views\Job\JobParts\Components.cshtml"
+            #line 83 "..\..\Views\Job\JobParts\Components.cshtml"
                              Write(Url.Action(MVC.API.Job.ComponentRemove()));
 
             
@@ -223,7 +224,7 @@ WriteLiteral("\',\r\n                            dataType: \'json\',\r\n
 "        $.ajax({\r\n                    url: \'");
 
             
-            #line 137 "..\..\Views\Job\JobParts\Components.cshtml"
+            #line 140 "..\..\Views\Job\JobParts\Components.cshtml"
                      Write(Url.Action(MVC.API.Job.ComponentUpdate()));
 
             
@@ -256,7 +257,7 @@ WriteLiteral(@"',
                     url: '");
 
             
-            #line 161 "..\..\Views\Job\JobParts\Components.cshtml"
+            #line 164 "..\..\Views\Job\JobParts\Components.cshtml"
                      Write(Url.Action(MVC.API.Job.ComponentAdd(Model.Job.Id, null, null)));
 
             

Disco.Web/Views/Job/JobParts/Flags.cshtml

@@ -80,7 +80,7 @@
                     }
                 },
                 close: function () {
-                    $flagCheckbox.attr('checked', false);
+                    $flagCheckbox.prop('checked', false);
                 }
             });
 

Disco.Web/Views/Job/JobParts/Flags.generated.cs

@@ -311,7 +311,7 @@ WriteLiteral(@"', { Flag: '-' + flagValue }, function (response, result) {
                     }
                 },
                 close: function () {
-                    $flagCheckbox.attr('checked', false);
+                    $flagCheckbox.prop('checked', false);
                 }
             });
 

Disco.Web/Views/Job/JobParts/_Subject.cshtml

@@ -146,39 +146,15 @@
                     </script>
                 </div>
                 <div id="Job_Show_GenerateDocument_Container" class="status">
-                    @Html.DropDownList("Job_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems) <span id="Job_Show_GenerateDocument_Status">@AjaxHelpers.AjaxLoader()&nbsp;Generating...</span>
+                    @Html.DropDownList("Job_Show_GenerateDocument", Model.DocumentTemplatesSelectListItems)
                     <script type="text/javascript">
                         $(function () {
                             var generatePdfUrl = '@Url.Action(MVC.API.Job.GeneratePdf(Model.Job.Id.ToString(), null))?DocumentTemplateId=';
                             var $documentTemplates = $('#Job_Show_GenerateDocument');
-                            var $Job_Show_GenerateDocument_Status = $('#Job_Show_GenerateDocument_Status');
-                            $Job_Show_GenerateDocument_Status.find('.ajaxLoading').css('display', 'inline-block');
                             $documentTemplates.change(function () {
                                 var v = $documentTemplates.val();
                                 if (v) {
-                                    if ($.browser.msie || $.browser.mozilla){
-                                        // Popup & Status for MSIE & Firefox
-                                        var w = window.open(generatePdfUrl + v, null, 'height=100,width=150,menubar=no,resizable=yes,scrollbars=no,status=no,toolbar=no');
-                                    
-                                        var statusShown = false;
-                                        var c = function(timeout){window.setTimeout(function(){
-                                            if (w.closed === undefined || w.closed === true){
-                                                if (statusShown)
-                                                    $Job_Show_GenerateDocument_Status.fadeOut(750);
-                                            }else{
-                                                if (!statusShown)
-                                                {
-                                                    $Job_Show_GenerateDocument_Status.show()
-                                                    statusShown = true;
-                                                }
-                                                c(500);
-                                            }
-                                        }, timeout)}
-                                        c(200);
-                                    }else{
-                                        // Redirect other Browsers with different download mechanisms
                                     window.location.href = generatePdfUrl + v;
-                                    }
                                     $documentTemplates.val('').blur();
                                 }
                             });

Disco.Web/Views/Job/_CreateSubject-Old.cshtml

@@ -1,34 +0,0 @@
-@model Disco.Web.Models.Job.CreateModel
-<table class="subtleHighlight">
-    <tr>
-        <td style="width: 50%">
-            <h2>
-                Device</h2>
-            @if (Model.Device == null)
-            { 
-                <span class="smallMessage">No Device referenced to this Job</span>
-            }
-            else
-            { 
-                <span><strong>Serial Number:</strong> @Html.ActionLink(Model.Device.SerialNumber, MVC.Device.Show(Model.Device.SerialNumber))</span><br />
-                <span><strong>Name:</strong> @Model.Device.ComputerName</span><br />
-                <span><strong>Model:</strong> @Model.Device.DeviceModel.ToString()</span><br />
-                <img alt="Model Image" src="@Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))" />
-            }
-        </td>
-        <td style="width: 50%">
-            <h2>
-                User</h2>
-            @if (Model.User == null)
-            { 
-                <span class="smallMessage">No User referenced to this Job</span>
-            }
-            else
-            {
-                <span><strong>Id:</strong> @Html.ActionLink(Model.User.Id, MVC.User.Show(Model.User.Id))</span><br />
-                <span><strong>Name:</strong> @Model.User.DisplayName</span><br />
-                <span><strong>Type:</strong> @Model.User.Type</span>
-            }
-        </td>
-    </tr>
-</table>

Disco.Web/Views/Job/_CreateSubject-Old.generated.cs

@@ -1,229 +0,0 @@
-#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Disco.Web.Views.Job
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Net;
-    using System.Text;
-    using System.Web;
-    using System.Web.Helpers;
-    using System.Web.Mvc;
-    using System.Web.Mvc.Ajax;
-    using System.Web.Mvc.Html;
-    using System.Web.Optimization;
-    using System.Web.Routing;
-    using System.Web.Security;
-    using System.Web.UI;
-    using System.Web.WebPages;
-    using Disco.BI.Extensions;
-    using Disco.Models.Repository;
-    using Disco.Web;
-    using Disco.Web.Extensions;
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
-    [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/_CreateSubject-Old.cshtml")]
-    public class CreateSubject_Old : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.CreateModel>
-    {
-        public CreateSubject_Old()
-        {
-        }
-        public override void Execute()
-        {
-WriteLiteral("<table");
-
-WriteLiteral(" class=\"subtleHighlight\"");
-
-WriteLiteral(">\r\n    <tr>\r\n        <td");
-
-WriteLiteral(" style=\"width: 50%\"");
-
-WriteLiteral(">\r\n            <h2>\r\n                Device</h2>\r\n");
-
-            
-            #line 7 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 7 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-             if (Model.Device == null)
-            { 
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span");
-
-WriteLiteral(" class=\"smallMessage\"");
-
-WriteLiteral(">No Device referenced to this Job</span>\r\n");
-
-            
-            #line 10 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-            }
-            else
-            { 
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span><strong>Serial Number:</strong> ");
-
-            
-            #line 13 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-                                                 Write(Html.ActionLink(Model.Device.SerialNumber, MVC.Device.Show(Model.Device.SerialNumber)));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>");
-
-WriteLiteral("<br />\r\n");
-
-WriteLiteral("                <span><strong>Name:</strong> ");
-
-            
-            #line 14 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-                                        Write(Model.Device.ComputerName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>");
-
-WriteLiteral("<br />\r\n");
-
-WriteLiteral("                <span><strong>Model:</strong> ");
-
-            
-            #line 15 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-                                         Write(Model.Device.DeviceModel.ToString());
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>");
-
-WriteLiteral("<br />\r\n");
-
-WriteLiteral("                <img");
-
-WriteLiteral(" alt=\"Model Image\"");
-
-WriteAttribute("src", Tuple.Create(" src=\"", 730), Tuple.Create("\"", 840)
-            
-            #line 16 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-, Tuple.Create(Tuple.Create("", 736), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.DeviceModel.Image(Model.Device.DeviceModelId, Model.Device.DeviceModel.ImageHash()))
-            
-            #line default
-            #line hidden
-, 736), false)
-);
-
-WriteLiteral(" />\r\n");
-
-            
-            #line 17 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </td>\r\n        <td");
-
-WriteLiteral(" style=\"width: 50%\"");
-
-WriteLiteral(">\r\n            <h2>\r\n                User</h2>\r\n");
-
-            
-            #line 22 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-            
-            
-            #line default
-            #line hidden
-            
-            #line 22 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-             if (Model.User == null)
-            { 
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span");
-
-WriteLiteral(" class=\"smallMessage\"");
-
-WriteLiteral(">No User referenced to this Job</span>\r\n");
-
-            
-            #line 25 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-            }
-            else
-            {
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                <span><strong>Id:</strong> ");
-
-            
-            #line 28 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-                                      Write(Html.ActionLink(Model.User.Id, MVC.User.Show(Model.User.Id)));
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>");
-
-WriteLiteral("<br />\r\n");
-
-WriteLiteral("                <span><strong>Name:</strong> ");
-
-            
-            #line 29 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-                                        Write(Model.User.DisplayName);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>");
-
-WriteLiteral("<br />\r\n");
-
-WriteLiteral("                <span><strong>Type:</strong> ");
-
-            
-            #line 30 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-                                        Write(Model.User.Type);
-
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 31 "..\..\Views\Job\_CreateSubject-Old.cshtml"
-            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("        </td>\r\n    </tr>\r\n</table>");
-
-        }
-    }
-}
-#pragma warning restore 1591

Disco.Web/Web.config

@@ -10,7 +10,7 @@
     <add key="PreserveLoginUrl" value="true" />
     <add key="ClientValidationEnabled" value="true" />
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-    <add key="DiscoIgnoreVersionUpdate" value="false" />
+    <add key="DiscoIgnoreVersionUpdate" value="true" />
   </appSettings>
   <connectionStrings>
     <add name="DiscoDataContext" connectionString="data source=(local);Initial Catalog=Disco;Integrated Security=True;MultipleActiveResultSets=True" providerName="System.Data.SqlClient" />