Update: Change UI for "Show Closed Jobs"

Move to a button at the bottom of the list.

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

@@ -56,14 +56,20 @@
                         wrapperPrev = null;
                     }
 
-                    var showClosedAnchor = $('<a class="dataTables_showStatusClosed" href="#">').text('Show Closed (' + $closedJobs.length + ')');
-                    wrapper.prepend(showClosedAnchor);
+                    var allClosedContainer = wrapperContext.find('div.allClosed_container');
+                    if (allClosedContainer.length > 0) {
+                        $table.hide();
+                        wrapper.find('.dataTables_filter').hide();
+                    } else {
+                        $('<a class="dataTables_showStatusClosed button small" href="#">').text('Show Closed Jobs (' + $closedJobs.length + ')').appendTo(wrapperContext);
+                    }
                     wrapperContext.on('click', 'a.dataTables_showStatusClosed', function () {
                         $table.show();
                         wrapper.find('.dataTables_filter').show();
                         $table.removeClass('hideStatusClosed');
                         allClosedContainer.remove();
-                        showClosedAnchor.remove();
+                        $(this).remove();
+
                         if (wrapperPrev)
                             wrapperPrev.html(wrapperPrev.data('dataTable_originalContent'));
 
@@ -71,18 +77,9 @@
 
                         return false;
                     });
-
-                    var allClosedContainer = wrapperContext.find('div.allClosed_container');
-                    if (allClosedContainer.length > 0) {
-                        $table.hide();
-                        wrapper.find('.dataTables_filter').hide();
-                        showClosedAnchor.css('right', '4px')
-                    }
                 }
             }
 
-                
-
             dataTables.push(this);
         });
 

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

