Feature: New Theme

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

Disco.BI/BI/Extensions/UtilityExtensions.cs

@@ -23,117 +23,6 @@ namespace Disco.BI.Extensions
             }
         }
 
-        #region Date/Time Extensions
-        public static string ToFuzzy(this DateTime d)
-        {
-            var n = DateTime.Now;
-
-            // Today
-            if (d.Date == n.Date)
-            {
-                if (d < n)
-                {
-                    // Earlier
-                    if (d > n.AddMinutes(-1))
-                        return "A moment ago";
-
-                    if (d > n.AddMinutes(-10))
-                        return "A few minutes ago";
-                }
-                else
-                {
-                    // Later
-                    if (d < n.AddMinutes(1))
-                        return "In a moment";
-
-                    if (d < n.AddMinutes(10))
-                        return "In a few minutes";
-                }
-
-                return string.Format("Today at {0:h:mm tt}", d);
-            }
-
-            if (d.Date < n.Date)
-            {
-                // PAST
-                var dif = n.Subtract(d);
-
-                // Yesterday
-                if (d.Date == n.Date.AddDays(-1))
-                    return string.Format("Yesterday at {0:h:mm tt}", d);
-                // Last Week
-                if (dif.TotalDays <= 7)
-                    return string.Format("Last {0:dddd} at {0:h:mm tt}", d);
-                // Within 8 Weeks
-                if (d > n.Date.AddMonths(-2))
-                    return string.Format("{0} Weeks ago, {1:ddd, d MMM}", (int)(dif.TotalDays / 7), d);
-                // Same Year
-                if (d.Year == n.Year)
-                    return string.Format("{0} Months ago, {1:ddd, d MMM}", (int)(dif.TotalDays / 30), d);
-            }
-            else
-            {
-                // Future
-                var dif = d.Subtract(n);
-
-                // Tomorrow
-                if (d.Date == n.Date.AddDays(1))
-                    return string.Format("Tomorrow at {0:h:mm tt}", d);
-                // Next Week
-                if (dif.TotalDays <= 7)
-                    return string.Format("Next {0:dddd} at {0:h:mm tt}", d);
-                // < 2 Month
-                if (d < n.Date.AddMonths(2))
-                    return string.Format("In {0} Weeks, {1:ddd, d MMM}", (int)(dif.TotalDays / 7), d);
-                // Same Year
-                if (d.Year == n.Year)
-                    return string.Format("In {0} Months, {1:ddd, d MMM}", (int)(dif.TotalDays / 30), d);
-            }
-
-            return d.ToString("ddd, d MMM yyyy");
-        }
-        public static string ToFuzzy(this DateTime? d, string NullValue = "N/A")
-        {
-            if (d.HasValue)
-                return ToFuzzy(d.Value);
-            else
-                return NullValue;
-        }
-        public static string ToFullDateTime(this DateTime d)
-        {
-            return d.ToString("ddd, d MMM yyyy @ h:mm:sstt");
-        }
-        public static string ToFullDateTime(this DateTime? d, string NullValue = "N/A")
-        {
-            if (d.HasValue)
-                return ToFullDateTime(d.Value);
-            else
-                return NullValue;
-        }
-        public static long ToSortableDateTime(this DateTime? d)
-        {
-            if (d.HasValue)
-                return d.Value.ToBinary();
-            else
-                return -1;
-        }
-        public static long ToSortableDateTime(this DateTime d)
-        {
-            return d.ToBinary();
-        }
-        public static string ToJavascriptDateTime(this DateTime d)
-        {
-            return d.ToString("yyyy/MM/dd hh:mm tt");
-        }
-        public static string ToJavascriptDateTime(this DateTime? d)
-        {
-            if (d.HasValue)
-                return d.Value.ToString("yyyy/MM/dd hh:mm tt");
-            else
-                return null;
-        }
-        #endregion
-
         #region Image Extensions
 
         public static Bitmap RotateImage(this Image Source, float Angle, Brush BackgroundColor = null, bool ResizeIfOver45Deg = true)

Disco.Models/UI/Job/JobShowModel.cs

@@ -9,7 +9,7 @@ namespace Disco.Models.UI.Job
     public interface JobShowModel : BaseUIModel
     {
         Repository.Job Job { get; set; }
-        bool IsLongRunning { get; set; }
+        TimeSpan? LongRunning { get; set; }
         List<Repository.DocumentTemplate> AvailableDocumentTemplates { get; set; }
         List<Repository.JobSubType> UpdatableJobSubTypes { get; set; }
     }

Disco.Services/Disco.Services.csproj

@@ -155,6 +155,7 @@
     <Compile Include="Authorization\Roles\RoleCache.cs" />
     <Compile Include="Authorization\Roles\RoleClaims.cs" />
     <Compile Include="Authorization\Roles\RoleToken.cs" />
+    <Compile Include="Extensions\DateTimeExtensions.cs" />
     <Compile Include="Logging\LogBase.cs" />
     <Compile Include="Logging\LogContext.cs" />
     <Compile Include="Logging\LogReInitalizeJob.cs" />
@@ -253,7 +254,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
+      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" />
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>

Disco.Services/Extensions/DateTimeExtensions.cs

@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco
+{
+    public static class DateTimeExtensions
+    {
+
+        public static string From(this DateTime moment, DateTime to, bool withoutSuffix)
+        {
+            var duration = to - moment;
+            return duration.Humanize(!withoutSuffix);
+        }
+        public static string From(this DateTime moment, DateTime to)
+        {
+            return moment.From(to, false);
+        }
+        public static string From(this DateTime? moment, DateTime to, bool withoutSuffix, string nullValue)
+        {
+            if (moment.HasValue)
+                return moment.Value.From(to, withoutSuffix);
+            else
+                return nullValue;
+        }
+        public static string From(this DateTime? moment, DateTime to, string nullValue)
+        {
+            if (moment.HasValue)
+                return moment.Value.From(to);
+            else
+                return nullValue;
+        }
+        public static string From(this DateTime? moment, DateTime to)
+        {
+            return moment.From(to, "n/a");
+        }
+        public static string FromNow(this DateTime moment, bool withoutSuffix)
+        {
+            return DateTime.Now.From(moment, withoutSuffix);
+        }
+        public static string FromNow(this DateTime moment)
+        {
+            return moment.FromNow(false);
+        }
+        public static string FromNow(this DateTime? moment, bool withoutSuffix, string nullValue)
+        {
+            if (moment.HasValue)
+                return moment.Value.FromNow(withoutSuffix);
+            else
+                return nullValue;
+        }
+        public static string FromNow(this DateTime? moment, string nullValue)
+        {
+            if (moment.HasValue)
+                return moment.Value.FromNow();
+            else
+                return nullValue;
+        }
+        public static string FromNow(this DateTime? moment)
+        {
+            return moment.FromNow("n/a");
+        }
+
+        public static string Humanize(this TimeSpan duration, bool withSuffix)
+        {
+            string output = RelativeTime(duration.Ticks > 0 ? duration : duration.Negate(), true);
+
+            if (withSuffix)
+                if (duration.TotalMilliseconds > 0)
+                    output = "in " + output;
+                else
+                    output = output + " ago";
+
+            return output;
+        }
+
+        private static string RelativeTime(this TimeSpan difference, bool withoutSuffix)
+        {
+            string output;
+
+            if (Math.Round(difference.TotalSeconds) < 45)
+                output = "a few seconds";
+            else if (Math.Round(difference.TotalMinutes) == 1)
+                output = "a minute";
+            else if (Math.Round(difference.TotalMinutes) < 45)
+                output = (int)Math.Round(difference.TotalMinutes) + " minutes";
+            else if (Math.Round(difference.TotalHours) == 1)
+                output = "an hour";
+            else if (Math.Round(difference.TotalHours) < 22)
+                output = (int)Math.Round(difference.TotalHours) + " hours";
+            else if (Math.Round(difference.TotalDays) == 1)
+                output = "a day";
+            else if (Math.Round(difference.TotalDays) <= 25)
+                output = (int)Math.Round(difference.TotalDays) + " days";
+            else if (Math.Round(difference.TotalDays) <= 45)
+                output = "a month";
+            else if (Math.Round(difference.TotalDays) < 345)
+                output = (int)Math.Round(difference.TotalDays / 30) + " months";
+            else if (Math.Round(difference.TotalDays / 365) == 1)
+                output = "a year";
+            else
+                output = (int)Math.Round(difference.TotalDays / 365) + " years";
+
+            if (!withoutSuffix)
+                if (difference.TotalMilliseconds > 0)
+                    output = "in " + output;
+                else
+                    output = output + " ago";
+
+            return output;
+        }
+
+        public static string ToFullDateTime(this DateTime d)
+        {
+            return d.ToString("ddd, d MMM yyyy h:mm:sstt");
+        }
+        public static string ToFullDateTime(this DateTime? d, string NullValue = "N/A")
+        {
+            if (d.HasValue)
+                return ToFullDateTime(d.Value);
+            else
+                return NullValue;
+        }
+        public static long ToSortable(this DateTime? d)
+        {
+            if (d.HasValue)
+                return d.Value.ToBinary();
+            else
+                return -1;
+        }
+        public static long ToSortable(this DateTime d)
+        {
+            return d.ToBinary();
+        }
+        public static string ToJavaScript(this DateTime d)
+        {
+            return d.ToString("yyyy/MM/dd hh:mm tt");
+        }
+        public static string ToJavaScript(this DateTime? d)
+        {
+            if (d.HasValue)
+                return d.Value.ToString("yyyy/MM/dd hh:mm tt");
+            else
+                return null;
+        }
+
+    }
+}

Disco.Web/App_Code/AjaxHelpers.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.

Disco.Web/App_Code/CommonHelpers.cshtml

@@ -1,4 +1,5 @@
 @* Generator: WebPagesHelper *@
+@using Disco;
 @using Disco.BI.Extensions;
 @using Disco.Models.Repository;
 @using Disco.Web;
@@ -6,13 +7,9 @@
 @using System.Web.Mvc.Html;
 @using Disco.Services.Web;
 @helper FriendlyDate(DateTime d, string ElementId = null)
-{
+{<span @(ElementId == null ? null : new HtmlString(string.Format("id=\"{0}\" ", ElementId)))title="@d.ToFullDateTime()" data-discodatetime="@d.ToSortable()" data-datetimeformatted="@d.ToJavaScript()" class="date nowrap">@d.FromNow()</span>}
-    <span @(ElementId == null ? null : new HtmlString(string.Format("id=\"{0}\" ", ElementId)))title="@d.ToFullDateTime()" data-discodatetime="@d.ToSortableDateTime()" data-datetimeformatted="@d.ToJavascriptDateTime()" class="date nowrap">@d.ToFuzzy()</span>
+@helper FriendlyDate(DateTime? d, string NullValue = "n/a", string ElementId = null)
-}
+{<span @(ElementId == null ? null : new HtmlString(string.Format("id=\"{0}\" ", ElementId)))title="@d.ToFullDateTime(NullValue)" data-discodatetime="@d.ToSortable()" data-datetimeformatted="@d.ToJavaScript()" class="date nowrap">@d.FromNow(NullValue)</span>}
-@helper FriendlyDate(DateTime? d, string NullValue = "N/A", string ElementId = null)
-{
-    <span @(ElementId == null ? null : new HtmlString(string.Format("id=\"{0}\" ", ElementId)))title="@d.ToFullDateTime(NullValue)" data-discodatetime="@d.ToSortableDateTime()" data-datetimeformatted="@d.ToJavascriptDateTime()" class="date nowrap">@d.ToFuzzy(NullValue)</span>
-}
 @helper RadioButtonList(string id, List<System.Web.Mvc.SelectListItem> items, int columns = 1)
 {
     @ItemList("radio", id, items, columns)
@@ -49,7 +46,7 @@
         </tr>
     </table>
 }
-@helper FriendlyDateAndUser(DateTime? d, User u, string DateNullValue = "N/A")
+@helper FriendlyDateAndUser(DateTime? d, User u, string DateNullValue = "n/a")
 {
     @FriendlyDate(d, DateNullValue);
     @FriendlyUser(u, null, "by");
@@ -59,13 +56,13 @@
     @FriendlyDate(d);
     @FriendlyUser(u, null, "by");
 }
-@helper FriendlyDateAndTitleUser(DateTime? d, User u, string DateNullValue = "N/A")
+@helper FriendlyDateAndTitleUser(DateTime? d, User u, string DateNullValue = "n/a")
 {
-    <span title="@d.ToFullDateTime(DateNullValue) by @u" data-discodatetime="@d.ToSortableDateTime()" class="date nowrap">@d.ToFuzzy(DateNullValue)</span>
+    <span title="@d.ToFullDateTime(DateNullValue) by @u" data-discodatetime="@d.ToSortable()" class="date nowrap">@d.FromNow(DateNullValue)</span>
 }
 @helper FriendlyDateAndTitleUser(DateTime d, User u)
 {
-    <span title="@d.ToFullDateTime() by @u" data-discodatetime="@d.ToSortableDateTime()" class="date nowrap">@d.ToFuzzy()</span>
+    <span title="@d.ToFullDateTime() by @u" data-discodatetime="@d.ToSortable()" class="date nowrap">@d.FromNow()</span>
 }
 @helper FriendlyUser(User u, string nullValue = null, string prepend = null)
 {

Disco.Web/App_Code/CommonHelpers.generated.cs

@@ -20,13 +20,13 @@ namespace Disco.Web
     using System.Web;
     using System.Web.Helpers;
     
-    #line 5 "..\..\App_Code\CommonHelpers.cshtml"
+    #line 6 "..\..\App_Code\CommonHelpers.cshtml"
     using System.Web.Mvc;
     
     #line default
     #line hidden
     
-    #line 6 "..\..\App_Code\CommonHelpers.cshtml"
+    #line 7 "..\..\App_Code\CommonHelpers.cshtml"
     using System.Web.Mvc.Html;
     
     #line default
@@ -37,24 +37,30 @@ namespace Disco.Web
     using System.Web.WebPages.Html;
     
     #line 2 "..\..\App_Code\CommonHelpers.cshtml"
-    using Disco.BI.Extensions;
+    using Disco;
     
     #line default
     #line hidden
     
     #line 3 "..\..\App_Code\CommonHelpers.cshtml"
-    using Disco.Models.Repository;
+    using Disco.BI.Extensions;
-    
-    #line default
-    #line hidden
-    
-    #line 7 "..\..\App_Code\CommonHelpers.cshtml"
-    using Disco.Services.Web;
     
     #line default
     #line hidden
     
     #line 4 "..\..\App_Code\CommonHelpers.cshtml"
+    using Disco.Models.Repository;
+    
+    #line default
+    #line hidden
+    
+    #line 8 "..\..\App_Code\CommonHelpers.cshtml"
+    using Disco.Services.Web;
+    
+    #line default
+    #line hidden
+    
+    #line 5 "..\..\App_Code\CommonHelpers.cshtml"
     using Disco.Web;
     
     #line default
@@ -70,12 +76,6 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 9 "..\..\App_Code\CommonHelpers.cshtml"
- 
-
-#line default
-#line hidden
-
 WriteLiteralTo(@__razor_helper_writer, "<span ");
 
 
@@ -101,7 +101,7 @@ WriteLiteralTo(@__razor_helper_writer, "\" data-discodatetime=\"");
 
 
 #line 10 "..\..\App_Code\CommonHelpers.cshtml"
-                                                                                                                WriteTo(@__razor_helper_writer, d.ToSortableDateTime());
+                                                                                                             WriteTo(@__razor_helper_writer, d.ToSortable());
 
 #line default
 #line hidden
@@ -111,7 +111,7 @@ WriteLiteralTo(@__razor_helper_writer, "\" data-datetimeformatted=\"");
 
 
 #line 10 "..\..\App_Code\CommonHelpers.cshtml"
-                                                                                                                                                                 WriteTo(@__razor_helper_writer, d.ToJavascriptDateTime());
+                                                                                                                                                      WriteTo(@__razor_helper_writer, d.ToJavaScript());
 
 #line default
 #line hidden
@@ -121,16 +121,16 @@ WriteLiteralTo(@__razor_helper_writer, "\" class=\"date nowrap\">");
 
 
 #line 10 "..\..\App_Code\CommonHelpers.cshtml"
-                                                                                                                                                                                                                WriteTo(@__razor_helper_writer, d.ToFuzzy());
+                                                                                                                                                                                             WriteTo(@__razor_helper_writer, d.FromNow());
 
 #line default
 #line hidden
 
-WriteLiteralTo(@__razor_helper_writer, "</span>\r\n");
+WriteLiteralTo(@__razor_helper_writer, "</span>");
 
 
 
-#line 11 "..\..\App_Code\CommonHelpers.cshtml"
+#line 10 "..\..\App_Code\CommonHelpers.cshtml"
                                                                                                                                                                                                                                                
 #line default
 #line hidden
@@ -140,23 +140,17 @@ WriteLiteralTo(@__razor_helper_writer, "</span>\r\n");
                                                                                                                                                                                                                                                }
 
 
