Feature: New Theme

New icon, theme, and fuzzy time. Add moment.js

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Device/DeviceParts/_AssignmentHistory.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Device/DeviceParts/_Certificates.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Device/DeviceParts/_Details.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Device/DeviceParts/_Jobs.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Device/DeviceParts/_Resources.cshtml

@@ -32,7 +32,7 @@
                                   else
                                   { @da.Comments }}
                             </span><span class="author">@da.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && da.TechUserId == CurrentUser.Id))
-                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@da.Timestamp.ToFullDateTime()">@da.Timestamp.ToFuzzy()</span>
+                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@da.Timestamp.ToFullDateTime()">@da.Timestamp.FromNow()</span>
                         </a>   
                         }
                     }

Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -279,7 +280,7 @@ WriteLiteral(">");
 
             
             #line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
-                                                                                                                                                                                           Write(da.Timestamp.ToFuzzy());
+                                                                                                                                                                                           Write(da.Timestamp.FromNow());
 
             
             #line default

Disco.Web/Views/Device/DeviceParts/_Subject.cshtml

@@ -370,7 +370,7 @@
                                     @foreach (var db in Model.DeviceBatches.OrderBy(i => i.Name))
                                     {
                                         <li>
-                                            <input type="radio" data-devicebatchid="@db.Id" name="DeviceBatch" id="DeviceBatch_@(db.Id)" /><label for="DeviceBatch_@(db.Id)" title="Purchased: @(db.PurchaseDate.ToFuzzy())">@db.Name</label></li>   
+                                            <input type="radio" data-devicebatchid="@db.Id" name="DeviceBatch" id="DeviceBatch_@(db.Id)" /><label for="DeviceBatch_@(db.Id)" title="Purchased: @(db.PurchaseDate.FromNow())">@db.Name</label></li>   
                                     }
                                 </ul>
                             </div>

Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device.DeviceParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -1521,7 +1522,7 @@ WriteAttribute("title", Tuple.Create(" title=\"", 22840), Tuple.Create("\"", 228
 , Tuple.Create(Tuple.Create("", 22848), Tuple.Create("Purchased:", 22848), true)
             
             #line 373 "..\..\Views\Device\DeviceParts\_Subject.cshtml"
-                                                                                                              , Tuple.Create(Tuple.Create(" ", 22858), Tuple.Create<System.Object, System.Int32>(db.PurchaseDate.ToFuzzy()
+                                                                                                              , Tuple.Create(Tuple.Create(" ", 22858), Tuple.Create<System.Object, System.Int32>(db.PurchaseDate.FromNow()
             
             #line default
             #line hidden

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     
     #line 2 "..\..\Views\Device\ImportReview.cshtml"
     using Disco.BI.DeviceBI.Importing;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Device
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/InitialConfig/Complete.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/InitialConfig/Database.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/InitialConfig/FileStore.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/InitialConfig/Welcome.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/InitialConfig/_Layout.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/InitialConfig/_ViewStart.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.InitialConfig
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Job/Index.cshtml

@@ -54,7 +54,7 @@
                                     height: 175,
                                     animation: false
                                 },
-                                colors: ['#BBBBBB', '#005fab', '#DB761D'],
+                                colors: ['#BBBBBB', '#005fab', '#60ab1e'],
                                 title: {
                                     text: null
                                 },

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -159,7 +160,7 @@ WriteLiteral(">\r\n                (function () {\r\n                    var cha
 "                     renderTo: \'chartHostJobDailyOpenedClosed\',\r\n               " +
 "                     height: 175,\r\n                                    animation" +
 ": false\r\n                                },\r\n                                col" +
-"ors: [\'#BBBBBB\', \'#005fab\', \'#DB761D\'],\r\n                                title: " +
+"ors: [\'#BBBBBB\', \'#005fab\', \'#60ab1e\'],\r\n                                title: " +
 "{\r\n                                    text: null\r\n                             " +
 "   },\r\n                                plotOptions: {\r\n                         " +
 "           series: {\r\n                                        marker: {\r\n       " +

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -526,7 +526,7 @@
                 <script>
                     $(function () {
                         var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
-                        var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
+                        var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
 
                         document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Claim Form Sent Date', 'Job_JobMetaInsurance_ClaimFormSentDate', 'Job_JobMetaInsurance_ClaimFormSentUserId', 'InsuranceClaimFormSentDate', 'Not Sent', jobOpenDate, false);
                     });

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -1673,7 +1674,7 @@ WriteLiteral("\';\r\n                        var jobOpenDate = \'");
 
             
             #line 529 "..\..\Views\Job\JobParts\Insurance.cshtml"
-                                       Write(Model.Job.OpenedDate.ToJavascriptDateTime());
+                                       Write(Model.Job.OpenedDate.ToJavaScript());
 
             
             #line default

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     
     #line 2 "..\..\Views\Job\JobParts\JobMetaAdditions.cshtml"

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -125,7 +125,7 @@
 <script>
     $(function () {
         var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
-        var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
+        var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
 
         @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeRequired))
         {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Required', 'Job_JobMetaNonWarranty_AccountingChargeRequiredDate', 'Job_JobMetaNonWarranty_AccountingChargeRequiredUser', 'NonWarrantyAccountingChargeRequired', 'Not Required', jobOpenDate, false);</text>}

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -459,7 +460,7 @@ WriteLiteral("\';\r\n        var jobOpenDate = \'");
 
             
             #line 128 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
-                       Write(Model.Job.OpenedDate.ToJavascriptDateTime());
+                       Write(Model.Job.OpenedDate.ToJavaScript());
 
             
             #line default

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

@@ -81,7 +81,7 @@
 <script>
     $(function () {
         var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
-        var jobOpenDate = '@(Model.Job.OpenedDate.ToJavascriptDateTime())';
+        var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
 
         @if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerLoggedDate))
         {<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repairer Name', 'Job_JobMetaNonWarranty_RepairerLoggedDate', null, 'NonWarrantyRepairerLoggedDate', 'Not Logged', jobOpenDate, false);</text>}

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -344,7 +345,7 @@ WriteLiteral("\';\r\n        var jobOpenDate = \'");
 
             
             #line 84 "..\..\Views\Job\JobParts\Repairs.cshtml"
-                       Write(Model.Job.OpenedDate.ToJavascriptDateTime());
+                       Write(Model.Job.OpenedDate.ToJavaScript());
 
             
             #line default

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

@@ -30,7 +30,7 @@
                     {
                         <div data-logid="@jl.Id">
                             <span class="author">@jl.TechUser.ToString()</span>@if (canRemoveAnyLogs || (canRemoveOwnLogs && jl.TechUserId == CurrentUser.Id))
-                                                                               {<text><span class="remove"></span></text>}<span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.ToFuzzy()</span>
+                                                                               {<text><span class="remove"></span></text>}<span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.FromNow()</span>
                             <span class="comment">@jl.Comments.ToMultilineJobRefString()</span>
                         </div>
                     }
@@ -59,7 +59,7 @@
                                   else
                                   { @ja.Comments }}
                             </span><span class="author">@ja.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ja.TechUserId == CurrentUser.Id))
-                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.ToFuzzy()</span>
+                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.FromNow()</span>
                         </a>   
                     }
                 </div>

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

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -206,7 +207,7 @@ WriteLiteral(">");
 
             
             #line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                                                                                                                                                    Write(jl.Timestamp.ToFuzzy());
+                                                                                                                                                                                    Write(jl.Timestamp.FromNow());
 
             
             #line default
@@ -498,7 +499,7 @@ WriteLiteral(">");
 
             
             #line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                                                                                                                                                           Write(ja.Timestamp.ToFuzzy());
+                                                                                                                                                                                           Write(ja.Timestamp.FromNow());
 
             
             #line default

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -202,7 +202,7 @@
                             {
                             <div id="Job_Show_Device_Details_HWar">
                                 <div>DEVICE WARRANTY</div>
-                                <div>Until: <span id="Job_Show_Device_Details_HWar_ValidUntil">@Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFuzzy("Unknown")</span></div>
+                                <div>Until: <span id="Job_Show_Device_Details_HWar_ValidUntil">@Model.Job.Device.DeviceBatch.WarrantyValidUntil.FromNow("Unknown")</span></div>
                                 @if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.WarrantyDetails))
                                 {
                                     <a id="Job_Show_Device_Details_HWar_Details_Button" href="#">Show Details</a>
@@ -232,7 +232,7 @@
                             <div id="Job_Show_Device_Details_HNWar">
                                 <div>INSURANCE</div>
                                 <div id="Job_Show_Device_Details_HNWar_InsuranceSupplier">@Model.Job.Device.DeviceBatch.InsuranceSupplier</div>
-                                <div>Until: <span id="Job_Show_Device_Details_HNWar_ValidUntil">@Model.Job.Device.DeviceBatch.InsuredUntil.ToFuzzy("Unknown")</span></div>
+                                <div>Until: <span id="Job_Show_Device_Details_HNWar_ValidUntil">@Model.Job.Device.DeviceBatch.InsuredUntil.FromNow("Unknown")</span></div>
                                 @if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.InsuranceDetails))
                                 {
                                     <a id="Job_Show_Device_Details_HNWar_Details_Button" href="#">Show Details</a>
@@ -367,7 +367,7 @@
                     {
                         <div id="Job_Show_User_WaitingForUserAction" class="status">
                             <h4>Awaiting Action</h4>
-                            Since: @Model.Job.WaitingForUserAction.ToFuzzy()
+                            Since: @Model.Job.WaitingForUserAction.FromNow()
                         </div>
                     }
                 </div>

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job.JobParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -842,7 +843,7 @@ WriteLiteral(">");
 
             
             #line 205 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                          Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFuzzy("Unknown"));
+                                                                                          Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.FromNow("Unknown"));
 
             
             #line default
@@ -966,7 +967,7 @@ WriteLiteral(">");
 
             
             #line 235 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                                                                                           Write(Model.Job.Device.DeviceBatch.InsuredUntil.ToFuzzy("Unknown"));
+                                                                                           Write(Model.Job.Device.DeviceBatch.InsuredUntil.FromNow("Unknown"));
 
             
             #line default
@@ -1549,7 +1550,7 @@ WriteLiteral(">\r\n                            <h4>Awaiting Action</h4>\r\n
 
             
             #line 370 "..\..\Views\Job\JobParts\_Subject.cshtml"
-                              Write(Model.Job.WaitingForUserAction.ToFuzzy());
+                              Write(Model.Job.WaitingForUserAction.FromNow());
 
             
             #line default

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Job/Show.cshtml

@@ -14,8 +14,8 @@
 <div id="Job_Show">
     <div id="Job_Show_Status">
         @{ var jobStatusInfo = Model.Job.Status();}
-        <span class="icon JobStatus@(jobStatusInfo.Item1)"></span>@jobStatusInfo.Item2 @if (Model.IsLongRunning)
-                                                                                       {<span class="smallMessage">(Long Running)</span>}
+        <span class="icon JobStatus@(jobStatusInfo.Item1)"></span>@jobStatusInfo.Item2 @if (Model.LongRunning.HasValue)
+                                                                                       {<span class="smallMessage">(Long Running: @Model.LongRunning.Value.Humanize(false))</span>}
         <script type="text/javascript">
             $(function () {
                 $('#Job_Show_Status').appendTo('#layout_PageHeading')

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

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -108,7 +109,7 @@ WriteLiteral(" ");
 
             
             #line 17 "..\..\Views\Job\Show.cshtml"
-                                                                                        if (Model.IsLongRunning)
+                                                                                        if (Model.LongRunning.HasValue)
                                                                                        {
             
             #line default
@@ -117,11 +118,20 @@ WriteLiteral("<span");
 
 WriteLiteral(" class=\"smallMessage\"");
 
-WriteLiteral(">(Long Running)</span>");
+WriteLiteral(">(Long Running: ");
 
             
             #line 18 "..\..\Views\Job\Show.cshtml"
-                                                                                                                                        }
+                                                                                                                             Write(Model.LongRunning.Value.Humanize(false));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(")</span>");
+
+            
+            #line 18 "..\..\Views\Job\Show.cshtml"
+                                                                                                                                                                                  }
 
             
             #line default

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Job
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Search/Query.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Search
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Shared/DisplayTemplates/AccessDeniedException.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared.DisplayTemplates
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Shared/DisplayTemplates/Exception.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared.DisplayTemplates
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Shared/Error.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Shared/_DialogLayout.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Shared/_EmptyLayout.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Shared/_JobTable.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Shared/_JobTableRender.cshtml

@@ -15,7 +15,7 @@
                     { <th class="status">Status
                     </th> }
                     @if (Model.ShowDates)
-                    { <th class="dates">Dates
+                    { <th class="dates">When
                     </th> }
                     @if (Model.ShowType)
                     { <th class="type">Type
@@ -36,81 +36,46 @@
             </thead>
             <tbody>
                 @foreach (var item in Model.Items)
-                {
-                    <tr data-id="@(item.Id)" data-status="@(Model.ShowStatus ? item.StatusId : null)">
-                        @if (Model.ShowId)
-                        { <td class="id">
-                            @if (Authorization.Has(Claims.Job.Show))
-                            {
-                                @Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id))
-                            }
+                {<tr data-id="@(item.Id)" data-status="@(Model.ShowStatus ? item.StatusId : null)">
+                    @if (Model.ShowId)
+                    {<td class="id">
+                        @if (Authorization.Has(Claims.Job.Show))
+                        {@Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id))}
+                        else
+                        {@item.Id.ToString()}</td>}
+                    @if (Model.ShowStatus)
+                    {<td class="status"><span class="icon JobStatus@(item.StatusId)"></span>&nbsp;@item.StatusDescription</td>}
+                    @if (Model.ShowDates)
+                    {<td class="dates">@if (item.ClosedDate.HasValue) {@CommonHelpers.FriendlyDate(item.ClosedDate.Value)}else{@CommonHelpers.FriendlyDate(item.OpenedDate)}</td>}
+                    @if (Model.ShowType)
+                    {<td class="type"><span title="@item.TypeDescription">@item.TypeId</span></td>}
+                    @if (Model.ShowDevice)
+                    {<td class="device">
+                        @if (item.DeviceSerialNumber != null)
+                        {
+                            if (Authorization.Has(Claims.Device.Show))
+                            {@Html.ActionLink(item.DeviceSerialNumber, MVC.Device.Show(item.DeviceSerialNumber), new { Title = item.DeviceModelDescription })}
                             else
-                            {
-                                @item.Id.ToString()
-                            }
-                        </td> }
-                        @if (Model.ShowStatus)
-                        { <td class="status">
-                            <span class="icon JobStatus@(item.StatusId)"></span>
-                            @item.StatusDescription
-                        </td> }
-                        @if (Model.ShowDates)
-                        { <td class="dates">
-                            @CommonHelpers.FriendlyDate(item.OpenedDate)
-                            - @CommonHelpers.FriendlyDate(item.ClosedDate)
-                        </td>}
-                        @if (Model.ShowType)
-                        { <td class="type">
-                            <span title="@item.TypeDescription">@item.TypeId</span>
-                        </td>}
-                        @if (Model.ShowDevice)
-                        { <td class="device">
-                            @if (item.DeviceSerialNumber != null)
-                            {
-                                if (Authorization.Has(Claims.Device.Show))
-                                {
-                                @Html.ActionLink(item.DeviceSerialNumber, MVC.Device.Show(item.DeviceSerialNumber), new { Title = item.DeviceModelDescription })
-                                }
-                                else
-                                {
-                                <span title="@item.DeviceModelDescription">@item.DeviceSerialNumber</span>
-                                }
-                            }
+                            {<span title="@item.DeviceModelDescription">@item.DeviceSerialNumber</span>}
+                        }
+                        else
+                        {<span class="smallMessage">N/A</span>}</td>}
+                    @if (Model.ShowUser)
+                    {<td class="user">
+                        @if (item.UserId != null)
+                        {
+                            if (Authorization.Has(Claims.User.Show))
+                            {@Html.ActionLink(string.Format("{0} ({1})", item.UserDisplayName, item.UserId), MVC.User.Show(item.UserId))}
                             else
-                            { 
-                                <span class="smallMessage">N/A</span>
-                            }
-                        </td> }
-                        @if (Model.ShowUser)
-                        {<td class="user">
-                            @if (item.UserId != null)
-                            {
-                                if (Authorization.Has(Claims.User.Show))
-                                {
-                                @Html.ActionLink(string.Format("{0} ({1})", item.UserDisplayName, item.UserId), MVC.User.Show(item.UserId))
-                                }
-                                else
-                                {
-                                @(string.Format("{0} ({1})", item.UserDisplayName, item.UserId))
-                                }
-                            }
-                            else
-                            { 
-                                <span class="smallMessage">N/A</span>
-                            }
-                        </td>}
-                        @if (Model.ShowTechnician)
-                        { <td class="technician">
-                            <span title="@item.OpenedTechUserDisplayName">@item.OpenedTechUserId
-                            </span>
-                        </td>}
-                        @if (Model.ShowLocation)
-                        { <td class="technician">
-                            <span>@(item.Location ?? "Unknown")
-                            </span>
-                        </td>}
-                    </tr>
-                }
+                            {@(string.Format("{0} ({1})", item.UserDisplayName, item.UserId))}
+                        }
+                        else
+                        {<span class="smallMessage">N/A</span>}</td>}
+                    @if (Model.ShowTechnician)
+                    {<td class="technician"><span title="@item.OpenedTechUserDisplayName">@item.OpenedTechUserId</span></td>}
+                    @if (Model.ShowLocation)
+                    {<td class="technician"><span>@(item.Location ?? "Unknown")</span></td>}
+                </tr>}
             </tbody>
         </table>
     }

Disco.Web/Views/Shared/_JobTableRender.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -167,7 +168,7 @@ WriteLiteral(" <th");
 
 WriteLiteral(" class=\"dates\"");
 
-WriteLiteral(">Dates\r\n                    </th> ");
+WriteLiteral(">When\r\n                    </th> ");
 
             
             #line 19 "..\..\Views\Shared\_JobTableRender.cshtml"
@@ -298,17 +299,16 @@ WriteLiteral("                </tr>\r\n            </thead>\r\n            <tbod
             #line 38 "..\..\Views\Shared\_JobTableRender.cshtml"
                  foreach (var item in Model.Items)
                 {
-
             
             #line default
             #line hidden
-WriteLiteral("                    <tr");
+WriteLiteral("<tr");
 
 WriteLiteral(" data-id=\"");
 
             
-            #line 40 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             Write(item.Id);
+            #line 39 "..\..\Views\Shared\_JobTableRender.cshtml"
+                          Write(item.Id);
 
             
             #line default
@@ -318,8 +318,8 @@ WriteLiteral("\"");
 WriteLiteral(" data-status=\"");
 
             
-            #line 40 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                      Write(Model.ShowStatus ? item.StatusId : null);
+            #line 39 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                   Write(Model.ShowStatus ? item.StatusId : null);
 
             
             #line default
@@ -329,320 +329,322 @@ WriteLiteral("\"");
 WriteLiteral(">\r\n");
 
             
-            #line 41 "..\..\Views\Shared\_JobTableRender.cshtml"
-                        
+            #line 40 "..\..\Views\Shared\_JobTableRender.cshtml"
+                    
             
             #line default
             #line hidden
             
-            #line 41 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         if (Model.ShowId)
-                        {
+            #line 40 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowId)
+                    {
             
             #line default
             #line hidden
-WriteLiteral(" <td");
+WriteLiteral("<td");
 
 WriteLiteral(" class=\"id\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 43 "..\..\Views\Shared\_JobTableRender.cshtml"
-                            
+            #line 42 "..\..\Views\Shared\_JobTableRender.cshtml"
+                        
             
             #line default
             #line hidden
             
-            #line 43 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             if (Authorization.Has(Claims.Job.Show))
-                            {
-                                
-            
-            #line default
-            #line hidden
-            
-            #line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
-                           Write(Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id)));
-
-            
-            #line default
-            #line hidden
-            
-            #line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                                                           
-                            }
-                            else
-                            {
-                                
-            
-            #line default
-            #line hidden
-            
-            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
-                           Write(item.Id.ToString());
-
-            
-            #line default
-            #line hidden
-            
-            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                   
-                            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        </td> ");
-
-            
-            #line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
-                              }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        ");
-
-            
-            #line 52 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         if (Model.ShowStatus)
+            #line 42 "..\..\Views\Shared\_JobTableRender.cshtml"
+                         if (Authorization.Has(Claims.Job.Show))
                         {
             
             #line default
             #line hidden
-WriteLiteral(" <td");
+            
+            #line 43 "..\..\Views\Shared\_JobTableRender.cshtml"
+                    Write(Html.ActionLink(item.Id.ToString(), MVC.Job.Show(item.Id)));
+
+            
+            #line default
+            #line hidden
+            
+            #line 43 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                    }
+                        else
+                        {
+            
+            #line default
+            #line hidden
+            
+            #line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
+                    Write(item.Id.ToString());
+
+            
+            #line default
+            #line hidden
+            
+            #line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                            }
+            
+            #line default
+            #line hidden
+WriteLiteral("</td>");
+
+            
+            #line 45 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                  }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
+
+            
+            #line 46 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowStatus)
+                    {
+            
+            #line default
+            #line hidden
+WriteLiteral("<td");
 
 WriteLiteral(" class=\"status\"");
 
-WriteLiteral(">\r\n                            <span");
+WriteLiteral("><span");
 
-WriteAttribute("class", Tuple.Create(" class=\"", 2336), Tuple.Create("\"", 2374)
-, Tuple.Create(Tuple.Create("", 2344), Tuple.Create("icon", 2344), true)
-, Tuple.Create(Tuple.Create(" ", 2348), Tuple.Create("JobStatus", 2349), true)
+WriteAttribute("class", Tuple.Create(" class=\"", 2094), Tuple.Create("\"", 2132)
+, Tuple.Create(Tuple.Create("", 2102), Tuple.Create("icon", 2102), true)
+, Tuple.Create(Tuple.Create(" ", 2106), Tuple.Create("JobStatus", 2107), true)
             
-            #line 54 "..\..\Views\Shared\_JobTableRender.cshtml"
-, Tuple.Create(Tuple.Create("", 2358), Tuple.Create<System.Object, System.Int32>(item.StatusId
+            #line 47 "..\..\Views\Shared\_JobTableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 2116), Tuple.Create<System.Object, System.Int32>(item.StatusId
             
             #line default
             #line hidden
-, 2358), false)
+, 2116), false)
 );
 
-WriteLiteral("></span>\r\n");
-
-WriteLiteral("                            ");
+WriteLiteral("></span>&nbsp;");
 
             
-            #line 55 "..\..\Views\Shared\_JobTableRender.cshtml"
-                       Write(item.StatusDescription);
+            #line 47 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                             Write(item.StatusDescription);
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                        </td> ");
+WriteLiteral("</td>");
 
             
-            #line 56 "..\..\Views\Shared\_JobTableRender.cshtml"
-                              }
+            #line 47 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                                              }
 
             
             #line default
             #line hidden
-WriteLiteral("                        ");
+WriteLiteral("                    ");
 
             
-            #line 57 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         if (Model.ShowDates)
-                        {
+            #line 48 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowDates)
+                    {
             
             #line default
             #line hidden
-WriteLiteral(" <td");
+WriteLiteral("<td");
 
 WriteLiteral(" class=\"dates\"");
 
-WriteLiteral(">\r\n");
-
-WriteLiteral("                            ");
+WriteLiteral(">");
 
             
-            #line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
-                       Write(CommonHelpers.FriendlyDate(item.OpenedDate));
+            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                        if (item.ClosedDate.HasValue) {
+            
+            #line default
+            #line hidden
+            
+            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                  Write(CommonHelpers.FriendlyDate(item.ClosedDate.Value));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                            - ");
-
             
-            #line 60 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         Write(CommonHelpers.FriendlyDate(item.ClosedDate));
+            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                                         }else{
+            
+            #line default
+            #line hidden
+            
+            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                                          Write(CommonHelpers.FriendlyDate(item.OpenedDate));
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                        </td>");
+            
+            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                                                                                           }
+            
+            #line default
+            #line hidden
+WriteLiteral("</td>");
 
             
-            #line 61 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             }
+            #line 49 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                                                                                                 }
 
             
             #line default
             #line hidden
-WriteLiteral("                        ");
+WriteLiteral("                    ");
 
             
-            #line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         if (Model.ShowType)
-                        {
+            #line 50 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowType)
+                    {
             
             #line default
             #line hidden
-WriteLiteral(" <td");
+WriteLiteral("<td");
 
 WriteLiteral(" class=\"type\"");
 
-WriteLiteral(">\r\n                            <span");
+WriteLiteral("><span");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 2870), Tuple.Create("\"", 2899)
+WriteAttribute("title", Tuple.Create(" title=\"", 2486), Tuple.Create("\"", 2515)
             
-            #line 64 "..\..\Views\Shared\_JobTableRender.cshtml"
-, Tuple.Create(Tuple.Create("", 2878), Tuple.Create<System.Object, System.Int32>(item.TypeDescription
+            #line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 2494), Tuple.Create<System.Object, System.Int32>(item.TypeDescription
             
             #line default
             #line hidden
-, 2878), false)
+, 2494), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 64 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                           Write(item.TypeId);
+            #line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                     Write(item.TypeId);
 
             
             #line default
             #line hidden
-WriteLiteral("</span>\r\n                        </td>");
+WriteLiteral("</span></td>");
 
             
-            #line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             }
+            #line 51 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                  }
 
             
             #line default
             #line hidden
-WriteLiteral("                        ");
+WriteLiteral("                    ");
 
             
-            #line 66 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         if (Model.ShowDevice)
-                        {
+            #line 52 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowDevice)
+                    {
             
             #line default
             #line hidden
-WriteLiteral(" <td");
+WriteLiteral("<td");
 
 WriteLiteral(" class=\"device\"");
 
 WriteLiteral(">\r\n");
 
             
-            #line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
-                            
+            #line 54 "..\..\Views\Shared\_JobTableRender.cshtml"
+                        
             
             #line default
             #line hidden
             
-            #line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             if (item.DeviceSerialNumber != null)
+            #line 54 "..\..\Views\Shared\_JobTableRender.cshtml"
+                         if (item.DeviceSerialNumber != null)
+                        {
+                            if (Authorization.Has(Claims.Device.Show))
                             {
-                                if (Authorization.Has(Claims.Device.Show))
-                                {
-                                
             
             #line default
             #line hidden
             
-            #line 72 "..\..\Views\Shared\_JobTableRender.cshtml"
-                           Write(Html.ActionLink(item.DeviceSerialNumber, MVC.Device.Show(item.DeviceSerialNumber), new { Title = item.DeviceModelDescription }));
+            #line 57 "..\..\Views\Shared\_JobTableRender.cshtml"
+                        Write(Html.ActionLink(item.DeviceSerialNumber, MVC.Device.Show(item.DeviceSerialNumber), new { Title = item.DeviceModelDescription }));
 
             
             #line default
             #line hidden
             
-            #line 72 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                                                                                                                                
-                                }
-                                else
-                                {
-
+            #line 57 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                                                                             }
+                            else
+                            {
             
             #line default
             #line hidden
-WriteLiteral("                                <span");
+WriteLiteral("<span");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 3565), Tuple.Create("\"", 3601)
+WriteAttribute("title", Tuple.Create(" title=\"", 3020), Tuple.Create("\"", 3056)
             
-            #line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
-, Tuple.Create(Tuple.Create("", 3573), Tuple.Create<System.Object, System.Int32>(item.DeviceModelDescription
+            #line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 3028), Tuple.Create<System.Object, System.Int32>(item.DeviceModelDescription
             
             #line default
             #line hidden
-, 3573), false)
+, 3028), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                                      Write(item.DeviceSerialNumber);
+            #line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                   Write(item.DeviceSerialNumber);
 
             
             #line default
             #line hidden
-WriteLiteral("</span>\r\n");
+WriteLiteral("</span>");
 
             
-            #line 77 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                }
-                            }
-                            else
-                            { 
-
+            #line 59 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                       }
+                        }
+                        else
+                        {
             
             #line default
             #line hidden
-WriteLiteral("                                <span");
+WriteLiteral("<span");
 
 WriteLiteral(" class=\"smallMessage\"");
 
-WriteLiteral(">N/A</span>\r\n");
+WriteLiteral(">N/A</span>");
 
             
-            #line 82 "..\..\Views\Shared\_JobTableRender.cshtml"
-                            }
+            #line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                              }
+            
+            #line default
+            #line hidden
+WriteLiteral("</td>");
+
+            
+            #line 62 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                    }
 
             
             #line default
             #line hidden
-WriteLiteral("                        </td> ");
+WriteLiteral("                    ");
 
             
-            #line 83 "..\..\Views\Shared\_JobTableRender.cshtml"
-                              }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        ");
-
-            
-            #line 84 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         if (Model.ShowUser)
-                        {
+            #line 63 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowUser)
+                    {
             
             #line default
             #line hidden
@@ -653,157 +655,151 @@ WriteLiteral(" class=\"user\"");
 WriteLiteral(">\r\n");
 
             
-            #line 86 "..\..\Views\Shared\_JobTableRender.cshtml"
-                            
+            #line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
+                        
             
             #line default
             #line hidden
             
-            #line 86 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             if (item.UserId != null)
+            #line 65 "..\..\Views\Shared\_JobTableRender.cshtml"
+                         if (item.UserId != null)
+                        {
+                            if (Authorization.Has(Claims.User.Show))
                             {
-                                if (Authorization.Has(Claims.User.Show))
-                                {
-                                
             
             #line default
             #line hidden
             
-            #line 90 "..\..\Views\Shared\_JobTableRender.cshtml"
-                           Write(Html.ActionLink(string.Format("{0} ({1})", item.UserDisplayName, item.UserId), MVC.User.Show(item.UserId)));
+            #line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
+                        Write(Html.ActionLink(string.Format("{0} ({1})", item.UserDisplayName, item.UserId), MVC.User.Show(item.UserId)));
 
             
             #line default
             #line hidden
             
-            #line 90 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                                                                                                           
-                                }
-                                else
-                                {
-                                
-            
-            #line default
-            #line hidden
-            
-            #line 94 "..\..\Views\Shared\_JobTableRender.cshtml"
-                            Write(string.Format("{0} ({1})", item.UserDisplayName, item.UserId));
-
-            
-            #line default
-            #line hidden
-            
-            #line 94 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                                                                
-                                }
-                            }
+            #line 68 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                                                        }
                             else
-                            { 
+                            {
+            
+            #line default
+            #line hidden
+            
+            #line 70 "..\..\Views\Shared\_JobTableRender.cshtml"
+                         Write(string.Format("{0} ({1})", item.UserDisplayName, item.UserId));
 
             
             #line default
             #line hidden
-WriteLiteral("                                <span");
-
-WriteLiteral(" class=\"smallMessage\"");
-
-WriteLiteral(">N/A</span>\r\n");
-
             
-            #line 100 "..\..\Views\Shared\_JobTableRender.cshtml"
-                            }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        </td>");
-
-            
-            #line 101 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                        ");
-
-            
-            #line 102 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         if (Model.ShowTechnician)
+            #line 70 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                             }
+                        }
+                        else
                         {
             
             #line default
             #line hidden
-WriteLiteral(" <td");
+WriteLiteral("<span");
 
-WriteLiteral(" class=\"technician\"");
+WriteLiteral(" class=\"smallMessage\"");
 
-WriteLiteral(">\r\n                            <span");
+WriteLiteral(">N/A</span>");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 4937), Tuple.Create("\"", 4976)
             
-            #line 104 "..\..\Views\Shared\_JobTableRender.cshtml"
-, Tuple.Create(Tuple.Create("", 4945), Tuple.Create<System.Object, System.Int32>(item.OpenedTechUserDisplayName
+            #line 73 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                              }
             
             #line default
             #line hidden
-, 4945), false)
+WriteLiteral("</td>");
+
+            
+            #line 73 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                    }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("                    ");
+
+            
+            #line 74 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowTechnician)
+                    {
+            
+            #line default
+            #line hidden
+WriteLiteral("<td");
+
+WriteLiteral(" class=\"technician\"");
+
+WriteLiteral("><span");
+
+WriteAttribute("title", Tuple.Create(" title=\"", 3944), Tuple.Create("\"", 3983)
+            
+            #line 75 "..\..\Views\Shared\_JobTableRender.cshtml"
+, Tuple.Create(Tuple.Create("", 3952), Tuple.Create<System.Object, System.Int32>(item.OpenedTechUserDisplayName
+            
+            #line default
+            #line hidden
+, 3952), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 104 "..\..\Views\Shared\_JobTableRender.cshtml"
-                                                                     Write(item.OpenedTechUserId);
+            #line 75 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                     Write(item.OpenedTechUserId);
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                            </span>\r\n                        </td>");
+WriteLiteral("</span></td>");
 
             
-            #line 106 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             }
+            #line 75 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                                                            }
 
             
             #line default
             #line hidden
-WriteLiteral("                        ");
+WriteLiteral("                    ");
 
             
-            #line 107 "..\..\Views\Shared\_JobTableRender.cshtml"
-                         if (Model.ShowLocation)
-                        {
+            #line 76 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     if (Model.ShowLocation)
+                    {
             
             #line default
             #line hidden
-WriteLiteral(" <td");
+WriteLiteral("<td");
 
 WriteLiteral(" class=\"technician\"");
 
-WriteLiteral(">\r\n                            <span>");
+WriteLiteral("><span>");
 
             
-            #line 109 "..\..\Views\Shared\_JobTableRender.cshtml"
-                              Write(item.Location ?? "Unknown");
+            #line 77 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                              Write(item.Location ?? "Unknown");
 
             
             #line default
             #line hidden
-WriteLiteral("\r\n                            </span>\r\n                        </td>");
+WriteLiteral("</span></td>");
 
             
-            #line 111 "..\..\Views\Shared\_JobTableRender.cshtml"
-                             }
+            #line 77 "..\..\Views\Shared\_JobTableRender.cshtml"
+                                                                                           }
 
             
             #line default
             #line hidden
-WriteLiteral("                    </tr>\r\n");
+WriteLiteral("                </tr>");
 
             
-            #line 113 "..\..\Views\Shared\_JobTableRender.cshtml"
-                }
+            #line 78 "..\..\Views\Shared\_JobTableRender.cshtml"
+                     }
 
             
             #line default
@@ -811,7 +807,7 @@ WriteLiteral("                    </tr>\r\n");
 WriteLiteral("            </tbody>\r\n        </table>\r\n");
 
             
-            #line 116 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 81 "..\..\Views\Shared\_JobTableRender.cshtml"
     }
     else
     { 
@@ -826,7 +822,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">No Jobs Found</span>\r\n");
 
             
-            #line 120 "..\..\Views\Shared\_JobTableRender.cshtml"
+            #line 85 "..\..\Views\Shared\_JobTableRender.cshtml"
     }
 
             

Disco.Web/Views/Shared/_Layout.cshtml

@@ -6,7 +6,7 @@
 <html>
 <head>
     <title>Disco - @CommonHelpers.BreadcrumbsTitle(ViewBag.Title ?? string.Empty)</title>
-    <link rel="shortcut icon" href="/favicon.ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico?v=20131224c" />
     <meta name="application-name" content="Disco" />
     <meta name="msapplication-starturl" content="/" />
     <meta name="msapplication-tooltip" content="Open Disco" />
@@ -16,19 +16,8 @@
 <body class="layout">
     <div class="page">
         <header>
-            <div class="clearfix">
-                <div id="heading">
-                    <a href="@Url.Action(MVC.Job.Index())">
-                        <img src="@Links.ClientSource.Style.Images.Heading_png" alt="DISCO - ICT Asset Management" /></a>
-                </div>
-                <div id="headerMenu">
-                    <span>Welcome @if (Authorization.Has(Claims.User.Show))
-                                  { @Html.ActionLink(CurrentUser.ToString(), MVC.User.Show(CurrentUser.Id))}
-                                  else
-                                  {@CurrentUser.ToString()}</span>
-                    @using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
-                    { @Html.TextBox("term", null, new { accesskey = "s" }) }
-                </div>
+            <div id="heading">
+                <a href="@Url.Action(MVC.Job.Index())"><i title="Disco - ICT Management"></i></a>
             </div>
             <nav>
                 <ul id="menu">
@@ -94,7 +83,7 @@
                     <li>@Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2")</li>
                     <li class="sep"></li>
                     <li>@Html.ActionLink("Users", MVC.User.Index(), accesskey: "3")</li>
-                    <li class="moveRight">@Html.ActionLink("Public Reports", MVC.Public.Public.Index())</li>
+                    <li class="moveRight">@Html.ActionLink("Reports", MVC.Public.Public.Index())</li>
                     @if (Authorization.Has(Claims.Config.Show))
                     {
                         <li class="sep"></li>
@@ -102,6 +91,14 @@
                     }
                 </ul>
             </nav>
+            <div id="headerMenu">
+                <span>@if (Authorization.Has(Claims.User.Show))
+                      { @Html.ActionLink(CurrentUser.ToString(), MVC.User.Show(CurrentUser.Id))}
+                      else
+                      {@CurrentUser.ToString()}</span>
+                @using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
+                { @Html.TextBox("term", null, new { id="SearchQuery", accesskey = "s" }) }
+            </div>
         </header>
         <div id="layout_PageHeading">@CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty)</div>
         <section id="layout_Page">

Disco.Web/Views/Shared/_Layout.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -64,7 +65,9 @@ WriteLiteral("</title>\r\n    <link");
 
 WriteLiteral(" rel=\"shortcut icon\"");
 
-WriteLiteral(" href=\"/favicon.ico\"");
+WriteLiteral(" type=\"image/x-icon\"");
+
+WriteLiteral(" href=\"/favicon.ico?v=20131224c\"");
 
 WriteLiteral(" />\r\n    <meta");
 
@@ -116,110 +119,25 @@ WriteLiteral(" class=\"page\"");
 
 WriteLiteral(">\r\n        <header>\r\n            <div");
 
-WriteLiteral(" class=\"clearfix\"");
-
-WriteLiteral(">\r\n                <div");
-
 WriteLiteral(" id=\"heading\"");
 
-WriteLiteral(">\r\n                    <a");
+WriteLiteral(">\r\n                <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 688), Tuple.Create("\"", 723)
+WriteAttribute("href", Tuple.Create(" href=\"", 676), Tuple.Create("\"", 711)
             
-            #line 21 "..\..\Views\Shared\_Layout.cshtml"
-, Tuple.Create(Tuple.Create("", 695), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Job.Index())
+            #line 20 "..\..\Views\Shared\_Layout.cshtml"
+, Tuple.Create(Tuple.Create("", 683), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Job.Index())
             
             #line default
             #line hidden
-, 695), false)
+, 683), false)
 );
 
-WriteLiteral(">\r\n                        <img");
+WriteLiteral("><i");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 755), Tuple.Create("\"", 805)
-            
-            #line 22 "..\..\Views\Shared\_Layout.cshtml"
-, Tuple.Create(Tuple.Create("", 761), Tuple.Create<System.Object, System.Int32>(Links.ClientSource.Style.Images.Heading_png
-            
-            #line default
-            #line hidden
-, 761), false)
-);
+WriteLiteral(" title=\"Disco - ICT Management\"");
 
-WriteLiteral(" alt=\"DISCO - ICT Asset Management\"");
-
-WriteLiteral(" /></a>\r\n                </div>\r\n                <div");
-
-WriteLiteral(" id=\"headerMenu\"");
-
-WriteLiteral(">\r\n                    <span>Welcome ");
-
-            
-            #line 25 "..\..\Views\Shared\_Layout.cshtml"
-                                   if (Authorization.Has(Claims.User.Show))
-                                  { 
-            
-            #line default
-            #line hidden
-            
-            #line 26 "..\..\Views\Shared\_Layout.cshtml"
-                               Write(Html.ActionLink(CurrentUser.ToString(), MVC.User.Show(CurrentUser.Id)));
-
-            
-            #line default
-            #line hidden
-            
-            #line 26 "..\..\Views\Shared\_Layout.cshtml"
-                                                                                                           }
-                                  else
-                                  {
-            
-            #line default
-            #line hidden
-            
-            #line 28 "..\..\Views\Shared\_Layout.cshtml"
-                              Write(CurrentUser.ToString());
-
-            
-            #line default
-            #line hidden
-            
-            #line 28 "..\..\Views\Shared\_Layout.cshtml"
-                                                          }
-            
-            #line default
-            #line hidden
-WriteLiteral("</span>\r\n");
-
-            
-            #line 29 "..\..\Views\Shared\_Layout.cshtml"
-                    
-            
-            #line default
-            #line hidden
-            
-            #line 29 "..\..\Views\Shared\_Layout.cshtml"
-                     using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
-                    { 
-            
-            #line default
-            #line hidden
-            
-            #line 30 "..\..\Views\Shared\_Layout.cshtml"
-                 Write(Html.TextBox("term", null, new { accesskey = "s" }));
-
-            
-            #line default
-            #line hidden
-            
-            #line 30 "..\..\Views\Shared\_Layout.cshtml"
-                                                                           }
-
-            
-            #line default
-            #line hidden
-WriteLiteral("                </div>\r\n            </div>\r\n            <nav>\r\n                <u" +
-"l");
+WriteLiteral("></i></a>\r\n            </div>\r\n            <nav>\r\n                <ul");
 
 WriteLiteral(" id=\"menu\"");
 
@@ -230,7 +148,7 @@ WriteLiteral(" class=\"hasSubMenu\"");
 WriteLiteral(">");
 
             
-            #line 35 "..\..\Views\Shared\_Layout.cshtml"
+            #line 24 "..\..\Views\Shared\_Layout.cshtml"
                                       Write(Html.ActionLink("Jobs", MVC.Job.Index(), accesskey: "1"));
 
             
@@ -243,13 +161,13 @@ WriteLiteral(" class=\"subMenu\"");
 WriteLiteral(">\r\n");
 
             
-            #line 37 "..\..\Views\Shared\_Layout.cshtml"
+            #line 26 "..\..\Views\Shared\_Layout.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 37 "..\..\Views\Shared\_Layout.cshtml"
+            #line 26 "..\..\Views\Shared\_Layout.cshtml"
                              if (Authorization.Has(Claims.Job.Lists.DevicesReadyForReturn))
                             {
 
@@ -259,7 +177,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                                <li>");
 
             
-            #line 39 "..\..\Views\Shared\_Layout.cshtml"
+            #line 28 "..\..\Views\Shared\_Layout.cshtml"
                                Write(Html.ActionLink("Devices Ready for Return", MVC.Job.DevicesReadyForReturn()));
 
             
@@ -268,7 +186,7 @@ WriteLiteral("                                <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 40 "..\..\Views\Shared\_Layout.cshtml"
+            #line 29 "..\..\Views\Shared\_Layout.cshtml"
                             }
 
             
@@ -277,7 +195,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 41 "..\..\Views\Shared\_Layout.cshtml"
+            #line 30 "..\..\Views\Shared\_Layout.cshtml"
                              if (Authorization.Has(Claims.Job.Lists.Locations))
                             {
 
@@ -287,7 +205,7 @@ WriteLiteral("                            ");
 WriteLiteral("                                <li>");
 
             
-            #line 43 "..\..\Views\Shared\_Layout.cshtml"
+            #line 32 "..\..\Views\Shared\_Layout.cshtml"
                                Write(Html.ActionLink("Device Held Locations", MVC.Job.Locations()));
 
             
@@ -296,7 +214,7 @@ WriteLiteral("                                <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 44 "..\..\Views\Shared\_Layout.cshtml"
+            #line 33 "..\..\Views\Shared\_Layout.cshtml"
                             }
 
             
@@ -305,7 +223,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 45 "..\..\Views\Shared\_Layout.cshtml"
+            #line 34 "..\..\Views\Shared\_Layout.cshtml"
                              if (Authorization.Has(Claims.Job.Lists.AwaitingUserAction))
                             {
 
@@ -315,7 +233,7 @@ WriteLiteral("                            ");
 WriteLiteral("                                <li>");
 
             
-            #line 47 "..\..\Views\Shared\_Layout.cshtml"
+            #line 36 "..\..\Views\Shared\_Layout.cshtml"
                                Write(Html.ActionLink("Awaiting User Action", MVC.Job.AwaitingUserAction()));
 
             
@@ -324,7 +242,7 @@ WriteLiteral("                                <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 48 "..\..\Views\Shared\_Layout.cshtml"
+            #line 37 "..\..\Views\Shared\_Layout.cshtml"
                             }
 
             
@@ -333,7 +251,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 49 "..\..\Views\Shared\_Layout.cshtml"
+            #line 38 "..\..\Views\Shared\_Layout.cshtml"
                              if (Authorization.Has(Claims.Job.Lists.AwaitingFinance))
                             {
                                 if (Authorization.HasAny(Claims.Job.Lists.AwaitingFinanceCharge, Claims.Job.Lists.AwaitingFinancePayment, Claims.Job.Lists.AwaitingFinanceAgreementBreach, Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
@@ -349,7 +267,7 @@ WriteLiteral(" class=\"hasSubMenu\"");
 WriteLiteral(">");
 
             
-            #line 53 "..\..\Views\Shared\_Layout.cshtml"
+            #line 42 "..\..\Views\Shared\_Layout.cshtml"
                                                   Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
 
             
@@ -362,13 +280,13 @@ WriteLiteral(" class=\"subMenu\"");
 WriteLiteral(">\r\n");
 
             
-            #line 55 "..\..\Views\Shared\_Layout.cshtml"
+            #line 44 "..\..\Views\Shared\_Layout.cshtml"
                                         
             
             #line default
             #line hidden
             
-            #line 55 "..\..\Views\Shared\_Layout.cshtml"
+            #line 44 "..\..\Views\Shared\_Layout.cshtml"
                                          if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceCharge))
                                         {
 
@@ -378,7 +296,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("                                            <li>");
 
             
-            #line 57 "..\..\Views\Shared\_Layout.cshtml"
+            #line 46 "..\..\Views\Shared\_Layout.cshtml"
                                            Write(Html.ActionLink("Accounting Charge", MVC.Job.AwaitingFinanceCharge()));
 
             
@@ -387,7 +305,7 @@ WriteLiteral("                                            <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 58 "..\..\Views\Shared\_Layout.cshtml"
+            #line 47 "..\..\Views\Shared\_Layout.cshtml"
                                         }
 
             
@@ -396,7 +314,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                                        ");
 
             
-            #line 59 "..\..\Views\Shared\_Layout.cshtml"
+            #line 48 "..\..\Views\Shared\_Layout.cshtml"
                                          if (Authorization.Has(Claims.Job.Lists.AwaitingFinancePayment))
                                         {
 
@@ -406,7 +324,7 @@ WriteLiteral("                                        ");
 WriteLiteral("                                            <li>");
 
             
-            #line 61 "..\..\Views\Shared\_Layout.cshtml"
+            #line 50 "..\..\Views\Shared\_Layout.cshtml"
                                            Write(Html.ActionLink("Accounting Payment", MVC.Job.AwaitingFinancePayment()));
 
             
@@ -415,7 +333,7 @@ WriteLiteral("                                            <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 62 "..\..\Views\Shared\_Layout.cshtml"
+            #line 51 "..\..\Views\Shared\_Layout.cshtml"
                                         }
 
             
@@ -424,7 +342,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                                        ");
 
             
-            #line 63 "..\..\Views\Shared\_Layout.cshtml"
+            #line 52 "..\..\Views\Shared\_Layout.cshtml"
                                          if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceAgreementBreach))
                                         {
 
@@ -434,7 +352,7 @@ WriteLiteral("                                        ");
 WriteLiteral("                                            <li>");
 
             
-            #line 65 "..\..\Views\Shared\_Layout.cshtml"
+            #line 54 "..\..\Views\Shared\_Layout.cshtml"
                                            Write(Html.ActionLink("Agreement Breach", MVC.Job.AwaitingFinanceAgreementBreach()));
 
             
@@ -443,7 +361,7 @@ WriteLiteral("                                            <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 66 "..\..\Views\Shared\_Layout.cshtml"
+            #line 55 "..\..\Views\Shared\_Layout.cshtml"
                                         }
 
             
@@ -452,7 +370,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                                        ");
 
             
-            #line 67 "..\..\Views\Shared\_Layout.cshtml"
+            #line 56 "..\..\Views\Shared\_Layout.cshtml"
                                          if (Authorization.Has(Claims.Job.Lists.AwaitingFinanceInsuranceProcessing))
                                         {
 
@@ -462,7 +380,7 @@ WriteLiteral("                                        ");
 WriteLiteral("                                            <li>");
 
             
-            #line 69 "..\..\Views\Shared\_Layout.cshtml"
+            #line 58 "..\..\Views\Shared\_Layout.cshtml"
                                            Write(Html.ActionLink("Insurance Processing", MVC.Job.AwaitingFinanceInsuranceProcessing()));
 
             
@@ -471,7 +389,7 @@ WriteLiteral("                                            <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 70 "..\..\Views\Shared\_Layout.cshtml"
+            #line 59 "..\..\Views\Shared\_Layout.cshtml"
                                         }
 
             
@@ -481,7 +399,7 @@ WriteLiteral("                                    </ul>\r\n
 "\n");
 
             
-            #line 73 "..\..\Views\Shared\_Layout.cshtml"
+            #line 62 "..\..\Views\Shared\_Layout.cshtml"
                                 }
                                 else
                                 {
@@ -492,7 +410,7 @@ WriteLiteral("                                    </ul>\r\n
 WriteLiteral("                                <li>");
 
             
-            #line 76 "..\..\Views\Shared\_Layout.cshtml"
+            #line 65 "..\..\Views\Shared\_Layout.cshtml"
                                Write(Html.ActionLink("Awaiting Finance", MVC.Job.AwaitingFinance()));
 
             
@@ -501,7 +419,7 @@ WriteLiteral("                                <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 77 "..\..\Views\Shared\_Layout.cshtml"
+            #line 66 "..\..\Views\Shared\_Layout.cshtml"
                                 }
                             }
 
@@ -511,7 +429,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 79 "..\..\Views\Shared\_Layout.cshtml"
+            #line 68 "..\..\Views\Shared\_Layout.cshtml"
                              if (Authorization.Has(Claims.Job.Lists.DevicesAwaitingRepair))
                             {
 
@@ -521,7 +439,7 @@ WriteLiteral("                            ");
 WriteLiteral("                                <li>");
 
             
-            #line 81 "..\..\Views\Shared\_Layout.cshtml"
+            #line 70 "..\..\Views\Shared\_Layout.cshtml"
                                Write(Html.ActionLink("Awaiting Device Repair", MVC.Job.DevicesAwaitingRepair()));
 
             
@@ -530,7 +448,7 @@ WriteLiteral("                                <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 82 "..\..\Views\Shared\_Layout.cshtml"
+            #line 71 "..\..\Views\Shared\_Layout.cshtml"
                             }
 
             
@@ -539,7 +457,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 83 "..\..\Views\Shared\_Layout.cshtml"
+            #line 72 "..\..\Views\Shared\_Layout.cshtml"
                              if (Authorization.Has(Claims.Job.Lists.AllOpen))
                             {
 
@@ -549,7 +467,7 @@ WriteLiteral("                            ");
 WriteLiteral("                                <li>");
 
             
-            #line 85 "..\..\Views\Shared\_Layout.cshtml"
+            #line 74 "..\..\Views\Shared\_Layout.cshtml"
                                Write(Html.ActionLink("All Open", MVC.Job.AllOpen()));
 
             
@@ -558,7 +476,7 @@ WriteLiteral("                                <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 86 "..\..\Views\Shared\_Layout.cshtml"
+            #line 75 "..\..\Views\Shared\_Layout.cshtml"
                             }
 
             
@@ -567,7 +485,7 @@ WriteLiteral("</li>\r\n");
 WriteLiteral("                            ");
 
             
-            #line 87 "..\..\Views\Shared\_Layout.cshtml"
+            #line 76 "..\..\Views\Shared\_Layout.cshtml"
                              if (Authorization.Has(Claims.Job.Lists.RecentlyClosed))
                             {
 
@@ -577,7 +495,7 @@ WriteLiteral("                            ");
 WriteLiteral("                                <li>");
 
             
-            #line 89 "..\..\Views\Shared\_Layout.cshtml"
+            #line 78 "..\..\Views\Shared\_Layout.cshtml"
                                Write(Html.ActionLink("Recently Closed", MVC.Job.RecentlyClosed()));
 
             
@@ -586,7 +504,7 @@ WriteLiteral("                                <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 90 "..\..\Views\Shared\_Layout.cshtml"
+            #line 79 "..\..\Views\Shared\_Layout.cshtml"
                             }
 
             
@@ -600,7 +518,7 @@ WriteLiteral(" class=\"sep\"");
 WriteLiteral("></li>\r\n                    <li>");
 
             
-            #line 94 "..\..\Views\Shared\_Layout.cshtml"
+            #line 83 "..\..\Views\Shared\_Layout.cshtml"
                    Write(Html.ActionLink("Devices", MVC.Device.Index(), accesskey: "2"));
 
             
@@ -613,7 +531,7 @@ WriteLiteral(" class=\"sep\"");
 WriteLiteral("></li>\r\n                    <li>");
 
             
-            #line 96 "..\..\Views\Shared\_Layout.cshtml"
+            #line 85 "..\..\Views\Shared\_Layout.cshtml"
                    Write(Html.ActionLink("Users", MVC.User.Index(), accesskey: "3"));
 
             
@@ -626,8 +544,8 @@ WriteLiteral(" class=\"moveRight\"");
 WriteLiteral(">");
 
             
-            #line 97 "..\..\Views\Shared\_Layout.cshtml"
-                                     Write(Html.ActionLink("Public Reports", MVC.Public.Public.Index()));
+            #line 86 "..\..\Views\Shared\_Layout.cshtml"
+                                     Write(Html.ActionLink("Reports", MVC.Public.Public.Index()));
 
             
             #line default
@@ -635,13 +553,13 @@ WriteLiteral(">");
 WriteLiteral("</li>\r\n");
 
             
-            #line 98 "..\..\Views\Shared\_Layout.cshtml"
+            #line 87 "..\..\Views\Shared\_Layout.cshtml"
                     
             
             #line default
             #line hidden
             
-            #line 98 "..\..\Views\Shared\_Layout.cshtml"
+            #line 87 "..\..\Views\Shared\_Layout.cshtml"
                      if (Authorization.Has(Claims.Config.Show))
                     {
 
@@ -657,7 +575,7 @@ WriteLiteral("></li>\r\n");
 WriteLiteral("                        <li>");
 
             
-            #line 101 "..\..\Views\Shared\_Layout.cshtml"
+            #line 90 "..\..\Views\Shared\_Layout.cshtml"
                        Write(Html.ActionLink("Configuration", MVC.Config.Config.Index(), accesskey: "0"));
 
             
@@ -666,20 +584,90 @@ WriteLiteral("                        <li>");
 WriteLiteral("</li>\r\n");
 
             
-            #line 102 "..\..\Views\Shared\_Layout.cshtml"
+            #line 91 "..\..\Views\Shared\_Layout.cshtml"
                     }
 
             
             #line default
             #line hidden
-WriteLiteral("                </ul>\r\n            </nav>\r\n        </header>\r\n        <div");
+WriteLiteral("                </ul>\r\n            </nav>\r\n            <div");
+
+WriteLiteral(" id=\"headerMenu\"");
+
+WriteLiteral(">\r\n                <span>");
+
+            
+            #line 95 "..\..\Views\Shared\_Layout.cshtml"
+                       if (Authorization.Has(Claims.User.Show))
+                      { 
+            
+            #line default
+            #line hidden
+            
+            #line 96 "..\..\Views\Shared\_Layout.cshtml"
+                   Write(Html.ActionLink(CurrentUser.ToString(), MVC.User.Show(CurrentUser.Id)));
+
+            
+            #line default
+            #line hidden
+            
+            #line 96 "..\..\Views\Shared\_Layout.cshtml"
+                                                                                               }
+                      else
+                      {
+            
+            #line default
+            #line hidden
+            
+            #line 98 "..\..\Views\Shared\_Layout.cshtml"
+                  Write(CurrentUser.ToString());
+
+            
+            #line default
+            #line hidden
+            
+            #line 98 "..\..\Views\Shared\_Layout.cshtml"
+                                              }
+            
+            #line default
+            #line hidden
+WriteLiteral("</span>\r\n");
+
+            
+            #line 99 "..\..\Views\Shared\_Layout.cshtml"
+                
+            
+            #line default
+            #line hidden
+            
+            #line 99 "..\..\Views\Shared\_Layout.cshtml"
+                 using (Html.BeginForm(MVC.Search.Query(), FormMethod.Get))
+                { 
+            
+            #line default
+            #line hidden
+            
+            #line 100 "..\..\Views\Shared\_Layout.cshtml"
+             Write(Html.TextBox("term", null, new { id="SearchQuery", accesskey = "s" }));
+
+            
+            #line default
+            #line hidden
+            
+            #line 100 "..\..\Views\Shared\_Layout.cshtml"
+                                                                                         }
+
+            
+            #line default
+            #line hidden
+WriteLiteral("            </div>\r\n        </header>\r\n        <div");
 
 WriteLiteral(" id=\"layout_PageHeading\"");
 
 WriteLiteral(">");
 
             
-            #line 106 "..\..\Views\Shared\_Layout.cshtml"
+            #line 103 "..\..\Views\Shared\_Layout.cshtml"
                                 Write(CommonHelpers.Breadcrumbs(ViewBag.Title ?? string.Empty));
 
             
@@ -694,7 +682,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("            ");
 
             
-            #line 108 "..\..\Views\Shared\_Layout.cshtml"
+            #line 105 "..\..\Views\Shared\_Layout.cshtml"
        Write(RenderBody());
 
             
@@ -703,7 +691,7 @@ WriteLiteral("            ");
 WriteLiteral("\r\n        </section>\r\n        <footer>\r\n            Disco v");
 
             
-            #line 111 "..\..\Views\Shared\_Layout.cshtml"
+            #line 108 "..\..\Views\Shared\_Layout.cshtml"
                Write(Disco.Web.DiscoApplication.Version);
 
             
@@ -714,7 +702,7 @@ WriteLiteral(" ");
 WriteLiteral("@ ");
 
             
-            #line 111 "..\..\Views\Shared\_Layout.cshtml"
+            #line 108 "..\..\Views\Shared\_Layout.cshtml"
                                                         Write(Disco.Web.DiscoApplication.OrganisationName);
 
             
@@ -724,7 +712,7 @@ WriteLiteral(" | <a\r\n                href=\"https://discoict.com.au/\" target=
 "om.au</a> | ");
 
             
-            #line 112 "..\..\Views\Shared\_Layout.cshtml"
+            #line 109 "..\..\Views\Shared\_Layout.cshtml"
                                                                                  Write(Html.ActionLink("Credits", MVC.Public.Public.Credits()));
 
             
@@ -733,7 +721,7 @@ WriteLiteral(" | <a\r\n                href=\"https://discoict.com.au/\" target=
 WriteLiteral(" | ");
 
             
-            #line 112 "..\..\Views\Shared\_Layout.cshtml"
+            #line 109 "..\..\Views\Shared\_Layout.cshtml"
                                                                                                                                             Write(Html.ActionLink("Licence", MVC.Public.Public.Licence()));
 
             
@@ -742,13 +730,13 @@ WriteLiteral(" | ");
 WriteLiteral("\r\n        </footer>\r\n    </div>\r\n");
 
             
-            #line 115 "..\..\Views\Shared\_Layout.cshtml"
+            #line 112 "..\..\Views\Shared\_Layout.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 115 "..\..\Views\Shared\_Layout.cshtml"
+            #line 112 "..\..\Views\Shared\_Layout.cshtml"
        Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this); 
             
             #line default

Disco.Web/Views/Shared/_PublicLayout.cshtml

@@ -14,19 +14,14 @@
 <body class="layout">
     <div class="page">
         <header>
-            <div class="clearfix">
-                <div id="heading">
-                    <a href="@Url.Action(MVC.Public.Public.Index())">
-                        <img src="@Links.ClientSource.Style.Images.Heading_png" alt="DISCO - ICT Asset Management" /></a>
-                </div>
-                <div id="headerMenu">
-                </div>
+            <div id="heading">
+                <a href="@Url.Action(MVC.Job.Index())"><i title="Disco - ICT Management"></i></a>
             </div>
             <nav>
                 <ul id="menu">
                     <li>@Html.ActionLink("Public Reports", MVC.Public.Public.Index())</li>
                     <li class="sep"></li>
-                    <li style="margin-left: 10px;">@Html.ActionLink("Disco Administration", MVC.Job.Index(), accesskey: "1")</li>
+                    <li>@Html.ActionLink("Disco Administration", MVC.Job.Index(), accesskey: "1")</li>
                 </ul>
             </nav>
         </header>

Disco.Web/Views/Shared/_PublicLayout.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -102,51 +103,32 @@ WriteLiteral(" class=\"page\"");
 
 WriteLiteral(">\r\n        <header>\r\n            <div");
 
-WriteLiteral(" class=\"clearfix\"");
-
-WriteLiteral(">\r\n                <div");
-
 WriteLiteral(" id=\"heading\"");
 
-WriteLiteral(">\r\n                    <a");
+WriteLiteral(">\r\n                <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 535), Tuple.Create("\"", 580)
+WriteAttribute("href", Tuple.Create(" href=\"", 491), Tuple.Create("\"", 526)
             
-            #line 19 "..\..\Views\Shared\_PublicLayout.cshtml"
-, Tuple.Create(Tuple.Create("", 542), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Public.Public.Index())
+            #line 18 "..\..\Views\Shared\_PublicLayout.cshtml"
+, Tuple.Create(Tuple.Create("", 498), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.Job.Index())
             
             #line default
             #line hidden
-, 542), false)
+, 498), false)
 );
 
-WriteLiteral(">\r\n                        <img");
+WriteLiteral("><i");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 612), Tuple.Create("\"", 662)
-            
-            #line 20 "..\..\Views\Shared\_PublicLayout.cshtml"
-, Tuple.Create(Tuple.Create("", 618), Tuple.Create<System.Object, System.Int32>(Links.ClientSource.Style.Images.Heading_png
-            
-            #line default
-            #line hidden
-, 618), false)
-);
+WriteLiteral(" title=\"Disco - ICT Management\"");
 
-WriteLiteral(" alt=\"DISCO - ICT Asset Management\"");
-
-WriteLiteral(" /></a>\r\n                </div>\r\n                <div");
-
-WriteLiteral(" id=\"headerMenu\"");
-
-WriteLiteral(">\r\n                </div>\r\n            </div>\r\n            <nav>\r\n               " +
-" <ul");
+WriteLiteral("></i></a>\r\n            </div>\r\n            <nav>\r\n                <ul");
 
 WriteLiteral(" id=\"menu\"");
 
 WriteLiteral(">\r\n                    <li>");
 
             
-            #line 27 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 22 "..\..\Views\Shared\_PublicLayout.cshtml"
                    Write(Html.ActionLink("Public Reports", MVC.Public.Public.Index()));
 
             
@@ -156,15 +138,11 @@ WriteLiteral("</li>\r\n                    <li");
 
 WriteLiteral(" class=\"sep\"");
 
-WriteLiteral("></li>\r\n                    <li");
-
-WriteLiteral(" style=\"margin-left: 10px;\"");
-
-WriteLiteral(">");
+WriteLiteral("></li>\r\n                    <li>");
 
             
-            #line 29 "..\..\Views\Shared\_PublicLayout.cshtml"
-                                              Write(Html.ActionLink("Disco Administration", MVC.Job.Index(), accesskey: "1"));
+            #line 24 "..\..\Views\Shared\_PublicLayout.cshtml"
+                   Write(Html.ActionLink("Disco Administration", MVC.Job.Index(), accesskey: "1"));
 
             
             #line default
@@ -177,7 +155,7 @@ WriteLiteral(" id=\"layout_PageHeading\"");
 WriteLiteral(">");
 
             
-            #line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 28 "..\..\Views\Shared\_PublicLayout.cshtml"
                                 Write(CommonHelpers.Breadcrumbs(ViewBag.Title));
 
             
@@ -192,7 +170,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("            ");
 
             
-            #line 35 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 30 "..\..\Views\Shared\_PublicLayout.cshtml"
        Write(RenderBody());
 
             
@@ -201,7 +179,7 @@ WriteLiteral("            ");
 WriteLiteral("\r\n        </section>\r\n        <footer>\r\n            Disco v");
 
             
-            #line 38 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
                Write(Disco.Web.DiscoApplication.Version);
 
             
@@ -212,7 +190,7 @@ WriteLiteral(" ");
 WriteLiteral("@ ");
 
             
-            #line 38 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
                                                         Write(Disco.Web.DiscoApplication.OrganisationName);
 
             
@@ -221,7 +199,7 @@ WriteLiteral("@ ");
 WriteLiteral(" | ");
 
             
-            #line 38 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
                                                                                                         Write(Html.ActionLink("Credits", MVC.Public.Public.Credits()));
 
             
@@ -230,7 +208,7 @@ WriteLiteral(" | ");
 WriteLiteral(" | ");
 
             
-            #line 38 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 33 "..\..\Views\Shared\_PublicLayout.cshtml"
                                                                                                                                                                    Write(Html.ActionLink("Licence", MVC.Public.Public.Licence()));
 
             
@@ -239,13 +217,13 @@ WriteLiteral(" | ");
 WriteLiteral("\r\n        </footer>\r\n    </div>\r\n");
 
             
-            #line 41 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 36 "..\..\Views\Shared\_PublicLayout.cshtml"
     
             
             #line default
             #line hidden
             
-            #line 41 "..\..\Views\Shared\_PublicLayout.cshtml"
+            #line 36 "..\..\Views\Shared\_PublicLayout.cshtml"
        Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this); 
             
             #line default

Disco.Web/Views/Shared/_SearchDialog.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Shared
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Update/Index.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.Update
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/User/Index.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

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

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/User/UserParts/_AssignmentHistory.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/User/UserParts/_Authorization.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/User/UserParts/_Jobs.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/User/UserParts/_Resources.cshtml

@@ -32,7 +32,7 @@
                                   else
                                   { @ua.Comments }}
                             </span><span class="author">@ua.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ua.TechUserId == CurrentUser.Id))
-                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@ua.Timestamp.ToFullDateTime()">@ua.Timestamp.ToFuzzy()</span>
+                                                                                      {<text><span class="remove"></span></text>}<span class="timestamp" title="@ua.Timestamp.ToFullDateTime()">@ua.Timestamp.FromNow()</span>
                         </a>   
                         }
                     }

Disco.Web/Views/User/UserParts/_Resources.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;
@@ -279,7 +280,7 @@ WriteLiteral(">");
 
             
             #line 35 "..\..\Views\User\UserParts\_Resources.cshtml"
-                                                                                                                                                                                           Write(ua.Timestamp.ToFuzzy());
+                                                                                                                                                                                           Write(ua.Timestamp.FromNow());
 
             
             #line default

Disco.Web/Views/User/UserParts/_Subject.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User.UserParts
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/User/_UserTable.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/User/_ViewStart.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
+//     Runtime Version:4.0.30319.34003
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -26,6 +26,7 @@ namespace Disco.Web.Views.User
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;

Disco.Web/Views/Web.config

@@ -12,6 +12,7 @@
     <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     <pages pageBaseType="Disco.Services.Web.WebViewPage">
       <namespaces>
+        <add namespace="Disco" />
         <add namespace="Disco.BI.Extensions" />
         <add namespace="Disco.Models.Repository" />
         <add namespace="Disco.Services.Authorization" />

Disco.Web/Views/_ViewStart.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Views
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     using Disco.Models.Repository;
     using Disco.Services.Authorization;