@@ -1,4 +1,4 @@
-(function(n,t,i){var r=[];i(function(){function t(){var t=i(this).closest(".dataTables_wrapper");t.length>0&&n.setTimeout(function(){var e=i(n),o=t.height(),r=t.offset(),u=e.scrollTop(),s=e.height(),h=u-r.top,f;h>0?i("html").animate({scrollTop:r.top},125):(f=(u+s-(o+r.top))*-1,f>0&&(o>s?i("html").animate({scrollTop:r.top},125):i("html").animate({scrollTop:u+f},125)))},1)}i("table.jobTable").each(function(){var u=i(this),c=!1,a=u.hasClass("enablePaging"),v=u.hasClass("enableFilter"),y=u.find("tr").length>20,p={bPaginate:a,sPaginationType:"full_numbers",bLengthChange:y,iDisplayLength:20,bFilter:v,bSort:!0,bInfo:!1,bAutoWidth:!1,aoColumnDefs:[{aTargets:["dates"],sSortDataType:"disco_datetime",sType:"disco_datetime"}],aaSorting:[],oLanguage:{sSearch:"Filter:"},fnDrawCallback:function(){c?t.apply(u):c=!0}},w=u.dataTable(p),l,s,f,e,n,o,h;if(u.hasClass("hideStatusClosed")&&(l=u.children("tbody"),s=l.children('tr[data-status="Closed"]'),s.length>0)){f=i(this).closest(".dataTables_wrapper");e=f;f.parent(".jobTable").length>0&&(e=f.parent());n=e.prev();n.length>0&&(n.is("h1")||n.is("h2")||n.is("h3"))?n.data("dataTable_originalContent",n.html()).text("Active "+n.text()):n=null;o=i('<a class="dataTables_showStatusClosed" href="#">').text("Show Closed ("+s.length+")");f.prepend(o);e.on("click","a.dataTables_showStatusClosed",function(){return u.show(),f.find(".dataTables_filter").show(),u.removeClass("hideStatusClosed"),h.remove(),o.remove(),n&&n.html(n.data("dataTable_originalContent")),t.apply(u[0]),!1});h=e.find("div.allClosed_container");h.length>0&&(u.hide(),f.find(".dataTables_filter").hide(),o.css("right","4px"))}r.push(this)});i("table.deviceTable").each(function(){var n=i(this),t=n.find("tr").length>20,u={bPaginate:t,sPaginationType:"full_numbers",bLengthChange:t,iDisplayLength:20,bFilter:!0,bSort:!0,bInfo:!1,bAutoWidth:!1,aaSorting:[],oLanguage:{sSearch:"Filter:"}};n.dataTable(u);r.push(this)});i("table.userTable").each(function(){var n=i(this),t=n.find("tr").length>20,u={bPaginate:t,sPaginationType:"full_numbers",bLengthChange:t,iDisplayLength:20,bFilter:!0,bSort:!0,bInfo:!1,bAutoWidth:!1,aaSorting:[],oLanguage:{sSearch:"Filter:"}};n.dataTable(u);r.push(this)})})})(window,document,$);
+(function(n,t,i){var r=[];i(function(){function t(){var t=i(this).closest(".dataTables_wrapper");t.length>0&&n.setTimeout(function(){var e=i(n),o=t.height(),r=t.offset(),u=e.scrollTop(),s=e.height(),h=u-r.top,f;h>0?i("html").animate({scrollTop:r.top},125):(f=(u+s-(o+r.top))*-1,f>0&&(o>s?i("html").animate({scrollTop:r.top},125):i("html").animate({scrollTop:u+f},125)))},1)}i("table.jobTable").each(function(){var u=i(this),h=!1,l=u.hasClass("enablePaging"),a=u.hasClass("enableFilter"),v=u.find("tr").length>20,y={bPaginate:l,sPaginationType:"full_numbers",bLengthChange:v,iDisplayLength:20,bFilter:a,bSort:!0,bInfo:!1,bAutoWidth:!1,aoColumnDefs:[{aTargets:["dates"],sSortDataType:"disco_datetime",sType:"disco_datetime"}],aaSorting:[],oLanguage:{sSearch:"Filter:"},fnDrawCallback:function(){h?t.apply(u):h=!0}},p=u.dataTable(y),c,o,f,e,n,s;if(u.hasClass("hideStatusClosed")&&(c=u.children("tbody"),o=c.children('tr[data-status="Closed"]'),o.length>0)){f=i(this).closest(".dataTables_wrapper");e=f;f.parent(".jobTable").length>0&&(e=f.parent());n=e.prev();n.length>0&&(n.is("h1")||n.is("h2")||n.is("h3"))?n.data("dataTable_originalContent",n.html()).text("Active "+n.text()):n=null;s=e.find("div.allClosed_container");s.length>0?(u.hide(),f.find(".dataTables_filter").hide()):i('<a class="dataTables_showStatusClosed button small" href="#">').text("Show Closed Jobs ("+o.length+")").appendTo(e);e.on("click","a.dataTables_showStatusClosed",function(){return u.show(),f.find(".dataTables_filter").show(),u.removeClass("hideStatusClosed"),s.remove(),i(this).remove(),n&&n.html(n.data("dataTable_originalContent")),t.apply(u[0]),!1})}r.push(this)});i("table.deviceTable").each(function(){var n=i(this),t=n.find("tr").length>20,u={bPaginate:t,sPaginationType:"full_numbers",bLengthChange:t,iDisplayLength:20,bFilter:!0,bSort:!0,bInfo:!1,bAutoWidth:!1,aaSorting:[],oLanguage:{sSearch:"Filter:"}};n.dataTable(u);r.push(this)});i("table.userTable").each(function(){var n=i(this),t=n.find("tr").length>20,u={bPaginate:t,sPaginationType:"full_numbers",bLengthChange:t,iDisplayLength:20,bFilter:!0,bSort:!0,bInfo:!1,bAutoWidth:!1,aaSorting:[],oLanguage:{sSearch:"Filter:"}};n.dataTable(u);r.push(this)})})})(window,document,$);
 /*
 //# sourceMappingURL=Disco-DataTableHelpers.min.js.map
 */

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

@@ -2,7 +2,7 @@
 "version":3,
 "file":"Disco-DataTableHelpers.min.js",
 "lineCount":1,
-"mappings":"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",
+"mappings":"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",
 "sources":["/ClientSource/Scripts/Modules/Disco-DataTableHelpers/disco.datatablehelpers.js"],