-public static System.Web.WebPages.HelperResult FriendlyDate(DateTime? d, string NullValue = "N/A", string ElementId = null)
+public static System.Web.WebPages.HelperResult FriendlyDate(DateTime? d, string NullValue = "n/a", string ElementId = null)
 {
 return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 13 "..\..\App_Code\CommonHelpers.cshtml"
- 
-
-#line default
-#line hidden
-
 WriteLiteralTo(@__razor_helper_writer, "<span ");
 
 
 
-#line 14 "..\..\App_Code\CommonHelpers.cshtml"
+#line 12 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, ElementId == null ? null : new HtmlString(string.Format("id=\"{0}\" ", ElementId)));
 
 #line default
@@ -166,7 +160,7 @@ WriteLiteralTo(@__razor_helper_writer, "title=\"");
 
 
 
-#line 14 "..\..\App_Code\CommonHelpers.cshtml"
+#line 12 "..\..\App_Code\CommonHelpers.cshtml"
                                                                     WriteTo(@__razor_helper_writer, d.ToFullDateTime(NullValue));
 
 #line default
@@ -176,8 +170,8 @@ WriteLiteralTo(@__razor_helper_writer, "\" data-discodatetime=\"");
 
 
 
-#line 14 "..\..\App_Code\CommonHelpers.cshtml"
+#line 12 "..\..\App_Code\CommonHelpers.cshtml"
-                                                                                                                         WriteTo(@__razor_helper_writer, d.ToSortableDateTime());
+                                                                                                                      WriteTo(@__razor_helper_writer, d.ToSortable());
 
 #line default
 #line hidden
@@ -186,8 +180,8 @@ WriteLiteralTo(@__razor_helper_writer, "\" data-datetimeformatted=\"");
 
 
 
-#line 14 "..\..\App_Code\CommonHelpers.cshtml"
+#line 12 "..\..\App_Code\CommonHelpers.cshtml"
-                                                                                                                                                                          WriteTo(@__razor_helper_writer, d.ToJavascriptDateTime());
+                                                                                                                                                               WriteTo(@__razor_helper_writer, d.ToJavaScript());
 
 #line default
 #line hidden
@@ -196,17 +190,17 @@ WriteLiteralTo(@__razor_helper_writer, "\" class=\"date nowrap\">");
 
 
 
-#line 14 "..\..\App_Code\CommonHelpers.cshtml"
+#line 12 "..\..\App_Code\CommonHelpers.cshtml"
-                                                                                                                                                                                                                         WriteTo(@__razor_helper_writer, d.ToFuzzy(NullValue));
+                                                                                                                                                                                                      WriteTo(@__razor_helper_writer, d.FromNow(NullValue));
 
 #line default
 #line hidden
 
-WriteLiteralTo(@__razor_helper_writer, "</span>\r\n");
+WriteLiteralTo(@__razor_helper_writer, "</span>");
 
 
 
-#line 15 "..\..\App_Code\CommonHelpers.cshtml"
+#line 12 "..\..\App_Code\CommonHelpers.cshtml"
                                                                                                                                                                                                                                                                  
 #line default
 #line hidden
@@ -222,21 +216,21 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 17 "..\..\App_Code\CommonHelpers.cshtml"
+#line 14 "..\..\App_Code\CommonHelpers.cshtml"
  
     
 #line default
 #line hidden
 
 
-#line 18 "..\..\App_Code\CommonHelpers.cshtml"
+#line 15 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, ItemList("radio", id, items, columns));
 
 #line default
 #line hidden
 
 
-#line 18 "..\..\App_Code\CommonHelpers.cshtml"
+#line 15 "..\..\App_Code\CommonHelpers.cshtml"
                                           
 
 #line default
@@ -253,21 +247,21 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 21 "..\..\App_Code\CommonHelpers.cshtml"
+#line 18 "..\..\App_Code\CommonHelpers.cshtml"
  
     
 #line default
 #line hidden
 
 
-#line 22 "..\..\App_Code\CommonHelpers.cshtml"
+#line 19 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, ItemList("checkbox", id, items, columns, alignEven, forceUniqueIds));
 
 #line default
 #line hidden
 
 
-#line 22 "..\..\App_Code\CommonHelpers.cshtml"
+#line 19 "..\..\App_Code\CommonHelpers.cshtml"
                                                                         
 
 #line default
@@ -284,7 +278,7 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 25 "..\..\App_Code\CommonHelpers.cshtml"
+#line 22 "..\..\App_Code\CommonHelpers.cshtml"
  
     int itemsPerColumn = items.Count / columns;
     int columnWidth = (100 / columns);
@@ -297,7 +291,7 @@ WriteLiteralTo(@__razor_helper_writer, "    <table class=\"none\">\r\n        <t
 
 
 
-#line 31 "..\..\App_Code\CommonHelpers.cshtml"
+#line 28 "..\..\App_Code\CommonHelpers.cshtml"
              for (int i = 0; i < columns; i++)
             {
 
@@ -308,7 +302,7 @@ WriteLiteralTo(@__razor_helper_writer, "                <td");
 
 
 
-#line 33 "..\..\App_Code\CommonHelpers.cshtml"
+#line 30 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, alignEven ? new HtmlString(string.Format(" style=\"width: {0}%\"", columnWidth)) : new HtmlString(string.Empty));
 
 #line default
@@ -318,7 +312,7 @@ WriteLiteralTo(@__razor_helper_writer, ">\r\n                    <ul class=\"non
 
 
 
-#line 35 "..\..\App_Code\CommonHelpers.cshtml"
+#line 32 "..\..\App_Code\CommonHelpers.cshtml"
                           
                 int itemsForThisColumn = itemsPerColumn + (items.Count % columns > i ? 1 : 0);
                 for (int i2 = 0; i2 < itemsForThisColumn && itemNextId < items.Count; i2++)
@@ -334,7 +328,7 @@ WriteLiteralTo(@__razor_helper_writer, "                            <li>\r\n
 
 
 
-#line 43 "..\..\App_Code\CommonHelpers.cshtml"
+#line 40 "..\..\App_Code\CommonHelpers.cshtml"
             WriteTo(@__razor_helper_writer, itemId);
 
 #line default
@@ -344,7 +338,7 @@ WriteLiteralTo(@__razor_helper_writer, "\" name=\"");
 
 
 
-#line 43 "..\..\App_Code\CommonHelpers.cshtml"
+#line 40 "..\..\App_Code\CommonHelpers.cshtml"
                            WriteTo(@__razor_helper_writer, id);
 
 #line default
@@ -354,7 +348,7 @@ WriteLiteralTo(@__razor_helper_writer, "\" value=\"");
 
 
 
-#line 43 "..\..\App_Code\CommonHelpers.cshtml"
+#line 40 "..\..\App_Code\CommonHelpers.cshtml"
                                        WriteTo(@__razor_helper_writer, item.Value);
 
 #line default
@@ -364,7 +358,7 @@ WriteLiteralTo(@__razor_helper_writer, "\" type=\"");
 
 
 
-#line 43 "..\..\App_Code\CommonHelpers.cshtml"
+#line 40 "..\..\App_Code\CommonHelpers.cshtml"
                                                           WriteTo(@__razor_helper_writer, inputType);
 
 #line default
@@ -374,7 +368,7 @@ WriteLiteralTo(@__razor_helper_writer, "\" ");
 
 
 
-#line 43 "..\..\App_Code\CommonHelpers.cshtml"
+#line 40 "..\..\App_Code\CommonHelpers.cshtml"
                                                                        WriteTo(@__razor_helper_writer, item.Selected ? new HtmlString("checked=\"checked\" ") : null);
 
 #line default
@@ -384,7 +378,7 @@ WriteLiteralTo(@__razor_helper_writer, "/><label for=\"");
 
 
 
-#line 43 "..\..\App_Code\CommonHelpers.cshtml"
+#line 40 "..\..\App_Code\CommonHelpers.cshtml"
                                                                                                                                                     WriteTo(@__razor_helper_writer, itemId);
 
 #line default
@@ -394,7 +388,7 @@ WriteLiteralTo(@__razor_helper_writer, "\">");
 
 
 
-#line 43 "..\..\App_Code\CommonHelpers.cshtml"
+#line 40 "..\..\App_Code\CommonHelpers.cshtml"
                                                                                                                                                              WriteTo(@__razor_helper_writer, item.Text);
 
 #line default
@@ -404,7 +398,7 @@ WriteLiteralTo(@__razor_helper_writer, "</label></li>\r\n");
 
 
 
-#line 44 "..\..\App_Code\CommonHelpers.cshtml"
+#line 41 "..\..\App_Code\CommonHelpers.cshtml"
                 }
                         
 
@@ -415,7 +409,7 @@ WriteLiteralTo(@__razor_helper_writer, "                    </ul>\r\n
 
 
 
-#line 48 "..\..\App_Code\CommonHelpers.cshtml"
+#line 45 "..\..\App_Code\CommonHelpers.cshtml"
             }
 
 #line default
@@ -425,7 +419,7 @@ WriteLiteralTo(@__razor_helper_writer, "        </tr>\r\n    </table>\r\n");
 
 
 
-#line 51 "..\..\App_Code\CommonHelpers.cshtml"
+#line 48 "..\..\App_Code\CommonHelpers.cshtml"
 
 #line default
 #line hidden
@@ -435,41 +429,41 @@ WriteLiteralTo(@__razor_helper_writer, "        </tr>\r\n    </table>\r\n");
 }
 
 
-public static System.Web.WebPages.HelperResult FriendlyDateAndUser(DateTime? d, User u, string DateNullValue = "N/A")
+public static System.Web.WebPages.HelperResult FriendlyDateAndUser(DateTime? d, User u, string DateNullValue = "n/a")
 {
 return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 53 "..\..\App_Code\CommonHelpers.cshtml"
+#line 50 "..\..\App_Code\CommonHelpers.cshtml"
  
     
 #line default
 #line hidden
 
 
-#line 54 "..\..\App_Code\CommonHelpers.cshtml"
+#line 51 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, FriendlyDate(d, DateNullValue));
 
 #line default
 #line hidden
 
 
-#line 54 "..\..\App_Code\CommonHelpers.cshtml"
+#line 51 "..\..\App_Code\CommonHelpers.cshtml"
                                    ;
     
 #line default
 #line hidden
 
 
-#line 55 "..\..\App_Code\CommonHelpers.cshtml"
+#line 52 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, FriendlyUser(u, null, "by"));
 
 #line default
 #line hidden
 
 
-#line 55 "..\..\App_Code\CommonHelpers.cshtml"
+#line 52 "..\..\App_Code\CommonHelpers.cshtml"
                                 ;
 
 #line default
@@ -486,35 +480,35 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 58 "..\..\App_Code\CommonHelpers.cshtml"
+#line 55 "..\..\App_Code\CommonHelpers.cshtml"
  
     
 #line default
 #line hidden
 
 
-#line 59 "..\..\App_Code\CommonHelpers.cshtml"
+#line 56 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, FriendlyDate(d));
 
 #line default
 #line hidden
 
 
-#line 59 "..\..\App_Code\CommonHelpers.cshtml"
+#line 56 "..\..\App_Code\CommonHelpers.cshtml"
                     ;
     
 #line default
 #line hidden
 
 
-#line 60 "..\..\App_Code\CommonHelpers.cshtml"
+#line 57 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, FriendlyUser(u, null, "by"));
 
 #line default
 #line hidden
 
 
-#line 60 "..\..\App_Code\CommonHelpers.cshtml"
+#line 57 "..\..\App_Code\CommonHelpers.cshtml"
                                 ;
 
 #line default
@@ -525,13 +519,13 @@ WriteTo(@__razor_helper_writer, FriendlyUser(u, null, "by"));
 }
 
 
-public static System.Web.WebPages.HelperResult FriendlyDateAndTitleUser(DateTime? d, User u, string DateNullValue = "N/A")
+public static System.Web.WebPages.HelperResult FriendlyDateAndTitleUser(DateTime? d, User u, string DateNullValue = "n/a")
 {
 return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 63 "..\..\App_Code\CommonHelpers.cshtml"
+#line 60 "..\..\App_Code\CommonHelpers.cshtml"
  
 
 #line default
@@ -541,7 +535,7 @@ WriteLiteralTo(@__razor_helper_writer, "    <span title=\"");
 
 
 
-#line 64 "..\..\App_Code\CommonHelpers.cshtml"
+#line 61 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, d.ToFullDateTime(DateNullValue));
 
 #line default
@@ -551,7 +545,7 @@ WriteLiteralTo(@__razor_helper_writer, " by ");
 
 
 
-#line 64 "..\..\App_Code\CommonHelpers.cshtml"
+#line 61 "..\..\App_Code\CommonHelpers.cshtml"
                       WriteTo(@__razor_helper_writer, u);
 
 #line default
@@ -561,8 +555,8 @@ WriteLiteralTo(@__razor_helper_writer, "\" data-discodatetime=\"");
 
 
 
-#line 64 "..\..\App_Code\CommonHelpers.cshtml"
+#line 61 "..\..\App_Code\CommonHelpers.cshtml"
-                                              WriteTo(@__razor_helper_writer, d.ToSortableDateTime());
+                                              WriteTo(@__razor_helper_writer, d.ToSortable());
 
 #line default
 #line hidden
@@ -571,8 +565,8 @@ WriteLiteralTo(@__razor_helper_writer, "\" class=\"date nowrap\">");
 
 
 
-#line 64 "..\..\App_Code\CommonHelpers.cshtml"
+#line 61 "..\..\App_Code\CommonHelpers.cshtml"
-                                                                                           WriteTo(@__razor_helper_writer, d.ToFuzzy(DateNullValue));
+                                                                                   WriteTo(@__razor_helper_writer, d.FromNow(DateNullValue));
 
 #line default
 #line hidden
@@ -581,7 +575,7 @@ WriteLiteralTo(@__razor_helper_writer, "</span>\r\n");
 
 
 
-#line 65 "..\..\App_Code\CommonHelpers.cshtml"
+#line 62 "..\..\App_Code\CommonHelpers.cshtml"
 
 #line default
 #line hidden
@@ -597,7 +591,7 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 67 "..\..\App_Code\CommonHelpers.cshtml"
+#line 64 "..\..\App_Code\CommonHelpers.cshtml"
  
 
 #line default
@@ -607,7 +601,7 @@ WriteLiteralTo(@__razor_helper_writer, "    <span title=\"");
 
 
 
-#line 68 "..\..\App_Code\CommonHelpers.cshtml"
+#line 65 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, d.ToFullDateTime());
 
 #line default
@@ -617,7 +611,7 @@ WriteLiteralTo(@__razor_helper_writer, " by ");
 
 
 
-#line 68 "..\..\App_Code\CommonHelpers.cshtml"
+#line 65 "..\..\App_Code\CommonHelpers.cshtml"
          WriteTo(@__razor_helper_writer, u);
 
 #line default
@@ -627,8 +621,8 @@ WriteLiteralTo(@__razor_helper_writer, "\" data-discodatetime=\"");
 
 
 
-#line 68 "..\..\App_Code\CommonHelpers.cshtml"
+#line 65 "..\..\App_Code\CommonHelpers.cshtml"
-                                 WriteTo(@__razor_helper_writer, d.ToSortableDateTime());
+                                 WriteTo(@__razor_helper_writer, d.ToSortable());
 
 #line default
 #line hidden
@@ -637,8 +631,8 @@ WriteLiteralTo(@__razor_helper_writer, "\" class=\"date nowrap\">");
 
 
 
-#line 68 "..\..\App_Code\CommonHelpers.cshtml"
+#line 65 "..\..\App_Code\CommonHelpers.cshtml"
-                                                                              WriteTo(@__razor_helper_writer, d.ToFuzzy());
+                                                                      WriteTo(@__razor_helper_writer, d.FromNow());
 
 #line default
 #line hidden
@@ -647,7 +641,7 @@ WriteLiteralTo(@__razor_helper_writer, "</span>\r\n");
 
 
 
-#line 69 "..\..\App_Code\CommonHelpers.cshtml"
+#line 66 "..\..\App_Code\CommonHelpers.cshtml"
 
 #line default
 #line hidden
@@ -663,7 +657,7 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 71 "..\..\App_Code\CommonHelpers.cshtml"
+#line 68 "..\..\App_Code\CommonHelpers.cshtml"
  
     if (u != null)
     { 
@@ -672,7 +666,7 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 #line hidden
 
 
-#line 74 "..\..\App_Code\CommonHelpers.cshtml"
+#line 71 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, prepend);
 
 #line default
@@ -683,7 +677,7 @@ WriteLiteralTo(@__razor_helper_writer, " <span title=\"");
 
 
 
-#line 74 "..\..\App_Code\CommonHelpers.cshtml"
+#line 71 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, u);
 
 #line default
@@ -693,7 +687,7 @@ WriteLiteralTo(@__razor_helper_writer, "\">");
 
 
 
-#line 74 "..\..\App_Code\CommonHelpers.cshtml"
+#line 71 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, u.Id);
 
 #line default
@@ -703,7 +697,7 @@ WriteLiteralTo(@__razor_helper_writer, "</span>\r\n");
 
 
 
-#line 75 "..\..\App_Code\CommonHelpers.cshtml"
+#line 72 "..\..\App_Code\CommonHelpers.cshtml"
     }
     else
     { 
@@ -715,7 +709,7 @@ WriteLiteralTo(@__razor_helper_writer, "    <span>");
 
 
 
-#line 78 "..\..\App_Code\CommonHelpers.cshtml"
+#line 75 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, nullValue);
 
 #line default
@@ -725,7 +719,7 @@ WriteLiteralTo(@__razor_helper_writer, "</span>\r\n");
 
 
 
-#line 79 "..\..\App_Code\CommonHelpers.cshtml"
+#line 76 "..\..\App_Code\CommonHelpers.cshtml"
     }
 
 #line default
@@ -742,7 +736,7 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 82 "..\..\App_Code\CommonHelpers.cshtml"
+#line 79 "..\..\App_Code\CommonHelpers.cshtml"
  
     for (int index = 0; index < BreadCrumbs.Count; index++)
     {
@@ -757,7 +751,7 @@ WriteLiteralTo(@__razor_helper_writer, "    <span>&gt;</span>\r\n");
 
 
 
-#line 89 "..\..\App_Code\CommonHelpers.cshtml"
+#line 86 "..\..\App_Code\CommonHelpers.cshtml"
         }
         if (breadCrumb.Item2 == null)
         {
@@ -766,14 +760,14 @@ WriteLiteralTo(@__razor_helper_writer, "    <span>&gt;</span>\r\n");
 #line hidden
 
 
-#line 92 "..\..\App_Code\CommonHelpers.cshtml"
+#line 89 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, breadCrumb.Item1);
 
 #line default
 #line hidden
 
 
-#line 92 "..\..\App_Code\CommonHelpers.cshtml"
+#line 89 "..\..\App_Code\CommonHelpers.cshtml"
                      
         }
         else
@@ -783,14 +777,14 @@ WriteTo(@__razor_helper_writer, breadCrumb.Item1);
 #line hidden
 
 
-#line 96 "..\..\App_Code\CommonHelpers.cshtml"
+#line 93 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, Html.GetPageHelper().ActionLink(breadCrumb.Item1, breadCrumb.Item2));
 
 #line default
 #line hidden
 
 
-#line 96 "..\..\App_Code\CommonHelpers.cshtml"
+#line 93 "..\..\App_Code\CommonHelpers.cshtml"
                                                                         
         }
     }
@@ -809,21 +803,21 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 101 "..\..\App_Code\CommonHelpers.cshtml"
+#line 98 "..\..\App_Code\CommonHelpers.cshtml"
  
     
 #line default
 #line hidden
 
 
-#line 102 "..\..\App_Code\CommonHelpers.cshtml"
+#line 99 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, Title);
 
 #line default
 #line hidden
 
 
-#line 102 "..\..\App_Code\CommonHelpers.cshtml"
+#line 99 "..\..\App_Code\CommonHelpers.cshtml"
           
 
 #line default
@@ -840,7 +834,7 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 105 "..\..\App_Code\CommonHelpers.cshtml"
+#line 102 "..\..\App_Code\CommonHelpers.cshtml"
  
     for (int index = 0; index < BreadCrumbs.Count; index++)
     {
@@ -852,14 +846,14 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 #line hidden
 
 
-#line 111 "..\..\App_Code\CommonHelpers.cshtml"
+#line 108 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, new HtmlString(" > "));
 
 #line default
 #line hidden
 
 
-#line 111 "..\..\App_Code\CommonHelpers.cshtml"
+#line 108 "..\..\App_Code\CommonHelpers.cshtml"
                             
         }
     
@@ -867,14 +861,14 @@ WriteTo(@__razor_helper_writer, new HtmlString(" > "));
 #line hidden
 
 
-#line 113 "..\..\App_Code\CommonHelpers.cshtml"
+#line 110 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, breadCrumb.Item1);
 
 #line default
 #line hidden
 
 
-#line 113 "..\..\App_Code\CommonHelpers.cshtml"
+#line 110 "..\..\App_Code\CommonHelpers.cshtml"
                      
     }
 
@@ -892,21 +886,21 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 117 "..\..\App_Code\CommonHelpers.cshtml"
+#line 114 "..\..\App_Code\CommonHelpers.cshtml"
  
     
 #line default
 #line hidden
 
 
-#line 118 "..\..\App_Code\CommonHelpers.cshtml"
+#line 115 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, Title);
 
 #line default
 #line hidden
 
 
-#line 118 "..\..\App_Code\CommonHelpers.cshtml"
+#line 115 "..\..\App_Code\CommonHelpers.cshtml"
           
 
 #line default
@@ -923,7 +917,7 @@ return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
-#line 121 "..\..\App_Code\CommonHelpers.cshtml"
+#line 118 "..\..\App_Code\CommonHelpers.cshtml"
  Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-jQueryExtensions");
 
 #line default
@@ -933,7 +927,7 @@ WriteLiteralTo(@__razor_helper_writer, "    <span id=\"");
 
 
 
-#line 122 "..\..\App_Code\CommonHelpers.cshtml"
+#line 119 "..\..\App_Code\CommonHelpers.cshtml"
 WriteTo(@__razor_helper_writer, BulkSelectContainerId);
 
 #line default
@@ -943,7 +937,7 @@ WriteLiteralTo(@__razor_helper_writer, "\" class=\"checkboxBulkSelectContainer\"
 
 
 
-#line 123 "..\..\App_Code\CommonHelpers.cshtml"
+#line 120 "..\..\App_Code\CommonHelpers.cshtml"
          if (string.IsNullOrWhiteSpace(ParentJQuerySelector))
         {
 
@@ -954,7 +948,7 @@ WriteLiteralTo(@__razor_helper_writer, "            <script type=\"text/javascri
 
 
 
-#line 125 "..\..\App_Code\CommonHelpers.cshtml"
+#line 122 "..\..\App_Code\CommonHelpers.cshtml"
                                  WriteTo(@__razor_helper_writer, BulkSelectContainerId);
 
 #line default
@@ -964,7 +958,7 @@ WriteLiteralTo(@__razor_helper_writer, "\').checkboxBulkSelect(); });</script>\r
 
 
 
-#line 126 "..\..\App_Code\CommonHelpers.cshtml"
+#line 123 "..\..\App_Code\CommonHelpers.cshtml"
         }
         else
         {
@@ -976,7 +970,7 @@ WriteLiteralTo(@__razor_helper_writer, "            <script type=\"text/javascri
 
 
 
-#line 129 "..\..\App_Code\CommonHelpers.cshtml"
+#line 126 "..\..\App_Code\CommonHelpers.cshtml"
                                  WriteTo(@__razor_helper_writer, BulkSelectContainerId);
 
 #line default
@@ -986,7 +980,7 @@ WriteLiteralTo(@__razor_helper_writer, "\').checkboxBulkSelect({ parentSelector:
 
 
 
-#line 129 "..\..\App_Code\CommonHelpers.cshtml"
+#line 126 "..\..\App_Code\CommonHelpers.cshtml"
                                                                                                   WriteTo(@__razor_helper_writer, ParentJQuerySelector);
 
 #line default
@@ -996,7 +990,7 @@ WriteLiteralTo(@__razor_helper_writer, "\' }); });</script>\r\n");
 
 
 
-#line 130 "..\..\App_Code\CommonHelpers.cshtml"
+#line 127 "..\..\App_Code\CommonHelpers.cshtml"
         }
 
 #line default
@@ -1006,7 +1000,7 @@ WriteLiteralTo(@__razor_helper_writer, "    </span>\r\n");
 
 
 
-#line 132 "..\..\App_Code\CommonHelpers.cshtml"
+#line 129 "..\..\App_Code\CommonHelpers.cshtml"
 
 #line default
 #line hidden

Disco.Web/Areas/API/Controllers/DeviceController.cs

@@ -373,7 +373,7 @@ namespace Disco.Web.Areas.API.Controllers
             var result = new
             {
                 Timestamp = device.LastNetworkLogonDate,
-                Friendly = device.LastNetworkLogonDate.ToFuzzy("Unknown"),
+                Friendly = device.LastNetworkLogonDate.FromNow("Unknown"),
                 Formatted = device.LastNetworkLogonDate.ToFullDateTime("Unknown")
             };
 

Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs

@@ -274,7 +274,7 @@ namespace Disco.Web.Areas.API.Controllers
             {
                 Id = System.IO.Path.GetFileNameWithoutExtension(f.Name),
                 Timestamp = f.CreationTime.ToString(),
-                TimestampFuzzy = f.CreationTime.ToFuzzy()
+                TimestampFuzzy = f.CreationTime.FromNow()
             }).ToArray();
 
             return Json(m);

Disco.Web/Areas/API/Models/Attachment/_AttachmentModel.cs

@@ -21,7 +21,7 @@ namespace Disco.Web.Areas.API.Models.Attachment
         {
             get
             {
-                return Timestamp.ToFuzzy();
+                return Timestamp.FromNow();
             }
             set
             {

Disco.Web/Areas/API/Models/Job/_CommentModel.cs

@@ -19,7 +19,7 @@ namespace Disco.Web.Areas.API.Models.Job
         {
             get
             {
-                return Timestamp.ToFuzzy();
+                return Timestamp.FromNow();
             }
             set
             {

Disco.Web/Areas/API/Models/Job/_DateChangeModel.cs

@@ -18,9 +18,9 @@ namespace Disco.Web.Areas.API.Models.Job
 
         public _DateChangeModel SetDateTime(DateTime? date)
         {
-            this.DateTimeFriendly = date.ToFuzzy(null);
+            this.DateTimeFriendly = date.FromNow(null);
-            this.DateTimeJavascript = date.ToJavascriptDateTime();
+            this.DateTimeJavascript = date.ToJavaScript();
-            this.DateTimeSortable = date.ToSortableDateTime();
+            this.DateTimeSortable = date.ToSortable();
             this.DateTimeFull = date.ToFullDateTime(null);
 
             return this;

Disco.Web/Areas/Config/Views/AuthorizationRole/Create.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.Areas.Config.Views.AuthorizationRole
     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/Areas/Config/Views/AuthorizationRole/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.Areas.Config.Views.AuthorizationRole
     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/Areas/Config/Views/AuthorizationRole/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.Areas.Config.Views.AuthorizationRole
     using System.Web.Security;
     using System.Web.UI;
     using System.Web.WebPages;
+    using Disco;
     using Disco.BI.Extensions;
     
     #line 2 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"

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

@@ -26,6 +26,7 @@ namespace Disco.Web.Areas.Config.Views.Config
     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/Areas/Config/Views/DeviceBatch/Create.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.Areas.Config.Views.DeviceBatch
     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/Areas/Config/Views/DeviceBatch/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.Areas.Config.Views.DeviceBatch
     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/Areas/Config/Views/DeviceBatch/Show.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
     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/Areas/Config/Views/DeviceBatch/Timeline.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceBatch
     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/Areas/Config/Views/DeviceModel/GenericComponents.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.Areas.Config.Views.DeviceModel
     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/Areas/Config/Views/DeviceModel/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.Areas.Config.Views.DeviceModel
     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/Areas/Config/Views/DeviceModel/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.Areas.Config.Views.DeviceModel
     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/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.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.Areas.Config.Views.DeviceModel
     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/Areas/Config/Views/DeviceProfile/Create.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.Areas.Config.Views.DeviceProfile
     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/Areas/Config/Views/DeviceProfile/Defaults.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.Areas.Config.Views.DeviceProfile
     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/Areas/Config/Views/DeviceProfile/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.Areas.Config.Views.DeviceProfile
     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/Areas/Config/Views/DeviceProfile/Show.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Areas.Config.Views.DeviceProfile
     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/Areas/Config/Views/DeviceProfile/_Table.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.Areas.Config.Views.DeviceProfile
     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/Areas/Config/Views/DeviceProfile/_TableRender.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.Areas.Config.Views.DeviceProfile
     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/Areas/Config/Views/DocumentTemplate/Create.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.Areas.Config.Views.DocumentTemplate
     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/Areas/Config/Views/DocumentTemplate/ExpressionBrowser2.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.Areas.Config.Views.DocumentTemplate
     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/Areas/Config/Views/DocumentTemplate/ImportStatus.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.Areas.Config.Views.DocumentTemplate
     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/Areas/Config/Views/DocumentTemplate/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.Areas.Config.Views.DocumentTemplate
     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/Areas/Config/Views/DocumentTemplate/Show.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
     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/Areas/Config/Views/DocumentTemplate/UndetectedPages.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.Areas.Config.Views.DocumentTemplate
     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/Areas/Config/Views/DocumentTemplate/_ExpressionsTable.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.Areas.Config.Views.DocumentTemplate
     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/Areas/Config/Views/Enrolment/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.Areas.Config.Views.Enrolment
     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/Areas/Config/Views/Enrolment/Status.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.Areas.Config.Views.Enrolment
     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/Areas/Config/Views/Expressions/Editor.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.Areas.Config.Views.Expressions
     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/Areas/Config/Views/JobPreferences/Index.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Areas.Config.Views.JobPreferences
     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/Areas/Config/Views/Logging/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.Areas.Config.Views.Logging
     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/Areas/Config/Views/Logging/TaskStatus.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.Areas.Config.Views.Logging
     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/Areas/Config/Views/Organisation/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.Areas.Config.Views.Organisation
     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/Areas/Config/Views/Plugins/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.Areas.Config.Views.Plugins
     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/Areas/Config/Views/Plugins/Install.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.Areas.Config.Views.Plugins
     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/Areas/Config/Views/Plugins/ProviderConfiguration.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.Areas.Config.Views.Plugins
     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/Areas/Config/Views/Shared/LogEvents.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.Areas.Config.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/Areas/Config/Views/SystemConfig/Index.cshtml

@@ -16,7 +16,7 @@
                     <code>@Model.DiscoVersion.ToString(4)</code>
                 </div>
                 <div class="smallMessage" title="@Model.DiscoVersionBuilt.ToFullDateTime()">
-                    Built @Model.DiscoVersionBuilt.ToFuzzy("Unknown")
+                    Built @CommonHelpers.FriendlyDate(Model.DiscoVersionBuilt, "Unknown")
                 </div>
             </td>
         </tr>
@@ -53,8 +53,6 @@
             </th>
             <td>
                 <span class="code">@Model.DataStoreLocation</span>
-                @*                    @Html.EditorFor(m => m.DataStoreLocation)<br />
-                    @Html.ValidationMessageFor(m => m.DataStoreLocation)*@
             </td>
         </tr>
     </table>

Disco.Web/Areas/Config/Views/SystemConfig/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.Areas.Config.Views.SystemConfig
     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;
@@ -92,7 +93,7 @@ WriteLiteral(">\r\n                    Built ");
 
             
             #line 19 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-                     Write(Model.DiscoVersionBuilt.ToFuzzy("Unknown"));
+                     Write(CommonHelpers.FriendlyDate(Model.DiscoVersionBuilt, "Unknown"));
 
             
             #line default
@@ -203,9 +204,7 @@ WriteLiteral(">");
             
             #line default
             #line hidden
-WriteLiteral("</span>\r\n                ");
+WriteLiteral("</span>\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n<div");
-
-WriteLiteral("\r\n            </td>\r\n        </tr>\r\n    </table>\r\n</div>\r\n<div");
 
 WriteLiteral(" class=\"form\"");
 
@@ -214,13 +213,13 @@ WriteLiteral(" style=\"width: 450px; margin-top: 15px;\"");
 WriteLiteral(">\r\n    <h2>Updates</h2>\r\n    <table>\r\n");
 
             
-            #line 65 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 63 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
         
             
             #line default
             #line hidden
             
-            #line 65 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 63 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
           
             if (Model.UpdateLatestResponse == null)
             {
@@ -246,7 +245,7 @@ WriteLiteral(" style=\"margin-right: 6px;\"");
 WriteLiteral("></span>Never</div>\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 75 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 73 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
             }
             else
             {
@@ -262,7 +261,7 @@ WriteLiteral(">Last Run:\r\n                </th>\r\n                <td>\r\n
 "n>");
 
             
-            #line 82 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 80 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                      Write(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.ResponseTimestamp));
 
             
@@ -271,7 +270,7 @@ WriteLiteral(">Last Run:\r\n                </th>\r\n                <td>\r\n
 WriteLiteral("</span>\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 85 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 83 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                 if (Model.UpdateLatestResponse.IsUpdatable(typeof(DiscoApplication).Assembly.GetName().Version))
                 {
 
@@ -292,7 +291,7 @@ WriteLiteral(" style=\"margin-right: 6px;\"");
 WriteLiteral("></span>Version ");
 
             
-            #line 92 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 90 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                                                                                          Write(Model.UpdateLatestResponse.Version);
 
             
@@ -305,7 +304,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">\r\n                        [Released ");
 
             
-            #line 95 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 93 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                               Write(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.VersionReleasedTimestamp));
 
             
@@ -318,7 +317,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">");
 
             
-            #line 97 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 95 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                                           Write(new HtmlString(Model.UpdateLatestResponse.Blurb));
 
             
@@ -326,14 +325,14 @@ WriteLiteral(">");
             #line hidden
 WriteLiteral("</div>\r\n                    <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 3813), Tuple.Create("\"", 3857)
+WriteAttribute("href", Tuple.Create(" href=\"", 3670), Tuple.Create("\"", 3714)
             
-            #line 98 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 96 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
-, Tuple.Create(Tuple.Create("", 3820), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink
+, Tuple.Create(Tuple.Create("", 3677), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink
             
             #line default
             #line hidden
-, 3820), false)
+, 3677), false)
 );
 
 WriteLiteral(" target=\"_blank\"");
@@ -341,7 +340,7 @@ WriteLiteral(" target=\"_blank\"");
 WriteLiteral(">Download Now</a>\r\n                </td>\r\n            </tr>\r\n");
 
             
-            #line 101 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 99 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                 }
                 else
                 {
@@ -363,7 +362,7 @@ WriteLiteral("></span><span>The latest version is installed</span>\r\n
 "        </tr>\r\n");
 
             
-            #line 111 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 109 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                 }
             }
         
@@ -377,7 +376,7 @@ WriteLiteral(" style=\"width: 135px\"");
 WriteLiteral(">Check for Update:");
 
             
-            #line 115 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 113 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                                                         
                 if (Model.UpdateBetaDeployment)
                 {
@@ -398,7 +397,7 @@ WriteLiteral(" style=\"margin-right: 6px;\"");
 WriteLiteral("></span>Beta Deployment</div>\r\n");
 
             
-            #line 119 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 117 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                 }
             
             
@@ -407,13 +406,13 @@ WriteLiteral("></span>Beta Deployment</div>\r\n");
 WriteLiteral("\r\n            </th>\r\n            <td>\r\n");
 
             
-            #line 123 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 121 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 123 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 121 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                   
                     if (Model.UpdateRunningStatus == null)
                     {
@@ -424,7 +423,7 @@ WriteLiteral("\r\n            </th>\r\n            <td>\r\n");
 WriteLiteral("                    <div>");
 
             
-            #line 126 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 124 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                     Write(Html.ActionLink("Check Now", MVC.API.System.UpdateCheck()));
 
             
@@ -433,7 +432,7 @@ WriteLiteral("                    <div>");
 WriteLiteral("</div>\r\n");
 
             
-            #line 127 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 125 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                     }
                     else
                     {
@@ -444,7 +443,7 @@ WriteLiteral("</div>\r\n");
 WriteLiteral("                    <div>Running now - ");
 
             
-            #line 130 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 128 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                                   Write(Html.ActionLink("Check Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId)));
 
             
@@ -453,7 +452,7 @@ WriteLiteral("                    <div>Running now - ");
 WriteLiteral("</div>\r\n");
 
             
-            #line 131 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 129 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                     }
                 
             
@@ -466,7 +465,7 @@ WriteLiteral(" class=\"smallMessage\"");
 WriteLiteral(">\r\n                    Next Scheduled: ");
 
             
-            #line 134 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 132 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                                Write(CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown"));
 
             
@@ -476,7 +475,7 @@ WriteLiteral("\r\n                </div>\r\n            </td>\r\n        </tr>\r
 "\n");
 
             
-            #line 140 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 138 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
  if (canConfigProxy)
 {
     using (Html.BeginForm())
@@ -501,7 +500,7 @@ WriteLiteral(">Address:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 151 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 149 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.EditorFor(m => m.ProxyAddress));
 
             
@@ -512,7 +511,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 152 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 150 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.ValidationMessageFor(m => m.ProxyAddress));
 
             
@@ -528,7 +527,7 @@ WriteLiteral(">Port:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 159 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 157 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.EditorFor(m => m.ProxyPort));
 
             
@@ -539,7 +538,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 160 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 158 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.ValidationMessageFor(m => m.ProxyPort));
 
             
@@ -555,7 +554,7 @@ WriteLiteral(">Username:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 167 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 165 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.EditorFor(m => m.ProxyUsername));
 
             
@@ -566,7 +565,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 168 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 166 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.ValidationMessageFor(m => m.ProxyUsername));
 
             
@@ -582,7 +581,7 @@ WriteLiteral(">Password:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 175 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 173 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.EditorFor(m => m.ProxyPassword));
 
             
@@ -593,7 +592,7 @@ WriteLiteral("<br />\r\n");
 WriteLiteral("                    ");
 
             
-            #line 176 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 174 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.ValidationMessageFor(m => m.ProxyPassword));
 
             
@@ -615,7 +614,7 @@ WriteLiteral(" value=\"Save Proxy Settings\"");
 WriteLiteral(" />\r\n                </td>\r\n            </tr>\r\n        </table>\r\n    </div>\r\n");
 
             
-            #line 188 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 186 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
     }
 }
 else
@@ -640,7 +639,7 @@ WriteLiteral(">Address:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 199 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 197 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.DisplayFor(m => m.ProxyAddress));
 
             
@@ -656,7 +655,7 @@ WriteLiteral(">Port:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 206 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 204 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.DisplayFor(m => m.ProxyPort));
 
             
@@ -672,7 +671,7 @@ WriteLiteral(">Username:\r\n                </th>\r\n                <td>\r\n");
 WriteLiteral("                    ");
 
             
-            #line 213 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 211 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
                Write(Html.DisplayFor(m => m.ProxyUsername));
 
             
@@ -687,7 +686,7 @@ WriteLiteral(">Password:\r\n                </th>\r\n                <td>*******
 "</td>\r\n            </tr>\r\n        </table>\r\n    </div>\r\n");
 
             
-            #line 224 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 222 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
 }
 
             
@@ -702,7 +701,7 @@ WriteLiteral(">\r\n");
 WriteLiteral("    ");
 
             
-            #line 226 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
+            #line 224 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
 Write(Html.ActionLinkButton("Update Device Last Network Logons", MVC.API.System.UpdateLastNetworkLogonDates()));
 
             

Disco.Web/Areas/Config/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/Areas/Config/Views/_ViewStart.generated.cs

@@ -26,6 +26,7 @@ namespace Disco.Web.Areas.Config.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;

Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceQueryModel.cs

@@ -43,16 +43,16 @@ namespace Disco.Web.Areas.Public.Models.HeldDevices
             var n = DateTime.Now;
             if (!this.ReadyForReturn && this.EstimatedReturnTime.HasValue && this.EstimatedReturnTime.Value > n)
             {
-                uhdm.EstimatedReturnTime = this.EstimatedReturnTime.ToFuzzy();
+                uhdm.EstimatedReturnTime = this.EstimatedReturnTime.FromNow();
             }
             if (this.ReadyForReturn)
             {
-                uhdm.ReadyForReturnSince = this.ReadyForReturnSince.ToFuzzy();
+                uhdm.ReadyForReturnSince = this.ReadyForReturnSince.FromNow();
                 uhdm.IsAlert = (this.ReadyForReturnSince.Value < DateTime.Now.AddDays(-3));
             }
             if (this.WaitingForUserAction)
             {
-                uhdm.WaitingForUserActionSince = this.WaitingForUserActionSince.ToFuzzy();
+                uhdm.WaitingForUserActionSince = this.WaitingForUserActionSince.FromNow();
                 uhdm.IsAlert = (this.WaitingForUserActionSince.Value < n.AddDays(-6));
             }
             return uhdm;

Disco.Web/Areas/Public/Models/UserHeldDevices/HeldJobDeviceModel.cs

@@ -36,16 +36,16 @@ namespace Disco.Web.Areas.Public.Models.UserHeldDevices
             var n = DateTime.Now;
             if (!this.ReadyForReturn && this.EstimatedReturnTime.HasValue && this.EstimatedReturnTime.Value > n)
             {
-                uhdm.EstimatedReturnTime = this.EstimatedReturnTime.ToFuzzy();
+                uhdm.EstimatedReturnTime = this.EstimatedReturnTime.FromNow();
             }
             if (this.ReadyForReturn)
             {
-                uhdm.ReadyForReturnSince = this.ReadyForReturnSince.ToFuzzy();
+                uhdm.ReadyForReturnSince = this.ReadyForReturnSince.FromNow();
                 uhdm.IsAlert = (this.ReadyForReturnSince.Value < DateTime.Now.AddDays(-3));
             }
             if (this.WaitingForUserAction)
             {
-                uhdm.WaitingForUserActionSince = this.WaitingForUserActionSince.ToFuzzy();
+                uhdm.WaitingForUserActionSince = this.WaitingForUserActionSince.FromNow();
                 uhdm.IsAlert = (this.WaitingForUserActionSince.Value < n.AddDays(-6));
             }
             return uhdm;

Disco.Web/Areas/Public/Views/HeldDevices/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.

Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.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.

Disco.Web/Areas/Public/Views/Public/Credits.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.

Disco.Web/Areas/Public/Views/Public/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.

Disco.Web/Areas/Public/Views/Public/Licence.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.

Disco.Web/Areas/Public/Views/UserHeldDevices/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.

Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.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.

Disco.Web/ClientSource/Scripts/Core.js.bundle

@@ -8,6 +8,9 @@
   <file>/ClientSource/Scripts/Core/jquery-ui-1.10.3.js</file>
   <file>/ClientSource/Scripts/Core/jquery.watermark.js</file>
   <file>/ClientSource/Scripts/Core/jquery.dataTables.js</file>
+	<file>/ClientSource/Scripts/Core/moment.js</file>
+	<file>/ClientSource/Scripts/Core/moment.en-au.js</file>
+	<file>/ClientSource/Scripts/Core/disco.moment.extensions.js</file>
   <file>/ClientSource/Scripts/Core/disco.dataTables.extensions.js</file>
   <file>/ClientSource/Scripts/Core/disco.uicore.js</file>
 </bundle>

Disco.Web/ClientSource/Scripts/Core/disco.moment.extensions.js

@@ -0,0 +1 @@
+moment.lang('en-au');

Disco.Web/ClientSource/Scripts/Core/disco.uicore.js

@@ -4,7 +4,7 @@
     $(function () {
 
         // Search Functionality
-        $('#term').watermark('Search').keypress(function (e) {
+        $('#SearchQuery').watermark('Search').keypress(function (e) {
             if (e.keyCode == 13) {
                 $(this).closest('form').submit();
                 return false;

Disco.Web/ClientSource/Scripts/Core/moment.en-au.js

@@ -0,0 +1,62 @@
+// moment.js language configuration
+// language : australian english (en-au)
+
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        define(['moment'], factory); // AMD
+    } else if (typeof exports === 'object') {
+        module.exports = factory(require('../moment')); // Node
+    } else {
+        factory(window.moment); // Browser global
+    }
+}(function (moment) {
+    return moment.lang('en-au', {
+        months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
+        monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
+        weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
+        weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
+        weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
+        longDateFormat : {
+            LT : "h:mm A",
+            L : "DD/MM/YYYY",
+            LL : "D MMMM YYYY",
+            LLL : "D MMMM YYYY LT",
+            LLLL : "dddd, D MMMM YYYY LT"
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : "in %s",
+            past : "%s ago",
+            s : "a few seconds",
+            m : "a minute",
+            mm : "%d minutes",
+            h : "an hour",
+            hh : "%d hours",
+            d : "a day",
+            dd : "%d days",
+            M : "a month",
+            MM : "%d months",
+            y : "a year",
+            yy : "%d years"
+        },
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~ (number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+}));

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

@@ -1,4 +1,4 @@
-///#source 1 1 /ClientSource/Scripts/Modules/Disco-CreateJob/disco.createjob.js
+///#source 1 1 /ClientSource/Scripts/Modules/Disco-CreateJob/disco.createjob.js
 /// <reference path="../../Core/jquery-1.8.1.js" />
 /// <reference path="../../Core/jquery-ui-1.8.23.js" />
 
@@ -19,7 +19,7 @@
             document.DiscoFunctions = {};
         }
         document.DiscoFunctions.CreateOpenJobDialog = function (url) {
-            createJobDialog = $('<div>').attr('id', 'createJobDialog').width('100%').height('100%').appendTo(document.body);
+            createJobDialog = $('<div>').attr('id', 'createJobDialog').css({ width: '100%', height: '100%', paddingTop: '0' }).appendTo(document.body);
 
             createJobDialog.dialog({
                 resizable: false,

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

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

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

@@ -2,7 +2,7 @@
 "version":3,
 "file":"Disco-CreateJob.min.js",
 "lineCount":1,
-"mappings":"CAGC,QAAS,CAACA,CAAC,CAAEC,CAAM,CAAEC,CAAZ,CAAsB,CAC5BF,CAAC,CAAC,QAAS,CAAA,CAAG,CACV,IAAIG,EAAkB,KAClBC,EAAgB,CAChB,KAAK,CAAEC,QAAS,CAAA,CAAG,CACfF,CAAeG,OAAO,CAAC,OAAD,CADP,CAElB,CACD,UAAU,CAAEC,QAAS,CAACC,CAAD,CAAU,CACvBL,C,EACAA,CAAeG,OAAO,CAAC,QAAQ,CAAE,SAAS,CAAEE,CAAtB,CAFC,CAJf,CADM,CAWrBN,CAAQO,e,GACTP,CAAQO,eAAgB,CAAE,CAAA,EAAE,CAEhCP,CAAQO,eAAeC,oBAAqB,CAAEC,QAAS,CAACC,CAAD,CAAM,CACzDT,CAAgB,CAAEH,CAAC,CAAC,OAAD,CAASa,KAAK,CAAC,IAAI,CAAE,iBAAP,CAAyBC,MAAM,CAAC,MAAD,CAAQC,OAAO,CAAC,MAAD,CAAQC,SAAS,CAACd,CAAQe,KAAT,CAAe,CAE/Gd,CAAeG,OAAO,CAAC,CACnB,SAAS,CAAE,CAAA,CAAK,CAChB,SAAS,CAAE,CAAA,CAAK,CAChB,KAAK,CAAE,CAAA,CAAI,CACX,QAAQ,CAAE,CAAA,CAAI,CACd,KAAK,CAAE,YAAY,CACnB,KAAK,CAAE,GAAG,CACV,MAAM,CAAEN,CAAC,CAACC,CAAD,CAAQc,OAAO,CAAA,CAAG,CAAE,EAAE,CAC/B,KAAK,CAAEV,QAAS,CAAA,CAAG,CACfF,CAAee,KAAK,CAAC,QAAD,CAAUL,KAAK,CAAC,KAAK,CAAE,aAAR,CAAsB,CACzDV,CAAeG,OAAO,CAAC,SAAD,CAAWa,OAAO,CAAA,CAAE,CAC1ChB,CAAgB,CAAE,IAHH,CAIlB,CACD,OAAO,CAAE,CAAA,CAbU,CAAD,CAcpB,CAEF,IAAIiB,EAASpB,CAAC,CAAC,UAAD,CAAYa,KAAK,CAAC,CAAE,GAAK,CAAED,CAAT,CAAD,CAAgBE,MAAM,CAAC,MAAD,CAAQC,OAAO,CAAC,MAAD,CAAQM,IAAI,CAAC,QAAQ,CAAE,MAAX,CAAkBL,SAAS,CAACb,CAAD,CAAiB,CAE5HA,CAAgB,CAAA,CAAA,CAAEmB,mBAAoB,CAAElB,CArBiB,C,CAyB7DJ,CAAC,CAAC,kBAAD,CAAoBuB,MAAM,CAAC,QAAS,CAAA,CAAG,CACpC,IAAIC,EAAQxB,CAAC,CAAC,IAAD,EACTyB,EAAOD,CAAKX,KAAK,CAAC,MAAD,CADF,CAKnB,OAFAX,CAAQO,eAAeC,oBAAoB,CAACe,CAAD,CAAM,CAE1C,CAAA,CAN6B,CAAb,CAxCjB,CAAb,CAD2B,EAkD9B,CAACzB,CAAC,CAAEC,MAAM,CAAEC,QAAZ,CAAqB",
+"mappings":"CAGC,QAAS,CAACA,CAAC,CAAEC,CAAM,CAAEC,CAAZ,CAAsB,CAC5BF,CAAC,CAAC,QAAS,CAAA,CAAG,CACV,IAAIG,EAAkB,KAClBC,EAAgB,CAChB,KAAK,CAAEC,QAAS,CAAA,CAAG,CACfF,CAAeG,OAAO,CAAC,OAAD,CADP,CAElB,CACD,UAAU,CAAEC,QAAS,CAACC,CAAD,CAAU,CACvBL,C,EACAA,CAAeG,OAAO,CAAC,QAAQ,CAAE,SAAS,CAAEE,CAAtB,CAFC,CAJf,CADM,CAWrBN,CAAQO,e,GACTP,CAAQO,eAAgB,CAAE,CAAA,EAAE,CAEhCP,CAAQO,eAAeC,oBAAqB,CAAEC,QAAS,CAACC,CAAD,CAAM,CACzDT,CAAgB,CAAEH,CAAC,CAAC,OAAD,CAASa,KAAK,CAAC,IAAI,CAAE,iBAAP,CAAyBC,IAAI,CAAC,CAAE,KAAK,CAAE,MAAM,CAAE,MAAM,CAAE,MAAM,CAAE,UAAU,CAAE,GAA7C,CAAD,CAAoDC,SAAS,CAACb,CAAQc,KAAT,CAAe,CAE1Ib,CAAeG,OAAO,CAAC,CACnB,SAAS,CAAE,CAAA,CAAK,CAChB,SAAS,CAAE,CAAA,CAAK,CAChB,KAAK,CAAE,CAAA,CAAI,CACX,QAAQ,CAAE,CAAA,CAAI,CACd,KAAK,CAAE,YAAY,CACnB,KAAK,CAAE,GAAG,CACV,MAAM,CAAEN,CAAC,CAACC,CAAD,CAAQgB,OAAO,CAAA,CAAG,CAAE,EAAE,CAC/B,KAAK,CAAEZ,QAAS,CAAA,CAAG,CACfF,CAAee,KAAK,CAAC,QAAD,CAAUL,KAAK,CAAC,KAAK,CAAE,aAAR,CAAsB,CACzDV,CAAeG,OAAO,CAAC,SAAD,CAAWa,OAAO,CAAA,CAAE,CAC1ChB,CAAgB,CAAE,IAHH,CAIlB,CACD,OAAO,CAAE,CAAA,CAbU,CAAD,CAcpB,CAEF,IAAIiB,EAASpB,CAAC,CAAC,UAAD,CAAYa,KAAK,CAAC,CAAE,GAAK,CAAED,CAAT,CAAD,CAAgBS,MAAM,CAAC,MAAD,CAAQJ,OAAO,CAAC,MAAD,CAAQH,IAAI,CAAC,QAAQ,CAAE,MAAX,CAAkBC,SAAS,CAACZ,CAAD,CAAiB,CAE5HA,CAAgB,CAAA,CAAA,CAAEmB,mBAAoB,CAAElB,CArBiB,C,CAyB7DJ,CAAC,CAAC,kBAAD,CAAoBuB,MAAM,CAAC,QAAS,CAAA,CAAG,CACpC,IAAIC,EAAQxB,CAAC,CAAC,IAAD,EACTyB,EAAOD,CAAKX,KAAK,CAAC,MAAD,CADF,CAKnB,OAFAX,CAAQO,eAAeC,oBAAoB,CAACe,CAAD,CAAM,CAE1C,CAAA,CAN6B,CAAb,CAxCjB,CAAb,CAD2B,EAkD9B,CAACzB,CAAC,CAAEC,MAAM,CAAEC,QAAZ,CAAqB",
 "sources":["/ClientSource/Scripts/Modules/Disco-CreateJob/disco.createjob.js"],
-"names":["$","window","document","createJobDialog","dialogMethods","close","dialog","setButtons","buttons","DiscoFunctions","CreateOpenJobDialog","document.DiscoFunctions.CreateOpenJobDialog","url","attr","width","height","appendTo","body","find","remove","iframe","css","discoDialogMethods","click","$this","href"]
+"names":["$","window","document","createJobDialog","dialogMethods","close","dialog","setButtons","buttons","DiscoFunctions","CreateOpenJobDialog","document.DiscoFunctions.CreateOpenJobDialog","url","attr","css","appendTo","body","height","find","remove","iframe","width","discoDialogMethods","click","$this","href"]
 }

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

@@ -18,7 +18,7 @@
             document.DiscoFunctions = {};
         }
         document.DiscoFunctions.CreateOpenJobDialog = function (url) {
-            createJobDialog = $('<div>').attr('id', 'createJobDialog').width('100%').height('100%').appendTo(document.body);
+            createJobDialog = $('<div>').attr('id', 'createJobDialog').css({ width: '100%', height: '100%', paddingTop: '0' }).appendTo(document.body);
 
             createJobDialog.dialog({
                 resizable: false,

Disco.Web/ClientSource/Style/BundleSite.css.bundle

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bundle minify="true" runOnBuild="true">
+  <file>/ClientSource/Style/normalize.css</file>
   <file>/ClientSource/Style/jQueryUI/jquery-ui.css</file>
   <file>/ClientSource/Style/Site.css</file>
+  <file>/ClientSource/Style/jQueryUIExtensions.css</file>
 </bundle>

Disco.Web/ClientSource/Style/Config.css

@@ -1,47 +1,47 @@
-.tableData {
+.tableData {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 .tableData > tbody > tr > td {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableData > tbody > tr:nth-child(odd) > td {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 .tableData > thead > tr > th,
 .tableData > tbody > tr > th {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
 }
 .tableData > tbody > tr:hover > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 .tableData > tfoot > tr > th,
 .tableData > tfoot > tr > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 .tableDataDark {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 .tableDataDark td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableDataDark th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 .tableDataContainer {
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableDataVertical {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 .tableDataVertical > tbody > tr:nth-child(odd) {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
   margin: 0;
   padding: 0;
 }
@@ -84,7 +84,7 @@
 #updateAvailableContainer {
   float: right;
   border: 1px dashed #ddd;
-  background-color: #fff;
+  background-color: #ffffff;
   font-size: 0.6em;
   line-height: 1em;
   padding: 4px 10px 4px 70px;
@@ -105,8 +105,8 @@
   padding: 10px;
 }
 #expressionEditor #expressionEditorContainer {
-  border: 1px solid #005fab;
+  border: 1px solid #1e6dab;
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
   height: 100px;
 }
 .expressionTree span.dynatree-node span.dynatree-icon {
@@ -126,27 +126,27 @@
   background-position-x: -48px;
 }
 table.expressionsTable {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 table.expressionsTable > tbody > tr > td {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 table.expressionsTable > tbody > tr:nth-child(odd) > td {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 table.expressionsTable > thead > tr > th,
 table.expressionsTable > tbody > tr > th {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
 }
 table.expressionsTable > tbody > tr:hover > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 table.expressionsTable > tfoot > tr > th,
 table.expressionsTable > tfoot > tr > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 table.expressionsTable td.parseError {
   background-color: #FFD8D8;
@@ -155,27 +155,27 @@ table.expressionsTable td.parseError {
   width: 375px;
 }
 #deviceComponents {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 #deviceComponents > tbody > tr > td {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #deviceComponents > tbody > tr:nth-child(odd) > td {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 #deviceComponents > thead > tr > th,
 #deviceComponents > tbody > tr > th {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
 }
 #deviceComponents > tbody > tr:hover > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 #deviceComponents > tfoot > tr > th,
 #deviceComponents > tfoot > tr > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 #deviceComponents tr th.actions {
   width: 20px;
@@ -214,7 +214,7 @@ table.expressionsTable td.parseError {
 #deviceComponents tr input.updating {
   background-position: right center;
   background-repeat: no-repeat;
-  background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
+  background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///zNah+Hm7dng6O7x9DddiTNah1d3nJqtw3+Xs8fS3k5vlm6JqaGzx4KatcrU4FFymDZciHGMq+ru8t/l7Pb3+V9+oeLo7vT2+MTP3LLB0dTc5fHz9gAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
 }
 #organisationAddresses {
   font-size: 0.9em;
@@ -232,7 +232,7 @@ table.expressionsTable td.parseError {
   vertical-align: middle;
 }
 #organisationAddresses tr:nth-child(even) {
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #organisationAddresses span.delete {
   display: inline-block;
@@ -295,7 +295,7 @@ table.deviceProfileTable th.deviceCount {
 #scheduledTaskStatus th.process {
   text-align: left;
   font-weight: bold;
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
   min-height: 30px;
   vertical-align: middle;
 }
@@ -309,7 +309,7 @@ table.deviceProfileTable th.deviceCount {
 #scheduledTaskStatus td.finishedRedirect {
   background-position: right center;
   background-repeat: no-repeat;
-  background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
+  background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///zNah+Hm7dng6O7x9DddiTNah1d3nJqtw3+Xs8fS3k5vlm6JqaGzx4KatcrU4FFymDZciHGMq+ru8t/l7Pb3+V9+oeLo7vT2+MTP3LLB0dTc5fHz9gAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
   padding-right: 20px;
 }
 #scheduledTaskStatus td.exception {
@@ -354,7 +354,7 @@ div.logEventsViewport table.logEventsViewport > thead > tr > th.eventType {
   width: 180px;
 }
 div.logEventsViewport table.logEventsViewport > tbody > tr {
-  background-color: #fff;
+  background-color: #ffffff;
 }
 div.logEventsViewport table.logEventsViewport > tbody > tr:nth-child(even) {
   background-color: #eee;
@@ -474,7 +474,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #dialogSession .sessionInfoContainer .sessionInfoMessages div.logEventsViewportContainer {
   overflow: auto;
@@ -487,7 +487,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
 #dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport {
   padding: 0;
   margin: 0;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport > thead > tr {
   background-color: #eee;
@@ -507,7 +507,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   width: 180px;
 }
 #dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport > tbody > tr {
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #dialogSession .sessionInfoContainer .sessionInfoMessages table.logEventsViewport > tbody > tr:nth-child(even) {
   background-color: #eee;
@@ -614,7 +614,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   float: left;
   margin: 3px 0 3px 0;
   padding: 170px 0 0 0;
-  background-color: #fff;
+  background-color: #ffffff;
   -moz-border-radius: 2px;
   -webkit-border-radius: 2px;
   border-radius: 2px;
@@ -638,7 +638,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #importStatus #sessions .session .sessionInfoMessages div.logEventsViewportContainer {
   max-height: 220px;
@@ -652,7 +652,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
 #importStatus #sessions .session .sessionInfoMessages table.logEventsViewport {
   padding: 0;
   margin: 0;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #importStatus #sessions .session .sessionInfoMessages table.logEventsViewport > thead > tr {
   background-color: #eee;
@@ -672,7 +672,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   width: 180px;
 }
 #importStatus #sessions .session .sessionInfoMessages table.logEventsViewport > tbody > tr {
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #importStatus #sessions .session .sessionInfoMessages table.logEventsViewport > tbody > tr:nth-child(even) {
   background-color: #eee;
@@ -709,11 +709,8 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
 #undetectedPagesContainer #undetectedPages > .undetectedPage {
   float: left;
   margin: 4px;
-  border: 1px solid #bbb;
+  border: 1px solid #f4f4f4;
-  -moz-border-radius: 4px;
+  background-color: #fcfcfc;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  background-color: #eee;
   height: 256px;
   width: 256px;
   background-position: top center;
@@ -726,8 +723,8 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   text-align: center;
 }
 #undetectedPagesContainer #undetectedPages > .undetectedPage:hover {
-  border: 1px solid #6C7A87;
+  border: 1px solid #d8d8d8;
-  background-color: #DFE1F8;
+  background-color: #f4f4f4;
 }
 #undetectedPageDialog > .pagePreview {
   height: 700px;
@@ -735,7 +732,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   background-repeat: no-repeat;
 }
 #undetectedPageDialog .actions {
-  border-top: 1px solid #e5bd99;
+  border-top: 1px solid #d1d1d1;
   padding-top: 8px;
   margin-top: 8px;
   text-align: right;
@@ -770,7 +767,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   color: #335a87;
 }
 #plugins .pageMenuArea a > h3:hover {
-  color: #4f81bd;
+  color: #5e8cc2;
 }
 #plugins .pageMenuArea .pageMenuBlurb {
   padding-left: 18px;
@@ -794,7 +791,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
 #pluginCatalog .pluginItem .pluginItemBlurb {
   margin: 4px 0 4px 2px;
   padding: 0 4px;
-  border-left: 4px solid #e8eef4;
+  border-left: 4px solid #f4f4f4;
 }
 #pluginCatalog .pluginItem .pluginItemBlurb * {
   padding: 0;
@@ -812,10 +809,10 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   font-size: 12px;
 }
 #Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-ico-c > span.fancytree-icon {
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACgklEQVQ4y5XSXUhTYRgH8OkItViSri676CIIupC6kIjIrQTNtLbhMEOLmjGsi1CiJoULZmEpW4l5RDehkR/owJNF+3DLliMd6GDWcrFNyNEceAarZZuc7d8xSNQzgx54Lt6v3/vxvBwAnI3Z0NDAJQiifWJiImgwGOIkScasVuuMWq2u3Dp3LTc15HJ5Zk9PzzhFURh79fpTr7avv4voHns/ORkJh8NQqVTX/wmIxWLZW5sNBNGt3tgvrareYzQavVqt9nt5eXnetkCTosk4OkrGWh485G7dqfXR4yvMlSCVSs9sC3z2frFOTU0vp7ur2TJe4XA4oNFoKrcFZl0us9lsodIBk44PpSaTCXa7vSwtoNPpAsxqOJ1OBAIBOhKJ0PF4nE6lUjQzTq+srKR8Ph/m5uaSS0tLLSygsbFx1ev1IhgMwuPxIBQKIRaLIZlM4m+4XC4olUp0dna+YwEKhSLh9/uxuLgIt9v9B4pGo6Bpeh1YOx1TSuj1+nEWcPfe/cSsy4fgtzB8vgX4F34wADbF/Pw81JoOGEgbG3jeVppY9jVD2XwbN+ol+BURwdBfC1ldPaL+ywi5ZTgvuYibshJQ5nNsQFxWmHCTRzHWvR88XjaeKrmgPnJw8AAPFcKdzANkQCrIQn4+H3fEWWyg4MixuOD4IdDTeWiTZyB3Nw+Wrkx4BjOxj5+LW1XZwDAHJw/vAjdnr5kNFBSsSipr0asqwcKbQlyqLkH91bOgZk6DaKlgfuAFzOpOwN5xCnw+37kOFBcX7ygqKrpWU1P7kylPqrXtGdqf6DAwMIjhkZcYGrHAZLbBYrGhT0/ixdBoSiQSfRUKhRKBQJDDSffr/id/A3fSz48XbZuBAAAAAElFTkSuQmCC') /*Images/Actions/locked.png*/;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACgklEQVQ4y5XSXUhTYRgH8OkItViSri676CIIupC6kIjIrQTNtLbhMEOLmjGsi1CiJoULZmEpW4l5RDehkR/owJNF+3DLliMd6GDWcrFNyNEceAarZZuc7d8xSNQzgx54Lt6v3/vxvBwAnI3Z0NDAJQiifWJiImgwGOIkScasVuuMWq2u3Dp3LTc15HJ5Zk9PzzhFURh79fpTr7avv4voHns/ORkJh8NQqVTX/wmIxWLZW5sNBNGt3tgvrareYzQavVqt9nt5eXnetkCTosk4OkrGWh485G7dqfXR4yvMlSCVSs9sC3z2frFOTU0vp7ur2TJe4XA4oNFoKrcFZl0us9lsodIBk44PpSaTCXa7vSwtoNPpAsxqOJ1OBAIBOhKJ0PF4nE6lUjQzTq+srKR8Ph/m5uaSS0tLLSygsbFx1ev1IhgMwuPxIBQKIRaLIZlM4m+4XC4olUp0dna+YwEKhSLh9/uxuLgIt9v9B4pGo6Bpeh1YOx1TSuj1+nEWcPfe/cSsy4fgtzB8vgX4F34wADbF/Pw81JoOGEgbG3jeVppY9jVD2XwbN+ol+BURwdBfC1ldPaL+ywi5ZTgvuYibshJQ5nNsQFxWmHCTRzHWvR88XjaeKrmgPnJw8AAPFcKdzANkQCrIQn4+H3fEWWyg4MixuOD4IdDTeWiTZyB3Nw+Wrkx4BjOxj5+LW1XZwDAHJw/vAjdnr5kNFBSsSipr0asqwcKbQlyqLkH91bOgZk6DaKlgfuAFzOpOwN5xCnw+37kOFBcX7ygqKrpWU1P7kylPqrXtGdqf6DAwMIjhkZcYGrHAZLbBYrGhT0/ixdBoSiQSfRUKhRKBQJDDSffr/id/A3fSz48XbZuBAAAAAElFTkSuQmCC) /*Images/Actions/locked.png*/;
 }
 #Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-ico-c.fancytree-selected > span.fancytree-icon {
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACWUlEQVQ4y6XRXWiSURgHcJsXa4WNNuuyiy6CoAupixERoXXhmljuxaJiFrVA1i72cVFCOSMt8rNt2YfGO5g5Z1NstWW+c4ZBq4QpqMkEbZDSCObAMprjdf90sIjxsgUdODd/zvmd5zwPCwDrf/aGB7q6utgmk8ngdruzVqt10eVyTWu1Wuk/AXK5vMpoNPpjsRgGbU8/9fbdH/J4PAuRSARKpfLKhoBYLG595nTCaDSZVjPp6TPbHQ5H0mAwfBeJRHXrAp0dna9JcqCguX2H/Xd+S625aLFYQBDE8XWBd+8/TI6Njc+vzcfGX4nLX4FOp5OuC0wGAlS53NzaPPAm2Gi32+H3+5tYJEl+pigKoVAIPp+PnpqaosPhMF1uHB2Px2mv14vya6VgMKhhHGN3d/dSMplENptFIpHA3NwcCoUCSqUSKqvScZVKBbPZHGQEFApFMZ1OI5PJIBqNrkD5fB40Ta8AlcrUajVsNpufEbh+42YxHEkh+/UbUqlZpGd/lAH8WTMzMzDd64d7NMAMDOobi/OpHqh6rqK9jcCvBQncQzK0Xm5DPn0BJ4lz6GgVIkedYAaamxqK0dEDePl4FziczehTsZGLs7BnNwdiwRac4lejvp6La83VzABv/8FF/qG9oD/WQS/fhNptHEw8rEJiuAo7ubXACAtH9m0Fu2YHxQzweEuEVIYnaiFmvQ04f1aItksi5KaP4ZFGjDB5GG/7j4LL5YYYgZYW2c/yiJbv6h/A0EvC4RjGiOsFnK4J+KgABmyjsDufL0skki8CgYCoXOLz+TWrwG+kXMkgQ6yv+QAAAABJRU5ErkJggg==') /*Images/Actions/unlocked.png*/;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACWUlEQVQ4y6XRXWiSURgHcJsXa4WNNuuyiy6CoAupixERoXXhmljuxaJiFrVA1i72cVFCOSMt8rNt2YfGO5g5Z1NstWW+c4ZBq4QpqMkEbZDSCObAMprjdf90sIjxsgUdODd/zvmd5zwPCwDrf/aGB7q6utgmk8ngdruzVqt10eVyTWu1Wuk/AXK5vMpoNPpjsRgGbU8/9fbdH/J4PAuRSARKpfLKhoBYLG595nTCaDSZVjPp6TPbHQ5H0mAwfBeJRHXrAp0dna9JcqCguX2H/Xd+S625aLFYQBDE8XWBd+8/TI6Njc+vzcfGX4nLX4FOp5OuC0wGAlS53NzaPPAm2Gi32+H3+5tYJEl+pigKoVAIPp+PnpqaosPhMF1uHB2Px2mv14vya6VgMKhhHGN3d/dSMplENptFIpHA3NwcCoUCSqUSKqvScZVKBbPZHGQEFApFMZ1OI5PJIBqNrkD5fB40Ta8AlcrUajVsNpufEbh+42YxHEkh+/UbUqlZpGd/lAH8WTMzMzDd64d7NMAMDOobi/OpHqh6rqK9jcCvBQncQzK0Xm5DPn0BJ4lz6GgVIkedYAaamxqK0dEDePl4FziczehTsZGLs7BnNwdiwRac4lejvp6La83VzABv/8FF/qG9oD/WQS/fhNptHEw8rEJiuAo7ubXACAtH9m0Fu2YHxQzweEuEVIYnaiFmvQ04f1aItksi5KaP4ZFGjDB5GG/7j4LL5YYYgZYW2c/yiJbv6h/A0EvC4RjGiOsFnK4J+KgABmyjsDufL0skki8CgYCoXOLz+TWrwG+kXMkgQ6yv+QAAAABJRU5ErkJggg==) /*Images/Actions/unlocked.png*/;
 }
 #Config_AuthRoles_Show #Config_AuthRoles_Claims_Tree span.fancytree-node.fancytree-selected {
   font-style: normal;
@@ -829,11 +826,11 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
 }
 #Config_AuthRoles_Subjects li.user,
 #Config_AuthRoles_Subjects_Update_Dialog_List li.user {
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNIBmxLMwAAAKCSURBVDjLjZK/axNxGMafu9yvXO5X01yaBHtpE2N/DbbURRREF3URxEIFRx1VtIPi4CC46h+gi3OpOBdRqrOYCnZITZuS5EybNklz+dXLN7lzKAiJQX3h3R6e58P7vJTruuifWGKBjRiRZ6JPupXfybIsz79tWLVH6dRyq1/LYMAEQsGnDx7feZL8toVsJgtJVe6KPhEA7vVrqX6CWGKBiibiaX8wEMttZXBQ2IVXkqEG9L1quRrd+Pra/isBTdNM0dzlM6kfoAEIigafFgHt1UQ9avAAegzofoN0apmQtr3joSlwogQtOIaAMYlQfLqw9u6+9UfgoBswHPNJHlIhSBpEfwRqMAw9MvRlkHagAbHJG8Xvb4mKBg/nhSAL4Fjn1SAtNahGAJiYWvyohYyLodgsjmrF9dXlh3P/TXBq6uYYrwyHGZZDp7GLfTOjxhILE/8kGI/fuMBy7BIvqVcCxiQ3HBkFXAclM4eSudUhR40PpN16Ccd5n95ccXsILl1der54e3FN1qPXBDnAEdtGvXKIRrWGThdQAgYj66OXlcCJVc4rveghGI9dH56Yn0+OT8+M5nNlsIIPFM2i61BwuoDrunBIB227iQ5polE2d8q5zfPpzRWTAQBBUkKVQzfo3atj9twsCHHRaHQBz3FKp+2gbXdw1GyjXrHgYfiwVcxGAZg0ALRatZOCT+IJseFSLAjpwsO4YOnj9QoUZIWFHpbRqhXgkDbfdamZ369slX+mdjPrn+tW5Ix/xBA13Q8PTaG3YQqVYgX7uUyzXsonqyVzo6cFVZ1jANrwqfrZkWj8tKaHDF6Uh2iapgixLat0kC9sp75X93NrgLNdrSYdAPgF6h0J0E7J5qMAAAAASUVORK5CYII=') /*Images/Actions/user16.png*/;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNIBmxLMwAAAKCSURBVDjLjZK/axNxGMafu9yvXO5X01yaBHtpE2N/DbbURRREF3URxEIFRx1VtIPi4CC46h+gi3OpOBdRqrOYCnZITZuS5EybNklz+dXLN7lzKAiJQX3h3R6e58P7vJTruuifWGKBjRiRZ6JPupXfybIsz79tWLVH6dRyq1/LYMAEQsGnDx7feZL8toVsJgtJVe6KPhEA7vVrqX6CWGKBiibiaX8wEMttZXBQ2IVXkqEG9L1quRrd+Pra/isBTdNM0dzlM6kfoAEIigafFgHt1UQ9avAAegzofoN0apmQtr3joSlwogQtOIaAMYlQfLqw9u6+9UfgoBswHPNJHlIhSBpEfwRqMAw9MvRlkHagAbHJG8Xvb4mKBg/nhSAL4Fjn1SAtNahGAJiYWvyohYyLodgsjmrF9dXlh3P/TXBq6uYYrwyHGZZDp7GLfTOjxhILE/8kGI/fuMBy7BIvqVcCxiQ3HBkFXAclM4eSudUhR40PpN16Ccd5n95ccXsILl1der54e3FN1qPXBDnAEdtGvXKIRrWGThdQAgYj66OXlcCJVc4rveghGI9dH56Yn0+OT8+M5nNlsIIPFM2i61BwuoDrunBIB227iQ5polE2d8q5zfPpzRWTAQBBUkKVQzfo3atj9twsCHHRaHQBz3FKp+2gbXdw1GyjXrHgYfiwVcxGAZg0ALRatZOCT+IJseFSLAjpwsO4YOnj9QoUZIWFHpbRqhXgkDbfdamZ369slX+mdjPrn+tW5Ix/xBA13Q8PTaG3YQqVYgX7uUyzXsonqyVzo6cFVZ1jANrwqfrZkWj8tKaHDF6Uh2iapgixLat0kC9sp75X93NrgLNdrSYdAPgF6h0J0E7J5qMAAAAASUVORK5CYII=) /*Images/Actions/user16.png*/;
 }
 #Config_AuthRoles_Subjects li.group,
 #Config_AuthRoles_Subjects_Update_Dialog_List li.group {
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNJ4fVuW8AAALmSURBVDjLpZNJaBNxFMa/mUyWmTSZJM02bRpta7W1VrErBRsqCIriwV0QFQRBXC6CngRP4lGKG9IiVrxYBEGwKnhwQWtqpBate0pptUmbtEkmM5ksM/P3VNH26Du9w/f93uPxPooQgv8pZqFxtjg7eA9/UtM0TkpLj1NvU71/Cw9vrOpiLYZTJU1T1QIu9z+fGgIAekHA2rgtNy/27vXXeLuNJmb34klOF9va3BbqNtusIZrC2SUbWO3s/msPrphEUXZZXVxjx9YDB3h62bHJX/EZay56emun7Ujz5v2eoZGXcPCm+SUAMSOXIqMfEFxXjmKSd4f82+60N1Tg3Pk+sP5ViE4NypcuHEVrwAtDqaQuATCMIeKvKm9avtaL3BgXv3/rYcWArhh5TyUI5/eZCvYvATc61ghuCJ66uwu+PzewONjjcjonT7yZJdF3qRMgJGVzeSDUtaG6ZWNUKjjO6ERFPK8rA5HIjX8Ay3fWtljspr6a9YLFG3RTRUf8BBfQFL68Cg6hQjfGnuSFithVl4HDr9icOZZOXN+3ubIdAKiukxsOen387SSScPpsoBkaBU3Gz6cUmKlO2Jws9qwIg9bicFjsINCQURTMSyrGU9IhRjHK3YGmGrQL9cgTGZlkHiOP0jCLK+BbuRo5OY37b/zYWW1AQ4cXRNdQUhWIiggN0yFanMlSqUwGpjIAYhnUcAjKp2YYKQ9KOgFoDpKnCT3T63BpkIXZ4YOVr0RC0jAxkzZThBCUd3oaAw3OVnOufrtg2bEr2BBEUWVQUgk0naAglyBJOeiJH5m19EBPtpiZHJlIhF+Pzn9kAGBuKDEGYKy2/mDA20l22d1u5JUiQHQAAOUzYnYqju+Tmr0vQvckZ78ufSQAmJ/91j/6LE2L6fim4Mr6OrOFtQLQs5ls6svwi+FYdPSeWtSzf3uoxWnk+fVOzu5uE6rr1rgDNS5dU7X4xI/p2Pjn8Fzi1fvFGaH+N86/AQJNOrMW5kkPAAAAAElFTkSuQmCC') /*Images/Actions/userGroup16.png*/;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNJ4fVuW8AAALmSURBVDjLpZNJaBNxFMa/mUyWmTSZJM02bRpta7W1VrErBRsqCIriwV0QFQRBXC6CngRP4lGKG9IiVrxYBEGwKnhwQWtqpBate0pptUmbtEkmM5ksM/P3VNH26Du9w/f93uPxPooQgv8pZqFxtjg7eA9/UtM0TkpLj1NvU71/Cw9vrOpiLYZTJU1T1QIu9z+fGgIAekHA2rgtNy/27vXXeLuNJmb34klOF9va3BbqNtusIZrC2SUbWO3s/msPrphEUXZZXVxjx9YDB3h62bHJX/EZay56emun7Ujz5v2eoZGXcPCm+SUAMSOXIqMfEFxXjmKSd4f82+60N1Tg3Pk+sP5ViE4NypcuHEVrwAtDqaQuATCMIeKvKm9avtaL3BgXv3/rYcWArhh5TyUI5/eZCvYvATc61ghuCJ66uwu+PzewONjjcjonT7yZJdF3qRMgJGVzeSDUtaG6ZWNUKjjO6ERFPK8rA5HIjX8Ay3fWtljspr6a9YLFG3RTRUf8BBfQFL68Cg6hQjfGnuSFithVl4HDr9icOZZOXN+3ubIdAKiukxsOen387SSScPpsoBkaBU3Gz6cUmKlO2Jws9qwIg9bicFjsINCQURTMSyrGU9IhRjHK3YGmGrQL9cgTGZlkHiOP0jCLK+BbuRo5OY37b/zYWW1AQ4cXRNdQUhWIiggN0yFanMlSqUwGpjIAYhnUcAjKp2YYKQ9KOgFoDpKnCT3T63BpkIXZ4YOVr0RC0jAxkzZThBCUd3oaAw3OVnOufrtg2bEr2BBEUWVQUgk0naAglyBJOeiJH5m19EBPtpiZHJlIhF+Pzn9kAGBuKDEGYKy2/mDA20l22d1u5JUiQHQAAOUzYnYqju+Tmr0vQvckZ78ufSQAmJ/91j/6LE2L6fim4Mr6OrOFtQLQs5ls6svwi+FYdPSeWtSzf3uoxWnk+fVOzu5uE6rr1rgDNS5dU7X4xI/p2Pjn8Fzi1fvFGaH+N86/AQJNOrMW5kkPAAAAAElFTkSuQmCC) /*Images/Actions/userGroup16.png*/;
 }
 #Config_AuthRoles_Subjects_Update_Dialog {
   display: none;
@@ -844,8 +841,8 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
 #Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_ListContainer {
   height: 280px;
   overflow-y: auto;
-  background-color: #fff;
+  background-color: #ffffff;
-  border: 1px solid #8db2d8;
+  border: 1px solid #d8d8d8;
 }
 #Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_None {
   padding-top: 15px;
@@ -860,7 +857,7 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
   cursor: pointer;
 }
 #Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li:hover {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 #Config_AuthRoles_Subjects_Update_Dialog #Config_AuthRoles_Subjects_Update_Dialog_List li:hover span.remove {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADHklEQVQ4T22SeUgUcRTHZ/aY2dnZLdfWI4KuP+zQsja7KMraXaMsOrUghe6DMjNXN7LlSyt2EHZAqbgdZFRQ/xR0QGVqZmi6h2mnVHYYBboVbgvS8evtSkHWF74w897nvTfv9xuO+48uRAyMrpqSnNSYssD6wJxqrUxISjonG6P7cv/otNZgfDR/cXrPwcO72dXrYK5TYKXlYMdLEUShw2uZu9wl6KP61oV1NiJmaFfGKhvLtYNtziJvA9u0FWzj1t73bTvAbHZ0LF2R55INw/8qPiboI9/PnpPH5i1C98RpaCP3TJ6On8kpYMlWfJthwSvLfAQnTQebtxBtU2fkH1JqjX8aVA0alvY13oQXsUPgWbkar5o8eEjgZ0MsvpAfWlPRTjFf5hq8jRmMwKhEXIkatCJcfICXjI8NsbsbVRJq4xIQCATAGIP/wwe4x09GU4IJne86wrFAMIgHI8fCp9KgQR/pcPKaaK5YKU24IehwjFPijCCiBXvwk+CQuzreo/Ptu/DzD/ITZxEuiRqcIPayQoMiXpzIOVWSuYSm2zkVijkFXBwHT64N/s4ufO7uDtvv98OXZ0cF5UqJ2UtsGS+gkBetnF0lWQrVEhZzPLZTsoigihHxeNbcjJevX+Nlezuet7bifMI4HKVcEU3fTJyDVyGfF1O4HKXGVCZosY4aZBNQPHoM6quq4aWi1qdPw/a2tKLhbi1KEidgFzFrid2nUCMntMIGTjCe1OgcRyhRNmQ4am7eRmVdHercHrizsuHZkoX7Hg9u1d6Fr9GLK4mTsJ/YEqXo2MgJvX/nLrWUVklrXJB1qN/jRLXbDU92DqoJrCF7qVENNWncfwAX+/XDNZpeoBB7rzGkTE4wuCS9rVkp4o5CgC/ZDB/t2UZ+QW6hT26ZZUYVXV8THWC5WsqnmgF/GoSUwQuDK7T9c98IMjpoalCtBYuMATMORI9Gj48Ua1dKqBBkWyYvDPur+LfSOXUkRN2yexFRBf64eHyflYLvMy34NGosGgwxBU5BTkvvO/l/WkIHu14lm3bqjGa7bDBvUMumpRTry4X0C+L3YvcBfxOhAAAAAElFTkSuQmCC) /*Images/Actions/removeSubtle.png*/;

Disco.Web/ClientSource/Style/Config.less

@@ -12,7 +12,7 @@
 #updateAvailableContainer {
     float: right;
     border: 1px dashed #ddd;
-    background-color: #fff;
+    background-color: @white;
     font-size: 0.6em;
     line-height: 1em;
     padding: 4px 10px 4px 70px;
@@ -128,7 +128,7 @@ table.expressionsTable {
         input.updating {
             background-position: right center;
             background-repeat: no-repeat;
-            background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
+            background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///zNah+Hm7dng6O7x9DddiTNah1d3nJqtw3+Xs8fS3k5vlm6JqaGzx4KatcrU4FFymDZciHGMq+ru8t/l7Pb3+V9+oeLo7vT2+MTP3LLB0dTc5fHz9gAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
         }
     }
 }
@@ -152,7 +152,7 @@ table.expressionsTable {
     }
 
     tr:nth-child(even) {
-        background-color: #fff;
+        background-color: @white;
     }
 
     span.delete {
@@ -238,7 +238,7 @@ table.deviceProfileTable {
     td.finishedRedirect {
         background-position: right center;
         background-repeat: no-repeat;
-        background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
+        background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///zNah+Hm7dng6O7x9DddiTNah1d3nJqtw3+Xs8fS3k5vlm6JqaGzx4KatcrU4FFymDZciHGMq+ru8t/l7Pb3+V9+oeLo7vT2+MTP3LLB0dTc5fHz9gAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
         padding-right: 20px;
     }
 
@@ -296,7 +296,7 @@ div.logEventsViewport {
 
         & > tbody {
             & > tr {
-                background-color: #fff;
+                background-color: @white;
 
                 &:nth-child(even) {
                     background-color: #eee;
@@ -449,7 +449,7 @@ div.logEventsViewport {
             -moz-border-radius: 4px;
             -webkit-border-radius: 4px;
             border-radius: 4px;
-            background-color: #fff;
+            background-color: @white;
 
             div.logEventsViewportContainer {
                 overflow: auto;
@@ -464,7 +464,7 @@ div.logEventsViewport {
             table.logEventsViewport {
                 padding: 0;
                 margin: 0;
-                background-color: #fff;
+                background-color: @white;
 
                 & > thead {
                     & > tr {
@@ -492,7 +492,7 @@ div.logEventsViewport {
 
                 & > tbody {
                     & > tr {
-                        background-color: #fff;
+                        background-color: @white;
 
                         &:nth-child(even) {
                             background-color: #eee;
@@ -633,7 +633,7 @@ div.logEventsViewport {
                     float: left;
                     margin: 3px 0 3px 0;
                     padding: 170px 0 0 0;
-                    background-color: #fff;
+                    background-color: @white;
                     -moz-border-radius: 2px;
                     -webkit-border-radius: 2px;
                     border-radius: 2px;
@@ -661,7 +661,7 @@ div.logEventsViewport {
                 -moz-border-radius: 4px;
                 -webkit-border-radius: 4px;
                 border-radius: 4px;
-                background-color: #fff;
+                background-color: @white;
 
                 div.logEventsViewportContainer {
                     max-height: 220px;
@@ -677,7 +677,7 @@ div.logEventsViewport {
                 table.logEventsViewport {
                     padding: 0;
                     margin: 0;
-                    background-color: #fff;
+                    background-color: @white;
 
                     & > thead {
                         & > tr {
@@ -705,7 +705,7 @@ div.logEventsViewport {
 
                     & > tbody {
                         & > tr {
-                            background-color: #fff;
+                            background-color: @white;
 
                             &:nth-child(even) {
                                 background-color: #eee;
@@ -758,11 +758,8 @@ div.logEventsViewport {
         & > .undetectedPage {
             float: left;
             margin: 4px;
-            border: 1px solid #bbb;
+            border: 1px solid @TableDataBorderColour;
-            -moz-border-radius: 4px;
+            background-color: @TableDataRowBackgroundColor;
-            -webkit-border-radius: 4px;
-            border-radius: 4px;
-            background-color: #eee;
             height: 256px;
             width: 256px;
             background-position: top center;
@@ -776,8 +773,8 @@ div.logEventsViewport {
             }
 
             &:hover {
-                border: 1px solid #6C7A87;
+                border: 1px solid @TableDataDarkBorderColour;
-                background-color: #DFE1F8;
+                background-color: @TableDataBorderColour;
             }
         }
     }
@@ -791,7 +788,7 @@ div.logEventsViewport {
     }
 
     .actions {
-        border-top: 1px solid #e5bd99;
+        border-top: 1px solid @ActionBarBorder;
         padding-top: 8px;
         margin-top: 8px;
         text-align: right;
@@ -896,11 +893,11 @@ div.logEventsViewport {
 #Config_AuthRoles_Show {
     #Config_AuthRoles_Claims_Tree {
         span.fancytree-ico-c > span.fancytree-icon {
-            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACgklEQVQ4y5XSXUhTYRgH8OkItViSri676CIIupC6kIjIrQTNtLbhMEOLmjGsi1CiJoULZmEpW4l5RDehkR/owJNF+3DLliMd6GDWcrFNyNEceAarZZuc7d8xSNQzgx54Lt6v3/vxvBwAnI3Z0NDAJQiifWJiImgwGOIkScasVuuMWq2u3Dp3LTc15HJ5Zk9PzzhFURh79fpTr7avv4voHns/ORkJh8NQqVTX/wmIxWLZW5sNBNGt3tgvrareYzQavVqt9nt5eXnetkCTosk4OkrGWh485G7dqfXR4yvMlSCVSs9sC3z2frFOTU0vp7ur2TJe4XA4oNFoKrcFZl0us9lsodIBk44PpSaTCXa7vSwtoNPpAsxqOJ1OBAIBOhKJ0PF4nE6lUjQzTq+srKR8Ph/m5uaSS0tLLSygsbFx1ev1IhgMwuPxIBQKIRaLIZlM4m+4XC4olUp0dna+YwEKhSLh9/uxuLgIt9v9B4pGo6Bpeh1YOx1TSuj1+nEWcPfe/cSsy4fgtzB8vgX4F34wADbF/Pw81JoOGEgbG3jeVppY9jVD2XwbN+ol+BURwdBfC1ldPaL+ywi5ZTgvuYibshJQ5nNsQFxWmHCTRzHWvR88XjaeKrmgPnJw8AAPFcKdzANkQCrIQn4+H3fEWWyg4MixuOD4IdDTeWiTZyB3Nw+Wrkx4BjOxj5+LW1XZwDAHJw/vAjdnr5kNFBSsSipr0asqwcKbQlyqLkH91bOgZk6DaKlgfuAFzOpOwN5xCnw+37kOFBcX7ygqKrpWU1P7kylPqrXtGdqf6DAwMIjhkZcYGrHAZLbBYrGhT0/ixdBoSiQSfRUKhRKBQJDDSffr/id/A3fSz48XbZuBAAAAAElFTkSuQmCC') /*Images/Actions/locked.png*/;
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACgklEQVQ4y5XSXUhTYRgH8OkItViSri676CIIupC6kIjIrQTNtLbhMEOLmjGsi1CiJoULZmEpW4l5RDehkR/owJNF+3DLliMd6GDWcrFNyNEceAarZZuc7d8xSNQzgx54Lt6v3/vxvBwAnI3Z0NDAJQiifWJiImgwGOIkScasVuuMWq2u3Dp3LTc15HJ5Zk9PzzhFURh79fpTr7avv4voHns/ORkJh8NQqVTX/wmIxWLZW5sNBNGt3tgvrareYzQavVqt9nt5eXnetkCTosk4OkrGWh485G7dqfXR4yvMlSCVSs9sC3z2frFOTU0vp7ur2TJe4XA4oNFoKrcFZl0us9lsodIBk44PpSaTCXa7vSwtoNPpAsxqOJ1OBAIBOhKJ0PF4nE6lUjQzTq+srKR8Ph/m5uaSS0tLLSygsbFx1ev1IhgMwuPxIBQKIRaLIZlM4m+4XC4olUp0dna+YwEKhSLh9/uxuLgIt9v9B4pGo6Bpeh1YOx1TSuj1+nEWcPfe/cSsy4fgtzB8vgX4F34wADbF/Pw81JoOGEgbG3jeVppY9jVD2XwbN+ol+BURwdBfC1ldPaL+ywi5ZTgvuYibshJQ5nNsQFxWmHCTRzHWvR88XjaeKrmgPnJw8AAPFcKdzANkQCrIQn4+H3fEWWyg4MixuOD4IdDTeWiTZyB3Nw+Wrkx4BjOxj5+LW1XZwDAHJw/vAjdnr5kNFBSsSipr0asqwcKbQlyqLkH91bOgZk6DaKlgfuAFzOpOwN5xCnw+37kOFBcX7ygqKrpWU1P7kylPqrXtGdqf6DAwMIjhkZcYGrHAZLbBYrGhT0/ixdBoSiQSfRUKhRKBQJDDSffr/id/A3fSz48XbZuBAAAAAElFTkSuQmCC) /*Images/Actions/locked.png*/;
         }
 
         span.fancytree-ico-c.fancytree-selected > span.fancytree-icon {
-            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACWUlEQVQ4y6XRXWiSURgHcJsXa4WNNuuyiy6CoAupixERoXXhmljuxaJiFrVA1i72cVFCOSMt8rNt2YfGO5g5Z1NstWW+c4ZBq4QpqMkEbZDSCObAMprjdf90sIjxsgUdODd/zvmd5zwPCwDrf/aGB7q6utgmk8ngdruzVqt10eVyTWu1Wuk/AXK5vMpoNPpjsRgGbU8/9fbdH/J4PAuRSARKpfLKhoBYLG595nTCaDSZVjPp6TPbHQ5H0mAwfBeJRHXrAp0dna9JcqCguX2H/Xd+S625aLFYQBDE8XWBd+8/TI6Njc+vzcfGX4nLX4FOp5OuC0wGAlS53NzaPPAm2Gi32+H3+5tYJEl+pigKoVAIPp+PnpqaosPhMF1uHB2Px2mv14vya6VgMKhhHGN3d/dSMplENptFIpHA3NwcCoUCSqUSKqvScZVKBbPZHGQEFApFMZ1OI5PJIBqNrkD5fB40Ta8AlcrUajVsNpufEbh+42YxHEkh+/UbUqlZpGd/lAH8WTMzMzDd64d7NMAMDOobi/OpHqh6rqK9jcCvBQncQzK0Xm5DPn0BJ4lz6GgVIkedYAaamxqK0dEDePl4FziczehTsZGLs7BnNwdiwRac4lejvp6La83VzABv/8FF/qG9oD/WQS/fhNptHEw8rEJiuAo7ubXACAtH9m0Fu2YHxQzweEuEVIYnaiFmvQ04f1aItksi5KaP4ZFGjDB5GG/7j4LL5YYYgZYW2c/yiJbv6h/A0EvC4RjGiOsFnK4J+KgABmyjsDufL0skki8CgYCoXOLz+TWrwG+kXMkgQ6yv+QAAAABJRU5ErkJggg==') /*Images/Actions/unlocked.png*/;
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACWUlEQVQ4y6XRXWiSURgHcJsXa4WNNuuyiy6CoAupixERoXXhmljuxaJiFrVA1i72cVFCOSMt8rNt2YfGO5g5Z1NstWW+c4ZBq4QpqMkEbZDSCObAMprjdf90sIjxsgUdODd/zvmd5zwPCwDrf/aGB7q6utgmk8ngdruzVqt10eVyTWu1Wuk/AXK5vMpoNPpjsRgGbU8/9fbdH/J4PAuRSARKpfLKhoBYLG595nTCaDSZVjPp6TPbHQ5H0mAwfBeJRHXrAp0dna9JcqCguX2H/Xd+S625aLFYQBDE8XWBd+8/TI6Njc+vzcfGX4nLX4FOp5OuC0wGAlS53NzaPPAm2Gi32+H3+5tYJEl+pigKoVAIPp+PnpqaosPhMF1uHB2Px2mv14vya6VgMKhhHGN3d/dSMplENptFIpHA3NwcCoUCSqUSKqvScZVKBbPZHGQEFApFMZ1OI5PJIBqNrkD5fB40Ta8AlcrUajVsNpufEbh+42YxHEkh+/UbUqlZpGd/lAH8WTMzMzDd64d7NMAMDOobi/OpHqh6rqK9jcCvBQncQzK0Xm5DPn0BJ4lz6GgVIkedYAaamxqK0dEDePl4FziczehTsZGLs7BnNwdiwRac4lejvp6La83VzABv/8FF/qG9oD/WQS/fhNptHEw8rEJiuAo7ubXACAtH9m0Fu2YHxQzweEuEVIYnaiFmvQ04f1aItksi5KaP4ZFGjDB5GG/7j4LL5YYYgZYW2c/yiJbv6h/A0EvC4RjGiOsFnK4J+KgABmyjsDufL0skki8CgYCoXOLz+TWrwG+kXMkgQ6yv+QAAAABJRU5ErkJggg==) /*Images/Actions/unlocked.png*/;
         }
 
         span.fancytree-node.fancytree-selected {
@@ -918,11 +915,11 @@ div.logEventsViewport {
     }
 
         li.user {
-            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNIBmxLMwAAAKCSURBVDjLjZK/axNxGMafu9yvXO5X01yaBHtpE2N/DbbURRREF3URxEIFRx1VtIPi4CC46h+gi3OpOBdRqrOYCnZITZuS5EybNklz+dXLN7lzKAiJQX3h3R6e58P7vJTruuifWGKBjRiRZ6JPupXfybIsz79tWLVH6dRyq1/LYMAEQsGnDx7feZL8toVsJgtJVe6KPhEA7vVrqX6CWGKBiibiaX8wEMttZXBQ2IVXkqEG9L1quRrd+Pra/isBTdNM0dzlM6kfoAEIigafFgHt1UQ9avAAegzofoN0apmQtr3joSlwogQtOIaAMYlQfLqw9u6+9UfgoBswHPNJHlIhSBpEfwRqMAw9MvRlkHagAbHJG8Xvb4mKBg/nhSAL4Fjn1SAtNahGAJiYWvyohYyLodgsjmrF9dXlh3P/TXBq6uYYrwyHGZZDp7GLfTOjxhILE/8kGI/fuMBy7BIvqVcCxiQ3HBkFXAclM4eSudUhR40PpN16Ccd5n95ccXsILl1der54e3FN1qPXBDnAEdtGvXKIRrWGThdQAgYj66OXlcCJVc4rveghGI9dH56Yn0+OT8+M5nNlsIIPFM2i61BwuoDrunBIB227iQ5polE2d8q5zfPpzRWTAQBBUkKVQzfo3atj9twsCHHRaHQBz3FKp+2gbXdw1GyjXrHgYfiwVcxGAZg0ALRatZOCT+IJseFSLAjpwsO4YOnj9QoUZIWFHpbRqhXgkDbfdamZ369slX+mdjPrn+tW5Ix/xBA13Q8PTaG3YQqVYgX7uUyzXsonqyVzo6cFVZ1jANrwqfrZkWj8tKaHDF6Uh2iapgixLat0kC9sp75X93NrgLNdrSYdAPgF6h0J0E7J5qMAAAAASUVORK5CYII=') /*Images/Actions/user16.png*/;
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNIBmxLMwAAAKCSURBVDjLjZK/axNxGMafu9yvXO5X01yaBHtpE2N/DbbURRREF3URxEIFRx1VtIPi4CC46h+gi3OpOBdRqrOYCnZITZuS5EybNklz+dXLN7lzKAiJQX3h3R6e58P7vJTruuifWGKBjRiRZ6JPupXfybIsz79tWLVH6dRyq1/LYMAEQsGnDx7feZL8toVsJgtJVe6KPhEA7vVrqX6CWGKBiibiaX8wEMttZXBQ2IVXkqEG9L1quRrd+Pra/isBTdNM0dzlM6kfoAEIigafFgHt1UQ9avAAegzofoN0apmQtr3joSlwogQtOIaAMYlQfLqw9u6+9UfgoBswHPNJHlIhSBpEfwRqMAw9MvRlkHagAbHJG8Xvb4mKBg/nhSAL4Fjn1SAtNahGAJiYWvyohYyLodgsjmrF9dXlh3P/TXBq6uYYrwyHGZZDp7GLfTOjxhILE/8kGI/fuMBy7BIvqVcCxiQ3HBkFXAclM4eSudUhR40PpN16Ccd5n95ccXsILl1der54e3FN1qPXBDnAEdtGvXKIRrWGThdQAgYj66OXlcCJVc4rveghGI9dH56Yn0+OT8+M5nNlsIIPFM2i61BwuoDrunBIB227iQ5polE2d8q5zfPpzRWTAQBBUkKVQzfo3atj9twsCHHRaHQBz3FKp+2gbXdw1GyjXrHgYfiwVcxGAZg0ALRatZOCT+IJseFSLAjpwsO4YOnj9QoUZIWFHpbRqhXgkDbfdamZ369slX+mdjPrn+tW5Ix/xBA13Q8PTaG3YQqVYgX7uUyzXsonqyVzo6cFVZ1jANrwqfrZkWj8tKaHDF6Uh2iapgixLat0kC9sp75X93NrgLNdrSYdAPgF6h0J0E7J5qMAAAAASUVORK5CYII=) /*Images/Actions/user16.png*/;
         }
 
         li.group {
-            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNJ4fVuW8AAALmSURBVDjLpZNJaBNxFMa/mUyWmTSZJM02bRpta7W1VrErBRsqCIriwV0QFQRBXC6CngRP4lGKG9IiVrxYBEGwKnhwQWtqpBate0pptUmbtEkmM5ksM/P3VNH26Du9w/f93uPxPooQgv8pZqFxtjg7eA9/UtM0TkpLj1NvU71/Cw9vrOpiLYZTJU1T1QIu9z+fGgIAekHA2rgtNy/27vXXeLuNJmb34klOF9va3BbqNtusIZrC2SUbWO3s/msPrphEUXZZXVxjx9YDB3h62bHJX/EZay56emun7Ujz5v2eoZGXcPCm+SUAMSOXIqMfEFxXjmKSd4f82+60N1Tg3Pk+sP5ViE4NypcuHEVrwAtDqaQuATCMIeKvKm9avtaL3BgXv3/rYcWArhh5TyUI5/eZCvYvATc61ghuCJ66uwu+PzewONjjcjonT7yZJdF3qRMgJGVzeSDUtaG6ZWNUKjjO6ERFPK8rA5HIjX8Ay3fWtljspr6a9YLFG3RTRUf8BBfQFL68Cg6hQjfGnuSFithVl4HDr9icOZZOXN+3ubIdAKiukxsOen387SSScPpsoBkaBU3Gz6cUmKlO2Jws9qwIg9bicFjsINCQURTMSyrGU9IhRjHK3YGmGrQL9cgTGZlkHiOP0jCLK+BbuRo5OY37b/zYWW1AQ4cXRNdQUhWIiggN0yFanMlSqUwGpjIAYhnUcAjKp2YYKQ9KOgFoDpKnCT3T63BpkIXZ4YOVr0RC0jAxkzZThBCUd3oaAw3OVnOufrtg2bEr2BBEUWVQUgk0naAglyBJOeiJH5m19EBPtpiZHJlIhF+Pzn9kAGBuKDEGYKy2/mDA20l22d1u5JUiQHQAAOUzYnYqju+Tmr0vQvckZ78ufSQAmJ/91j/6LE2L6fim4Mr6OrOFtQLQs5ls6svwi+FYdPSeWtSzf3uoxWnk+fVOzu5uE6rr1rgDNS5dU7X4xI/p2Pjn8Fzi1fvFGaH+N86/AQJNOrMW5kkPAAAAAElFTkSuQmCC') /*Images/Actions/userGroup16.png*/;
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKmlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAACjPY2Bg0nB0cXJlEmBgyM0rKQpyd1KIiIxSYD/PwMbAzAAGicnFBY4BAT4gdl5+XioDBvh2jYERRF/WBZnFQBrgSi4oKgHSf4DYKCW1OJmBgdEAyE4pLykAijNOAbJFkrLB7BUgdlFIkDOQvQfI5kuHsM+A2EkQ9h0QuwjoCSD7DUh9OpjNxAA2B8IWAbFLUitA9jI45xdUFmWmZ5QoGFpaWio4puQnpSoEVxaXpOYWK3jmJecXFeQXJZakpoAcBXYfxN2OBQU5qQrAEGOgLgCFP4T1ORAcroxiZxBiCJBcWlQGZTIyniXMR5hRuZeBwTGIgYFlJ0Is7AcDwxp9BgZZZoSYmhIDg1A9A8PGAgDxwFA9A4LzMgAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KAQQNJ4fVuW8AAALmSURBVDjLpZNJaBNxFMa/mUyWmTSZJM02bRpta7W1VrErBRsqCIriwV0QFQRBXC6CngRP4lGKG9IiVrxYBEGwKnhwQWtqpBate0pptUmbtEkmM5ksM/P3VNH26Du9w/f93uPxPooQgv8pZqFxtjg7eA9/UtM0TkpLj1NvU71/Cw9vrOpiLYZTJU1T1QIu9z+fGgIAekHA2rgtNy/27vXXeLuNJmb34klOF9va3BbqNtusIZrC2SUbWO3s/msPrphEUXZZXVxjx9YDB3h62bHJX/EZay56emun7Ujz5v2eoZGXcPCm+SUAMSOXIqMfEFxXjmKSd4f82+60N1Tg3Pk+sP5ViE4NypcuHEVrwAtDqaQuATCMIeKvKm9avtaL3BgXv3/rYcWArhh5TyUI5/eZCvYvATc61ghuCJ66uwu+PzewONjjcjonT7yZJdF3qRMgJGVzeSDUtaG6ZWNUKjjO6ERFPK8rA5HIjX8Ay3fWtljspr6a9YLFG3RTRUf8BBfQFL68Cg6hQjfGnuSFithVl4HDr9icOZZOXN+3ubIdAKiukxsOen387SSScPpsoBkaBU3Gz6cUmKlO2Jws9qwIg9bicFjsINCQURTMSyrGU9IhRjHK3YGmGrQL9cgTGZlkHiOP0jCLK+BbuRo5OY37b/zYWW1AQ4cXRNdQUhWIiggN0yFanMlSqUwGpjIAYhnUcAjKp2YYKQ9KOgFoDpKnCT3T63BpkIXZ4YOVr0RC0jAxkzZThBCUd3oaAw3OVnOufrtg2bEr2BBEUWVQUgk0naAglyBJOeiJH5m19EBPtpiZHJlIhF+Pzn9kAGBuKDEGYKy2/mDA20l22d1u5JUiQHQAAOUzYnYqju+Tmr0vQvckZ78ufSQAmJ/91j/6LE2L6fim4Mr6OrOFtQLQs5ls6svwi+FYdPSeWtSzf3uoxWnk+fVOzu5uE6rr1rgDNS5dU7X4xI/p2Pjn8Fzi1fvFGaH+N86/AQJNOrMW5kkPAAAAAElFTkSuQmCC) /*Images/Actions/userGroup16.png*/;
         }
 }
 
@@ -936,7 +933,7 @@ div.logEventsViewport {
     #Config_AuthRoles_Subjects_Update_Dialog_ListContainer {
         height: 280px;
         overflow-y: auto;
-        background-color: #fff;
+        background-color: @white;
         border: 1px solid @TableDataDarkBorderColour;
     }
 

Disco.Web/ClientSource/Style/Credits.css

@@ -1,4 +1,4 @@
-#organisationCredits span.message {
+#organisationCredits span.message {
   color: #888;
 }
 #organisationCredits a {

Disco.Web/ClientSource/Style/Declarations.css

@@ -1 +0,0 @@
-

Disco.Web/ClientSource/Style/Declarations.less

@@ -1,28 +1,36 @@
 // Default Colours
 @BackgroundColour: #D1D1D1;
+@BackgroundColourGradient: #f2f2f2;
+@BackgroundColourLight: #fafafa;
+@HeaderBackgroundColour: #515151;
 
 @HyperLinkColour: #335A87;
-@HyperLinkHoverColour:  #4f81bd;
+@HyperLinkHoverColour: lighten(@HyperLinkColour, 20%);
 
-@ButtonColour: #DB761D;
+@ButtonColour: #1e6dab;
-@ButtonBorderColour: #875A33;
+@ButtonBorderColour: darken(@ButtonColour, 5%);
 @ButtonHoverColour: #9e9e9e;
-@ButtonBorderHoverColour: #696969;
+@ButtonBorderHoverColour: darken(@ButtonHoverColour, 20%);
 @ButtonAlertColour: #e90000;
 @ButtonBorderAlertColour: #990000;
 
-@MenuHoverColour: #FFD5BA;
+@MenuHoverColour: lighten(@HyperLinkHoverColour, 30%);
-@ActionBarBorder: #E5BD99;
+@ActionBarBorder: @BackgroundColour;
-@ActionBarBackgound: #F2F2F2;
+@ActionBarBackgound: @BackgroundColourGradient;
 
-@FormBorderColour: #005fab;
+@FormBorderColour: @ButtonColour;
-@TableDataBorderColour: #e8eef4;
+@FormBackgroundOddColour: @BackgroundColourGradient;
-@TableDataDarkBorderColour: #8db2d8;
+@FormBackgroundEvenColour: @white;
+@TableDataBorderColour: #f4f4f4;
+@TableDataDarkBorderColour: #d8d8d8;
 @TableDataRowBackgroundColor: hsl(hue(@TableDataBorderColour), saturation(@TableDataBorderColour), 99%);
 
 @SubtleColour: #ededed;
 @SubtleBorderColour: #ccc;
 
+@HighlightColour: lighten(@HyperLinkColour, 50%);
+
+@FontBodyColour: #333;
 @FontFamilyBody: "Segoe UI", Arial, Verdana, Tahoma, sans-serif;
 @FontFamilyHeading: "Segoe UI", Arial, Verdana, Tahoma, sans-serif;
 @FontFamilyMono: Consolas, "Courier New", monospace;
@@ -45,3 +53,8 @@
   -webkit-border-radius: @topLeftRadius @topRightRadius @bottomLeftRadius @bottomRightRadius;
   border-radius: @topLeftRadius @topRightRadius @bottomLeftRadius @bottomRightRadius;
 }
+
+// Standard Colours
+
+@white: #fff;
+@black: #000;

Disco.Web/ClientSource/Style/Declarations.min.css

@@ -1 +0,0 @@
-

Disco.Web/ClientSource/Style/Device.css

@@ -1,47 +1,47 @@
-.tableData {
+.tableData {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 .tableData > tbody > tr > td {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableData > tbody > tr:nth-child(odd) > td {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 .tableData > thead > tr > th,
 .tableData > tbody > tr > th {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
 }
 .tableData > tbody > tr:hover > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 .tableData > tfoot > tr > th,
 .tableData > tfoot > tr > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 .tableDataDark {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 .tableDataDark td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableDataDark th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 .tableDataContainer {
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableDataVertical {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 .tableDataVertical > tbody > tr:nth-child(odd) {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
   margin: 0;
   padding: 0;
 }
@@ -155,7 +155,7 @@
 
   border-radius: 0;
   background-image: none;
-  background-color: #fff;
+  background-color: #ffffff;
   border: none;
   padding: 0;
 }
@@ -192,16 +192,16 @@
 }
 #Device_Show_Policies_Profile_Actions_Update_Dialog ul li,
 #Device_Show_Policies_Batch_Actions_Update_Dialog ul li {
-  background-color: #fff;
+  background-color: #ffffff;
   padding: 2px 0;
 }
 #Device_Show_Policies_Profile_Actions_Update_Dialog ul li:nth-child(odd),
 #Device_Show_Policies_Batch_Actions_Update_Dialog ul li:nth-child(odd) {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 #Device_Show_Policies_Profile_Actions_Update_Dialog ul li.selected,
 #Device_Show_Policies_Batch_Actions_Update_Dialog ul li.selected {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
   font-weight: bold;
 }
 #DeviceDetailTab-JobsContainer div.jobTable {
@@ -223,27 +223,27 @@
   margin-top: -24px;
 }
 #DeviceDetailTab-DetailsContainer > table {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 #DeviceDetailTab-DetailsContainer > table > tbody > tr > td {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #DeviceDetailTab-DetailsContainer > table > tbody > tr:nth-child(odd) > td {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 #DeviceDetailTab-DetailsContainer > table > thead > tr > th,
 #DeviceDetailTab-DetailsContainer > table > tbody > tr > th {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
 }
 #DeviceDetailTab-DetailsContainer > table > tbody > tr:hover > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 #DeviceDetailTab-DetailsContainer > table > tfoot > tr > th,
 #DeviceDetailTab-DetailsContainer > table > tfoot > tr > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 #DeviceDetailTab-DetailsContainer > table > tbody > tr > th {
   width: 150px;
@@ -255,7 +255,7 @@
 #deviceShowResources #Attachments {
   padding: 0;
   border: 1px solid #cccccc;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #deviceShowResources #Attachments div.attachmentOutput {
   height: 115px;
@@ -270,8 +270,8 @@
   padding: 2px;
   margin: 2px;
   font-size: 0.9em;
-  border: 1px solid #fff;
+  border: 1px solid #ffffff;
-  color: #000;
+  color: #000000;
   text-decoration: none;
 }
 #deviceShowResources #Attachments div.attachmentOutput > a span.comments,
@@ -325,7 +325,7 @@
 #deviceShowResources #Attachments div.attachmentInput {
   border-top: 1px solid #cccccc;
   height: 40px;
-  background-color: #fff;
+  background-color: #ffffff;
   padding: 3px;
 }
 #deviceShowResources #Attachments div.attachmentInput span.action {
@@ -335,7 +335,7 @@
   width: 32px;
   cursor: pointer;
   float: right;
-  border: 1px solid #fff;
+  border: 1px solid #ffffff;
   padding: 3px;
   background-repeat: no-repeat;
   background-position: 2px 3px;
@@ -391,28 +391,28 @@
   background-color: #d9ffb4;
 }
 #deviceImportReview #devices {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
   margin-top: 6px;
 }
 #deviceImportReview #devices > tbody > tr > td {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #deviceImportReview #devices > tbody > tr:nth-child(odd) > td {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 #deviceImportReview #devices > thead > tr > th,
 #deviceImportReview #devices > tbody > tr > th {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
 }
 #deviceImportReview #devices > tbody > tr:hover > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 #deviceImportReview #devices > tfoot > tr > th,
 #deviceImportReview #devices > tfoot > tr > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 #deviceImportReview #devices > tbody td {
   vertical-align: middle;

Disco.Web/ClientSource/Style/Device.less

@@ -112,7 +112,7 @@
     /*jQuery Tab Extensions*/
     border-radius: 0;
     background-image: none;
-    background-color: #fff;
+    background-color: @white;
     border: none;
     padding: 0;
 
@@ -155,7 +155,7 @@
 #Device_Show_Policies_Profile_Actions_Update_Dialog, #Device_Show_Policies_Batch_Actions_Update_Dialog {
     ul {
         li {
-            background-color: #fff;
+            background-color: @white;
             padding: 2px 0;
 
             &:nth-child(odd) {
@@ -217,7 +217,7 @@
     #Attachments {
         padding: 0;
         border: 1px solid @SubtleBorderColour;
-        background-color: #fff;
+        background-color: @white;
 
         div.attachmentOutput {
             height: 115px;
@@ -232,8 +232,8 @@
                 padding: 2px;
                 margin: 2px;
                 font-size: 0.9em;
-                border: 1px solid #fff;
+                border: 1px solid @white;
-                color: #000;
+                color: @black;
                 text-decoration: none;
 
                 span.comments, span.author, span.timestamp {
@@ -294,7 +294,7 @@
         div.attachmentInput {
             border-top: 1px solid @SubtleBorderColour;
             height: 40px;
-            background-color: #fff;
+            background-color: @white;
             padding: 3px;
 
             span.action {
@@ -304,7 +304,7 @@
                 width: 32px;
                 cursor: pointer;
                 float: right;
-                border: 1px solid #fff;
+                border: 1px solid @white;
                 padding: 3px;
                 background-repeat: no-repeat;
                 background-position: 2px 3px;

Disco.Web/ClientSource/Style/Job.css

@@ -1,47 +1,47 @@
-.tableData {
+.tableData {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 .tableData > tbody > tr > td {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableData > tbody > tr:nth-child(odd) > td {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 .tableData > thead > tr > th,
 .tableData > tbody > tr > th {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
 }
 .tableData > tbody > tr:hover > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 .tableData > tfoot > tr > th,
 .tableData > tfoot > tr > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 .tableDataDark {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 .tableDataDark td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableDataDark th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 .tableDataContainer {
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableDataVertical {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 .tableDataVertical > tbody > tr:nth-child(odd) {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
   margin: 0;
   padding: 0;
 }
@@ -199,7 +199,7 @@
 
   border-radius: 0;
   background-image: none;
-  background-color: #fff;
+  background-color: #ffffff;
   border: none;
   padding: 0;
 }
@@ -239,13 +239,13 @@
   height: 300px;
   padding: 0;
   border: 1px solid #cccccc;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #jobShowResources #Comments div.commentOutput {
   height: 249px;
   overflow: auto;
-  background-color: #f4f4f4;
+  background-color: #fafafa;
-  color: #000;
+  color: #000000;
 }
 #jobShowResources #Comments div.commentOutput > div {
   padding: 3px;
@@ -321,7 +321,7 @@
   width: 32px;
   cursor: pointer;
   float: left;
-  border: 1px solid #fff;
+  border: 1px solid #ffffff;
   padding: 3px;
   background-repeat: no-repeat;
   background-position: 2px 3px;
@@ -329,9 +329,6 @@
 #jobShowResources #Comments div.commentInput span.action:hover {
   background-color: #ededed;
   border: 1px solid #cccccc;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
 }
 #jobShowResources #Comments div.commentInput span.post {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFCElEQVRYw+WXT2gdVRTGf+femXl/Ek3bvLRNGgO1wRZtY8VINyJUrQURKbpQUMF/iCCi4MKNblyJoCBF0IULEV25EEQtalG01tqoaXxpm9AmTdI0iU2aNHkvyXvO3HtcvLQa0lRr+3DhheEOs5jvu+c757vniKryXy7Df7wCgLa2tu3OuajaYCLiM5nM2Y6Ojo7zBIwx8ulnn79x5x23b6maHKoogvde29rablsSgdnZ4towDG0cJ5enpwhOLG9/UyAbgvcgRrBGefDmENQraLSEQJIkznsljuPLImCN4IxgrJA4ZbbkMIGlJgXl0jxBEKiI6BICVzDWCNCQy7K5yVAnCd/2FpmalXNKVLcKxAjqPeb3EoemYNXKgFvWhQiKcw5VX/0ydF4pxzGFWUgUDv/ajY71MVcqV98HvKtIMDMvuMki7302yOmajdTXRwwMDON1GR+4IuDek3hPOSmz63qHFWF0rERzc444bqa/7xhcQIJgIXcuG9x7j3MOi0eMcvDAMO3tDQwc7yXxSnNTI97rkkRcJMHk5CT9/f3n3y8VvLJ7ksSRH5rn9ff7EamhuWk13nsqRqfLE8jl6mltbUVEyOXqEZF/Bv6XXdWTJJ4hF9G4fSu7955lfGwGEY+/QBIYEKw1GCP09vbS03OU8fHT9PT0cOzYMQqFGcIwwFqLtebCJ3euQsJVnsR5Sgiv9Fnsjnbe/GqaibEigl8iQSAiWGMBWL/+WiqHFurqVhAElRQpl8tEUYS1AeAWalorJFT/BPcL39WBEQL1fDljuWvHNnbv7eA5O65GFlMwoPiF7Dx69Ajd3YcpFgt0d3dTLpeYmBgnn88zPT3N8ePHOXGiH+8cI6dOMT83h7oYK4rBEYgnFEdKPMZUnM8k8MWUJbxjG6/tmcSGm1YsioCqkiQO75XNm7egqogIW7duRURIpzM0NFSSqLExjfdK4hwrcw2UE2VwuMDo+By/TZSYjz2lxFMoe4jqWBUqxWIZq8qeOcPdd26z7vCjz29pf6sz/9Mzw+fLMJPJpI0Ramqyf+tybkHvuBQz83vMXO1VnHFZBgKlrwCDRRjF4MRgSwmQ4BZK/ZOisOuZe27/+r0f3r3xpt2PdXU+OyLGGHnp5ZffabmmZX0cx7q8yyW4uIwiouqJM6vsbDoXFW1tdEauzk5otvaMS9ec9VFmxgXpWMVW7r3Fv1Qj7GqJ2PvBwY+ivqEXRFXZuXNn06Waz2R6XXZ6xcZcObt6dZzNbdCo9joN0q1xdnWzIC0CWZapYjWG7c0Rhz78/kX5t13QmlcHa/BujaquRf1GlBtANwGtKC2IZpxfCICcv61BIGOFTOfR/eHE1EOXdBe0vNInjSsCMRl0Qz0GCQxgBKyiFiVAJBLRyM8LQ9MJZVO5oM7xyIaG6Mf8/vTJ0QfyB58eviQCtmSYT9DSvBI7nVNlOPvtzxavtYDRVDSiUXBATVg3d3VTe7LuqltNpKAgCDWhEO3v2h8NjTyQP/j0MIBUqxG99vG9n8zeuPGec5HPWkj98GtXMDh67+F9TwxVdS5Y8+awtc5lJLAQWlKpgNSP3V1mfOq+v4JXoSdcaM0CKxiBVECEkvmu85Adm7jvyJcPn6haQ7KIQGhJwmycmTKken7+xZw6ff+Rrx4ZWHYyuvKDiCU6UxgPzh7YY0ZGn8rve/LkRUezK45vcKmh/o8lcQe6Op8duWi0/vfT8R81FrV4fklnMAAAAABJRU5ErkJggg==) /*Images/Actions/post.png*/;
@@ -340,7 +337,7 @@
   height: 300px;
   padding: 0;
   border: 1px solid #cccccc;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #jobShowResources #Attachments div.attachmentOutput {
   height: 249px;
@@ -354,12 +351,9 @@
   padding: 2px;
   margin: 2px;
   font-size: 0.95em;
-  border: 1px solid #fff;
+  border: 1px solid #ffffff;
-  color: #000;
+  color: #000000;
   text-decoration: none;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
 }
 #jobShowResources #Attachments div.attachmentOutput > a span.comments,
 #jobShowResources #Attachments div.attachmentOutput > a span.author,
@@ -412,7 +406,7 @@
 #jobShowResources #Attachments div.attachmentInput {
   border-top: 1px solid #cccccc;
   height: 40px;
-  background-color: #fff;
+  background-color: #ffffff;
   padding: 5px;
 }
 #jobShowResources #Attachments div.attachmentInput span.action {
@@ -422,7 +416,7 @@
   width: 32px;
   cursor: pointer;
   float: right;
-  border: 1px solid #fff;
+  border: 1px solid #ffffff;
   padding: 3px;
   background-repeat: no-repeat;
   background-position: 2px 3px;
@@ -430,9 +424,6 @@
 #jobShowResources #Attachments div.attachmentInput span.action:hover {
   background-color: #ededed;
   border: 1px solid #cccccc;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
 }
 #jobShowResources #Attachments div.attachmentInput span.upload {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFPUlEQVRYw7VXayzkVxRfy4yKTj0aj6JWJISuR9EiWj5IFZt4pB+kLYmdbEJEJpp2daeIJkRNMx7xqFcl0iXxaKwVj8ishhG+eARr10wY6hVMx3gM1mNxeo7YRDfzNr3Jyfzn/u/939899/x+59xbAHDLEIbNxNHRMSQ5OTmvuLi4pbS0tDU1NbXA3d09FN8ZqZxniMVZLJZvSUnJ0NHREVA7PDwEhUIBb1pNTU2PtbW1+/8CwMvLiz07O/uKFqqrq9sNDAzstLCw4Jubm/Pd3NyeZGdnb56dncH09LQUQfgaFIC9vX30+vr6uUwmg5CQkD509Rdo75HL0W6jWaJF+/n5CRcXF0EgEEiMjIw+MAgAbM7d3d1/y6QywAU68b+NmrFeYWFhwtPTU8jIyKi/MQDaXU5OjoDcHhsb+4x2fdX/jqqAwxbf0dFxNj4+vofPtjcCgO7+gRbn8/lSS0vLjPT09KrOp09F/f39S9XV1QOhoaFsXITxFoD3cfcv8MgA2RKuNwAzM7MgsVh8MDAwAAkJCRI8230CIxKJYHh4GLa2ti4jv6CggI7F7BoABlJ0cHNzEzA4v9ELADar1tZWkVQqBS6Xe4G/F/Pz8xAdHT2KwZWN7zkODg7NVVVVr87PzyErK6vp2lxTnDO2vLwMOCZeLwBsNvu3K9fDxMQEjI2NgZ2dXSl+3OnaQtZo3Pr6+qNt+TZ4enreu+q/09nZuUdeQrA+OgNwdXX9en9/H5qbm+Hx48dAO/fw8PiddqbEUyyMg66VlRVg379fQ32+vr4Z5Lnc3Nzn/zkabRY3MTHxmJmZ2UExgfz8fKBAiomJ+Usd9fCcc+fm5gDluB3HOSLwtcnJSXB2dv5JJxoS5crLy58dHx9DXl4eLCwsAMquFPs/VjcvPDy8dHV1FeLi4v7E6O+V4e7j4+MHiQ06AYiIiPiRzh2TC/T19YFQKASUWo4G0GZlZWUvpqamyAOLBATnb2N/sE5S7OTk9KVcLn/d09MDlZWVl+fu4+PTSIKjbh7GRuqCZIGSEAwNDV2gPgDmgYc6J6PMzMxW0nDk9MXa2hqkpaW9vB7xyozBYNzt7e3dHRkZuQxYiURCUv2HKtBqzx75yk1MTFwmFzY1Nb1G+sRrcL1RFpcr2NzYgNraWlheWgIOhyOmvKFXPYDtM3S/ggLP1tb2F3WFBZm/v/93BLaxsRFGR0ehoaHhBEF/pXYNdRUOj8cTUgCi0hHlWGqLEgvW5+j2EwrS9vb2SwB29vY/a2SZqhcoJFxaHClH0fuppqjHceO0exKpJXQ96kQ/9r+rFwAmkxmMCeeIdoGUe6gFVX8lnpPrUbCAV8iT4eKfaJVflHUidxtp9ygiAk2Uo927uLhUFBUVnVDkd3V1nZuamj7QOsEpy3iYNJZINq2srBK0zJKeKDT/EGVR8yk/3L4JgLuDg4PHLS0tB/j8oTYfSUpKqtuWyyElJeWltnPUAfDHKD5FEaHgs9T0gYCAAA4lJ6yEdnF8hM7lnRIAd1D5VijfI/eDNVRH/pjfD0jzsS54pFd9qQQAMygoqJ3Eh1dYSKU2U0WKdseiQ0QlVmRkJI0zNwiAKxAxWD5t7ezsAGa1IaTiR9dLK6xyvu3q7pYeHhwAFqQktZ56l/cqAJgaGxt/z+cXHSr2FEA3n8qKihEsRnoxOCUbqPVkmOdXcGzoje6U6vhNRWZUVNTztra2szmxGIhmVAei6u17e3s/wfchN77UarrxknvRHuAFtMjGxqacwWQ8omjXlBsMAuAtMMYEyFDX+Tf2LzGXbu1DZYkMAAAAAElFTkSuQmCC) /*Images/Actions/attach.png*/;
@@ -441,16 +432,16 @@
   background-image: url(data:image/png;base64,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) /*Images/Actions/photo.png*/;
 }
 #jobComponents {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 #jobComponents td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #jobComponents th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 #jobComponents tr th.actions {
   width: 20px;
@@ -473,54 +464,54 @@
 #jobComponents tr input.updating {
   background-position: right center;
   background-repeat: no-repeat;
-  background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
+  background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///zNah+Hm7dng6O7x9DddiTNah1d3nJqtw3+Xs8fS3k5vlm6JqaGzx4KatcrU4FFymDZciHGMq+ru8t/l7Pb3+V9+oeLo7vT2+MTP3LLB0dTc5fHz9gAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
 }
 #jobComponents tr .totalCost {
   font-weight: bold;
 }
 #jobNonWarrantyFinance {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 #jobNonWarrantyFinance td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #jobNonWarrantyFinance th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 #jobNonWarrantyFinance tr th {
   width: 200px;
   text-align: right;
 }
 #jobNonWarrantyRepairs {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 #jobNonWarrantyRepairs td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #jobNonWarrantyRepairs th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 #jobNonWarrantyRepairs tr th {
   width: 200px;
   text-align: right;
 }
 #jobNonWarrantyInsurance {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 #jobNonWarrantyInsurance td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #jobNonWarrantyInsurance th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 #jobNonWarrantyInsurance tr th {
   width: 200px;
@@ -530,16 +521,16 @@
   width: 400px;
 }
 #jobFlags {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 #jobFlags td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 #jobFlags th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 #jobFlags tr th {
   width: 200px;
@@ -579,9 +570,6 @@
   border: 1px solid #ccc;
   background-color: #f2f2f2;
   padding: 2px 4px;
-  -moz-border-radius: 0 0 0 6px;
-  -webkit-border-radius: 0 0 0 6px;
-  border-radius: 0 0 0 6px;
 }
 #createJob_Container #createJob_SubTypes {
   margin: -1px 0 0 35px;
@@ -589,36 +577,29 @@
   border-top: none;
   padding: 2px 4px;
   background-color: #f2f2f2;
-  -moz-border-radius: 0 0 6px 6px;
-  -webkit-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
 }
 #createJob_Container #createJob_SubTypes .createJob_SubType {
   display: none;
 }
 #createJob_Container #createJob_Type li,
 #createJob_Container #createJob_SubTypes li {
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
   margin: 2px 8px 2px 0;
   padding: 0 0 0 4px;
 }
 #createJob_Container #createJob_Type li.highlight,
 #createJob_Container #createJob_SubTypes li.highlight {
-  background-color: #f6cd8a;
+  background-color: #cddbec;
-  color: #000;
+  font-weight: 600;
+  color: #000000;
 }
 #createJob_Container #createJob_CommentsContainer #Comments {
-  width: 600px;
+  width: 100%;
+  min-width: 500px;
 }
 #createJob_Container #createJob_QuickLogAutoCloseContainer {
   border: 1px solid #ccc;
   background-color: #f2f2f2;
   padding: 2px 4px;
-  -moz-border-radius: 0 0 0 6px;
-  -webkit-border-radius: 0 0 0 6px;
-  border-radius: 0 0 0 6px;
 }
 #createJob_Container #createJob_QuickLogAutoCloseContainer h3 {
   margin-bottom: 4px;
@@ -633,9 +614,6 @@
   border-top: none;
   padding: 2px 4px;
   background-color: #f2f2f2;
-  -moz-border-radius: 0 0 6px 6px;
-  -webkit-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
 }
 #createJob_Container #createJob_QuickLogTaskTimeContainer h3 {
   margin-bottom: 4px;

Disco.Web/ClientSource/Style/Job.less

@@ -200,7 +200,7 @@
 	/*jQuery Tab Extensions*/
 	border-radius: 0;
 	background-image: none;
-	background-color: #fff;
+	background-color: @white;
 	border: none;
 	padding: 0;
 
@@ -247,14 +247,14 @@
         height: 300px;
         padding: 0;
         border: 1px solid @SubtleBorderColour;
-        background-color: #fff;
+        background-color: @white;
 
         div.commentOutput
         {
             height: 249px;
             overflow: auto;
-            background-color: #f4f4f4;
+            background-color: @BackgroundColourLight;
-            color: #000;
+            color: @black;
 
             &>div
             {
@@ -357,7 +357,7 @@
                 width: 32px;
                 cursor: pointer;
                 float: left;
-                border: 1px solid #fff;
+                border: 1px solid @white;
                 padding: 3px;
                 background-repeat: no-repeat;
                 background-position: 2px 3px;
@@ -366,7 +366,6 @@
                 {
                     background-color: @SubtleColour;
                     border: 1px solid @SubtleBorderColour;
-                    .border-radius(3px);
                 }
             }
 
@@ -382,7 +381,7 @@
         height: 300px;
         padding: 0;
         border: 1px solid @SubtleBorderColour;
-        background-color: #fff;
+        background-color: @white;
 
         div.attachmentOutput
         {
@@ -398,10 +397,9 @@
                 padding: 2px;
                 margin: 2px;
                 font-size: 0.95em;
-                border: 1px solid #fff;
+                border: 1px solid @white;
-                color: #000;
+                color: @black;
                 text-decoration: none;
-                .border-radius(3px);
 
                 span.comments, span.author, span.timestamp
                 {
@@ -474,7 +472,7 @@
         {
             border-top: 1px solid @SubtleBorderColour;
             height: 40px;
-            background-color: #fff;
+            background-color: @white;
             padding: 5px;
 
             span.action
@@ -485,7 +483,7 @@
                 width: 32px;
                 cursor: pointer;
                 float: right;
-                border: 1px solid #fff;
+                border: 1px solid @white;
                 padding: 3px;
                 background-repeat: no-repeat;
                 background-position: 2px 3px;
@@ -494,7 +492,6 @@
                 {
                     background-color: @SubtleColour;
                     border: 1px solid @SubtleBorderColour;
-                    .border-radius(3px);
                 }
             }
 
@@ -547,7 +544,7 @@
         {
             background-position: right center;
             background-repeat: no-repeat;
-            background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
+            background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///zNah+Hm7dng6O7x9DddiTNah1d3nJqtw3+Xs8fS3k5vlm6JqaGzx4KatcrU4FFymDZciHGMq+ru8t/l7Pb3+V9+oeLo7vT2+MTP3LLB0dTc5fHz9gAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
         }
 
         .totalCost
@@ -682,9 +679,8 @@
     #createJob_Type
     {
         border: 1px solid #ccc;
-        background-color: #f2f2f2;
+        background-color: @BackgroundColourGradient;
         padding: 2px 4px;
-        .border-radius4(0, 0, 0, 6px);
     }
 
     #createJob_SubTypes
@@ -693,8 +689,7 @@
         border: 1px solid #ccc;
         border-top: none;
         padding: 2px 4px;
-        background-color: #f2f2f2;
+        background-color: @BackgroundColourGradient;
-        .border-radius4(0, 0, 6px, 6px);
 
         .createJob_SubType
         {
@@ -704,17 +699,15 @@
 
         #createJob_Type li, #createJob_SubTypes li
         {
-            -moz-border-radius: 3px;
-            -webkit-border-radius: 3px;
-            border-radius: 3px;
             margin: 2px 8px 2px 0;
             padding: 0 0 0 4px;
         }
 
             #createJob_Type li.highlight, #createJob_SubTypes li.highlight
             {
-                background-color: #f6cd8a;
+                background-color: @HighlightColour;
-                color: #000;
+                font-weight: 600;
+                color: @black;
             }
 
 
@@ -722,16 +715,16 @@
     {
         #Comments
         {
-            width: 600px;
+            width: 100%;
+            min-width: 500px;
         }
     }
 
     #createJob_QuickLogAutoCloseContainer
     {
         border: 1px solid #ccc;
-        background-color: #f2f2f2;
+        background-color: @BackgroundColourGradient;
         padding: 2px 4px;
-        .border-radius4(0, 0, 0, 6px);
 
         h3
         {
@@ -751,8 +744,7 @@
         border: 1px solid #ccc;
         border-top: none;
         padding: 2px 4px;
-        background-color: #f2f2f2;
+        background-color: @BackgroundColourGradient;
-        .border-radius4(0, 0, 6px, 6px);
 
         h3
         {

Disco.Web/ClientSource/Style/Shared.css

@@ -1,47 +1,47 @@
-.tableData {
+.tableData {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 .tableData > tbody > tr > td {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableData > tbody > tr:nth-child(odd) > td {
-  background-color: #fcfcfd;
+  background-color: #fcfcfc;
 }
 .tableData > thead > tr > th,
 .tableData > tbody > tr > th {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
 }
 .tableData > tbody > tr:hover > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 .tableData > tfoot > tr > th,
 .tableData > tfoot > tr > td {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
 }
 .tableDataDark {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
   border-collapse: collapse;
 }
 .tableDataDark td {
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableDataDark th {
-  background-color: #8db2d8;
+  background-color: #d8d8d8;
-  border: solid 1px #8db2d8;
+  border: solid 1px #d8d8d8;
 }
 .tableDataContainer {
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .tableDataVertical {
-  border: solid 1px #e8eef4;
+  border: solid 1px #f4f4f4;
   border-collapse: collapse;
 }
 .tableDataVertical > tbody > tr:nth-child(odd) {
-  background-color: #e8eef4;
+  background-color: #f4f4f4;
   margin: 0;
   padding: 0;
 }

Disco.Web/ClientSource/Style/Shared.less

@@ -7,7 +7,7 @@
 
     & > tbody > tr > td {
         border: solid 1px @TableDataBorderColour;
-        background-color: #fff;
+        background-color: @white;
     }
 
     & > tbody > tr:nth-child(odd) > td {
@@ -36,7 +36,7 @@
     td
     {
         border: solid 1px @TableDataDarkBorderColour;
-        background-color: #fff;
+        background-color: @white;
     }
 
     th
@@ -48,7 +48,7 @@
 
 .tableDataContainer
 {
-    background-color: #fff;
+    background-color: @white;
 }
 
 .tableDataVertical

Disco.Web/ClientSource/Style/Shared.min.css

@@ -1 +1 @@
-.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}
+.tableData{border:solid 1px #f4f4f4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #f4f4f4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfc}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#f4f4f4;border:solid 1px #f4f4f4}.tableData>tbody>tr:hover>td{background-color:#f4f4f4}.tableData>tfoot>tr>th,.tableData>tfoot>tr>td{background-color:#f4f4f4}.tableDataDark{border:solid 1px #d8d8d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #d8d8d8;background-color:#fff}.tableDataDark th{background-color:#d8d8d8;border:solid 1px #d8d8d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #f4f4f4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#f4f4f4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}

Disco.Web/ClientSource/Style/Site.less

@@ -5,62 +5,53 @@ body {
     font-size: 12px;
     font-family: @FontFamilyBody;
     margin: 0;
-    padding: 0 10px;
+    padding: 0;
-    color: #333;
+    color: @FontBodyColour;
 
     &.layout {
-        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAMAAABEoqrSAAADAFBMVEVRUVFUVFRYWFhbW1tfX19iYmJmZmZpaWltbW1wcHB0dHR3d3d7e3t/f3/MzMzNzc3Ozs7Pz8/Q0NDR0dHS0tLT09PU1NTV1dXW1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojp6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD28iAmAAAAbklEQVRIx2NUZ4ABlv9kMZkYRrXhYUphMwzZXEYCogQV0FfbUHMOrSxGAoyMBEygM/M/zZnMjFiZDPQEjCYEsin2/EYKk6qGDTVzR7TnRwN1NFBHPT8aqKOBOur5Uc+PBip1zWVkYGCBCv2nhrkAr7hI+jpl4KUAAAAASUVORK5CYII=) /*Images/BackgroundDocument.png*/ left top repeat-x @BackgroundColour;
+        background: url(data:image/png;base64,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) /*Images/BackgroundDocument.png*/ left top repeat-x @BackgroundColour;
+        background: linear-gradient(to bottom, @BackgroundColourGradient 0px, @BackgroundColour 370px) left top repeat-x @BackgroundColour;
+        min-height: 370px;
     }
 }
 
 // Primary Layout Elements
 .page {
-    max-width: 1230px;
+    max-width: 1232px;
-    min-width: 750px;
+    min-width: 752px;
     margin-left: auto;
     margin-right: auto;
 }
 
 header, #header {
     position: relative;
+    background-color: @HeaderBackgroundColour;
     margin: 0;
     padding: 0;
-    height: 110px;
+    height: 34px;
-
-    #headerMenu {
-        height: 24px;
-        padding: 4px;
-        line-height: 22px;
-        text-align: right;
-
-        a {
-            color: #000;
-            text-decoration: none;
-        }
-
-            a:hover {
-                text-decoration: underline;
-            }
-    }
 
     #heading {
         float: left;
-        height: 75px;
+        height: 34px;
 
-        img {
+        i {
-            height: 75px;
+            display: block;
-            width: 300px;
+            height: 34px;
+            width: 34px;
+            background-image: url(data:image/png;base64,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) /*Images/Heading.png*/;
         }
     }
 
     nav {
+        float: left;
+        height: 34px;
         padding: 0;
         margin: 0;
         font-size: 1.1em;
 
         ul#menu {
-            height: 29px;
+            height: 30px;
-            padding: 3px 6px;
+            padding: 2px 2px;
             margin: 0;
             list-style: none;
             z-index: 100000;
@@ -68,35 +59,32 @@ header, #header {
             & > li {
                 display: inline-block;
                 z-index: 100000;
-                margin-bottom: -4px;
 
-                a {
+                &.sep:after {
-                    padding: 4px 10px;
+                    padding: 4px 0;
-                    text-decoration: none;
+                    color: @white;
-                    color: #FFF;
+                    content: '\007C';
-                    display: inline-block;
-                    height: 21px;
-
-                    &:hover {
-                        color: @MenuHoverColour;
-                        text-decoration: none;
-                    }
-
-                    &:active {
-                        text-decoration: none;
-                    }
-                }
-
-                &.sep {
-                    margin-top: 4px;
-                    height: 21px;
-                    border-left: 1px solid #777;
                 }
 
                 &.moveRight {
                     margin-left: 40px;
                 }
 
+                & > a {
+                    display: inline-block;
+                    padding: 5px 10px 3px 10px;
+                    height: 22px;
+                    color: @white;
+                    font-weight: 400;
+                    text-transform: uppercase;
+                    text-decoration: none;
+
+                    &:hover, &:active {
+                        color: @MenuHoverColour;
+                        text-decoration: none;
+                    }
+                }
+
                 & > ul {
                     z-index: 100000;
                     display: none;
@@ -106,13 +94,13 @@ header, #header {
                     border-left: 1px solid @BackgroundColour;
                     border-bottom: 1px solid @BackgroundColour;
                     border-right: 1px solid @BackgroundColour;
+                    background-color: hsla(hue(@BackgroundColour), saturation(@BackgroundColour), 95%, 1);
                     padding: 0;
                     min-width: 180px;
                     box-shadow: 2px 2px 5px fade(@BackgroundColour, 50%);
 
                     li {
                         position: relative;
-                        background-color: hsla(hue(@BackgroundColour), saturation(@BackgroundColour), 95%, 1);
                         background-position: top;
                         background-repeat: repeat-x;
 
@@ -137,18 +125,18 @@ header, #header {
 
                         a {
                             display: block;
-                            padding: 4px 10px;
+                            color: @black;
+                            padding: 4px 8px;
                             text-decoration: none;
-                            color: #000;
-
-                            &:active {
-                                text-decoration: none;
-                            }
 
                             &:hover {
                                 color: @HyperLinkColour;
                                 text-decoration: none;
                             }
+
+                            &:active {
+                                text-decoration: none;
+                            }
                         }
                     }
 
@@ -158,6 +146,7 @@ header, #header {
                         position: absolute;
                         top: -1px;
                         left: 180px;
+                        background-color: hsla(hue(@BackgroundColour), saturation(@BackgroundColour), 95%, 1);
                         border: 1px solid @BackgroundColour;
                         padding: 0;
                         min-width: 180px;
@@ -168,24 +157,62 @@ header, #header {
         }
     }
 
+    #headerMenu {
+        float: right;
+        height: 24px;
+        padding: 5px 8px;
+        font-size: .9em;
+        line-height: 22px;
+        text-align: right;
+        color: @white;
+
+        a {
+            color: @white;
+            text-decoration: none;
+        }
+
+            a:hover {
+                color: @MenuHoverColour;
+                text-decoration: none;
+            }
+    }
+
     #SearchQuery {
         font-size: 0.9em;
-        margin-left: 10px;
+        margin-left: 6px;
+        width: 130px;
+        background-color: #eee;
+        -moz-transition-property: width;
+        -o-transition-property: width;
+        -webkit-transition-property: width;
+        transition-property: width;
+        -moz-transition-duration: .1s;
+        -o-transition-duration: .1s;
+        -webkit-transition-duration: .1s;
+        transition-duration: .1s;
+
+        &:hover, &:focus {
+            background-color: @white;
+            width: 200px;
+        }
     }
 
     .watermark {
-        background-color: #eee;
+        background-color: #888;
     }
 }
 
 #layout_PageHeading {
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAA8CAYAAABfESsNAAAAOUlEQVRIx+2SuREAIAzDFELL/uOSFVLx3Mm1C8nnABaNDJq5WJzAVkZGZXyPMg7+jUwCIeNZmdcZC2pxCZOpoRNgAAAAAElFTkSuQmCC) /*Images/BackgroundPage.png*/ left top repeat-x #fff;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAA8CAYAAABfESsNAAAAOUlEQVRIx+2SuREAIAzDFELL/uOSFVLx3Mm1C8nnABaNDJq5WJzAVkZGZXyPMg7+jUwCIeNZmdcZC2pxCZOpoRNgAAAAAElFTkSuQmCC) /*Images/BackgroundPage.png*/ left top repeat-x @white;
+    background: linear-gradient(to bottom, @BackgroundColourGradient 0px, @white 50px) @white;
     height: 50px;
     padding: 6px 20px 4px 20px;
     font-size: 2em;
-    color: #000;
+    color: @black;
     line-height: 50px;
     position: relative;
+    border-left: 1px solid @BackgroundColour;
+    border-right: 1px solid @BackgroundColour;
 
     a {
         text-decoration: none;
@@ -193,22 +220,25 @@ header, #header {
 }
 
 #layout_Page {
-    background-color: #FFF;
+    background-color: @white;
     overflow: auto;
+    border-left: 1px solid @BackgroundColour;
+    border-right: 1px solid @BackgroundColour;
+    border-bottom: 1px solid @BackgroundColour;
     // min-height: 400px;
     padding: 0 30px 15px 30px;
-    .border-radius4(0, 0, 6px, 6px);
+    .border-radius4(0, 0, 4px, 4px);
 }
 
 #layout_Error {
     min-height: 200px;
 
     table {
-        background-color: #fff;
+        background-color: @white;
     }
 
     h1, h2, h3, h4, h5 {
-        color: #fff;
+        color: @white;
         white-space: pre-wrap;
     }
 
@@ -323,7 +353,7 @@ a {
         margin: 2px;
         border: 1px solid @ButtonBorderColour;
         background: @ButtonColour;
-        color: #fff;
+        color: @white;
         font-weight: bold;
         text-transform: uppercase;
         cursor: pointer;
@@ -370,7 +400,7 @@ div.actionBar {
 }
 
 h1, h2, h3, h4, h5, h6 {
-    color: #000;
+    color: @black;
     font-family: @FontFamilyHeading;
     font-weight: @FontWeightHeading;
     font-stretch: @FontStretchHeading;
@@ -676,7 +706,7 @@ span.icon {
     }
 }
 
-#layout_Page > div:first-child.jobTable {
+#layout_Page > div.jobTable:first-child {
     padding-top: 30px;
 }
 
@@ -691,7 +721,7 @@ table.jobTable {
     }
 
     td.id, th.id {
-        width: 45px;
+        width: 50px;
         text-align: center;
 
         a {
@@ -700,22 +730,22 @@ table.jobTable {
     }
 
     td.status, th.status {
-        width: 220px;
     }
 
     td.dates, th.dates {
+        width: 130px;
     }
 
     td.type, th.type {
-        width: 45px;
+        width: 50px;
     }
 
     td.device, th.device {
-        width: 100px;
+        width: 110px;
     }
 
     td.user, th.user {
-        width: 230px;
+        width: 240px;
     }
 
     td.technician, th.technician {
@@ -736,6 +766,7 @@ table.deviceTable {
 textarea {
     min-height: 75px;
     font-family: @FontFamilyBody;
+    border: 1px solid #ccc;
 }
 
 input[type="text"], input[type="password"], input[type="file"], input[type="number"] {
@@ -753,13 +784,18 @@ input[type="text"], input[type="password"], input[type="file"], input[type="numb
     }
 
     input[type="text"].discreet, input[type="password"].discreet, input[type="file"].discreet, input[type="number"].discreet {
-        border: 1px solid #fff;
+        border: 1px solid @white;
 
         &:hover, &:focus {
             border: 1px solid #ccc;
         }
     }
 
+input[type="checkbox"], input[type="radio"] {
+    margin-right: 4px;
+    vertical-align: sub;
+}
+
 select {
     font-family: @FontFamilyBody;
     font-size: 12px;
@@ -769,16 +805,17 @@ select {
 }
 
 input[type="submit"], button {
+    font-family: @FontFamilyBody;
     padding: 5px;
 
     &.button {
         font-size: 12px;
-        padding: 6px 10px 4px 10px;
+        padding: 4px 10px 4px 10px;
         margin: 2px;
         border: 1px solid @ButtonBorderColour;
         background: @ButtonColour;
-        color: #fff;
+        color: @white;
-        font-weight: bold;
+        font-weight: 600;
         text-transform: uppercase;
         cursor: pointer;
 
@@ -827,6 +864,7 @@ div.form {
         border-left: 1px solid @FormBorderColour;
         border-right: 1px solid @FormBorderColour;
         border-bottom: 3px solid @FormBorderColour;
+        background-color: @FormBackgroundEvenColour;
 
         & > tbody {
             & > tr {
@@ -843,7 +881,7 @@ div.form {
                 }
 
                 &:nth-child(odd) {
-                    background-color: #eee;
+                    background-color: @FormBackgroundOddColour;
                     margin: 0;
                     padding: 0;
                 }
@@ -970,7 +1008,7 @@ td.subtleHighlight {
 }
 
 .field-validation-error {
-    color: #ff0000;
+    color: red;
 }
 
 .field-validation-valid {
@@ -978,13 +1016,13 @@ td.subtleHighlight {
 }
 
 .input-validation-error {
-    border: 1px solid #ff0000;
+    border: 1px solid red;
     background-color: #ffeeee;
 }
 
 .validation-summary-errors {
     font-weight: bold;
-    color: #ff0000;
+    color: red;
 }
 
 .validation-summary-valid {
@@ -1001,7 +1039,7 @@ td.subtleHighlight {
 
 .ajaxLoading {
     height: 11px;
-    background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///9t2Hfnq3vfl1fvz7Nt5Itt2HeGORey7kOipcvTZwd+IO+WdXu6/l+irdfXbxeCKPtt4IOWfYvrx6Pjp3Pz49eKTTvnr3/z38/TXvvHLqvbiz/v17wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
+    background-image: url(data:image/gif;base64,R0lGODlhEAALAPQAAP///zNah+Hm7dng6O7x9DddiTNah1d3nJqtw3+Xs8fS3k5vlm6JqaGzx4KatcrU4FFymDZciHGMq+ru8t/l7Pb3+V9+oeLo7vT2+MTP3LLB0dTc5fHz9gAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCwAAACwAAAAAEAALAAAFLSAgjmRpnqSgCuLKAq5AEIM4zDVw03ve27ifDgfkEYe04kDIDC5zrtYKRa2WQgAh+QQJCwAAACwAAAAAEAALAAAFJGBhGAVgnqhpHIeRvsDawqns0qeN5+y967tYLyicBYE7EYkYAgAh+QQJCwAAACwAAAAAEAALAAAFNiAgjothLOOIJAkiGgxjpGKiKMkbz7SN6zIawJcDwIK9W/HISxGBzdHTuBNOmcJVCyoUlk7CEAAh+QQJCwAAACwAAAAAEAALAAAFNSAgjqQIRRFUAo3jNGIkSdHqPI8Tz3V55zuaDacDyIQ+YrBH+hWPzJFzOQQaeavWi7oqnVIhACH5BAkLAAAALAAAAAAQAAsAAAUyICCOZGme1rJY5kRRk7hI0mJSVUXJtF3iOl7tltsBZsNfUegjAY3I5sgFY55KqdX1GgIAIfkECQsAAAAsAAAAABAACwAABTcgII5kaZ4kcV2EqLJipmnZhWGXaOOitm2aXQ4g7P2Ct2ER4AMul00kj5g0Al8tADY2y6C+4FIIACH5BAkLAAAALAAAAAAQAAsAAAUvICCOZGme5ERRk6iy7qpyHCVStA3gNa/7txxwlwv2isSacYUc+l4tADQGQ1mvpBAAIfkECQsAAAAsAAAAABAACwAABS8gII5kaZ7kRFGTqLLuqnIcJVK0DeA1r/u3HHCXC/aKxJpxhRz6Xi0ANAZDWa+kEAA7AAAAAAAAAAAA) /*Images/Status/loading.gif*/;
     margin-bottom: 0;
 }
 
@@ -1084,7 +1122,7 @@ div.columnHost {
 
 div.code {
     border: 1px dashed #bbb;
-    background-color: #fff;
+    background-color: @white;
     margin: 3px 6px;
     padding: 4px;
     font-size: 0.9em;
@@ -1123,5 +1161,3 @@ textarea.block {
         font-size: 0.9em;
     }
 }
-
-@import "jQueryUIExtensions";