-"names":["window","document","$","dataTables","scrollCheck","wrapper","closest","length","setTimeout","$window","wrapperHeight","height","wrapperOffset","offset","windowScrollTop","scrollTop","windowHeight","wrapperTopNotShown","top","wrapperBottomNotShown","animate","each","$table","tableDrawn","enablePaging","hasClass","enableFilter","dataTableOptionsPagination","find","dataTableOptions","fnDrawCallback","apply","$dataTable","dataTable","$tbody","$closedJobs","wrapperContext","wrapperPrev","showClosedAnchor","allClosedContainer","children","parent","prev","is","data","html","text","prepend","on","show","removeClass","remove","hide","css","push"]
+"names":["window","document","$","dataTables","scrollCheck","wrapper","closest","length","setTimeout","$window","wrapperHeight","height","wrapperOffset","offset","windowScrollTop","scrollTop","windowHeight","wrapperTopNotShown","top","wrapperBottomNotShown","animate","each","$table","tableDrawn","enablePaging","hasClass","enableFilter","dataTableOptionsPagination","find","dataTableOptions","fnDrawCallback","apply","$dataTable","dataTable","$tbody","$closedJobs","wrapperContext","wrapperPrev","allClosedContainer","children","parent","prev","is","data","html","text","hide","appendTo","on","show","removeClass","remove","push"]
 }

Disco.Web/ClientSource/Scripts/Modules/Disco-DataTableHelpers/disco.datatablehelpers.js

@@ -55,14 +55,20 @@
                         wrapperPrev = null;
                     }
 
-                    var showClosedAnchor = $('<a class="dataTables_showStatusClosed" href="#">').text('Show Closed (' + $closedJobs.length + ')');
-                    wrapper.prepend(showClosedAnchor);
+                    var allClosedContainer = wrapperContext.find('div.allClosed_container');
+                    if (allClosedContainer.length > 0) {
+                        $table.hide();
+                        wrapper.find('.dataTables_filter').hide();
+                    } else {
+                        $('<a class="dataTables_showStatusClosed button small" href="#">').text('Show Closed Jobs (' + $closedJobs.length + ')').appendTo(wrapperContext);
+                    }
                     wrapperContext.on('click', 'a.dataTables_showStatusClosed', function () {
                         $table.show();
                         wrapper.find('.dataTables_filter').show();
                         $table.removeClass('hideStatusClosed');
                         allClosedContainer.remove();
-                        showClosedAnchor.remove();
+                        $(this).remove();
+
                         if (wrapperPrev)
                             wrapperPrev.html(wrapperPrev.data('dataTable_originalContent'));
 
@@ -70,18 +76,9 @@
 
                         return false;
                     });
-
-                    var allClosedContainer = wrapperContext.find('div.allClosed_container');
-                    if (allClosedContainer.length > 0) {
-                        $table.hide();
-                        wrapper.find('.dataTables_filter').hide();
-                        showClosedAnchor.css('right', '4px')
-                    }
                 }
             }
 
-                
-
             dataTables.push(this);
         });
 

Disco.Web/ClientSource/Style/BundleSite.css

@@ -3838,14 +3838,6 @@ table.genericData td.id a {
   padding: 0;
   height: 1.4em;
 }
-.dataTables_wrapper .dataTables_showStatusClosed {
-  display: block;
-  position: absolute;
-  height: 20px;
-  margin-top: -20px;
-  right: 320px;
-  font-weight: bold;
-}
 .dataTables_wrapper .dataTables_paginate {
   text-align: right;
   background-color: #f4f4f4;
@@ -4076,6 +4068,17 @@ table.jobTable td.location,
 table.jobTable th.location {
   width: 200px;
 }
+div.jobTable > a.dataTables_showStatusClosed {
+  margin: 10px 5px;
+}
+div.jobTable > h3,
+div.jobTable > div.allClosed_container {
+  margin: 50px 20px !important;
+}
+div.jobTable > h3 a.button,
+div.jobTable > div.allClosed_container a.button {
+  margin-top: 10px;
+}
 table.deviceTable tr.decommissioned {
   background-color: #ededed;
 }

Disco.Web/ClientSource/Style/Device.css

@@ -208,14 +208,6 @@
   margin: -1px;
   border: 1px solid #ddd;
 }
-#DeviceDetailTab-JobsContainer div.jobTable > h3,
-#DeviceDetailTab-JobsContainer div.jobTable > div.allClosed_container {
-  margin: 50px 20px !important;
-}
-#DeviceDetailTab-JobsContainer div.jobTable > h3 a.button,
-#DeviceDetailTab-JobsContainer div.jobTable > div.allClosed_container a.button {
-  margin-top: 10px;
-}
 #DeviceDetailTab-JobsContainer .dataTables_wrapper .dataTables_filter {
   margin-top: -24px;
   -moz-opacity: 1;

Disco.Web/ClientSource/Style/Device.less

@@ -170,14 +170,6 @@
     div.jobTable {
         margin: -1px;
         border: 1px solid #ddd;
-
-        & > h3, & > div.allClosed_container {
-            margin: 50px 20px !important;
-
-            a.button {
-                margin-top: 10px;
-            }
-        }
     }
 
     .dataTables_wrapper {

Disco.Web/ClientSource/Style/Site.css

@@ -637,14 +637,6 @@ table.genericData td.id a {
   padding: 0;
   height: 1.4em;
 }
-.dataTables_wrapper .dataTables_showStatusClosed {
-  display: block;
-  position: absolute;
-  height: 20px;
-  margin-top: -20px;
-  right: 320px;
-  font-weight: bold;
-}
 .dataTables_wrapper .dataTables_paginate {
   text-align: right;
   background-color: #f4f4f4;
@@ -875,6 +867,17 @@ table.jobTable td.location,
 table.jobTable th.location {
   width: 200px;
 }
+div.jobTable > a.dataTables_showStatusClosed {
+  margin: 10px 5px;
+}
+div.jobTable > h3,
+div.jobTable > div.allClosed_container {
+  margin: 50px 20px !important;
+}
+div.jobTable > h3 a.button,
+div.jobTable > div.allClosed_container a.button {
+  margin-top: 10px;
+}
 table.deviceTable tr.decommissioned {
   background-color: #ededed;
 }

Disco.Web/ClientSource/Style/Site.less

@@ -229,6 +229,7 @@ header, #header {
 
         & > a {
             padding: 2px;
+
             & > i {
                 margin-right: 2px;
             }
@@ -569,15 +570,6 @@ table {
         opacity: 0.3;
     }
 
-    .dataTables_showStatusClosed {
-        display: block;
-        position: absolute;
-        height: 20px;
-        margin-top: -20px;
-        right: 320px;
-        font-weight: bold;
-    }
-
     .dataTables_paginate {
         text-align: right;
         background-color: @TableDataBorderColour;
@@ -833,6 +825,21 @@ table.jobTable {
     }
 }
 
+div.jobTable {
+    & > a.dataTables_showStatusClosed {
+        margin: 10px 5px;
+    }
+
+    & > h3, & > div.allClosed_container {
+        margin: 50px 20px !important;
+
+        a.button {
+            margin-top: 10px;
+        }
+    }
+}
+
+
 table.deviceTable {
     tr.decommissioned {
         background-color: @SubtleColour;

Disco.Web/ClientSource/Style/User.css

@@ -183,14 +183,6 @@
   margin: -1px;
   border: 1px solid #ddd;
 }
-#UserDetailTab-JobsContainer div.jobTable > h3,
-#UserDetailTab-JobsContainer div.jobTable > div.allClosed_container {
-  margin: 50px 20px !important;
-}
-#UserDetailTab-JobsContainer div.jobTable > h3 a.button,
-#UserDetailTab-JobsContainer div.jobTable > div.allClosed_container a.button {
-  margin-top: 10px;
-}
 #UserDetailTab-JobsContainer .dataTables_wrapper .dataTables_filter {
   margin-top: -24px;
   -moz-opacity: 1;

Disco.Web/ClientSource/Style/User.less

@@ -135,14 +135,6 @@
     div.jobTable {
         margin: -1px;
         border: 1px solid #ddd;
-
-        & > h3, & > div.allClosed_container {
-            margin: 50px 20px !important;
-
-            a.button {
-                margin-top: 10px;
-            }
-        }
     }
 
     .dataTables_wrapper {