jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: FontAwesome Pass 2

Browse Source 
Removal of bitmap icons, replacing with vector based icons from
FontAwesome. Includes other UI style changes.
This commit is contained in:
Gary Sharp
2013-12-25 17:49:30 +11:00
parent 20263905f9
commit ab553a05cb
115 changed files with 1928 additions and 1707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/Extensions/DeviceExtensions.cs
+11
View File
@@ -223,6 +223,17 @@ namespace Disco.BI.Extensions
return r.Value.ReasonMessage(); return r.Value.ReasonMessage();
} }
public static string StatusCode(this Device Device)
{
if (Device.DecommissionedDate.HasValue)
return "Decommissioned";
if (!Device.EnrolledDate.HasValue)
return "NotEnrolled";
return "Active";
}
public static string Status(this Device Device) public static string Status(this Device Device)
{ {
if (Device.DecommissionedDate.HasValue) if (Device.DecommissionedDate.HasValue)
Disco.Web/App_Code/AjaxHelpers.cshtml
+14 -17
View File
@@ -3,30 +3,27 @@
@using Disco.Web; @using Disco.Web;
@using Disco.Services.Web; @using Disco.Services.Web;
@helper AjaxLoader(string id = null) @helper AjaxLoader(string id = null)
{ {
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
<span @(id!=null ? new HtmlString(string.Format("id=\"{0}_loading\"", id)) : new HtmlString(string.Empty)) class="ajaxHelperIcon ajaxLoading" title="Loading..."></span><span @(id != null ? new HtmlString(string.Format("id=\"{0}_ok\"", id)) : new HtmlString(string.Empty)) class="ajaxHelperIcon ajaxOk" <i @(id != null ? new HtmlString(string.Format("id=\"{0}_loading\"", id)) : new HtmlString(string.Empty)) class="ajaxLoading" title="Loading..."></i><i @(id != null ? new HtmlString(string.Format("id=\"{0}_ok\"", id)) : null) class="fa fa-check fa-lg hidden ajaxOk" title="Ok"></i>
title="Ok"></span>
} }
@helper AjaxSave() @helper AjaxSave()
{ {
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); <i class="fa fa-check-square fa-lg hidden ajaxSave" title="Save Changes"></i>
<span class="ajaxHelperIcon ajaxSave" title="Save Changes"></span>
} }
@helper AjaxRemove() @helper AjaxRemove()
{ {
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); <i class="fa fa-times-circle fa-lg hidden ajaxRemove" title="Remove"></i>
<span class="ajaxHelperIcon ajaxRemove" title="Remove"></span>
} }
@helper JsonDate(DateTime? date) @helper JsonDate(DateTime? date)
{
if (date.HasValue)
{ {
if (date.HasValue) var d = date.Value;
{
var d = date.Value;
@(new HtmlString(string.Format("new Date({0}, {1}, {2}, {3}, {4}, {5})", d.Year, d.Month - 1, d.Day, d.Hour, d.Minute, d.Second))) @(new HtmlString(string.Format("new Date({0}, {1}, {2}, {3}, {4}, {5})", d.Year, d.Month - 1, d.Day, d.Hour, d.Minute, d.Second)))
} }
else else
{ {
@(new HtmlString("null")) @(new HtmlString("null"))
} }
} }
Disco.Web/App_Code/AjaxHelpers.generated.cs
+35 -36
View File
@@ -47,47 +47,47 @@ namespace Disco.Web
{ {
public static System.Web.WebPages.HelperResult AjaxLoader(string id = null) public static System.Web.WebPages.HelperResult AjaxLoader(string id = null)
{ {
return new System.Web.WebPages.HelperResult(__razor_helper_writer => { return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
#line 6 "..\..\App_Code\AjaxHelpers.cshtml" #line 6 "..\..\App_Code\AjaxHelpers.cshtml"
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
#line default #line default
#line hidden #line hidden
WriteLiteralTo(@__razor_helper_writer, " <span "); WriteLiteralTo(@__razor_helper_writer, " <i ");
#line 8 "..\..\App_Code\AjaxHelpers.cshtml" #line 8 "..\..\App_Code\AjaxHelpers.cshtml"
WriteTo(@__razor_helper_writer, id!=null ? new HtmlString(string.Format("id=\"{0}_loading\"", id)) : new HtmlString(string.Empty)); WriteTo(@__razor_helper_writer, id != null ? new HtmlString(string.Format("id=\"{0}_loading\"", id)) : new HtmlString(string.Empty));
#line default #line default
#line hidden #line hidden
WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxHelperIcon ajaxLoading\" title=\"Loading...\"></span>"); WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxLoading\" title=\"Loading...\"></i>");
WriteLiteralTo(@__razor_helper_writer, "<span "); WriteLiteralTo(@__razor_helper_writer, "<i ");
#line 8 "..\..\App_Code\AjaxHelpers.cshtml" #line 8 "..\..\App_Code\AjaxHelpers.cshtml"
WriteTo(@__razor_helper_writer, id != null ? new HtmlString(string.Format("id=\"{0}_ok\"", id)) : new HtmlString(string.Empty)); WriteTo(@__razor_helper_writer, id != null ? new HtmlString(string.Format("id=\"{0}_ok\"", id)) : null);
#line default #line default
#line hidden #line hidden
WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxHelperIcon ajaxOk\"\r\n title=\"Ok\"></span>\r\n"); WriteLiteralTo(@__razor_helper_writer, " class=\"fa fa-check fa-lg hidden ajaxOk\" title=\"Ok\"></i>\r\n");
#line 10 "..\..\App_Code\AjaxHelpers.cshtml" #line 9 "..\..\App_Code\AjaxHelpers.cshtml"
#line default #line default
#line hidden #line hidden
@@ -98,23 +98,23 @@ WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxHelperIcon ajaxOk\"\r\n
public static System.Web.WebPages.HelperResult AjaxSave() public static System.Web.WebPages.HelperResult AjaxSave()
{ {
return new System.Web.WebPages.HelperResult(__razor_helper_writer => { return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
#line 12 "..\..\App_Code\AjaxHelpers.cshtml" #line 11 "..\..\App_Code\AjaxHelpers.cshtml"
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
#line default #line default
#line hidden #line hidden
WriteLiteralTo(@__razor_helper_writer, " <span class=\"ajaxHelperIcon ajaxSave\" title=\"Save Changes\"></span>\r\n"); WriteLiteralTo(@__razor_helper_writer, " <i class=\"fa fa-check-square fa-lg hidden ajaxSave\" title=\"Save Changes\"></i>" +
"\r\n");
#line 15 "..\..\App_Code\AjaxHelpers.cshtml" #line 13 "..\..\App_Code\AjaxHelpers.cshtml"
#line default #line default
#line hidden #line hidden
@@ -125,23 +125,22 @@ WriteLiteralTo(@__razor_helper_writer, " <span class=\"ajaxHelperIcon ajaxSav
public static System.Web.WebPages.HelperResult AjaxRemove() public static System.Web.WebPages.HelperResult AjaxRemove()
{ {
return new System.Web.WebPages.HelperResult(__razor_helper_writer => { return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
#line 17 "..\..\App_Code\AjaxHelpers.cshtml" #line 15 "..\..\App_Code\AjaxHelpers.cshtml"
Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
#line default #line default
#line hidden #line hidden
WriteLiteralTo(@__razor_helper_writer, " <span class=\"ajaxHelperIcon ajaxRemove\" title=\"Remove\"></span>\r\n"); WriteLiteralTo(@__razor_helper_writer, " <i class=\"fa fa-times-circle fa-lg hidden ajaxRemove\" title=\"Remove\"></i>\r\n");
#line 20 "..\..\App_Code\AjaxHelpers.cshtml" #line 17 "..\..\App_Code\AjaxHelpers.cshtml"
#line default #line default
#line hidden #line hidden
@@ -152,48 +151,48 @@ WriteLiteralTo(@__razor_helper_writer, " <span class=\"ajaxHelperIcon ajaxRem
public static System.Web.WebPages.HelperResult JsonDate(DateTime? date) public static System.Web.WebPages.HelperResult JsonDate(DateTime? date)
{ {
return new System.Web.WebPages.HelperResult(__razor_helper_writer => { return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
#line 22 "..\..\App_Code\AjaxHelpers.cshtml" #line 19 "..\..\App_Code\AjaxHelpers.cshtml"
if (date.HasValue) if (date.HasValue)
{ {
var d = date.Value; var d = date.Value;
#line default #line default
#line hidden #line hidden
#line 26 "..\..\App_Code\AjaxHelpers.cshtml" #line 23 "..\..\App_Code\AjaxHelpers.cshtml"
WriteTo(@__razor_helper_writer, new HtmlString(string.Format("new Date({0}, {1}, {2}, {3}, {4}, {5})", d.Year, d.Month - 1, d.Day, d.Hour, d.Minute, d.Second))); WriteTo(@__razor_helper_writer, new HtmlString(string.Format("new Date({0}, {1}, {2}, {3}, {4}, {5})", d.Year, d.Month - 1, d.Day, d.Hour, d.Minute, d.Second)));
#line default #line default
#line hidden #line hidden
#line 26 "..\..\App_Code\AjaxHelpers.cshtml" #line 23 "..\..\App_Code\AjaxHelpers.cshtml"
} }
else else
{ {
#line default #line default
#line hidden #line hidden
#line 30 "..\..\App_Code\AjaxHelpers.cshtml" #line 27 "..\..\App_Code\AjaxHelpers.cshtml"
WriteTo(@__razor_helper_writer, new HtmlString("null")); WriteTo(@__razor_helper_writer, new HtmlString("null"));
#line default #line default
#line hidden #line hidden
#line 30 "..\..\App_Code\AjaxHelpers.cshtml" #line 27 "..\..\App_Code\AjaxHelpers.cshtml"
} }
#line default #line default
#line hidden #line hidden
Disco.Web/Areas/Config/Views/AuthorizationRole/Show.cshtml
+21 -5
View File
@@ -50,11 +50,11 @@
var displayName = sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id); var displayName = sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id);
<li class="@(sg.IsGroup ? "group" : "user")">@if (sg.IsGroup) <li class="@(sg.IsGroup ? "group" : "user")">@if (sg.IsGroup)
{ {
@displayName <i class="fa fa-users fa-lg"></i>@displayName
} }
else else
{ {
<a href="@(Url.Action(MVC.User.Show(sg.Id)))#UserDetailTab-Authorization">@displayName</a> <a href="@(Url.Action(MVC.User.Show(sg.Id)))#UserDetailTab-Authorization"><i class="fa fa-user fa-lg"></i>@displayName</a>
}</li> }</li>
} }
</ul> </ul>
@@ -67,7 +67,15 @@
<ul id="Config_AuthRoles_Subjects_Update_Dialog_List" class="none"> <ul id="Config_AuthRoles_Subjects_Update_Dialog_List" class="none">
@foreach (var sg in Model.Subjects) @foreach (var sg in Model.Subjects)
{ {
<li class="@(sg.IsGroup ? "group" : "user")" data-subjectid="@sg.Id">@(sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id)) <span class="remove"></span></li> var displayName = sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id);
<li class="@(sg.IsGroup ? "group" : "user")" data-subjectid="@sg.Id">@if (sg.IsGroup)
{
<i class="fa fa-users fa-lg"></i>@displayName
}
else
{
<i class="fa fa-user fa-lg"></i>@displayName
}<i class="fa fa-times-circle remove"></i></li>
} }
</ul> </ul>
</div> </div>
@@ -168,9 +176,17 @@
}).done(function(response){ }).done(function(response){
if (response){ if (response){
if (list.find('li[data-subjectid="'+response.Id+'"]').length == 0){ if (list.find('li[data-subjectid="'+response.Id+'"]').length == 0){
var liIcon = $('<i>').addClass('fa fa-lg');
if (response.Type === 'user')
liIcon.addClass('fa-user');
else
liIcon.addClass('fa-users');
var li = $('<li>') var li = $('<li>')
.append(liIcon)
.append($('<span>').text(response.Id == response.Name ? response.Id : response.Name + ' [' + response.Id + ']')) .append($('<span>').text(response.Id == response.Name ? response.Id : response.Name + ' [' + response.Id + ']'))
.append($('<span>').addClass('remove')) .append($('<i>').addClass('fa fa-times-circle remove'))
.addClass(response.Type) .addClass(response.Type)
.attr('data-subjectid', response.Id) .attr('data-subjectid', response.Id)
.attr('data-subjectstatus', 'new'); .attr('data-subjectstatus', 'new');
@@ -292,7 +308,7 @@
@Html.ActionLinkButton("Delete", MVC.API.AuthorizationRole.Delete(Model.Token.Role.Id, true), "Config_AuthRoles_Actions_Delete_Button") @Html.ActionLinkButton("Delete", MVC.API.AuthorizationRole.Delete(Model.Token.Role.Id, true), "Config_AuthRoles_Actions_Delete_Button")
<div id="Config_AuthRoles_Actions_Delete_Dialog" title="Delete this Authorization Role?"> <div id="Config_AuthRoles_Actions_Delete_Dialog" title="Delete this Authorization Role?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg warning"></i>
This item will be permanently deleted and cannot be recovered.<br /> This item will be permanently deleted and cannot be recovered.<br />
<br /> <br />
Are you sure? Are you sure?
Disco.Web/Areas/Config/Views/AuthorizationRole/Show.generated.cs
+150 -73
View File
@@ -206,20 +206,32 @@ WriteLiteral(">");
#line 51 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 51 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
if (sg.IsGroup) if (sg.IsGroup)
{ {
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-users fa-lg\"");
WriteLiteral("></i>");
#line 53 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
#line default #line default
#line hidden #line hidden
#line 53 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 53 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(displayName); Write(displayName);
#line default #line default
#line hidden #line hidden
#line 53 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 53 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
} }
else else
{ {
@@ -229,22 +241,26 @@ WriteLiteral(">");
#line hidden #line hidden
WriteLiteral(" <a"); WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 2724), Tuple.Create("\"", 2794) WriteAttribute("href", Tuple.Create(" href=\"", 2757), Tuple.Create("\"", 2827)
#line 57 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 57 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
, Tuple.Create(Tuple.Create("", 2731), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.User.Show(sg.Id)) , Tuple.Create(Tuple.Create("", 2764), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.User.Show(sg.Id))
#line default #line default
#line hidden #line hidden
, 2731), false) , 2764), false)
, Tuple.Create(Tuple.Create("", 2766), Tuple.Create("#UserDetailTab-Authorization", 2766), true) , Tuple.Create(Tuple.Create("", 2799), Tuple.Create("#UserDetailTab-Authorization", 2799), true)
); );
WriteLiteral(">"); WriteLiteral("><i");
WriteLiteral(" class=\"fa fa-user fa-lg\"");
WriteLiteral("></i>");
#line 57 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 57 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(displayName); Write(displayName);
#line default #line default
@@ -319,26 +335,27 @@ WriteLiteral(">\r\n");
#line 68 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 68 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
foreach (var sg in Model.Subjects) foreach (var sg in Model.Subjects)
{ {
var displayName = sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id);
#line default #line default
#line hidden #line hidden
WriteLiteral(" <li"); WriteLiteral(" <li");
WriteAttribute("class", Tuple.Create(" class=\"", 3687), Tuple.Create("\"", 3727) WriteAttribute("class", Tuple.Create(" class=\"", 3878), Tuple.Create("\"", 3918)
#line 70 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 71 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
, Tuple.Create(Tuple.Create("", 3695), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user" , Tuple.Create(Tuple.Create("", 3886), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
#line default #line default
#line hidden #line hidden
, 3695), false) , 3886), false)
); );
WriteLiteral(" data-subjectid=\""); WriteLiteral(" data-subjectid=\"");
#line 70 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 71 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(sg.Id); Write(sg.Id);
@@ -349,20 +366,76 @@ WriteLiteral("\"");
WriteLiteral(">"); WriteLiteral(">");
#line 70 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 71 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(sg.Id == sg.Name ? sg.Id : string.Format("{0} [{1}]", sg.Name, sg.Id)); if (sg.IsGroup)
{
#line default #line default
#line hidden #line hidden
WriteLiteral(" <span"); WriteLiteral(" <i");
WriteLiteral(" class=\"remove\""); WriteLiteral(" class=\"fa fa-users fa-lg\"");
WriteLiteral("></span></li>\r\n"); WriteLiteral("></i>");
#line 71 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 73 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
#line default
#line hidden
#line 73 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(displayName);
#line default
#line hidden
#line 73 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
}
else
{
#line default
#line hidden
WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-user fa-lg\"");
WriteLiteral("></i>");
#line 77 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
#line default
#line hidden
#line 77 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(displayName);
#line default
#line hidden
#line 77 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
}
#line default
#line hidden
WriteLiteral("<i");
WriteLiteral(" class=\"fa fa-times-circle remove\"");
WriteLiteral("></i></li>\r\n");
#line 79 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
} }
@@ -391,14 +464,14 @@ WriteLiteral(">Add</a>\r\n </div>\r\n
WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_Form\""); WriteLiteral(" id=\"Config_AuthRoles_Subjects_Update_Dialog_Form\"");
WriteAttribute("action", Tuple.Create(" action=\"", 4386), Tuple.Create("\"", 4483) WriteAttribute("action", Tuple.Create(" action=\"", 5163), Tuple.Create("\"", 5260)
#line 78 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 86 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
, Tuple.Create(Tuple.Create("", 4395), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.AuthorizationRole.UpdateSubjects(Model.Token.Role.Id, null, true)) , Tuple.Create(Tuple.Create("", 5172), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.AuthorizationRole.UpdateSubjects(Model.Token.Role.Id, null, true))
#line default #line default
#line hidden #line hidden
, 4395), false) , 5172), false)
); );
WriteLiteral(" method=\"post\""); WriteLiteral(" method=\"post\"");
@@ -425,7 +498,7 @@ WriteLiteral("></form>\r\n </div>\r\n <scr
"ce: \'"); "ce: \'");
#line 107 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 115 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(Url.Action(MVC.API.AuthorizationRole.SearchSubjects())); Write(Url.Action(MVC.API.AuthorizationRole.SearchSubjects()));
@@ -469,7 +542,7 @@ WriteLiteral("\',\r\n minLength: 2,\r
"\n url: \'"); "\n url: \'");
#line 165 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 173 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(Url.Action(MVC.API.AuthorizationRole.Subject())); Write(Url.Action(MVC.API.AuthorizationRole.Subject()));
@@ -479,42 +552,48 @@ WriteLiteral("\',\r\n method: \'get\',\r\n
" data: { Id: id }\r\n }).done(function(re" + " data: { Id: id }\r\n }).done(function(re" +
"sponse){\r\n if (response){\r\n " + "sponse){\r\n if (response){\r\n " +
" if (list.find(\'li[data-subjectid=\"\'+response.Id+\'\"]\').leng" + " if (list.find(\'li[data-subjectid=\"\'+response.Id+\'\"]\').leng" +
"th == 0){\r\n var li = $(\'<li>\')\r\n " + "th == 0){\r\n \r\n " +
" .append($(\'<span>\').text(response.Id " + " var liIcon = $(\'<i>\').addClass(\'fa fa-lg\');\r\n " +
"== response.Name ? response.Id : response.Name + \' [\' + response.Id + \']\'))\r\n " + " if (response.Type === \'user\')\r\n " +
" .append($(\'<span>\').addClass(\'remo" + " liIcon.addClass(\'fa-user\');\r\n " +
"ve\'))\r\n .addClass(response.Type)\r" + " else\r\n liIc" +
"\n .attr(\'data-subjectid\', respons" + "on.addClass(\'fa-users\');\r\n\r\n var li =" +
"e.Id)\r\n .attr(\'data-subjectstatus" + " $(\'<li>\')\r\n .append(liIcon)\r\n " +
"\', \'new\');\r\n\r\n list.append(li);\r\n\r\n " + " .append($(\'<span>\').text(response.I" +
" updateNoSubjects(); " + "d == response.Name ? response.Id : response.Name + \' [\' + response.Id + \']\'))\r\n" +
" \r\n }else{\r\n " + " .append($(\'<i>\').addClass(\'fa fa" +
" alert(\'That subject has already been added\');" + "-times-circle remove\'))\r\n .addCla" +
"\r\n }\r\n " + "ss(response.Type)\r\n .attr(\'data-s" +
" }else{\r\n alert(\'Unknown Id\');\r\n " + "ubjectid\', response.Id)\r\n .attr(\'" +
" }\r\n }).fail(function(j" + "data-subjectstatus\', \'new\');\r\n\r\n list" +
"qXHR, textStatus, errorThrown){\r\n alert(\'Erro" + ".append(li);\r\n\r\n updateNoSubjects(); " +
"r: \' + errorThrown);\r\n });\r\n " + " \r\n " +
" }\r\n\r\n function updateNoSubjects(){\r\n " + " }else{\r\n alert(\'That subject has alr" +
" if (list.find(\'li:visible\').length > 0)\r\n " + "eady been added\');\r\n }\r\n " +
" noSubjects.hide();\r\n else\r" + " }else{\r\n alert(\'Unknow" +
"\n noSubjects.show();\r\n " + "n Id\');\r\n }\r\n " +
" }\r\n\r\n function saveChanges(){\r\n " + "}).fail(function(jqXHR, textStatus, errorThrown){\r\n " +
" var form = $(\'#Config_AuthRoles_Subjects_Update_Dialog_Form\').emp" + " alert(\'Error: \' + errorThrown);\r\n });\r\n " +
"ty();\r\n\r\n list.find(\'li[data-subjectstatus!=\"remo" + " }\r\n\r\n function updateNoS" +
"ved\"]\').each(function(){\r\n var subjectId = $(" + "ubjects(){\r\n if (list.find(\'li:visible\').length >" +
"this).attr(\'data-subjectid\');\r\n \r\n " + " 0)\r\n noSubjects.hide();\r\n " +
" form.append($(\'<input>\').attr({\r\n " + " else\r\n noSubjects.show();\r\n " +
" \'name\': \'Subjects\',\r\n \'" + " }\r\n\r\n function saveChanges(){\r" +
"type\': \'hidden\'\r\n }).val(subjectId));\r\n\r\n " + "\n var form = $(\'#Config_AuthRoles_Subjects_Update" +
" }).get();\r\n\r\n form.su" + "_Dialog_Form\').empty();\r\n\r\n list.find(\'li[data-su" +
"bmit();\r\n\r\n dialog.dialog(\"disable\");\r\n " + "bjectstatus!=\"removed\"]\').each(function(){\r\n " +
" dialog.dialog(\"option\", \"buttons\", null);\r\n " + "var subjectId = $(this).attr(\'data-subjectid\');\r\n " +
" }\r\n\r\n $(function(){\r\n " + " \r\n form.append($(\'<input>\').attr({\r\n " +
" $(\'#Config_AuthRoles_Subjects_Update\').click(showDialog);\r\n " + " \'name\': \'Subjects\',\r\n " +
" });\r\n\r\n })();\r\n </" + " \'type\': \'hidden\'\r\n }).val(su" +
"script>\r\n </div>\r\n </td>\r\n </tr>\r\n <tr>\r" + "bjectId));\r\n\r\n }).get();\r\n\r\n " +
"\n <td"); " form.submit();\r\n\r\n dialog.dialog(\"disa" +
"ble\");\r\n dialog.dialog(\"option\", \"buttons\", null)" +
";\r\n }\r\n\r\n $(function(){\r\n " +
" $(\'#Config_AuthRoles_Subjects_Update\').click(show" +
"Dialog);\r\n });\r\n\r\n })();\r\n " +
" </script>\r\n </div>\r\n </td>\r\n </" +
"tr>\r\n <tr>\r\n <td");
WriteLiteral(" colspan=\"2\""); WriteLiteral(" colspan=\"2\"");
@@ -533,7 +612,7 @@ WriteLiteral(" class=\"button small disabled\"");
WriteLiteral(">Save Changes</a>"); WriteLiteral(">Save Changes</a>");
#line 232 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 248 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(AjaxHelpers.AjaxLoader()); Write(AjaxHelpers.AjaxLoader());
@@ -543,7 +622,7 @@ WriteLiteral("\r\n </div>\r\n <script>\r\n
"(){\r\n var claimNodes = "); "(){\r\n var claimNodes = ");
#line 236 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 252 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(new HtmlString(Newtonsoft.Json.JsonConvert.SerializeObject(Model.ClaimNavigatorFancyTreeNodes))); Write(new HtmlString(Newtonsoft.Json.JsonConvert.SerializeObject(Model.ClaimNavigatorFancyTreeNodes)));
@@ -582,7 +661,7 @@ WriteLiteral(@";
url: '"); url: '");
#line 266 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 282 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(Url.Action(MVC.API.AuthorizationRole.UpdateClaims(Model.Token.Role.Id))); Write(Url.Action(MVC.API.AuthorizationRole.UpdateClaims(Model.Token.Role.Id)));
@@ -622,7 +701,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 292 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml" #line 308 "..\..\Areas\Config\Views\AuthorizationRole\Show.cshtml"
Write(Html.ActionLinkButton("Delete", MVC.API.AuthorizationRole.Delete(Model.Token.Role.Id, true), "Config_AuthRoles_Actions_Delete_Button")); Write(Html.ActionLinkButton("Delete", MVC.API.AuthorizationRole.Delete(Model.Token.Role.Id, true), "Config_AuthRoles_Actions_Delete_Button"));
@@ -634,15 +713,13 @@ WriteLiteral(" id=\"Config_AuthRoles_Actions_Delete_Dialog\"");
WriteLiteral(" title=\"Delete this Authorization Role?\""); WriteLiteral(" title=\"Delete this Authorization Role?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg warning\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>\r\n This item will be permanently deleted and cannot be recovered." +
"<br />\r\n <br />\r\n Are you sure?\r\n </p>\r\n </div>\r" +
WriteLiteral("></span>\r\n This item will be permanently deleted and cannot be recover" + "\n <script");
"ed.<br />\r\n <br />\r\n Are you sure?\r\n </p>\r\n </di" +
"v>\r\n <script");
WriteLiteral(" type=\"text/javascript\""); WriteLiteral(" type=\"text/javascript\"");
Disco.Web/Areas/Config/Views/Config/Index.cshtml
+4 -3
View File
@@ -124,8 +124,9 @@
if (Model.UpdateAvailable) if (Model.UpdateAvailable)
{ {
<div id="updateAvailableContainer"> <div id="updateAvailableContainer">
<i class="fa fa-cloud-download info"></i>
<div>An updated version of Disco is available</div> <div>An updated version of Disco is available</div>
<a href="@Model.UpdateResponse.UrlLink" target="_blank">Download Disco v@(Model.UpdateResponse.Version)</a> <a href="@Model.UpdateResponse.UrlLink" class="button small alert" target="_blank">Download v@(Model.UpdateResponse.Version)</a>
</div> </div>
<script> <script>
(function () { (function () {
@@ -134,10 +135,10 @@
var updateAvailableContainer = $('#updateAvailableContainer'); var updateAvailableContainer = $('#updateAvailableContainer');
updateAvailableContainer.appendTo(layout_PageHeading); updateAvailableContainer.appendTo(layout_PageHeading);
@{ @{
if (Model.UpdateResponse.VersionReleasedTimestamp < DateTime.Now.AddDays(-7)) if (Model.UpdateResponse.VersionReleasedTimestamp < DateTime.Now.AddDays(-14))
{ {
<text> <text>
updateAvailableContainer.effect("shake", { times: 3 }, 100); updateAvailableContainer.effect("shake", { times: 3 }, 500);
</text> </text>
} }
} }
Disco.Web/Areas/Config/Views/Config/Index.generated.cs
+20 -14
View File
@@ -776,25 +776,31 @@ WriteLiteral(" <div");
WriteLiteral(" id=\"updateAvailableContainer\""); WriteLiteral(" id=\"updateAvailableContainer\"");
WriteLiteral(">\r\n <div>An updated version of Disco is available</div>\r\n <a"); WriteLiteral(">\r\n <i");
WriteAttribute("href", Tuple.Create(" href=\"", 6601), Tuple.Create("\"", 6637) WriteLiteral(" class=\"fa fa-cloud-download info\"");
WriteLiteral("></i>\r\n <div>An updated version of Disco is available</div>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 6652), Tuple.Create("\"", 6688)
#line 128 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 129 "..\..\Areas\Config\Views\Config\Index.cshtml"
, Tuple.Create(Tuple.Create("", 6608), Tuple.Create<System.Object, System.Int32>(Model.UpdateResponse.UrlLink , Tuple.Create(Tuple.Create("", 6659), Tuple.Create<System.Object, System.Int32>(Model.UpdateResponse.UrlLink
#line default #line default
#line hidden #line hidden
, 6608), false) , 6659), false)
); );
WriteLiteral(" class=\"button small alert\"");
WriteLiteral(" target=\"_blank\""); WriteLiteral(" target=\"_blank\"");
WriteLiteral(">Download Disco v"); WriteLiteral(">Download v");
#line 128 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 129 "..\..\Areas\Config\Views\Config\Index.cshtml"
Write(Model.UpdateResponse.Version); Write(Model.UpdateResponse.Version);
#line default #line default
@@ -810,15 +816,15 @@ WriteLiteral(@" <script>
"); ");
#line 136 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 137 "..\..\Areas\Config\Views\Config\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 136 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 137 "..\..\Areas\Config\Views\Config\Index.cshtml"
if (Model.UpdateResponse.VersionReleasedTimestamp < DateTime.Now.AddDays(-7)) if (Model.UpdateResponse.VersionReleasedTimestamp < DateTime.Now.AddDays(-14))
{ {
@@ -826,13 +832,13 @@ WriteLiteral(@" <script>
#line hidden #line hidden
WriteLiteral(" "); WriteLiteral(" ");
WriteLiteral("\r\n updateAvailableContainer.effect(\"shake\", { times: 3 }, 100);\r\n " + WriteLiteral("\r\n updateAvailableContainer.effect(\"shake\", { times: 3 }, 500);\r\n " +
" "); " ");
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 142 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 143 "..\..\Areas\Config\Views\Config\Index.cshtml"
} }
@@ -841,7 +847,7 @@ WriteLiteral("\r\n");
WriteLiteral("\r\n });\r\n })();\r\n </script>\r\n"); WriteLiteral("\r\n });\r\n })();\r\n </script>\r\n");
#line 147 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 148 "..\..\Areas\Config\Views\Config\Index.cshtml"
} }
Disco.Web/Areas/Config/Views/DeviceBatch/Show.cshtml
+1 -1
View File
@@ -134,7 +134,7 @@
{ {
var missingCount = Model.DeviceBatch.UnitQuantity.Value - Model.DeviceCount; var missingCount = Model.DeviceBatch.UnitQuantity.Value - Model.DeviceCount;
<div style="padding: 0.7em 0.7em; margin-top: 20px;" class="ui-state-highlight ui-corner-all"> <div style="padding: 0.7em 0.7em; margin-top: 20px;" class="ui-state-highlight ui-corner-all">
<span style="margin-right: 0.3em; float: left;" class="ui-icon ui-icon-alert"></span> <i class="fa fa-info-circle information"></i>
@Model.DeviceCount.ToString("n0") of @(Model.DeviceBatch.UnitQuantity.Value.ToString("n0")) purchased devices are managed by Disco. <strong>@missingCount.ToString("n0") @(missingCount == 1 ? "is" : "are") not managed</strong>. @Model.DeviceCount.ToString("n0") of @(Model.DeviceBatch.UnitQuantity.Value.ToString("n0")) purchased devices are managed by Disco. <strong>@missingCount.ToString("n0") @(missingCount == 1 ? "is" : "are") not managed</strong>.
</div> </div>
} }
Disco.Web/Areas/Config/Views/DeviceBatch/Show.generated.cs
+3 -5
View File
@@ -504,13 +504,11 @@ WriteLiteral(" style=\"padding: 0.7em 0.7em; margin-top: 20px;\"");
WriteLiteral(" class=\"ui-state-highlight ui-corner-all\""); WriteLiteral(" class=\"ui-state-highlight ui-corner-all\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <i");
WriteLiteral(" style=\"margin-right: 0.3em; float: left;\""); WriteLiteral(" class=\"fa fa-info-circle information\"");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral("></i>\r\n");
WriteLiteral("></span>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.cshtml
+11 -8
View File
@@ -29,10 +29,13 @@
<input type="text" class="cost" value="@item.Cost.ToString("C")" /> <input type="text" class="cost" value="@item.Cost.ToString("C")" />
</td> </td>
<td> <td>
<span class="edit@(item.JobSubTypes.Count > 0 ? " editAlert" : string.Empty)"></span> <span class="fa-stack edit">
<i class="fa fa-list-alt fa-stack-2x"></i>
<i class="fa fa-asterisk fa-stack-1x@(item.JobSubTypes.Count == 0 ? " hidden" : string.Empty)"></i>
</span>
</td> </td>
<td> <td>
<span class="remove"></span> <i class="fa fa-times-circle remove"></i>
</td> </td>
</tr> </tr>
} }
@@ -47,7 +50,7 @@
var $deviceComponents = $('#deviceComponents'); var $deviceComponents = $('#deviceComponents');
$('#addDeviceComponent').click(function () { $('#addDeviceComponent').click(function () {
var dc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="edit"></span></td><td><span class="remove"></span></td></tr>'); var dc = $('<tr><td><input type="text" class="description" /></td><td><input type="text" class="cost" /></td><td><span class="fa-stack edit"><i class="fa fa-list-alt fa-stack-2x"></i><i class="fa fa-asterisk fa-stack-1x hidden"></i></span></td><td><i class="fa fa-times-circle remove"></i></td></tr>');
dc.find('input').focus(function () { $(this).select() }) dc.find('input').focus(function () { $(this).select() })
dc.insertBefore($deviceComponents.find('tr').last()); dc.insertBefore($deviceComponents.find('tr').last());
dc.find('input.description').focus(); dc.find('input.description').focus();
@@ -57,8 +60,8 @@
$deviceComponents.on('change', 'input', updateComponent); $deviceComponents.on('change', 'input', updateComponent);
$deviceComponents.on('focus', 'input', function () { $(this).select(); }); $deviceComponents.on('focus', 'input', function () { $(this).select(); });
$deviceComponents.on('click', 'span.remove', removeComponent); $deviceComponents.on('click', '.remove', removeComponent);
$deviceComponents.on('click', 'span.edit', editComponentJobTypes); $deviceComponents.on('click', '.edit', editComponentJobTypes);
function removeComponentConfirmed(id, row) { function removeComponentConfirmed(id, row) {
var data = { id: id }; var data = { id: id };
@@ -194,9 +197,9 @@
success: function (d) { success: function (d) {
if (d.Result == 'OK') { if (d.Result == 'OK') {
if (d.Component.JobSubTypes.length > 0) { if (d.Component.JobSubTypes.length > 0) {
edit$this.addClass('editAlert'); edit$this.find('.fa-asterisk').removeClass('hidden');
} else { } else {
edit$this.removeClass('editAlert'); edit$this.find('.fa-asterisk').addClass('hidden');
} }
$dialogUpdateJobTypes.dialog("enable"); $dialogUpdateJobTypes.dialog("enable");
$dialogUpdateJobTypes.dialog("close"); $dialogUpdateJobTypes.dialog("close");
@@ -266,7 +269,7 @@
</div> </div>
<div id="dialogConfirmRemove" title="Delete this Component?"> <div id="dialogConfirmRemove" title="Delete this Component?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg warning"></i>
This item will be permanently deleted and cannot be recovered. Are you sure? This item will be permanently deleted and cannot be recovered. Are you sure?
</p> </p>
</div> </div>
Disco.Web/Areas/Config/Views/DeviceModel/_DeviceComponentsTable.generated.cs
+85 -75
View File
@@ -149,25 +149,36 @@ WriteAttribute("value", Tuple.Create(" value=\"", 1010), Tuple.Create("\"", 1042
WriteLiteral(" />\r\n </td>\r\n <td>\r\n <span"); WriteLiteral(" />\r\n </td>\r\n <td>\r\n <span");
WriteAttribute("class", Tuple.Create(" class=\"", 1118), Tuple.Create("\"", 1189) WriteLiteral(" class=\"fa-stack edit\"");
, Tuple.Create(Tuple.Create("", 1126), Tuple.Create("edit", 1126), true)
WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-list-alt fa-stack-2x\"");
WriteLiteral("></i>\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 1237), Tuple.Create("\"", 1328)
, Tuple.Create(Tuple.Create("", 1245), Tuple.Create("fa", 1245), true)
, Tuple.Create(Tuple.Create(" ", 1247), Tuple.Create("fa-asterisk", 1248), true)
, Tuple.Create(Tuple.Create(" ", 1259), Tuple.Create("fa-stack-1x", 1260), true)
#line 32 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 34 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
, Tuple.Create(Tuple.Create("", 1130), Tuple.Create<System.Object, System.Int32>(item.JobSubTypes.Count > 0 ? " editAlert" : string.Empty , Tuple.Create(Tuple.Create("", 1271), Tuple.Create<System.Object, System.Int32>(item.JobSubTypes.Count == 0 ? " hidden" : string.Empty
#line default #line default
#line hidden #line hidden
, 1130), false) , 1271), false)
); );
WriteLiteral("></span>\r\n </td>\r\n <td>\r\n <span"); WriteLiteral("></i>\r\n </span>\r\n </td>\r\n <td>\r\n" +
" <i");
WriteLiteral(" class=\"remove\""); WriteLiteral(" class=\"fa fa-times-circle remove\"");
WriteLiteral("></span>\r\n </td>\r\n </tr>\r\n"); WriteLiteral("></i>\r\n </td>\r\n </tr>\r\n");
#line 38 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 41 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
} }
@@ -194,7 +205,7 @@ WriteLiteral(@">
var $deviceComponents = $('#deviceComponents'); var $deviceComponents = $('#deviceComponents');
$('#addDeviceComponent').click(function () { $('#addDeviceComponent').click(function () {
var dc = $('<tr><td><input type=""text"" class=""description"" /></td><td><input type=""text"" class=""cost"" /></td><td><span class=""edit""></span></td><td><span class=""remove""></span></td></tr>'); var dc = $('<tr><td><input type=""text"" class=""description"" /></td><td><input type=""text"" class=""cost"" /></td><td><span class=""fa-stack edit""><i class=""fa fa-list-alt fa-stack-2x""></i><i class=""fa fa-asterisk fa-stack-1x hidden""></i></span></td><td><i class=""fa fa-times-circle remove""></i></td></tr>');
dc.find('input').focus(function () { $(this).select() }) dc.find('input').focus(function () { $(this).select() })
dc.insertBefore($deviceComponents.find('tr').last()); dc.insertBefore($deviceComponents.find('tr').last());
dc.find('input.description').focus(); dc.find('input.description').focus();
@@ -204,8 +215,8 @@ WriteLiteral(@">
$deviceComponents.on('change', 'input', updateComponent); $deviceComponents.on('change', 'input', updateComponent);
$deviceComponents.on('focus', 'input', function () { $(this).select(); }); $deviceComponents.on('focus', 'input', function () { $(this).select(); });
$deviceComponents.on('click', 'span.remove', removeComponent); $deviceComponents.on('click', '.remove', removeComponent);
$deviceComponents.on('click', 'span.edit', editComponentJobTypes); $deviceComponents.on('click', '.edit', editComponentJobTypes);
function removeComponentConfirmed(id, row) { function removeComponentConfirmed(id, row) {
var data = { id: id }; var data = { id: id };
@@ -213,7 +224,7 @@ WriteLiteral(@">
url: '"); url: '");
#line 66 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 69 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(Url.Action(MVC.API.DeviceModel.ComponentRemove())); Write(Url.Action(MVC.API.DeviceModel.ComponentRemove()));
@@ -245,7 +256,7 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
" };\r\n $.ajax({\r\n url: \'"); " };\r\n $.ajax({\r\n url: \'");
#line 108 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 111 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(Url.Action(MVC.API.DeviceModel.ComponentUpdate())); Write(Url.Action(MVC.API.DeviceModel.ComponentUpdate()));
@@ -280,7 +291,7 @@ WriteLiteral(@"',
url: '"); url: '");
#line 134 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 137 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(Url.Action(MVC.API.DeviceModel.ComponentAdd(null, null, null))); Write(Url.Action(MVC.API.DeviceModel.ComponentAdd(null, null, null)));
@@ -320,7 +331,7 @@ WriteLiteral(@"',
url: '"); url: '");
#line 165 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 168 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(Url.Action(MVC.API.DeviceModel.Component())); Write(Url.Action(MVC.API.DeviceModel.Component()));
@@ -349,7 +360,7 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
" $.ajax({\r\n url: \'"); " $.ajax({\r\n url: \'");
#line 189 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 192 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(Url.Action(MVC.API.DeviceModel.ComponentUpdateJobSubTypes())); Write(Url.Action(MVC.API.DeviceModel.ComponentUpdateJobSubTypes()));
@@ -361,40 +372,41 @@ WriteLiteral("\',\r\n dataType: \'json\',
" success: function (d) {\r\n " + " success: function (d) {\r\n " +
" if (d.Result == \'OK\') {\r\n " + " if (d.Result == \'OK\') {\r\n " +
" if (d.Component.JobSubTypes.length > 0) {\r\n " + " if (d.Component.JobSubTypes.length > 0) {\r\n " +
" edit$this.addClass(\'editAlert\');\r\n " + " edit$this.find(\'.fa-asterisk\').removeClass(\'hidden\');" +
" } else {\r\n " + "\r\n } else {\r\n " +
" edit$this.removeClass(\'editAlert\');\r\n " + " edit$this.find(\'.fa-asterisk\').addClass(\'hidden\'" +
" }\r\n $dialogUpdate" + ");\r\n }\r\n " +
"JobTypes.dialog(\"enable\");\r\n $dia" + " $dialogUpdateJobTypes.dialog(\"enable\");\r\n " +
"logUpdateJobTypes.dialog(\"close\");\r\n " + " $dialogUpdateJobTypes.dialog(\"close\");\r\n " +
"} else {\r\n alert(\'Unable to updat" + " } else {\r\n " +
"e component sub types: \' + d.Result);\r\n " + " alert(\'Unable to update component sub types: \' + d.Result);\r\n " +
" }\r\n },\r\n " + " }\r\n " +
" error: function (jqXHR, textStatus, errorThrown) {\r\n " + " },\r\n error: function (jqXHR, textStatus" +
" alert(\'Unable to update component sub types: \' + textS" + ", errorThrown) {\r\n alert(\'Unable to u" +
"tatus);\r\n }\r\n " + "pdate component sub types: \' + textStatus);\r\n " +
" });\r\n };\r\n " + " }\r\n });\r\n " +
" var buttons = $dialogUpdateJobTypes.dialog(\"option\", \"buttons\", buttons);\r\n " + " };\r\n var buttons = $dialogUpdateJobTypes.dialog(" +
" $dialogUpdateJobTypes.dialog(\'open\');\r\n " + "\"option\", \"buttons\", buttons);\r\n $dialogUpdateJob" +
" } else {\r\n alert(\'Unable to load c" + "Types.dialog(\'open\');\r\n } else {\r\n " +
"omponent: \' + d.Result);\r\n }\r\n " + " alert(\'Unable to load component: \' + d.Result);\r\n " +
" },\r\n error: function (jqXHR, textStatus, errorThrown) {\r" + " }\r\n },\r\n error: function" +
"\n alert(\'Unable to load component: \' + textStatus);\r\n" + " (jqXHR, textStatus, errorThrown) {\r\n alert(\'Unable t" +
" }\r\n });\r\n }\r\n\r\n " + "o load component: \' + textStatus);\r\n }\r\n " +
" }\r\n\r\n $(\"#dialogConfirmRemove\").dialog({\r\n resiza" + " });\r\n }\r\n\r\n }\r\n\r\n $(\"#dialogConfirmRemov" +
"ble: false,\r\n height: 140,\r\n modal: true,\r\n " + "e\").dialog({\r\n resizable: false,\r\n height: 140,\r\n " +
" autoOpen: false,\r\n buttons: {\r\n \"Remo" + " modal: true,\r\n autoOpen: false,\r\n b" +
"ve\": function () {\r\n $(this).dialog(\"close\");\r\n " + "uttons: {\r\n \"Remove\": function () {\r\n " +
" },\r\n Cancel: function () {\r\n " + "$(this).dialog(\"close\");\r\n },\r\n Cancel: fu" +
" $(this).dialog(\"close\");\r\n }\r\n }\r\n " + "nction () {\r\n $(this).dialog(\"close\");\r\n " +
" });\r\n\r\n $(\'#dialogUpdateJobTypes\').dialog({\r\n resizab" + " }\r\n }\r\n });\r\n\r\n $(\'#dialogUpdateJobTypes" +
"le: false,\r\n modal: true,\r\n autoOpen: false,\r\n " + "\').dialog({\r\n resizable: false,\r\n modal: true,\r\n " +
" width: 550,\r\n buttons: {\r\n \"Save\":" + " autoOpen: false,\r\n width: 550,\r\n but" +
" function () {\r\n $(this).dialog(\"close\");\r\n " + "tons: {\r\n \"Save\": function () {\r\n $(th" +
" },\r\n Cancel: function () {\r\n $(t" + "is).dialog(\"close\");\r\n },\r\n Cancel: functi" +
"his).dialog(\"close\");\r\n }\r\n }\r\n });" + "on () {\r\n $(this).dialog(\"close\");\r\n }" +
"\r\n\r\n $(\'#CheckboxBulkSelect_dialogUpdateJobTypes\').checkboxBulkSelect" + "\r\n }\r\n });\r\n\r\n $(\'#CheckboxBulkSelect_dialo" +
"({ parentSelector: \'div\' });\r\n });\r\n </script>\r\n"); "gUpdateJobTypes\').checkboxBulkSelect({ parentSelector: \'div\' });\r\n });\r\n " +
" </script>\r\n");
WriteLiteral(" <div"); WriteLiteral(" <div");
@@ -407,7 +419,7 @@ WriteLiteral(">\r\n <div>\r\n <h2>Hardware Non-Warranty Job Ty
WriteLiteral(" "); WriteLiteral(" ");
#line 262 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 265 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2)); Write(CommonHelpers.CheckBoxList("SubTypes", Model.JobSubTypes.ToSelectListItems(), 2));
@@ -427,17 +439,15 @@ WriteLiteral(" id=\"dialogConfirmRemove\"");
WriteLiteral(" title=\"Delete this Component?\""); WriteLiteral(" title=\"Delete this Component?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg warning\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>\r\n This item will be permanently deleted and cannot be recovered." +
" Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n This item will be permanently deleted and cannot be recover" +
"ed. Are you sure?\r\n </p>\r\n </div>\r\n");
#line 273 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 276 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
} }
else else
{ {
@@ -452,7 +462,7 @@ WriteLiteral(" id=\"deviceComponents\"");
WriteLiteral(" data-devicemodelid=\""); WriteLiteral(" data-devicemodelid=\"");
#line 276 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 279 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(Model.DeviceModelId.HasValue ? Model.DeviceModelId.Value.ToString() : string.Empty); Write(Model.DeviceModelId.HasValue ? Model.DeviceModelId.Value.ToString() : string.Empty);
@@ -465,13 +475,13 @@ WriteLiteral(">\r\n <tr>\r\n <th>Description\r\n </
"/tr>\r\n"); "/tr>\r\n");
#line 285 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 288 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 285 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 288 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
foreach (var item in Model.DeviceComponents) foreach (var item in Model.DeviceComponents)
{ {
@@ -483,7 +493,7 @@ WriteLiteral(" <tr");
WriteLiteral(" data-devicecomponentid=\""); WriteLiteral(" data-devicecomponentid=\"");
#line 287 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 290 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(item.Id); Write(item.Id);
@@ -496,7 +506,7 @@ WriteLiteral(">\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 289 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 292 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(item.Description); Write(item.Description);
@@ -507,7 +517,7 @@ WriteLiteral("\r\n </td>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 292 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 295 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(item.Cost.ToString("C")); Write(item.Cost.ToString("C"));
@@ -516,13 +526,13 @@ WriteLiteral(" ");
WriteLiteral("\r\n </td>\r\n <td>\r\n"); WriteLiteral("\r\n </td>\r\n <td>\r\n");
#line 295 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 298 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 295 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 298 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
if (item.JobSubTypes.Count > 0) if (item.JobSubTypes.Count > 0)
{ {
@@ -532,13 +542,13 @@ WriteLiteral("\r\n </td>\r\n <td>\r\n");
WriteLiteral(" <ul>\r\n"); WriteLiteral(" <ul>\r\n");
#line 298 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 301 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
#line default #line default
#line hidden #line hidden
#line 298 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 301 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
foreach (var jst in item.JobSubTypes) foreach (var jst in item.JobSubTypes)
{ {
@@ -548,7 +558,7 @@ WriteLiteral(" <ul>\r\n");
WriteLiteral(" <li>"); WriteLiteral(" <li>");
#line 300 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 303 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
Write(jst.Description); Write(jst.Description);
@@ -557,7 +567,7 @@ WriteLiteral(" <li>");
WriteLiteral("</li>\r\n"); WriteLiteral("</li>\r\n");
#line 301 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 304 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
} }
@@ -566,7 +576,7 @@ WriteLiteral("</li>\r\n");
WriteLiteral(" </ul>\r\n"); WriteLiteral(" </ul>\r\n");
#line 303 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 306 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
} }
else else
{ {
@@ -581,7 +591,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">&lt;None Specified&gt;</span>\r\n"); WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
#line 307 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 310 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
} }
@@ -590,7 +600,7 @@ WriteLiteral(">&lt;None Specified&gt;</span>\r\n");
WriteLiteral(" </td>\r\n </tr>\r\n"); WriteLiteral(" </td>\r\n </tr>\r\n");
#line 310 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 313 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
} }
@@ -599,7 +609,7 @@ WriteLiteral(" </td>\r\n </tr>\r\n");
WriteLiteral(" </table>\r\n"); WriteLiteral(" </table>\r\n");
#line 312 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml" #line 315 "..\..\Areas\Config\Views\DeviceModel\_DeviceComponentsTable.cshtml"
} }
#line default #line default
Disco.Web/Areas/Config/Views/DeviceProfile/Show.cshtml
+1 -1
View File
@@ -693,7 +693,7 @@
{ {
<div id="dialogConfirmDelete" title="Delete this Device Profile?"> <div id="dialogConfirmDelete" title="Delete this Device Profile?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg warning"></i>
This item will be permanently deleted and cannot be recovered. Are you sure? This item will be permanently deleted and cannot be recovered. Are you sure?
</p> </p>
</div> </div>
Disco.Web/Areas/Config/Views/DeviceProfile/Show.generated.cs
+4 -6
View File
@@ -1950,14 +1950,12 @@ WriteLiteral(" id=\"dialogConfirmDelete\"");
WriteLiteral(" title=\"Delete this Device Profile?\""); WriteLiteral(" title=\"Delete this Device Profile?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg warning\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>\r\n This item will be permanently deleted and cannot be recovered." +
" Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n This item will be permanently deleted and cannot be recover" +
"ed. Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral(" <script"); WriteLiteral(" <script");
Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml
+1 -3
View File
@@ -70,8 +70,7 @@
<table class="logEventsViewport" data-bind="visible: messages().length > 0" style="display: none"> <table class="logEventsViewport" data-bind="visible: messages().length > 0" style="display: none">
<tbody data-bind="foreach: messages"> <tbody data-bind="foreach: messages">
<tr> <tr>
<td class="icon" data-bind="attr: { title: FormattedTimestamp }, css: { information: EventTypeSeverity == 0, warning: EventTypeSeverity == 1, error: EventTypeSeverity == 2 }">&nbsp; <td class="icon"><i class="fa" data-bind="css: { 'fa-info-circle': EventTypeSeverity == 0, 'fa-exclamation-triangle': EventTypeSeverity == 1, 'fa-exclamation-circle': EventTypeSeverity == 2 }"></i></td>
</td>
<td class="message" data-bind="text: FormattedMessage, attr: { title: EventTypeName }"></td> <td class="message" data-bind="text: FormattedMessage, attr: { title: EventTypeName }"></td>
</tr> </tr>
</tbody> </tbody>
@@ -107,7 +106,6 @@
var urlPageThumbnail = '@(Url.Action(MVC.API.DocumentTemplate.ImporterThumbnail()))/' var urlPageThumbnail = '@(Url.Action(MVC.API.DocumentTemplate.ImporterThumbnail()))/'
var urlDocumentTemplate = '@(Url.Action(MVC.Config.DocumentTemplate.Index()))/'; var urlDocumentTemplate = '@(Url.Action(MVC.Config.DocumentTemplate.Index()))/';
var urlManuallyAssign = '@(Url.Action(MVC.Config.DocumentTemplate.UndetectedPages()))'; var urlManuallyAssign = '@(Url.Action(MVC.Config.DocumentTemplate.UndetectedPages()))';
var iconErrorUrl = 'url(@(Links.ClientSource.Style.Images.Status.fail32_png))';
var isLive = false; var isLive = false;
function pageViewModel() { function pageViewModel() {
Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.generated.cs
+117 -122
View File
@@ -227,11 +227,15 @@ WriteLiteral(">\r\n <tr>\r\n
WriteLiteral(" class=\"icon\""); WriteLiteral(" class=\"icon\"");
WriteLiteral(" data-bind=\"attr: { title: FormattedTimestamp }, css: { information: EventTypeSev" + WriteLiteral("><i");
"erity == 0, warning: EventTypeSeverity == 1, error: EventTypeSeverity == 2 }\"");
WriteLiteral(">&nbsp;\r\n </td>\r\n <" + WriteLiteral(" class=\"fa\"");
"td");
WriteLiteral(" data-bind=\"css: { \'fa-info-circle\': EventTypeSeverity == 0, \'fa-exclamation-tria" +
"ngle\': EventTypeSeverity == 1, \'fa-exclamation-circle\': EventTypeSeverity == 2 }" +
"\"");
WriteLiteral("></i></td>\r\n <td");
WriteLiteral(" class=\"message\""); WriteLiteral(" class=\"message\"");
@@ -266,7 +270,7 @@ WriteLiteral(">\r\n $(function () {\r\n var vm;\r\n var host =
" var urlDeviceShow = \'"); " var urlDeviceShow = \'");
#line 104 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 103 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Url.Action(MVC.Device.Show())); Write(Url.Action(MVC.Device.Show()));
@@ -275,7 +279,7 @@ WriteLiteral(">\r\n $(function () {\r\n var vm;\r\n var host =
WriteLiteral("/\'\r\n var urlJobShow = \'"); WriteLiteral("/\'\r\n var urlJobShow = \'");
#line 105 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 104 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Url.Action(MVC.Job.Show())); Write(Url.Action(MVC.Job.Show()));
@@ -284,7 +288,7 @@ WriteLiteral("/\'\r\n var urlJobShow = \'");
WriteLiteral("/\'\r\n var urlUserShow = \'"); WriteLiteral("/\'\r\n var urlUserShow = \'");
#line 106 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 105 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Url.Action(MVC.User.Show())); Write(Url.Action(MVC.User.Show()));
@@ -293,7 +297,7 @@ WriteLiteral("/\'\r\n var urlUserShow = \'");
WriteLiteral("/\'\r\n var urlPageThumbnail = \'"); WriteLiteral("/\'\r\n var urlPageThumbnail = \'");
#line 107 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 106 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Url.Action(MVC.API.DocumentTemplate.ImporterThumbnail())); Write(Url.Action(MVC.API.DocumentTemplate.ImporterThumbnail()));
@@ -302,7 +306,7 @@ WriteLiteral("/\'\r\n var urlPageThumbnail = \'");
WriteLiteral("/\'\r\n var urlDocumentTemplate = \'"); WriteLiteral("/\'\r\n var urlDocumentTemplate = \'");
#line 108 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 107 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Url.Action(MVC.Config.DocumentTemplate.Index())); Write(Url.Action(MVC.Config.DocumentTemplate.Index()));
@@ -311,124 +315,115 @@ WriteLiteral("/\'\r\n var urlDocumentTemplate = \'");
WriteLiteral("/\';\r\n var urlManuallyAssign = \'"); WriteLiteral("/\';\r\n var urlManuallyAssign = \'");
#line 109 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 108 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Url.Action(MVC.Config.DocumentTemplate.UndetectedPages())); Write(Url.Action(MVC.Config.DocumentTemplate.UndetectedPages()));
#line default #line default
#line hidden #line hidden
WriteLiteral("\';\r\n var iconErrorUrl = \'url("); WriteLiteral("\';\r\n var isLive = false;\r\n\r\n function pageViewModel() {\r\n " +
" var self = this;\r\n\r\n self.noSessions = ko.observable(true);\r\n " +
" self.sessions = ko.observableArray();\r\n self.sessionIndex = {};" +
"\r\n\r\n self.sessionRendered = function (e, d) {\r\n if (!d" +
".sessionEnded()) {\r\n d.progressbar = $(e).find(\'.sessionProgr" +
"ess\').progressbar();\r\n }\r\n };\r\n }\r\n func" +
"tion sessionViewModel(id) {\r\n var self = this;\r\n\r\n self.ti" +
"tle = ko.observable(id);\r\n self.messages = ko.observableArray();\r\n " +
" self.progressStatus = ko.observable();\r\n self.progressValue " +
"= ko.observable();\r\n self.startTime = ko.observable();\r\n s" +
"elf.sessionEnded = ko.observable(false);\r\n\r\n self.sessionPages = ko.o" +
"bservableArray();\r\n self.sessionPagesIndex = {};\r\n self.ad" +
"dSessionPage = function (sessionPage) {\r\n //if (isLive) {\r\n " +
" self.sessionPages.push(sessionPage);\r\n self.sessionPage" +
"sIndex[sessionPage.pageNumber] = sessionPage;\r\n //}\r\n " +
"}\r\n }\r\n function sessionPageViewModel(sessionId, pageNumber) {\r\n " +
" var self = this;\r\n\r\n self.sessionId = sessionId;\r\n " +
" self.pageNumber = pageNumber;\r\n self.title = \'Page \' + pageNumber;" +
"\r\n self.progressStatus = ko.observable();\r\n self.progressV" +
"alue = ko.observable();\r\n self.undetected = ko.observable(false);\r\n " +
" self.detected = ko.observable(false);\r\n self.documentTempla" +
"teId = ko.observable();\r\n self.documentTemplate = ko.observable();\r\n " +
" self.assignedDataType = ko.observable();\r\n self.assignedDa" +
"taId = ko.observable();\r\n self.assignedData = ko.observable();\r\n " +
" self.thumbnailEnabled = ko.observable(0);\r\n self.updateThumbna" +
"il = function () {\r\n self.thumbnailEnabled(self.thumbnailEnabled(" +
") + 1);\r\n }\r\n self.documentTemplateUrl = ko.computed(funct" +
"ion () {\r\n return urlDocumentTemplate + self.documentTemplateId()" +
";\r\n });\r\n self.manuallyAssignUrl = ko.computed(function ()" +
" {\r\n return urlManuallyAssign + \'#\' + self.sessionId + \'_\' + self" +
".pageNumber;\r\n });\r\n self.assignedDataUrl = ko.computed(fu" +
"nction () {\r\n var t = self.assignedDataType();\r\n v" +
"ar dId = self.assignedDataId();\r\n switch (t) {\r\n " +
" case \'Device\':\r\n return urlDeviceShow + dId;\r\n " +
" case \'Job\':\r\n return urlJobShow + dId;\r\n " +
" case \'User\':\r\n return urlUserShow + dId;\r\n" +
" }\r\n return null;\r\n });\r\n se" +
"lf.thumbnailUrl = ko.computed(function () {\r\n var enabled = self." +
"thumbnailEnabled();\r\n if (enabled > 0) {\r\n ret" +
"urn \'url(\' + urlPageThumbnail + \'?SessionId=\' + self.sessionId + \'&PageNumber=\' " +
"+ self.pageNumber + \'&NoCache=\' + enabled + \')\';\r\n }\r\n " +
" return null;\r\n });\r\n }\r\n\r\n function parseLog(log) " +
"{\r\n if (log.ModuleId === 40 && log.Arguments && log.Arguments.length " +
"> 0) {\r\n // find session\r\n var sessionId = log.Arg" +
"uments[0];\r\n var session = vm.sessionIndex[sessionId];\r\n " +
" if (!session && log.EventTypeId === 10) { // Starting Session (Ignore \'pa" +
"rtial\' sessions)\r\n session = new sessionViewModel(log.Argumen" +
"ts[1]);\r\n vm.sessionIndex[sessionId] = session;\r\n " +
" vm.sessions.unshift(session);\r\n vm.noSessions(false);" +
"\r\n }\r\n if (session) {\r\n switch " +
"(log.EventTypeId) {\r\n case 10: // SessionStarting\r\n " +
" session.startTime(log.FormattedTimestamp.substring(log.For" +
"mattedTimestamp.indexOf(\' \') + 1));\r\n break;\r\n " +
" case 11: // SessionProgress\r\n sessio" +
"n.progressValue(log.Arguments[1]);\r\n session.progress" +
"Status(log.Arguments[2]);\r\n break;\r\n " +
" case 12: // SessionFinished\r\n session.sessionE" +
"nded(true);\r\n session.progressStatus(\'Import Finished" +
"\');\r\n break;\r\n case 15: // Ses" +
"sionWarning\r\n session.messages.unshift(log);\r\n " +
" break;\r\n case 16: // SessionError\r\n " +
" session.messages.unshift(log);\r\n " +
" break;\r\n case 100: // ImportPageStarting\r\n " +
" session.addSessionPage(new sessionPageViewModel(sessionId, l" +
"og.Arguments[1]));\r\n break;\r\n " +
"case 104: // ImportPageImageUpdate\r\n var p = session." +
"sessionPagesIndex[log.Arguments[1]];\r\n if (p) {\r\n " +
" p.updateThumbnail();\r\n }\r" +
"\n break;\r\n case 105: // Import" +
"PageProgress\r\n var p = session.sessionPagesIndex[log." +
"Arguments[1]];\r\n if (p) {\r\n " +
" p.progressValue(log.Arguments[2]);\r\n p.prog" +
"ressStatus(log.Arguments[3]);\r\n }\r\n " +
" break;\r\n case 110: // ImportPageDetected\r\n " +
" var p = session.sessionPagesIndex[log.Arguments[1]];\r\n " +
" if (p) {\r\n p.documentTem" +
"plateId(log.Arguments[2]);\r\n p.documentTemplate(l" +
"og.Arguments[3]);\r\n p.assignedDataType(log.Argume" +
"nts[4]);\r\n p.assignedDataId(log.Arguments[5]);\r\n " +
" p.assignedData(log.Arguments[6]);\r\n " +
" p.detected(true);\r\n if (!isLive" +
") {\r\n p.updateThumbnail();\r\n " +
" }\r\n }\r\n ses" +
"sion.messages.unshift(log);\r\n break;\r\n " +
" case 115: // ImportPageUndetected\r\n var p = " +
"session.sessionPagesIndex[log.Arguments[1]];\r\n if (p)" +
" {\r\n p.undetected(true);\r\n " +
" if (!isLive) {\r\n p.updateThumbnail()" +
";\r\n }\r\n }\r\n " +
" session.messages.unshift(log);\r\n bre" +
"ak;\r\n case 150: // Ignore: ImportPageUndetectedStored\r\n " +
" break;\r\n default:\r\n " +
" session.messages.unshift(log);\r\n }\r\n " +
" }\r\n }\r\n }\r\n function init() {\r\n // Cr" +
"eate View Model\r\n vm = new pageViewModel();\r\n\r\n // Load Lo" +
"gs\r\n var d = new Date();\r\n var loadData = {\r\n " +
" Format: \"json\",\r\n Start: d.getFullYear() + \'-\' + (d.getMonth()" +
" + 1) + \'-\' + d.getDate(),\r\n End: null,\r\n ModuleId" +
": 40,\r\n Take: 2000\r\n };\r\n $.ajax({\r\n " +
" url: \'");
#line 110 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 283 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Links.ClientSource.Style.Images.Status.fail32_png);
#line default
#line hidden
WriteLiteral(")\';\r\n var isLive = false;\r\n\r\n function pageViewModel() {\r\n " +
" var self = this;\r\n\r\n self.noSessions = ko.observable(true);\r\n " +
" self.sessions = ko.observableArray();\r\n self.sessionIndex = {}" +
";\r\n\r\n self.sessionRendered = function (e, d) {\r\n if (!" +
"d.sessionEnded()) {\r\n d.progressbar = $(e).find(\'.sessionProg" +
"ress\').progressbar();\r\n }\r\n };\r\n }\r\n fun" +
"ction sessionViewModel(id) {\r\n var self = this;\r\n\r\n self.t" +
"itle = ko.observable(id);\r\n self.messages = ko.observableArray();\r\n " +
" self.progressStatus = ko.observable();\r\n self.progressValue" +
" = ko.observable();\r\n self.startTime = ko.observable();\r\n " +
"self.sessionEnded = ko.observable(false);\r\n\r\n self.sessionPages = ko." +
"observableArray();\r\n self.sessionPagesIndex = {};\r\n self.a" +
"ddSessionPage = function (sessionPage) {\r\n //if (isLive) {\r\n " +
" self.sessionPages.push(sessionPage);\r\n self.sessionPag" +
"esIndex[sessionPage.pageNumber] = sessionPage;\r\n //}\r\n " +
" }\r\n }\r\n function sessionPageViewModel(sessionId, pageNumber) {\r\n " +
" var self = this;\r\n\r\n self.sessionId = sessionId;\r\n " +
" self.pageNumber = pageNumber;\r\n self.title = \'Page \' + pageNumber" +
";\r\n self.progressStatus = ko.observable();\r\n self.progress" +
"Value = ko.observable();\r\n self.undetected = ko.observable(false);\r\n " +
" self.detected = ko.observable(false);\r\n self.documentTempl" +
"ateId = ko.observable();\r\n self.documentTemplate = ko.observable();\r\n" +
" self.assignedDataType = ko.observable();\r\n self.assignedD" +
"ataId = ko.observable();\r\n self.assignedData = ko.observable();\r\n " +
" self.thumbnailEnabled = ko.observable(0);\r\n self.updateThumbn" +
"ail = function () {\r\n self.thumbnailEnabled(self.thumbnailEnabled" +
"() + 1);\r\n }\r\n self.documentTemplateUrl = ko.computed(func" +
"tion () {\r\n return urlDocumentTemplate + self.documentTemplateId(" +
");\r\n });\r\n self.manuallyAssignUrl = ko.computed(function (" +
") {\r\n return urlManuallyAssign + \'#\' + self.sessionId + \'_\' + sel" +
"f.pageNumber;\r\n });\r\n self.assignedDataUrl = ko.computed(f" +
"unction () {\r\n var t = self.assignedDataType();\r\n " +
"var dId = self.assignedDataId();\r\n switch (t) {\r\n " +
" case \'Device\':\r\n return urlDeviceShow + dId;\r\n " +
" case \'Job\':\r\n return urlJobShow + dId;\r\n " +
" case \'User\':\r\n return urlUserShow + dId;\r" +
"\n }\r\n return null;\r\n });\r\n s" +
"elf.thumbnailUrl = ko.computed(function () {\r\n var enabled = self" +
".thumbnailEnabled();\r\n if (enabled > 0) {\r\n re" +
"turn \'url(\' + urlPageThumbnail + \'?SessionId=\' + self.sessionId + \'&PageNumber=\'" +
" + self.pageNumber + \'&NoCache=\' + enabled + \')\';\r\n }\r\n " +
" return null;\r\n });\r\n }\r\n\r\n function parseLog(log)" +
" {\r\n if (log.ModuleId === 40 && log.Arguments && log.Arguments.length" +
" > 0) {\r\n // find session\r\n var sessionId = log.Ar" +
"guments[0];\r\n var session = vm.sessionIndex[sessionId];\r\n " +
" if (!session && log.EventTypeId === 10) { // Starting Session (Ignore \'p" +
"artial\' sessions)\r\n session = new sessionViewModel(log.Argume" +
"nts[1]);\r\n vm.sessionIndex[sessionId] = session;\r\n " +
" vm.sessions.unshift(session);\r\n vm.noSessions(false)" +
";\r\n }\r\n if (session) {\r\n switch" +
" (log.EventTypeId) {\r\n case 10: // SessionStarting\r\n " +
" session.startTime(log.FormattedTimestamp.substring(log.Fo" +
"rmattedTimestamp.indexOf(\' \') + 1));\r\n break;\r\n " +
" case 11: // SessionProgress\r\n sessi" +
"on.progressValue(log.Arguments[1]);\r\n session.progres" +
"sStatus(log.Arguments[2]);\r\n break;\r\n " +
" case 12: // SessionFinished\r\n session.session" +
"Ended(true);\r\n session.progressStatus(\'Import Finishe" +
"d\');\r\n break;\r\n case 15: // Se" +
"ssionWarning\r\n session.messages.unshift(log);\r\n " +
" break;\r\n case 16: // SessionError\r\n" +
" session.messages.unshift(log);\r\n " +
" break;\r\n case 100: // ImportPageStarting\r\n " +
" session.addSessionPage(new sessionPageViewModel(sessionId, " +
"log.Arguments[1]));\r\n break;\r\n " +
" case 104: // ImportPageImageUpdate\r\n var p = session" +
".sessionPagesIndex[log.Arguments[1]];\r\n if (p) {\r\n " +
" p.updateThumbnail();\r\n }" +
"\r\n break;\r\n case 105: // Impor" +
"tPageProgress\r\n var p = session.sessionPagesIndex[log" +
".Arguments[1]];\r\n if (p) {\r\n " +
" p.progressValue(log.Arguments[2]);\r\n p.pro" +
"gressStatus(log.Arguments[3]);\r\n }\r\n " +
" break;\r\n case 110: // ImportPageDetected\r\n " +
" var p = session.sessionPagesIndex[log.Arguments[1]];\r\n " +
" if (p) {\r\n p.documentTe" +
"mplateId(log.Arguments[2]);\r\n p.documentTemplate(" +
"log.Arguments[3]);\r\n p.assignedDataType(log.Argum" +
"ents[4]);\r\n p.assignedDataId(log.Arguments[5]);\r\n" +
" p.assignedData(log.Arguments[6]);\r\n " +
" p.detected(true);\r\n if (!isLiv" +
"e) {\r\n p.updateThumbnail();\r\n " +
" }\r\n }\r\n se" +
"ssion.messages.unshift(log);\r\n break;\r\n " +
" case 115: // ImportPageUndetected\r\n var p =" +
" session.sessionPagesIndex[log.Arguments[1]];\r\n if (p" +
") {\r\n p.undetected(true);\r\n " +
" if (!isLive) {\r\n p.updateThumbnail(" +
");\r\n }\r\n }\r\n " +
" session.messages.unshift(log);\r\n br" +
"eak;\r\n case 150: // Ignore: ImportPageUndetectedStored\r\n " +
" break;\r\n default:\r\n " +
" session.messages.unshift(log);\r\n }\r\n " +
" }\r\n }\r\n }\r\n function init() {\r\n // C" +
"reate View Model\r\n vm = new pageViewModel();\r\n\r\n // Load L" +
"ogs\r\n var d = new Date();\r\n var loadData = {\r\n " +
" Format: \"json\",\r\n Start: d.getFullYear() + \'-\' + (d.getMonth(" +
") + 1) + \'-\' + d.getDate(),\r\n End: null,\r\n ModuleI" +
"d: 40,\r\n Take: 2000\r\n };\r\n $.ajax({\r\n " +
" url: \'");
#line 285 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Url.Action(MVC.API.Logging.RetrieveEvents())); Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
@@ -457,7 +452,7 @@ WriteLiteral(@"',
liveConnection = $.connection('"); liveConnection = $.connection('");
#line 305 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 303 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Url.Content("~/API/Logging/Notifications")); Write(Url.Content("~/API/Logging/Notifications"));
@@ -466,7 +461,7 @@ WriteLiteral(@"',
WriteLiteral("\', { addToGroups: \'"); WriteLiteral("\', { addToGroups: \'");
#line 305 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml" #line 303 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
Write(Disco.BI.DocumentTemplateBI.Importer.DocumentImporterLog.Current.LiveLogGroupName); Write(Disco.BI.DocumentTemplateBI.Importer.DocumentImporterLog.Current.LiveLogGroupName);
Disco.Web/Areas/Config/Views/DocumentTemplate/Show.cshtml
+1 -1
View File
@@ -389,7 +389,7 @@
@Html.Partial(MVC.Config.DocumentTemplate.Views._ExpressionsTable, Model.TemplateExpressions) @Html.Partial(MVC.Config.DocumentTemplate.Views._ExpressionsTable, Model.TemplateExpressions)
<div id="dialogConfirmDelete" title="Delete this Document Template?"> <div id="dialogConfirmDelete" title="Delete this Document Template?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 100px 0;"></span>This item will be permanently deleted and cannot be recovered.<br /> <i class="fa fa-exclamation-triangle fa-lg warning"></i>This item will be permanently deleted and cannot be recovered.<br />
<em>This <strong>will not delete attachments</strong> which have already been imported, <em>This <strong>will not delete attachments</strong> which have already been imported,
but any generated documents will no longer be automatically imported.</em><br /> but any generated documents will no longer be automatically imported.</em><br />
Are you sure? Are you sure?
Disco.Web/Areas/Config/Views/DocumentTemplate/Show.generated.cs
+8 -10
View File
@@ -982,13 +982,11 @@ WriteLiteral(" id=\"dialogConfirmDelete\"");
WriteLiteral(" title=\"Delete this Document Template?\""); WriteLiteral(" title=\"Delete this Document Template?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg warning\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 100px 0;\""); WriteLiteral(@"></i>This item will be permanently deleted and cannot be recovered.<br />
WriteLiteral(@"></span>This item will be permanently deleted and cannot be recovered.<br />
<em>This <strong>will not delete attachments</strong> which have already been imported, <em>This <strong>will not delete attachments</strong> which have already been imported,
but any generated documents will no longer be automatically imported.</em><br /> but any generated documents will no longer be automatically imported.</em><br />
Are you sure? Are you sure?
@@ -1088,16 +1086,16 @@ WriteLiteral(" id=\"dialogBulkGenerate\"");
WriteLiteral(" class=\"hiddenDialog\""); WriteLiteral(" class=\"hiddenDialog\"");
WriteAttribute("title", Tuple.Create(" title=\"", 20958), Tuple.Create("\"", 21009) WriteAttribute("title", Tuple.Create(" title=\"", 20927), Tuple.Create("\"", 20978)
, Tuple.Create(Tuple.Create("", 20966), Tuple.Create("Bulk", 20966), true) , Tuple.Create(Tuple.Create("", 20935), Tuple.Create("Bulk", 20935), true)
, Tuple.Create(Tuple.Create(" ", 20970), Tuple.Create("Generate:", 20971), true) , Tuple.Create(Tuple.Create(" ", 20939), Tuple.Create("Generate:", 20940), true)
#line 435 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml" #line 435 "..\..\Areas\Config\Views\DocumentTemplate\Show.cshtml"
, Tuple.Create(Tuple.Create(" ", 20980), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id , Tuple.Create(Tuple.Create(" ", 20949), Tuple.Create<System.Object, System.Int32>(Model.DocumentTemplate.Id
#line default #line default
#line hidden #line hidden
, 20981), false) , 20950), false)
); );
WriteLiteral(">\r\n <div"); WriteLiteral(">\r\n <div");
Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.cshtml
+1 -1
View File
@@ -33,7 +33,7 @@
</div> </div>
<div id="dialogRemove" title="Delete this Page?"> <div id="dialogRemove" title="Delete this Page?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg warning"></i>
Are you sure? Are you sure?
</p> </p>
</div> </div>
Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.generated.cs
+3 -5
View File
@@ -159,13 +159,11 @@ WriteLiteral(" id=\"dialogRemove\"");
WriteLiteral(" title=\"Delete this Page?\""); WriteLiteral(" title=\"Delete this Page?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg warning\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>\r\n Are you sure?\r\n </p>\r\n</div>\r\n<script");
WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n</div>\r\n<script");
WriteLiteral(" type=\"text/javascript\""); WriteLiteral(" type=\"text/javascript\"");
Disco.Web/Areas/Config/Views/Enrolment/Status.cshtml
+2 -5
View File
@@ -101,11 +101,8 @@
<table class="logEventsViewport" data-bind="visible: messages().length > 0" style="display: none"> <table class="logEventsViewport" data-bind="visible: messages().length > 0" style="display: none">
<tbody data-bind="foreach: messages"> <tbody data-bind="foreach: messages">
<tr> <tr>
<td class="icon" data-bind="attr: {title: FormattedTimestamp}, css: {information: EventTypeSeverity == 0, warning: EventTypeSeverity == 1, error: EventTypeSeverity == 2}"> <td class="icon"><i class="fa" data-bind="css: { 'fa-info-circle': EventTypeSeverity == 0, 'fa-exclamation-triangle': EventTypeSeverity == 1, 'fa-exclamation-circle': EventTypeSeverity == 2 }"></i></td>
&nbsp; <td class="message" data-bind="text: FormattedMessage, attr: {title: EventTypeName}"></td>
</td>
<td class="message" data-bind="text: FormattedMessage, attr: {title: EventTypeName}">
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
Disco.Web/Areas/Config/Views/Enrolment/Status.generated.cs
+19 -15
View File
@@ -262,19 +262,23 @@ WriteLiteral(">\r\n <tr>\r\n
WriteLiteral(" class=\"icon\""); WriteLiteral(" class=\"icon\"");
WriteLiteral(" data-bind=\"attr: {title: FormattedTimestamp}, css: {information: EventTypeSeveri" + WriteLiteral("><i");
"ty == 0, warning: EventTypeSeverity == 1, error: EventTypeSeverity == 2}\"");
WriteLiteral(">\r\n &nbsp;\r\n </" + WriteLiteral(" class=\"fa\"");
"td>\r\n <td");
WriteLiteral(" data-bind=\"css: { \'fa-info-circle\': EventTypeSeverity == 0, \'fa-exclamation-tria" +
"ngle\': EventTypeSeverity == 1, \'fa-exclamation-circle\': EventTypeSeverity == 2 }" +
"\"");
WriteLiteral("></i></td>\r\n <td");
WriteLiteral(" class=\"message\""); WriteLiteral(" class=\"message\"");
WriteLiteral(" data-bind=\"text: FormattedMessage, attr: {title: EventTypeName}\""); WriteLiteral(" data-bind=\"text: FormattedMessage, attr: {title: EventTypeName}\"");
WriteLiteral(">\r\n </td>\r\n </tr>\r\n " + WriteLiteral("></td>\r\n </tr>\r\n </tbody>\r\n " +
" </tbody>\r\n </table>\r\n </di" + " </table>\r\n </div>\r\n </div>\r\n " +
"v>\r\n </div>\r\n <div"); " <div");
WriteLiteral(" class=\"sessionInfoConsole\""); WriteLiteral(" class=\"sessionInfoConsole\"");
@@ -318,7 +322,7 @@ WriteLiteral(@">
var deviceBaseUrl = '"); var deviceBaseUrl = '");
#line 143 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 140 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Action(MVC.Device.Show())); Write(Url.Action(MVC.Device.Show()));
@@ -327,7 +331,7 @@ WriteLiteral(@">
WriteLiteral("/\'\r\n var deviceModelImageUrl = \'"); WriteLiteral("/\'\r\n var deviceModelImageUrl = \'");
#line 144 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 141 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Action(MVC.API.DeviceModel.Image())); Write(Url.Action(MVC.API.DeviceModel.Image()));
@@ -336,7 +340,7 @@ WriteLiteral("/\'\r\n var deviceModelImageUrl = \'");
WriteLiteral("/\'\r\n var iconWarningUrl = \'url("); WriteLiteral("/\'\r\n var iconWarningUrl = \'url(");
#line 145 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 142 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Links.ClientSource.Style.Images.Status.warning32_png); Write(Links.ClientSource.Style.Images.Status.warning32_png);
@@ -345,7 +349,7 @@ WriteLiteral("/\'\r\n var iconWarningUrl = \'url(");
WriteLiteral(")\';\r\n var iconErrorUrl = \'url("); WriteLiteral(")\';\r\n var iconErrorUrl = \'url(");
#line 146 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 143 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Links.ClientSource.Style.Images.Status.fail32_png); Write(Links.ClientSource.Style.Images.Status.fail32_png);
@@ -448,7 +452,7 @@ WriteLiteral(")\';\r\n\r\n function pageViewModel() {\r\n var
" vm = new pageViewModel();\r\n $.ajax({\r\n url: \'"); " vm = new pageViewModel();\r\n $.ajax({\r\n url: \'");
#line 310 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 307 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Action(MVC.API.DeviceModel.Index())); Write(Url.Action(MVC.API.DeviceModel.Index()));
@@ -482,7 +486,7 @@ WriteLiteral(@"',
url: '"); url: '");
#line 335 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 332 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Action(MVC.API.Logging.RetrieveEvents())); Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
@@ -518,7 +522,7 @@ WriteLiteral(@"',
liveConnection = $.connection('"); liveConnection = $.connection('");
#line 362 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 359 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Url.Content("~/API/Logging/Notifications")); Write(Url.Content("~/API/Logging/Notifications"));
@@ -527,7 +531,7 @@ WriteLiteral(@"',
WriteLiteral("\', { addToGroups: \'"); WriteLiteral("\', { addToGroups: \'");
#line 362 "..\..\Areas\Config\Views\Enrolment\Status.cshtml" #line 359 "..\..\Areas\Config\Views\Enrolment\Status.cshtml"
Write(Disco.BI.DeviceBI.EnrolmentLog.Current.LiveLogGroupName); Write(Disco.BI.DeviceBI.EnrolmentLog.Current.LiveLogGroupName);
Disco.Web/Areas/Config/Views/Organisation/Index.cshtml
+9 -7
View File
@@ -77,8 +77,7 @@
@if (Model.OrganisationAddresses.Count > 1) @if (Model.OrganisationAddresses.Count > 1)
{ {
<div id="messageMultiSiteMode" style="padding: 0.7em 0.7em; margin-top: 20px;" class="ui-state-highlight ui-corner-all"> <div id="messageMultiSiteMode" style="padding: 0.7em 0.7em; margin-top: 20px;" class="ui-state-highlight ui-corner-all">
<span style="margin-right: 0.3em; float: left;" class="ui-icon ui-icon-info"></span> <i class="fa fa-info-circle information"></i>&nbsp;Multi-Site mode is recommended where multiple addresses are configured.
Multi-Site mode is recommended where multiple addresses are configured.
</div> </div>
} }
</td> </td>
@@ -119,7 +118,7 @@
<td> <td>
@if (canConfigAddresses) @if (canConfigAddresses)
{ {
<span class="edit" title="Edit Address"></span><span class="delete" title="Delete Address"></span> <i class="fa fa-edit information edit" title="Edit Address"></i> <i class="fa fa-times-circle warning delete" title="Delete Address"></i>
} }
</td> </td>
</tr> </tr>
@@ -205,8 +204,11 @@
{ {
<div id="dialogConfirmRemove" title="Delete this Address?"> <div id="dialogConfirmRemove" title="Delete this Address?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg warning"></i>
This item will be permanently deleted and cannot be recovered. Are you sure? This item will be permanently deleted and cannot be recovered.
</p>
<p>
<strong>Are you sure?</strong>
</p> </p>
</div> </div>
<div id="dialogEdit" title="Edit/Create Address"> <div id="dialogEdit" title="Edit/Create Address">
@@ -291,7 +293,7 @@
} }
} }
}); });
$('#organisationAddresses').find('span.delete').click(function () { $('#organisationAddresses').find('i.delete').click(function () {
var componentRow = $(this).closest('tr'); var componentRow = $(this).closest('tr');
var id = componentRow.attr('data-addressid'); var id = componentRow.attr('data-addressid');
if (id) { if (id) {
@@ -336,7 +338,7 @@
dialog.dialog('open'); dialog.dialog('open');
} }
$('#organisationAddresses').find('span.edit').click(function () { $('#organisationAddresses').find('i.edit').click(function () {
var componentRow = $(this).closest('tr'); var componentRow = $(this).closest('tr');
editAddress(componentRow); editAddress(componentRow);
}); });
Disco.Web/Areas/Config/Views/Organisation/Index.generated.cs
+62 -66
View File
@@ -362,17 +362,15 @@ WriteLiteral(" style=\"padding: 0.7em 0.7em; margin-top: 20px;\"");
WriteLiteral(" class=\"ui-state-highlight ui-corner-all\""); WriteLiteral(" class=\"ui-state-highlight ui-corner-all\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <i");
WriteLiteral(" style=\"margin-right: 0.3em; float: left;\""); WriteLiteral(" class=\"fa fa-info-circle information\"");
WriteLiteral(" class=\"ui-icon ui-icon-info\""); WriteLiteral("></i>&nbsp;Multi-Site mode is recommended where multiple addresses are configured" +
".\r\n </div>\r\n");
WriteLiteral("></span>\r\n Multi-Site mode is recommended where multiple a" +
"ddresses are configured.\r\n </div>\r\n");
#line 83 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 82 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
@@ -385,13 +383,13 @@ WriteLiteral(" style=\"width: 160px\"");
WriteLiteral(">Addresses:\r\n"); WriteLiteral(">Addresses:\r\n");
#line 88 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 87 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 88 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 87 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
if (canConfigAddresses) if (canConfigAddresses)
{ {
@@ -413,7 +411,7 @@ WriteLiteral(" class=\"button\"");
WriteLiteral(">Create</a>\r\n"); WriteLiteral(">Create</a>\r\n");
#line 93 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 92 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
@@ -422,13 +420,13 @@ WriteLiteral(">Create</a>\r\n");
WriteLiteral(" </th>\r\n <td>\r\n"); WriteLiteral(" </th>\r\n <td>\r\n");
#line 96 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 95 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 96 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 95 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
if (Model.OrganisationAddresses.Count > 0) if (Model.OrganisationAddresses.Count > 0)
{ {
@@ -445,13 +443,13 @@ WriteLiteral(">\r\n <tr>\r\n <
" </tr>\r\n"); " </tr>\r\n");
#line 106 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 105 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 106 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 105 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
foreach (var item in Model.OrganisationAddresses) foreach (var item in Model.OrganisationAddresses)
{ {
@@ -463,7 +461,7 @@ WriteLiteral(" <tr");
WriteLiteral(" data-addressid=\""); WriteLiteral(" data-addressid=\"");
#line 108 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 107 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(item.Id); Write(item.Id);
@@ -479,7 +477,7 @@ WriteLiteral(" class=\"name\"");
WriteLiteral(">"); WriteLiteral(">");
#line 110 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 109 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.Name)); Write(Html.DisplayFor(modelItem => item.Name));
@@ -492,7 +490,7 @@ WriteLiteral(" class=\"shortName\"");
WriteLiteral(">"); WriteLiteral(">");
#line 110 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 109 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.ShortName)); Write(Html.DisplayFor(modelItem => item.ShortName));
@@ -506,7 +504,7 @@ WriteLiteral(" class=\"address\"");
WriteLiteral(">"); WriteLiteral(">");
#line 113 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 112 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.Address)); Write(Html.DisplayFor(modelItem => item.Address));
@@ -519,7 +517,7 @@ WriteLiteral(" class=\"suburb\"");
WriteLiteral(">"); WriteLiteral(">");
#line 114 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 113 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.Suburb)); Write(Html.DisplayFor(modelItem => item.Suburb));
@@ -532,7 +530,7 @@ WriteLiteral(" class=\"postcode\"");
WriteLiteral(">"); WriteLiteral(">");
#line 114 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 113 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.Postcode)); Write(Html.DisplayFor(modelItem => item.Postcode));
@@ -545,7 +543,7 @@ WriteLiteral(" class=\"state\"");
WriteLiteral(">"); WriteLiteral(">");
#line 115 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 114 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.State)); Write(Html.DisplayFor(modelItem => item.State));
@@ -558,7 +556,7 @@ WriteLiteral(" class=\"country\"");
WriteLiteral(">"); WriteLiteral(">");
#line 115 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 114 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.Country)); Write(Html.DisplayFor(modelItem => item.Country));
@@ -575,7 +573,7 @@ WriteLiteral(" class=\"phoneNumber\"");
WriteLiteral(">"); WriteLiteral(">");
#line 116 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 115 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.PhoneNumber)); Write(Html.DisplayFor(modelItem => item.PhoneNumber));
@@ -592,7 +590,7 @@ WriteLiteral(" class=\"faxNumber\"");
WriteLiteral(">"); WriteLiteral(">");
#line 117 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 116 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Html.DisplayFor(modelItem => item.FaxNumber)); Write(Html.DisplayFor(modelItem => item.FaxNumber));
@@ -602,37 +600,37 @@ WriteLiteral("</span>\r\n </td>\r\n
"td>\r\n"); "td>\r\n");
#line 120 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 119 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 120 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 119 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
if (canConfigAddresses) if (canConfigAddresses)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <span"); WriteLiteral(" <i");
WriteLiteral(" class=\"edit\""); WriteLiteral(" class=\"fa fa-edit information edit\"");
WriteLiteral(" title=\"Edit Address\""); WriteLiteral(" title=\"Edit Address\"");
WriteLiteral("></span>"); WriteLiteral("></i> ");
WriteLiteral("<span"); WriteLiteral("<i");
WriteLiteral(" class=\"delete\""); WriteLiteral(" class=\"fa fa-times-circle warning delete\"");
WriteLiteral(" title=\"Delete Address\""); WriteLiteral(" title=\"Delete Address\"");
WriteLiteral("></span>\r\n"); WriteLiteral("></i>\r\n");
#line 123 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 122 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
@@ -641,7 +639,7 @@ WriteLiteral("></span>\r\n");
WriteLiteral(" </td>\r\n </tr>\r\n"); WriteLiteral(" </td>\r\n </tr>\r\n");
#line 126 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 125 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
@@ -650,7 +648,7 @@ WriteLiteral(" </td>\r\n
WriteLiteral(" </table>\r\n"); WriteLiteral(" </table>\r\n");
#line 128 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 127 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
else else
{ {
@@ -665,7 +663,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">No Addresses Stored</span>\r\n"); WriteLiteral(">No Addresses Stored</span>\r\n");
#line 132 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 131 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
@@ -674,7 +672,7 @@ WriteLiteral(">No Addresses Stored</span>\r\n");
WriteLiteral(" </td>\r\n </tr>\r\n </table>\r\n</div>\r\n"); WriteLiteral(" </td>\r\n </tr>\r\n </table>\r\n</div>\r\n");
#line 137 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 136 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
if (Authorization.Has(Claims.Config.Organisation.ConfigureLogo)) if (Authorization.Has(Claims.Config.Organisation.ConfigureLogo))
{ {
@@ -690,13 +688,13 @@ WriteLiteral(" title=\"Update Organisation Logo\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 140 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 139 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 140 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 139 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
using (Html.BeginForm(MVC.API.System.OrganisationLogo(true, null, null), FormMethod.Post, new { enctype = "multipart/form-data" })) using (Html.BeginForm(MVC.API.System.OrganisationLogo(true, null, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
{ {
@@ -765,7 +763,7 @@ WriteLiteral(" class=\"field-validation-valid field-validation-error\"");
WriteLiteral(">* Required</span>\r\n </div>\r\n </div>\r\n"); WriteLiteral(">* Required</span>\r\n </div>\r\n </div>\r\n");
#line 155 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 154 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
@@ -807,14 +805,14 @@ WriteLiteral(">\r\n $(function () {\r\n var button = $(\'#butt
" </script>\r\n"); " </script>\r\n");
#line 203 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 202 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 204 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 203 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
if (canConfigAddresses) if (canConfigAddresses)
{ {
@@ -827,14 +825,13 @@ WriteLiteral(" id=\"dialogConfirmRemove\"");
WriteLiteral(" title=\"Delete this Address?\""); WriteLiteral(" title=\"Delete this Address?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg warning\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>\r\n This item will be permanently deleted and cannot be recovered." +
"\r\n </p>\r\n <p>\r\n <strong>Are you sure?</strong>\r\n " +
WriteLiteral("></span>\r\n This item will be permanently deleted and cannot be recover" + " </p>\r\n </div>\r\n");
"ed. Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral(" <div"); WriteLiteral(" <div");
@@ -934,7 +931,7 @@ WriteLiteral(@">
} }
} }
}); });
$('#organisationAddresses').find('span.delete').click(function () { $('#organisationAddresses').find('i.delete').click(function () {
var componentRow = $(this).closest('tr'); var componentRow = $(this).closest('tr');
var id = componentRow.attr('data-addressid'); var id = componentRow.attr('data-addressid');
if (id) { if (id) {
@@ -943,7 +940,7 @@ WriteLiteral(@">
buttons['Delete'] = function () { $(this).dialog(""disable""); window.location.href = '"); buttons['Delete'] = function () { $(this).dialog(""disable""); window.location.href = '");
#line 300 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 302 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Url.Action(MVC.API.System.DeleteOrganisationAddress())); Write(Url.Action(MVC.API.System.DeleteOrganisationAddress()));
@@ -972,22 +969,21 @@ WriteLiteral("\' + \'?redirect=true&id=\' + id; };\r\n var button
"state);\r\n $(\'#editCountry\').val(country);\r\n $(\'#editPhoneN" + "state);\r\n $(\'#editCountry\').val(country);\r\n $(\'#editPhoneN" +
"umber\').val(phoneNumber);\r\n $(\'#editFaxNumber\').val(faxNumber);\r\n " + "umber\').val(phoneNumber);\r\n $(\'#editFaxNumber\').val(faxNumber);\r\n " +
" dialog.dialog(\'open\');\r\n }\r\n\r\n $(\'#organisationAddresses\')" + " dialog.dialog(\'open\');\r\n }\r\n\r\n $(\'#organisationAddresses\')" +
".find(\'span.edit\').click(function () {\r\n var componentRow = $(this).c" + ".find(\'i.edit\').click(function () {\r\n var componentRow = $(this).clos" +
"losest(\'tr\');\r\n editAddress(componentRow);\r\n });\r\n\r\n $(" + "est(\'tr\');\r\n editAddress(componentRow);\r\n });\r\n\r\n $(\'#c" +
"\'#createAddress\').click(function () {\r\n editAddress();\r\n r" + "reateAddress\').click(function () {\r\n editAddress();\r\n retu" +
"eturn false;\r\n });\r\n\r\n var submitAddress = function () {\r\n " + "rn false;\r\n });\r\n\r\n var submitAddress = function () {\r\n " +
" var dialog = $(\'#dialogEdit\');\r\n var data = {\r\n Id" + " var dialog = $(\'#dialogEdit\');\r\n var data = {\r\n Id: d" +
": dialog.attr(\'data-addressid\'),\r\n ShortName: $(\'#editShortName\')" + "ialog.attr(\'data-addressid\'),\r\n ShortName: $(\'#editShortName\').va" +
".val(),\r\n Name: $(\'#editName\').val(),\r\n Address: $" + "l(),\r\n Name: $(\'#editName\').val(),\r\n Address: $(\'#" +
"(\'#editAddress\').val(),\r\n Suburb: $(\'#editSuburb\').val(),\r\n " + "editAddress\').val(),\r\n Suburb: $(\'#editSuburb\').val(),\r\n " +
" Postcode: $(\'#editPostcode\').val(),\r\n State: $(\'#editSt" + " Postcode: $(\'#editPostcode\').val(),\r\n State: $(\'#editState" +
"ate\').val(),\r\n Country: $(\'#editCountry\').val(),\r\n " + "\').val(),\r\n Country: $(\'#editCountry\').val(),\r\n Ph" +
" PhoneNumber: $(\'#editPhoneNumber\').val(),\r\n FaxNumber: $(\'#editF" + "oneNumber: $(\'#editPhoneNumber\').val(),\r\n FaxNumber: $(\'#editFaxN" +
"axNumber\').val()\r\n };\r\n\r\n $.ajax({\r\n url: \'" + "umber\').val()\r\n };\r\n\r\n $.ajax({\r\n url: \'");
"");
#line 365 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 367 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Url.Action(MVC.API.System.UpdateOrganisationAddress())); Write(Url.Action(MVC.API.System.UpdateOrganisationAddress()));
@@ -998,7 +994,7 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n data
"f (d == \'OK\') {\r\n window.location.href = \'"); "f (d == \'OK\') {\r\n window.location.href = \'");
#line 371 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 373 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Url.Action(MVC.Config.Organisation.Index())); Write(Url.Action(MVC.Config.Organisation.Index()));
@@ -1037,7 +1033,7 @@ WriteLiteral(@"';
"); ");
#line 401 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 403 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
#line default #line default
Disco.Web/Areas/Config/Views/Plugins/Index.cshtml
+5 -4
View File
@@ -71,17 +71,17 @@
<div> <div>
<input id="uninstallPluginData" type="checkbox" /><label for="uninstallPluginData"> Uninstall Plugin Data</label> <input id="uninstallPluginData" type="checkbox" /><label for="uninstallPluginData"> Uninstall Plugin Data</label>
<div id="uninstallPluginDataAlert" style="display: none; padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-error ui-corner-all"> <div id="uninstallPluginDataAlert" style="display: none; padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-error ui-corner-all">
<span style="margin-right: 0.3em; float: left;" class="ui-icon ui-icon-alert"></span>NOTE: Data will be permanently deleted <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;NOTE: Data will be permanently deleted
</div> </div>
</div> </div>
</div> </div>
<div id="dialogUninstallPluginConfirm" title="Confirm Plugin Uninstall"> <div id="dialogUninstallPluginConfirm" title="Confirm Plugin Uninstall">
<div style="padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-highlight ui-corner-all"> <div style="padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-highlight ui-corner-all">
<span style="margin-right: 0.3em; float: left;" class="ui-icon ui-icon-help"></span>Are you sure you want to uninstall this plugin? <i class="fa fa-info-circle information"></i>&nbsp;Are you sure you want to uninstall this plugin?
<h4 id="uninstallPluginConfirm"></h4> <h4 id="uninstallPluginConfirm"></h4>
</div> </div>
<div id="uninstallPluginDataConfirm" style="display: none; padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-error ui-corner-all"> <div id="uninstallPluginDataConfirm" style="display: none; padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-error ui-corner-all">
<span style="margin-right: 0.3em; float: left;" class="ui-icon ui-icon-alert"></span>NOTE: Data will be permanently deleted <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;NOTE: Data will be permanently deleted
</div> </div>
</div> </div>
<script> <script>
@@ -171,10 +171,11 @@
if (Model.PluginUpdates.Count > 0) if (Model.PluginUpdates.Count > 0)
{ {
<div id="updateAvailableContainer"> <div id="updateAvailableContainer">
<i class="fa fa-cloud-download"></i>
<div>@(Model.PluginUpdates.Count) plugin update@(Model.PluginUpdates.Count == 1 ? " is" : "s are") available</div> <div>@(Model.PluginUpdates.Count) plugin update@(Model.PluginUpdates.Count == 1 ? " is" : "s are") available</div>
@if (canInstall) @if (canInstall)
{ {
@Html.ActionLinkButton("Update Now", MVC.API.Plugin.UpdateAll()) @Html.ActionLinkSmallButton("Update Now", MVC.API.Plugin.UpdateAll(), null, "alert")
} }
else else
{ {
Disco.Web/Areas/Config/Views/Plugins/Index.generated.cs
+33 -35
View File
@@ -350,14 +350,12 @@ WriteLiteral(" style=\"display: none; padding: 0.7em 0.7em; margin-top: 8px;\"")
WriteLiteral(" class=\"ui-state-error ui-corner-all\""); WriteLiteral(" class=\"ui-state-error ui-corner-all\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <i");
WriteLiteral(" style=\"margin-right: 0.3em; float: left;\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral("></i>&nbsp;NOTE: Data will be permanently deleted\r\n </div>\r\n " +
" </div>\r\n </div>\r\n");
WriteLiteral("></span>NOTE: Data will be permanently deleted\r\n </div>\r\n " +
" </div>\r\n </div>\r\n");
WriteLiteral(" <div"); WriteLiteral(" <div");
@@ -371,13 +369,11 @@ WriteLiteral(" style=\"padding: 0.7em 0.7em; margin-top: 8px;\"");
WriteLiteral(" class=\"ui-state-highlight ui-corner-all\""); WriteLiteral(" class=\"ui-state-highlight ui-corner-all\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <i");
WriteLiteral(" style=\"margin-right: 0.3em; float: left;\""); WriteLiteral(" class=\"fa fa-info-circle information\"");
WriteLiteral(" class=\"ui-icon ui-icon-help\""); WriteLiteral("></i>&nbsp;Are you sure you want to uninstall this plugin?\r\n <h4");
WriteLiteral("></span>Are you sure you want to uninstall this plugin?\r\n <h4");
WriteLiteral(" id=\"uninstallPluginConfirm\""); WriteLiteral(" id=\"uninstallPluginConfirm\"");
@@ -389,14 +385,12 @@ WriteLiteral(" style=\"display: none; padding: 0.7em 0.7em; margin-top: 8px;\"")
WriteLiteral(" class=\"ui-state-error ui-corner-all\""); WriteLiteral(" class=\"ui-state-error ui-corner-all\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <i");
WriteLiteral(" style=\"margin-right: 0.3em; float: left;\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral("></i>&nbsp;NOTE: Data will be permanently deleted\r\n </div>\r\n </" +
"div>\r\n");
WriteLiteral("></span>NOTE: Data will be permanently deleted\r\n </div>\r\n </div" +
">\r\n");
WriteLiteral(" <script>\r\n $(function () {\r\n // Uninstall\r\n " + WriteLiteral(" <script>\r\n $(function () {\r\n // Uninstall\r\n " +
" var uninstallUrl = \'"); " var uninstallUrl = \'");
@@ -460,10 +454,14 @@ WriteLiteral(" <div");
WriteLiteral(" id=\"updateAvailableContainer\""); WriteLiteral(" id=\"updateAvailableContainer\"");
WriteLiteral(">\r\n <div>"); WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-cloud-download\"");
WriteLiteral("></i>\r\n <div>");
#line 174 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 175 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
Write(Model.PluginUpdates.Count); Write(Model.PluginUpdates.Count);
@@ -472,7 +470,7 @@ WriteLiteral(">\r\n <div>");
WriteLiteral(" plugin update"); WriteLiteral(" plugin update");
#line 174 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 175 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
Write(Model.PluginUpdates.Count == 1 ? " is" : "s are"); Write(Model.PluginUpdates.Count == 1 ? " is" : "s are");
@@ -481,13 +479,13 @@ WriteLiteral(" plugin update");
WriteLiteral(" available</div>\r\n"); WriteLiteral(" available</div>\r\n");
#line 175 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 176 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 175 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 176 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
if (canInstall) if (canInstall)
{ {
@@ -495,15 +493,15 @@ WriteLiteral(" available</div>\r\n");
#line default #line default
#line hidden #line hidden
#line 177 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 178 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
Write(Html.ActionLinkButton("Update Now", MVC.API.Plugin.UpdateAll())); Write(Html.ActionLinkSmallButton("Update Now", MVC.API.Plugin.UpdateAll(), null, "alert"));
#line default #line default
#line hidden #line hidden
#line 177 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 178 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
} }
else else
{ {
@@ -518,7 +516,7 @@ WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">You do not have sufficient permission to install these updates.</div>\r\n"); WriteLiteral(">You do not have sufficient permission to install these updates.</div>\r\n");
#line 182 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 183 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
} }
@@ -538,7 +536,7 @@ WriteLiteral(@" <script>
"); ");
#line 193 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 194 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
} }
} }
@@ -552,13 +550,13 @@ WriteLiteral(" class=\"actionBar\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 198 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 199 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 198 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 199 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
if (canUninstall && Model.PluginManifests.Count > 0) if (canUninstall && Model.PluginManifests.Count > 0)
{ {
@@ -566,14 +564,14 @@ WriteLiteral(">\r\n");
#line default #line default
#line hidden #line hidden
#line 200 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 201 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
Write(Html.ActionLinkButton("Uninstall Plugins", MVC.Config.Plugins.Index(), "buttonUninstall")); Write(Html.ActionLinkButton("Uninstall Plugins", MVC.Config.Plugins.Index(), "buttonUninstall"));
#line default #line default
#line hidden #line hidden
#line 200 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 201 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
} }
@@ -583,7 +581,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 202 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 203 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
if (canInstall) if (canInstall)
{ {
@@ -591,14 +589,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 204 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 205 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
Write(Html.ActionLinkButton("Install Plugins", MVC.Config.Plugins.Install())); Write(Html.ActionLinkButton("Install Plugins", MVC.Config.Plugins.Install()));
#line default #line default
#line hidden #line hidden
#line 204 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line 205 "..\..\Areas\Config\Views\Plugins\Index.cshtml"
} }
Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
+2 -2
View File
@@ -69,7 +69,7 @@
<h4 id="dialogInstallPluginDetails"></h4> <h4 id="dialogInstallPluginDetails"></h4>
<div style="padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-highlight ui-corner-all"> <div style="padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-highlight ui-corner-all">
<span style="margin-right: 0.3em; margin-bottom: 2em; float: left;" class="ui-icon ui-icon-alert"></span>Warning: All plugins run with the same level of network privileges as the Disco Web App.<br /> <i class="fa fa-exclamation-triangle fa-lg information"></i>&nbsp;Warning: All plugins run with the same level of network privileges as the Disco Web App.<br />
<strong>Only Install plugins from a trusted source.</strong> <strong>Only Install plugins from a trusted source.</strong>
</div> </div>
</div> </div>
@@ -84,7 +84,7 @@
} }
</div> </div>
<div style="padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-error ui-corner-all"> <div style="padding: 0.7em 0.7em; margin-top: 8px;" class="ui-state-error ui-corner-all">
<span style="margin-right: 0.3em; margin-bottom: 2em; float: left;" class="ui-icon ui-icon-alert"></span>Warning: All plugins run with the same level of network privileges as the Disco Web App.<br /> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Warning: All plugins run with the same level of network privileges as the Disco Web App.<br />
<strong>Only install plugins from a trusted source.</strong> <strong>Only install plugins from a trusted source.</strong>
</div> </div>
</div> </div>
Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs
+10 -14
View File
@@ -394,15 +394,13 @@ WriteLiteral(" style=\"padding: 0.7em 0.7em; margin-top: 8px;\"");
WriteLiteral(" class=\"ui-state-highlight ui-corner-all\""); WriteLiteral(" class=\"ui-state-highlight ui-corner-all\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <i");
WriteLiteral(" style=\"margin-right: 0.3em; margin-bottom: 2em; float: left;\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg information\"");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral("></i>&nbsp;Warning: All plugins run with the same level of network privileges as " +
"the Disco Web App.<br />\r\n <strong>Only Install plugins from a trusted so" +
WriteLiteral("></span>Warning: All plugins run with the same level of network privileges as the" + "urce.</strong>\r\n </div>\r\n</div>\r\n");
" Disco Web App.<br />\r\n <strong>Only Install plugins from a trusted sourc" +
"e.</strong>\r\n </div>\r\n</div>\r\n");
#line 76 "..\..\Areas\Config\Views\Plugins\Install.cshtml" #line 76 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
@@ -467,15 +465,13 @@ WriteLiteral(" style=\"padding: 0.7em 0.7em; margin-top: 8px;\"");
WriteLiteral(" class=\"ui-state-error ui-corner-all\""); WriteLiteral(" class=\"ui-state-error ui-corner-all\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <i");
WriteLiteral(" style=\"margin-right: 0.3em; margin-bottom: 2em; float: left;\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral("></i>&nbsp;Warning: All plugins run with the same level of network privileges as " +
"the Disco Web App.<br />\r\n <strong>Only install plugins from a truste" +
WriteLiteral("></span>Warning: All plugins run with the same level of network privileges as the" + "d source.</strong>\r\n </div>\r\n </div>\r\n");
" Disco Web App.<br />\r\n <strong>Only install plugins from a trusted s" +
"ource.</strong>\r\n </div>\r\n </div>\r\n");
#line 91 "..\..\Areas\Config\Views\Plugins\Install.cshtml" #line 91 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml
+1 -2
View File
@@ -29,8 +29,7 @@
<table class="logEventsViewport" data-bind="visible: EventLogs().length > 0" style="display: none"> <table class="logEventsViewport" data-bind="visible: EventLogs().length > 0" style="display: none">
<tbody data-bind="foreach: EventLogs"> <tbody data-bind="foreach: EventLogs">
<tr> <tr>
<td class="icon" data-bind="css: {information: EventTypeSeverity == 0, warning: EventTypeSeverity == 1, error: EventTypeSeverity == 2}">&nbsp; <td class="icon"><i class="fa" data-bind="css: {'fa-info-circle': EventTypeSeverity == 0, 'fa-exclamation-triangle': EventTypeSeverity == 1, 'fa-exclamation-circle': EventTypeSeverity == 2}"></i></td>
</td>
<td class="timestamp" data-bind="text: FormattedTimestamp"></td> <td class="timestamp" data-bind="text: FormattedTimestamp"></td>
<td class="eventType" data-bind="text: EventTypeName, attr: {title: ModuleDescription}"></td> <td class="eventType" data-bind="text: EventTypeName, attr: {title: ModuleDescription}"></td>
<td class="message" data-bind="text: FormattedMessage, attr: {title: $parent.LogArguments($data)}"></td> <td class="message" data-bind="text: FormattedMessage, attr: {title: $parent.LogArguments($data)}"></td>
Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs
+20 -16
View File
@@ -136,10 +136,14 @@ WriteLiteral(">\r\n <tr>\r\n <td");
WriteLiteral(" class=\"icon\""); WriteLiteral(" class=\"icon\"");
WriteLiteral(" data-bind=\"css: {information: EventTypeSeverity == 0, warning: EventTypeSeverity" + WriteLiteral("><i");
" == 1, error: EventTypeSeverity == 2}\"");
WriteLiteral(">&nbsp;\r\n </td>\r\n <td"); WriteLiteral(" class=\"fa\"");
WriteLiteral(" data-bind=\"css: {\'fa-info-circle\': EventTypeSeverity == 0, \'fa-exclamation-trian" +
"gle\': EventTypeSeverity == 1, \'fa-exclamation-circle\': EventTypeSeverity == 2}\"");
WriteLiteral("></i></td>\r\n <td");
WriteLiteral(" class=\"timestamp\""); WriteLiteral(" class=\"timestamp\"");
@@ -161,13 +165,13 @@ WriteLiteral("></td>\r\n </tr>\r\n </tbody>\r\n
"\r\n"); "\r\n");
#line 41 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 40 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
#line default #line default
#line hidden #line hidden
#line 41 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 40 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
var eventTypesFilterJson = (Model.EventTypesFilter != null) ? Newtonsoft.Json.JsonConvert.SerializeObject(Model.EventTypesFilter.Select(et => et.Id).ToArray()) : "null"; var eventTypesFilterJson = (Model.EventTypesFilter != null) ? Newtonsoft.Json.JsonConvert.SerializeObject(Model.EventTypesFilter.Select(et => et.Id).ToArray()) : "null";
@@ -181,7 +185,7 @@ WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(">\r\n $(function () {\r\n var logEventsHost = $(\'LogEvents_"); WriteLiteral(">\r\n $(function () {\r\n var logEventsHost = $(\'LogEvents_");
#line 46 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 45 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(uniqueId); Write(uniqueId);
@@ -190,7 +194,7 @@ WriteLiteral(">\r\n $(function () {\r\n var logEventsHost = $(
WriteLiteral("\');\r\n var logModuleId = \'"); WriteLiteral("\');\r\n var logModuleId = \'");
#line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 46 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(Model.ModuleFilter != null ? Model.ModuleFilter.ModuleId.ToString() : null); Write(Model.ModuleFilter != null ? Model.ModuleFilter.ModuleId.ToString() : null);
@@ -199,7 +203,7 @@ WriteLiteral("\');\r\n var logModuleId = \'");
WriteLiteral("\';\r\n var logModuleLiveGroupName = \'"); WriteLiteral("\';\r\n var logModuleLiveGroupName = \'");
#line 48 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(Model.ModuleFilter != null ? Model.ModuleFilter.LiveLogGroupName : Disco.BI.Interop.SignalRHandlers.LogNotifications.AllNotifications); Write(Model.ModuleFilter != null ? Model.ModuleFilter.LiveLogGroupName : Disco.BI.Interop.SignalRHandlers.LogNotifications.AllNotifications);
@@ -208,7 +212,7 @@ WriteLiteral("\';\r\n var logModuleLiveGroupName = \'");
WriteLiteral("\';\r\n var logEventTypeFiltered = "); WriteLiteral("\';\r\n var logEventTypeFiltered = ");
#line 49 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 48 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(eventTypesFilterJson); Write(eventTypesFilterJson);
@@ -217,7 +221,7 @@ WriteLiteral("\';\r\n var logEventTypeFiltered = ");
WriteLiteral(";\r\n var logStartFiler = "); WriteLiteral(";\r\n var logStartFiler = ");
#line 50 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 49 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(AjaxHelpers.JsonDate(Model.StartFilter)); Write(AjaxHelpers.JsonDate(Model.StartFilter));
@@ -226,7 +230,7 @@ WriteLiteral(";\r\n var logStartFiler = ");
WriteLiteral(";\r\n var logEndFiler = "); WriteLiteral(";\r\n var logEndFiler = ");
#line 51 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 50 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(AjaxHelpers.JsonDate(Model.EndFilter)); Write(AjaxHelpers.JsonDate(Model.EndFilter));
@@ -235,7 +239,7 @@ WriteLiteral(";\r\n var logEndFiler = ");
WriteLiteral(";\r\n var logTakeFiler = \'"); WriteLiteral(";\r\n var logTakeFiler = \'");
#line 52 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 51 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(Model.TakeFilter); Write(Model.TakeFilter);
@@ -245,7 +249,7 @@ WriteLiteral("\';\r\n var liveConnection = null;\r\n var l
"tion = \'"); "tion = \'");
#line 54 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 53 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(Model.JavascriptLiveEventFunctionName); Write(Model.JavascriptLiveEventFunctionName);
@@ -254,7 +258,7 @@ WriteLiteral("\';\r\n var liveConnection = null;\r\n var l
WriteLiteral("\';\r\n var useLive = (\'True\'===\'"); WriteLiteral("\';\r\n var useLive = (\'True\'===\'");
#line 55 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 54 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(Model.IsLive); Write(Model.IsLive);
@@ -297,7 +301,7 @@ WriteLiteral(@"');
url: '"); url: '");
#line 89 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 88 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(Url.Action(MVC.API.Logging.RetrieveEvents())); Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
@@ -334,7 +338,7 @@ WriteLiteral(@"',
liveConnection = $.connection('"); liveConnection = $.connection('");
#line 117 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml" #line 116 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
Write(Url.Content("~/API/Logging/Notifications")); Write(Url.Content("~/API/Logging/Notifications"));
Disco.Web/Areas/Config/Views/SystemConfig/Index.cshtml
+13 -15
View File
@@ -67,7 +67,7 @@
<th style="width: 135px">Last Check: <th style="width: 135px">Last Check:
</th> </th>
<td> <td>
<div class="error"><span class="icon error" style="margin-right: 6px;"></span>Never</div> <div class="error"><i class="fa fa-exclamation-circle fa-lg"></i>&nbsp;Never</div>
</td> </td>
</tr> </tr>
} }
@@ -87,7 +87,7 @@
</th> </th>
<td> <td>
<div> <div>
<span class="icon warning" style="margin-right: 6px;"></span>Version @(Model.UpdateLatestResponse.Version) is available <i class="fa fa-info-circle fa-lg information"></i>&nbsp;Version @(Model.UpdateLatestResponse.Version) is available
</div> </div>
<div class="smallMessage"> <div class="smallMessage">
[Released @(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.VersionReleasedTimestamp))] [Released @(CommonHelpers.FriendlyDate(Model.UpdateLatestResponse.VersionReleasedTimestamp))]
@@ -103,34 +103,32 @@
<th style="width: 135px">Status: <th style="width: 135px">Status:
</th> </th>
<td> <td>
<span class="icon success" style="margin-right: 6px;"></span><span>The latest version is installed</span> <i class="fa fa-check-square fa-lg success"></i>&nbsp;<span>The latest version is installed</span>
</td> </td>
</tr> </tr>
} }
} }
} }
<tr> <tr>
<th style="width: 135px">Check for Update:@{ <th style="width: 135px">Check for Update:</th>
if (Model.UpdateBetaDeployment)
{
<div class="alert"><span class="icon warning" style="margin-right: 6px;"></span>Beta Deployment</div>
}
}
</th>
<td> <td>
@{ @{
if (Model.UpdateRunningStatus == null) if (Model.UpdateRunningStatus == null)
{ {
<div>@Html.ActionLink("Check Now", MVC.API.System.UpdateCheck())</div> <span>@Html.ActionLinkSmallButton("Check Now", MVC.API.System.UpdateCheck())</span>
<span class="smallMessage">[Will run automatically <strong>@CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown")</strong>]</span>
} }
else else
{ {
<div>Running now - @Html.ActionLink("Check Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId))</div> <span>@Html.ActionLink("View Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId))</span>
<span class="smallMessage">[Running Now]</span>
} }
} }
<div class="smallMessage"> @if (Model.UpdateBetaDeployment)
Next Scheduled: @CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown") {
</div> <hr />
<span class="alert"><i class="fa fa-info-circle fa-lg"></i>&nbsp;Beta Deployment</span>
}
</td> </td>
</tr> </tr>
</table> </table>
Disco.Web/Areas/Config/Views/SystemConfig/Index.generated.cs
+93 -87
View File
@@ -236,13 +236,11 @@ WriteLiteral(">Last Check:\r\n </th>\r\n <td>\r\n
WriteLiteral(" class=\"error\""); WriteLiteral(" class=\"error\"");
WriteLiteral("><span"); WriteLiteral("><i");
WriteLiteral(" class=\"icon error\""); WriteLiteral(" class=\"fa fa-exclamation-circle fa-lg\"");
WriteLiteral(" style=\"margin-right: 6px;\""); WriteLiteral("></i>&nbsp;Never</div>\r\n </td>\r\n </tr>\r\n");
WriteLiteral("></span>Never</div>\r\n </td>\r\n </tr>\r\n");
#line 73 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 73 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
@@ -282,17 +280,15 @@ WriteLiteral(" <tr>\r\n <th");
WriteLiteral(" style=\"width: 135px\""); WriteLiteral(" style=\"width: 135px\"");
WriteLiteral(">Update Available:\r\n </th>\r\n <td>\r\n " + WriteLiteral(">Update Available:\r\n </th>\r\n <td>\r\n " +
" <div>\r\n <span"); " <div>\r\n <i");
WriteLiteral(" class=\"icon warning\""); WriteLiteral(" class=\"fa fa-info-circle fa-lg information\"");
WriteLiteral(" style=\"margin-right: 6px;\""); WriteLiteral("></i>&nbsp;Version ");
WriteLiteral("></span>Version ");
#line 90 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 90 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Model.UpdateLatestResponse.Version); Write(Model.UpdateLatestResponse.Version);
#line default #line default
@@ -325,14 +321,14 @@ WriteLiteral(">");
#line hidden #line hidden
WriteLiteral("</div>\r\n <a"); WriteLiteral("</div>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 3670), Tuple.Create("\"", 3714) WriteAttribute("href", Tuple.Create(" href=\"", 3659), Tuple.Create("\"", 3703)
#line 96 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 96 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
, Tuple.Create(Tuple.Create("", 3677), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink , Tuple.Create(Tuple.Create("", 3666), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink
#line default #line default
#line hidden #line hidden
, 3677), false) , 3666), false)
); );
WriteLiteral(" target=\"_blank\""); WriteLiteral(" target=\"_blank\"");
@@ -352,14 +348,12 @@ WriteLiteral(" <tr>\r\n <th");
WriteLiteral(" style=\"width: 135px\""); WriteLiteral(" style=\"width: 135px\"");
WriteLiteral(">Status:\r\n </th>\r\n <td>\r\n <span"); WriteLiteral(">Status:\r\n </th>\r\n <td>\r\n <i");
WriteLiteral(" class=\"icon success\""); WriteLiteral(" class=\"fa fa-check-square fa-lg success\"");
WriteLiteral(" style=\"margin-right: 6px;\""); WriteLiteral("></i>&nbsp;<span>The latest version is installed</span>\r\n </td>\r\n " +
" </tr>\r\n");
WriteLiteral("></span><span>The latest version is installed</span>\r\n </td>\r\n " +
" </tr>\r\n");
#line 109 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 109 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
@@ -373,46 +367,16 @@ WriteLiteral("\r\n <tr>\r\n <th");
WriteLiteral(" style=\"width: 135px\""); WriteLiteral(" style=\"width: 135px\"");
WriteLiteral(">Check for Update:"); WriteLiteral(">Check for Update:</th>\r\n <td>\r\n");
#line 113 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 115 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
if (Model.UpdateBetaDeployment)
{
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" class=\"alert\"");
WriteLiteral("><span");
WriteLiteral(" class=\"icon warning\"");
WriteLiteral(" style=\"margin-right: 6px;\"");
WriteLiteral("></span>Beta Deployment</div>\r\n");
#line 117 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
#line default
#line hidden
WriteLiteral("\r\n </th>\r\n <td>\r\n");
#line 121 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
#line default #line default
#line hidden #line hidden
#line 121 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 115 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
if (Model.UpdateRunningStatus == null) if (Model.UpdateRunningStatus == null)
{ {
@@ -420,19 +384,34 @@ WriteLiteral("\r\n </th>\r\n <td>\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div>"); WriteLiteral(" <span>");
#line 124 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 118 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ActionLink("Check Now", MVC.API.System.UpdateCheck())); Write(Html.ActionLinkSmallButton("Check Now", MVC.API.System.UpdateCheck()));
#line default #line default
#line hidden #line hidden
WriteLiteral("</div>\r\n"); WriteLiteral("</span>\r\n");
WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">[Will run automatically <strong>");
#line 125 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 119 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown"));
#line default
#line hidden
WriteLiteral("</strong>]</span>\r\n");
#line 120 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
} }
else else
{ {
@@ -440,42 +419,69 @@ WriteLiteral("</div>\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div>Running now - "); WriteLiteral(" <span>");
#line 128 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 123 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ActionLink("Check Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId))); Write(Html.ActionLink("View Status", MVC.Config.Logging.TaskStatus(Model.UpdateRunningStatus.SessionId)));
#line default #line default
#line hidden #line hidden
WriteLiteral("</div>\r\n"); WriteLiteral("</span>\r\n");
WriteLiteral(" <span");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">[Running Now]</span>\r\n");
#line 129 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 125 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n <div"); WriteLiteral("\r\n");
WriteLiteral(" class=\"smallMessage\"");
WriteLiteral(">\r\n Next Scheduled: ");
#line 132 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 127 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(CommonHelpers.FriendlyDate(Model.UpdateNextScheduled, "Unknown"));
#line default
#line hidden
#line 127 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
if (Model.UpdateBetaDeployment)
{
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n </table>\r\n</div>\r" + WriteLiteral(" <hr />\r\n");
"\n");
WriteLiteral(" <span");
WriteLiteral(" class=\"alert\"");
WriteLiteral("><i");
WriteLiteral(" class=\"fa fa-info-circle fa-lg\"");
WriteLiteral("></i>&nbsp;Beta Deployment</span>\r\n");
#line 138 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 131 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
}
#line default
#line hidden
WriteLiteral(" </td>\r\n </tr>\r\n </table>\r\n</div>\r\n");
#line 136 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
if (canConfigProxy) if (canConfigProxy)
{ {
using (Html.BeginForm()) using (Html.BeginForm())
@@ -500,7 +506,7 @@ WriteLiteral(">Address:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 149 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 147 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.EditorFor(m => m.ProxyAddress)); Write(Html.EditorFor(m => m.ProxyAddress));
@@ -511,7 +517,7 @@ WriteLiteral("<br />\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 150 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 148 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ValidationMessageFor(m => m.ProxyAddress)); Write(Html.ValidationMessageFor(m => m.ProxyAddress));
@@ -527,7 +533,7 @@ WriteLiteral(">Port:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 157 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 155 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.EditorFor(m => m.ProxyPort)); Write(Html.EditorFor(m => m.ProxyPort));
@@ -538,7 +544,7 @@ WriteLiteral("<br />\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 158 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 156 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ValidationMessageFor(m => m.ProxyPort)); Write(Html.ValidationMessageFor(m => m.ProxyPort));
@@ -554,7 +560,7 @@ WriteLiteral(">Username:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 165 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 163 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.EditorFor(m => m.ProxyUsername)); Write(Html.EditorFor(m => m.ProxyUsername));
@@ -565,7 +571,7 @@ WriteLiteral("<br />\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 166 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 164 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ValidationMessageFor(m => m.ProxyUsername)); Write(Html.ValidationMessageFor(m => m.ProxyUsername));
@@ -581,7 +587,7 @@ WriteLiteral(">Password:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 173 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 171 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.EditorFor(m => m.ProxyPassword)); Write(Html.EditorFor(m => m.ProxyPassword));
@@ -592,7 +598,7 @@ WriteLiteral("<br />\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 174 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 172 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ValidationMessageFor(m => m.ProxyPassword)); Write(Html.ValidationMessageFor(m => m.ProxyPassword));
@@ -614,7 +620,7 @@ WriteLiteral(" value=\"Save Proxy Settings\"");
WriteLiteral(" />\r\n </td>\r\n </tr>\r\n </table>\r\n </div>\r\n"); WriteLiteral(" />\r\n </td>\r\n </tr>\r\n </table>\r\n </div>\r\n");
#line 186 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 184 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
} }
} }
else else
@@ -639,7 +645,7 @@ WriteLiteral(">Address:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 197 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 195 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.DisplayFor(m => m.ProxyAddress)); Write(Html.DisplayFor(m => m.ProxyAddress));
@@ -655,7 +661,7 @@ WriteLiteral(">Port:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 204 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 202 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.DisplayFor(m => m.ProxyPort)); Write(Html.DisplayFor(m => m.ProxyPort));
@@ -671,7 +677,7 @@ WriteLiteral(">Username:\r\n </th>\r\n <td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 211 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 209 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.DisplayFor(m => m.ProxyUsername)); Write(Html.DisplayFor(m => m.ProxyUsername));
@@ -686,7 +692,7 @@ WriteLiteral(">Password:\r\n </th>\r\n <td>*******
"</td>\r\n </tr>\r\n </table>\r\n </div>\r\n"); "</td>\r\n </tr>\r\n </table>\r\n </div>\r\n");
#line 222 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 220 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
} }
@@ -701,7 +707,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 224 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 222 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Html.ActionLinkButton("Update Device Last Network Logons", MVC.API.System.UpdateLastNetworkLogonDates())); Write(Html.ActionLinkButton("Update Device Last Network Logons", MVC.API.System.UpdateLastNetworkLogonDates()));
Disco.Web/ClientSource/Scripts/Modules/Disco-AjaxHelperIcons.js
+2 -2
View File
@@ -1,4 +1,4 @@
///#source 1 1 /ClientSource/Scripts/Modules/Disco-AjaxHelperIcons/disco.ajaxhelpericons.js ///#source 1 1 /ClientSource/Scripts/Modules/Disco-AjaxHelperIcons/disco.ajaxhelpericons.js
$(function () { $(function () {
$('.ajaxHelperIcon:not(.ajaxShowInitially)').hide(); $('.ajaxLoading:not(.showInitially)').hide();
}) })
Disco.Web/ClientSource/Scripts/Modules/Disco-AjaxHelperIcons.min.js
Vendored
+4 -2
View File
@@ -1,2 +1,4 @@
$(function(){$(".ajaxHelperIcon:not(.ajaxShowInitially)").hide()}); $(function(){$(".ajaxLoading:not(.showInitially)").hide()});
//@ sourceMappingURL=Disco-AjaxHelperIcons.min.js.map /*
//# sourceMappingURL=Disco-AjaxHelperIcons.min.js.map
*/
Disco.Web/ClientSource/Scripts/Modules/Disco-AjaxHelperIcons.min.js.map
+1 -1
View File
@@ -2,7 +2,7 @@
"version":3, "version":3,
"file":"Disco-AjaxHelperIcons.min.js", "file":"Disco-AjaxHelperIcons.min.js",
"lineCount":1, "lineCount":1,
"mappings":"AAAAA,CAAC,CAAC,QAAS,CAAA,CAAG,CACVA,CAAC,CAAC,yCAAD,CAA2CC,KAAK,CAAA,CADvC,CAAb,C", "mappings":"AAAAA,CAAC,CAAC,QAAS,CAAA,CAAG,CACVA,CAAC,CAAC,kCAAD,CAAoCC,KAAK,CAAA,CADhC,CAAb,C",
"sources":["/ClientSource/Scripts/Modules/Disco-AjaxHelperIcons/disco.ajaxhelpericons.js"], "sources":["/ClientSource/Scripts/Modules/Disco-AjaxHelperIcons/disco.ajaxhelpericons.js"],
"names":["$","hide"] "names":["$","hide"]
} }
Disco.Web/ClientSource/Scripts/Modules/Disco-AjaxHelperIcons/disco.ajaxhelpericons.js
+1 -1
View File
@@ -1,3 +1,3 @@
$(function () { $(function () {
$('.ajaxHelperIcon:not(.ajaxShowInitially)').hide(); $('.ajaxLoading:not(.showInitially)').hide();
}) })
Disco.Web/ClientSource/Style/BundleSite.css
+69 -58
View File
@@ -3078,13 +3078,16 @@ header nav ul#menu > li > a,
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
} }
header nav ul#menu > li > a:hover,
#header nav ul#menu > li > a:hover,
header nav ul#menu > li > a:active, header nav ul#menu > li > a:active,
#header nav ul#menu > li > a:active { #header nav ul#menu > li > a:active {
color: #cddbec; color: #cddbec;
text-decoration: none; text-decoration: none;
} }
header nav ul#menu > li:hover > a,
#header nav ul#menu > li:hover > a {
color: #cddbec;
text-decoration: none;
}
header nav ul#menu > li > ul, header nav ul#menu > li > ul,
#header nav ul#menu > li > ul { #header nav ul#menu > li > ul {
z-index: 100000; z-index: 100000;
@@ -3118,13 +3121,6 @@ header nav ul#menu > li > ul li:hover:not(:first-child),
#header nav ul#menu > li > ul li:hover:not(:first-child) { #header nav ul#menu > li > ul li:hover:not(:first-child) {
border-top: 1px solid #d9d9d9; border-top: 1px solid #d9d9d9;
} }
header nav ul#menu > li > ul li.hasSubMenu,
#header nav ul#menu > li > ul li.hasSubMenu {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAKCAYAAAC9vt6cAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QoRASA2m51WBgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAUElEQVQoz6XMMQ3AMBBD0S9TKJWCKIlDZxLh0FAJhy6tFGWL6+XOgx+2b9sHYQScQEsRvTdGNP0RoqVvI+JnVqADV1WNBNgez0A0/oB4DPAAhbAcw1qVNTUAAAAASUVORK5CYII=) /*Images/SubSubMenuIcon.png*/;
background-position: center right;
background-repeat: no-repeat;
padding-right: 14px;
}
header nav ul#menu > li > ul li a, header nav ul#menu > li > ul li a,
#header nav ul#menu > li > ul li a { #header nav ul#menu > li > ul li a {
display: block; display: block;
@@ -3141,6 +3137,20 @@ header nav ul#menu > li > ul li a:active,
#header nav ul#menu > li > ul li a:active { #header nav ul#menu > li > ul li a:active {
text-decoration: none; text-decoration: none;
} }
header nav ul#menu > li > ul li i.fa,
#header nav ul#menu > li > ul li i.fa {
cursor: pointer;
color: #848484;
font-size: 16px;
position: absolute;
display: block;
right: 12px;
top: 7px;
}
header nav ul#menu > li > ul li:hover i.fa,
#header nav ul#menu > li > ul li:hover i.fa {
color: #515151;
}
header nav ul#menu > li > ul ul, header nav ul#menu > li > ul ul,
#header nav ul#menu > li > ul ul { #header nav ul#menu > li > ul ul {
display: none; display: none;
@@ -3353,7 +3363,7 @@ a.button.disabled {
} }
a.button.alert { a.button.alert {
border-color: #990000; border-color: #990000;
background-color: #e90000; background-color: #e51400;
} }
a.button.small { a.button.small {
padding: 2px 5px; padding: 2px 5px;
@@ -3636,47 +3646,39 @@ table.genericData td.id a {
.dataTables_wrapper table > thead tr > th.sorting_disabled { .dataTables_wrapper table > thead tr > th.sorting_disabled {
background-image: none; background-image: none;
} }
span.icon { .jobStatus {
display: inline-block; color: #515151;
height: 16px;
width: 16px;
margin-left: 2px;
cursor: pointer;
cursor: default;
} }
span.icon.JobStatusClosed, .jobStatus.Closed {
span.icon.DeviceStatusDecommissioned { color: #9e9e9e;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACg0lEQVQ4y3VTTWsaURR9M35EDWqMxhBoUIrFD0h+QIuIWLPrrkhWiuAiuHCRIsmuaaEEau0yUFDX/oIuQjZBLBbsQhtSqEiLIFqDiVFj/RjHnvdoili9MMzMnXvPOXPufRyZH3KNRuMwGAyboijy19fX1Xa7/RX5wWwhN/u+tbW1HwwGw06n86Fer2fJZrNJstlsJZVKfSgWi2+REv4DkEgkBjSmo9GoB+zk9vZ2LJfLJRzHkeFwKOp0Oh45Eo/HPyUSieeCINSmAWSBQODjwcHB01arNVpaWpLRRlbw9z6ZTMhgMBAAJI3FYp+TyaQb6d/s6/b29v7x8XG83++PZAhaPN14HzzPk/F4LIBAenh4eFQoFF5xSMojkch3h8NhAgBrvG+eF/QbAAi8qJ+cnDziIMkWDoe/3d3diSDn4QVjWhSYChmNRiI84NPp9GPOYrF43G73GXUappHl5WUilUrnNkM+9YHdaS0ms8vZbDaP1Wo9q9VqRKFQkNXVVQIlcwHATKCUqaC/Uq1Wdzmz2bzp9Xor+Xx+AukcBVikALLvAUS1Ws1XKpUn1AOJ3+/vnJ6eKldWVphBVB71YXoSlBX7QKjRdB+wcL9yuZyFVezs7LxwuVzvMpmMCJm8Uqkk9KJKKAj9Z9rY7XYpkADVUsh/DdKXDGBtbY3b29urgn2jXC6LaOQhkahUKqaEGocFI71ejy0SgPIgc5VKpd6/gZtMJnkoFPppNBo3rq6uCA7SRKvV0j2hkicwmT03Go0v5+fnz7AHtXmHifh8vihMPbLb7SoAsNzNzQ25vLxsg/U9tu/NxcWFsOg0soBBkvX19Qc4jRaw8p1Op1Kv139gUsPZ2j85BjJj8dYkIwAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Closed.png*/;
} }
span.icon.JobStatusOpen, .jobStatus.Open {
span.icon.DeviceStatusActive { color: #60a917;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACs0lEQVQ4y4WTXUiTURjHJ9Wi6PKc9z3vtnebm9vcNNM0v2fldKI2tS7SyqRMceRXS8qlhjgpUjQ0KlAsow+yboq6iKwb+wCjvOkqLxKVsC686UIL5/bvrMIwZj3w48Dz/5/nOTycR6EIE4QQpWgm8YZM2WXI0BSLFpLEcxsV/wtuirDtiWyqfXLw48BCF+5jEPcwgMvfOuEeLZ2xuSJbuGd9+MuMkLze5Ofn4cElnEM32pb74EM/OtGL9sANXOFZD/L6k18TiUh/d96Q3RX/rBlH4V4sW6pfrkBj4AjqgxWoRTnqcBjHg4dQ832//wyqsLtn2zihZNNKAWuR9mT5fDaKpuxLrtksuGY4/CyczUTBbMYKrk92FE/v9JfNO2Apkdt/XqYiVdpvGqcTJnRIHItC4gsTxxyWpJdm7HhlQeKEESnX9Z+pRLcoVFYxOuWhBuYhFjAMizDcYjDc/gdcNw2zwNZhBk2CmKaI3KV2JF5VQe8VoG6jUF+gUPWsQRfXfRS6Dgprr4jIHFaqMORqHNu9euhKBbByCuYhEJvDwzwUUjWFzDHX8QL5vIAqnckZQ/wF+4SgtJcbqwgEd3hCmnSAQC6jgZgGCXKOmK4g0WSdfUS9yJxcLOPGCgJazanhuH9T8ysX0lTcE/Im+DRfhBQ+xFDE1mmb4kYF6OtpgB3jxjre7TSnlZtbBai8IlijALGSQFNJ/XF9DNG16o4/HymWROQ9ss2ljQkwdgsBmQ9MP8gQdUcDy10dTNe00Pbwqfuo3zggIKlf+5Zm0c2rfiNNoUrnU9ucc0oN+QFB+rg1mP8hFfmTach4ExsURwhMjwlSh7XvWIEgrblQMS2GU65J68IJFOIiGjiNqA+4UPg+9mtMp9xOnGss06rdyKPrpEpRJ3tVDt1ZlivV8oUuocpw3h+OzGWzs/zxOgAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Open.png*/;
} }
span.icon.JobStatusAwaitingWarrantyRepair, .jobStatus.AwaitingWarrantyRepair,
span.icon.JobStatusAwaitingRepairs { .jobStatus.AwaitingRepairs {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACwklEQVQ4y4WTX0jTURTHJ5pR+Hjv7/ebzqlZ6kzJhbj8N6dzmqb5J3NWOtJmav7LTBNTbNPAlVY+FGyYk0ryJfr3YJk+WAlGZlQECWkqYT340oMW6vbtmtE/Zh74cC7nfM+53HvPFYkcGCHElXj7hXjKo1Il8sg04uMfymIbResZEzn5qFKqD1r6Jkwv52GZAczTQPPYV2gt/dM+qtR6pnFxXMwJJKy6faDqDXB2HGgYw7LxLStmNL2C7fIHYCUXVtMxTHix+N+dN4RUmh7ljwI5fQuLuoFlHB60QTdoR+4gkMc4NGBH9oNvS/oxYEdl2wihdNOvBtLYvSfi7s4h2jq5qLTOQGmdxoqP6ppB5B9Ed39ETPfUkvrWHDxj05t+FFOOd/VtvDbl1foCWw1D2GZ8DD/DGjQ/gX/LU/gyrXdt1yfKi91EvK8sQGK4A6G408YftTJ/nXHjP7B8idUmHLeCl8nDRR6hKrV71RVwGXWgaQ2gWa2g+9sck2UCzTSytQG8vh2CIl4rkig0am9dHTiVFjQyFySxCiTplENoQhVobCGophB8RhmEiCStSNge4ene0AlOmWknigyQGD2IqtgxK7moA6DKHJs4uwJ8aHyEiEgDnD1aeheIPAEkMoehA1EWMnERo/gnRauxlVwU0zCtRG/8TP0VbqvPuK+smjvTD5pSbiOqIyBxZSC7a0H2nAbH4JPZETWVrEkBaFzBknDsEjzSSw2/B8k7yCnw/L1Z7uIQuLxzNprTBiHfAklJD7xKb0KqvwqBxdgFLnGFZkjLO57TQOXmv6aR+ilcAy88nPXonQQpvQ2ZacS+y/wO4eZxBJme2Ul+L8jJ+5DWWUe5ncniNT/UFm19jaxnfH4PG+uKCaDyPZA6bENQ1+svnrrmJhKc4LL+rwxOdOaVBV7uKXVqIbNRw6tL/Yk83dWR9jsKtpCP82kfBAAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Repairs.png*/; color: #1e6dab;
} }
span.icon.JobStatusAwaitingDeviceReturn, .jobStatus.AwaitingDeviceReturn,
span.icon.JobStatusAwaitingUserAction, .jobStatus.AwaitingUserAction,
span.icon.JobStatusAwaitingAccountingPayment, .jobStatus.AwaitingAccountingPayment,
span.icon.JobStatusAwaitingAccountingCharge, .jobStatus.AwaitingAccountingCharge {
span.icon.DeviceStatusNotEnrolled { color: #f0a30a;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACyElEQVQ4y4WTWUhUYRTHRyqj6PH77r2j46hZbgxkEOM+huPW4lqkuUzuVm5M5jg5iqm51RgpWSnagKbZU6HZovWgFSklhEbkg6JS2oNhPTiaOvPv3gKpGOnAj+9wzv+cDw7niEQWjBBi7exEPPy87MJ95ZJIFydygI9tF/3PeJHVUaVjweOu+Mmlz3XASgvwoxnLc5Xovxc7Ex7kWMxrtlos5jhC6nXyZzCqAVQBxpJ1rFcApkpgucwENPHN1Gi4KH8lFhPxvz9vq9N4DGApBca5uNX1ryqYFpNhXlQB3xJ5kng/ASvzJ9awnA69bt8wpWTHRoMIpfTcwlggpkb9V2fHFZgZU0B4Z8f9MDvmu8Gn9/6YfhewtvBBiahgu7JfxSxLrdtrnaZHB+wx2LsHQw/3YqjP2SIveF4+csHocyfcrnGYF4vpLpGbM+v6oEmC1qucyXCdRcctDndaNkfIGxp57RUO+2Wst+igj63yRqkNtHkMSjQUtRUU+hrL1F2iqNBRlBdR1OtYBPlysaLgAIlSm+mA2AgGifEU6lyCovOWUedRZKTwJFHkJLI4FMA38PHi7Fp1NogJY8zR4QTpKQSnMy0j5E4eJ4iLpqa8BDGCFKyPyNWVbOmusjWGBPKJYwSqRIKMNIKsDL4o6zeCL8SEXFwMgaCtyJV88ZTzQxQsRyUt6G9nkJtKTWkqgpyzBJoCAp2W5wIDrYZFfg6D1FMEqQl07Voxh2yVbfnGHshkxKqnyX1usI3B5VLGpOeH1dLIobNVgrsGe7TdlEJfzQkDXGvWM2jQSd8oFHTnX9vo6Umtn7a6z0312OJ+F8HwEzfzx9demBjxxsiAzNzdSdDbQWColr49HMaINz2oYvXuwok+tyVMHQEW8njyYZoMx1iv7HtloV1ZSMgmx/SnhYaSLanJrL220EZZquGCs8+wLpFRxNqS9ifnTKmvqTT0WwAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-User.png*/;
} }
span.icon.JobStatusAwaitingInsuranceProcessing { .jobStatus.AwaitingInsuranceProcessing {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACzElEQVQ4y4WTbUiTURTHJ9mi8OO9z/NM59Q0p2ZkEJrv1jYly7Q3Z2XLmWalqcvS+ZJDpfCVNEhwacO0NAqK+lBqQWaBkfZBiGaUqIm9+cVQC+ezf88MjGLigR/3cM7/3AvnniMS2TFCiNiLeAcEu4bFBUlD472IfKsQWyNayQSRg9Jjd97tw48+fq2axYIR4JuAbxU/cVfdPabyiCsSNI52iznCkdLAuicWHYCLgKUECygX/ApgwQAeVwGrkKsIbHgpIRLJ/y+vLgyo6rFoge9Jc/M/NAuYSeExo7FiNhmYPQrMHLFiKvGXhU8DSjfX9lNC1y5doJLtOWveMYWh8JF5c8Q43kWMwXYOh43DHPqX9+ETeBs5avmgmEKMa4JhsZilrLjW88Zor9sgHnv1omvDc3R7L0cfeuQv0Oc5iBr3658lVOIkkrO+PkbpfVzhmvkm1oQWrg0mrn1ZbPlGzsRf5kzYxG4JFoW6RCnKnBuhY/QopCW4RCtRQ2vtUkmrYKDlKKZlMLB1COOUalGUVKU45a5HAqNGMk1GLtGhgBTYRUd1SKPpSBE4xmZhO7dTLQrmQlwNzs2IZfZZ48lepJE0nCQZdrHlEskh7KdJvEaSjUhWGSLyIfJV1S6dc0oSjYMkCRqiQbogzCAnhKI/2HxbzJY7IGhs2lxp+ZcgGuS0+BNaWVZeB9ONdHqG15LjyCKZyCf5KCbFKGaKoGcLkMPkIJWkQkNTLaVcPbQumWVLc+BPNjoY/R5MtjG9KGOq+UqhYY2cEa3Sm2h368A1WQuquVpbAy31TBMMsobXETR83T/TGEQDxa1+XZNdLiO4Q+7hqW+/dWCbGW+Ch/HM/5W1k9xCJ3mIaplpIJaJlSy7UOfWF53v8R2endgFTGcL5ACf4nh0+Q9N610rDNFE6bjiVsYQ1apUVuumd9YrCrkLqkz2tDyBxIntaX8D6jqsQHV9jFEAAAAASUVORK5CYII=) /*Images/Status/jobStatus-Insurance.png*/; color: #6a00ff;
} }
span.icon.success { .deviceStatus {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB4klEQVQ4y2P4//8/AyWYZA0ckxlYyDaAcy4Dt0SZ0FnBWP7tJBvAOZuBW7xC4MLe67v+x84L+8/ky7CFaAM4pgE1lwtc3Hl92/+o+UH/HWda/Q+c7Pmf0ZVxE1yRyFJWYZElbKbomnnnM3CLlPNd3H5ny/+oTYH/Reax/Refyv1fKFjgLrcHiwBYEftkBhGrfpO3LpPsf3LNZ3CEaZZcy8UjWS94cfvjzf8TjoT+V90u+l9hsfB/Vi+m22xuDJxgL4i2cop59ru82XV36/91t1b+N+3X/ya+mt1Gaaswm1yr+MVVj5b+z7qQ8N/8pMZ//Q1K/1l9mO+weTBwwAORPYh1SdqW2H+VF/P/L74/9//8+zP+azQrf1GtVXi04OnM/yW3M/973rD8b3vI8D9bOPNdjjSIzSixwOHPvsdgocrP+OvB/yc+6fg/7Wnf/6Wv5v+veV74P/K513+fa/b/uZM47grOZOLEmZCY/Bl3G2xU+Rn30v9/y/uK/y2fKv+nf434HwY0QCCH9672XhkOgimRJYRxr8N+sx/5/xL+V/zP/J/6IeK/WJHQXc9bVpxEJ2X2CJbd4af9fja+K/+vVKJwp+hbCgfJeYE3nmufcoP82Tn/J3CSnZnSf0Sy0iQ3omMAFlyLENN9tK8AAAAASUVORK5CYII=) /*Images/Status/success.png*/; color: #515151;
} }
span.icon.error { .deviceStatus.Decommissioned {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Status/error.png*/; color: #9e9e9e;
} }
span.icon.warning { .deviceStatus.Active {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC) /*Images/Status/warning.png*/; color: #60a917;
} }
span.icon.information { .deviceStatus.NotEnrolled {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==) /*Images/Status/information.png*/; color: #f0a30a;
} }
#layout_Page > div.jobTable:first-child { #layout_Page > div.jobTable:first-child {
padding-top: 30px; padding-top: 30px;
@@ -3815,7 +3817,7 @@ button.button {
input[type="submit"].button.alert, input[type="submit"].button.alert,
button.button.alert { button.button.alert {
border-color: #990000; border-color: #990000;
background-color: #e90000; background-color: #e51400;
} }
input[type="submit"].button.small, input[type="submit"].button.small,
button.button.small { button.button.small {
@@ -3955,31 +3957,28 @@ td.subtleHighlight {
.validation-summary-valid { .validation-summary-valid {
display: none; display: none;
} }
.ajaxHelperIcon { .ajaxLoading {
height: 16px; height: 11px;
width: 16px; width: 16px;
display: inline-block; display: inline-block;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-bottom: -4px;
}
.ajaxLoading {
height: 11px;
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*/; 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; margin-bottom: 0;
} }
.ajaxSave {
cursor: pointer;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEUlEQVQ4y52Su05UURSGv33mzDlzc1CpBBI7fAArTWjEyyMY7U14AzsLn8DagicwEk0kEBOjYoBCQmJlSKQTSMB4IsOcy15rL4uZkQBqwd/u7C//ZbmJianbXsP87Oyt6OGD+wXgLBh/U+ScqQW3vPz2wtr653xzY+1q3C+KztjY+FS323X37t4hSVL+p19ZxsLCK9rdywDEDgtJkqpZFPtKEAVRBdyJj2ZGmiYEM8zAl+UAYAaVrwgqiBk+rxBVnDsLCOZQMzQoGnQEMFQVCYG+D/jKo/IPAI4QDFVDvB8AwhCgIVAUQpEXqCrRKUAwQ9RwzhE0IF4GAAyCKFVZYeZod7r44eNpB41mg6OjQypf4UcOLChJmrK19ZWnTx7TaLSGJYL7U6RhQBzH9I96bG9/I0nT4whxvYbXGh8/rlPkfaLIkdbTYVkBCKgEolpE2miSpilpWhs5MMQLIQSarRYzN68zfW0aNWg3m9TrMQ6oxzEbm1/48GmdPM8Jw2OLDRDxHPUOabWazM094sXL1ywuvWP++bMTPZQivF9ZxXvBReXxjCICUUVVRgDs7uyxt7N7psjsZ0ZVVqh6LMSjFUKsqjHeI/EgV6/Xo8h7ZwC+EsQLoorZMIKXar8o+lm/t3+x3WnyZnGJmZkbTE5eYWVllfHxS6gqnU6bLMv4cfCdssg5IBkuNYghnFNuZOW8+g2XUFURWZwj0wAAAABJRU5ErkJggg==) /*Images/Status/save.png*/;
}
.ajaxOk { .ajaxOk {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB5UlEQVQ4y2NgGJyAiYGZQ4pVS8JUKFrCWDCCTYxFjYERKEoM4JRjMfOab3G28V3hv75/9f/7/tb/r3uZ/89xguEhVlEmbbyaueVZLUPP2X7P/h/9P+1H+P/Ub2H/U7+H/8/4Ffk/93/Mf+/dZm9ZhRl1sOtmZ+AwXyB/2/GW4X+78/r/HS8a/Xe6ZPzf6bIxmHa4aPjf5a7Jf50OyRNY9fPrsfkoreX+L7qI/b/UKu7/cuv4/ytsFPyvCMTyGwT+y67l+y+xgvO//BLu/5zyzLYYBkiH8vQJljP/5ypj+M/TzPCftweIJwDxRCDuBYq1M/znqmH4L1TP9F/Ejb0AwwCZMJ4ZPI7M/9m9gQpTGf5zFwE1VQJxNZANNJQ7h+E/ZzTQsBCm/6LeHCUYBoh4ciYLh7P+Z3Vg+M8RDFQcBzQoBWIYZwJQLIzhP6szw3/BQNb/fLasgRgGsOkyi6s2835gDwdqSoe4AGxzGYTNlQFxgUwhxwMmdUYurAEpEceToTSZ8z9XKVATMBwEpjP/F5zJ/J+nDcivYPgv180OdAF7BN60IJnFk6u6iOubxk6B/45X9f47XzP4r7lb+L/iHM4PQnEc8USlRrYAFhnZRoEK0xVKy0yWKy2VquUrZPNjFhuc+Q4ABEOzcbMMpzIAAAAASUVORK5CYII=) /*Images/Status/ok.png*/; color: #60a917;
}
.ajaxSave {
color: #1e6dab;
cursor: pointer;
} }
.ajaxRemove { .ajaxRemove {
color: #e51400;
cursor: pointer; cursor: pointer;
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*/; opacity: .8;
} }
.ajaxRemove:hover { .ajaxRemove:hover {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/; opacity: 1;
} }
#layout_Page div.hiddenDialog { #layout_Page div.hiddenDialog {
display: none; display: none;
@@ -4006,11 +4005,23 @@ div.columnHost .column50 {
float: left; float: left;
width: 50%; width: 50%;
} }
.hidden {
display: none;
}
.success {
color: #60a917;
}
.information {
color: #1e6dab;
}
.warning {
color: #f0a30a;
}
.error { .error {
color: Red; color: #e51400;
} }
.alert { .alert {
color: #ff5e00; color: #fa6800;
} }
.smallText { .smallText {
font-size: 0.9em; font-size: 0.9em;
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Config.css
+119 -90
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Config.less
+139 -85
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Config.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Declarations.less
+18 -1
View File
@@ -11,7 +11,7 @@
@ButtonBorderColour: darken(@ButtonColour, 5%); @ButtonBorderColour: darken(@ButtonColour, 5%);
@ButtonHoverColour: #9e9e9e; @ButtonHoverColour: #9e9e9e;
@ButtonBorderHoverColour: darken(@ButtonHoverColour, 20%); @ButtonBorderHoverColour: darken(@ButtonHoverColour, 20%);
@ButtonAlertColour: #e90000; @ButtonAlertColour: #e51400;
@ButtonBorderAlertColour: #990000; @ButtonBorderAlertColour: #990000;
@MenuHoverColour: lighten(@HyperLinkHoverColour, 30%); @MenuHoverColour: lighten(@HyperLinkHoverColour, 30%);
@@ -36,6 +36,23 @@
@FontFamilyMono: Consolas, "Courier New", monospace; @FontFamilyMono: Consolas, "Courier New", monospace;
@FontWeightHeading: lighter; @FontWeightHeading: lighter;
@FontStretchHeading: condensed; @FontStretchHeading: condensed;
@FontSizeDefault: 12px;
// Status
@StatusUnknown: @HeaderBackgroundColour;
@StatusSuccess: #60a917;
@StatusInformation: @ButtonColour;
@StatusWarning: #f0a30a;
@StatusAlert: #fa6800;
@StatusError: @ButtonAlertColour;
@StatusRemove: @ButtonAlertColour;
// Status: Job & Device
@StatusOpen: @StatusSuccess;
@StatusClosed: darken(@BackgroundColour, 20%);
@StatusAwaitingRepair: @ButtonColour;
@StatusAwaitingUser: @StatusWarning;
@StatusAwaitingProcessing: #6a00ff;
// Border Radius Mixins // Border Radius Mixins
.border-radius(@radius: 5px) { .border-radius(@radius: 5px) {
Disco.Web/ClientSource/Style/Device.css
+1 -1
View File
@@ -311,7 +311,7 @@
} }
#deviceShowResources #Attachments div.attachmentOutput > a span.remove { #deviceShowResources #Attachments div.attachmentOutput > a span.remove {
font-size: 1.4em; font-size: 1.4em;
color: #e90000; color: #e51400;
margin-left: 6px; margin-left: 6px;
cursor: pointer; cursor: pointer;
opacity: 0; opacity: 0;
Disco.Web/ClientSource/Style/Device.less
+1 -1
View File
@@ -278,7 +278,7 @@
span.remove { span.remove {
font-size: 1.4em; font-size: 1.4em;
color: @ButtonAlertColour; color: @StatusRemove;
margin-left: 6px; margin-left: 6px;
cursor: pointer; cursor: pointer;
opacity: 0; opacity: 0;
Disco.Web/ClientSource/Style/Device.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Dialog.css
+17 -17
View File
@@ -1,47 +1,47 @@
.tableData { .tableData {
border: solid 1px #e8eef4; border: solid 1px #f4f4f4;
border-collapse: collapse; border-collapse: collapse;
} }
.tableData > tbody > tr > td { .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 { .tableData > tbody > tr:nth-child(odd) > td {
background-color: #fcfcfd; background-color: #fcfcfc;
} }
.tableData > thead > tr > th, .tableData > thead > tr > th,
.tableData > tbody > 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 { .tableData > tbody > tr:hover > td {
background-color: #e8eef4; background-color: #f4f4f4;
} }
.tableData > tfoot > tr > th, .tableData > tfoot > tr > th,
.tableData > tfoot > tr > td { .tableData > tfoot > tr > td {
background-color: #e8eef4; background-color: #f4f4f4;
} }
.tableDataDark { .tableDataDark {
border: solid 1px #8db2d8; border: solid 1px #d8d8d8;
border-collapse: collapse; border-collapse: collapse;
} }
.tableDataDark td { .tableDataDark td {
border: solid 1px #8db2d8; border: solid 1px #d8d8d8;
background-color: #fff; background-color: #ffffff;
} }
.tableDataDark th { .tableDataDark th {
background-color: #8db2d8; background-color: #d8d8d8;
border: solid 1px #8db2d8; border: solid 1px #d8d8d8;
} }
.tableDataContainer { .tableDataContainer {
background-color: #fff; background-color: #ffffff;
} }
.tableDataVertical { .tableDataVertical {
border: solid 1px #e8eef4; border: solid 1px #f4f4f4;
border-collapse: collapse; border-collapse: collapse;
} }
.tableDataVertical > tbody > tr:nth-child(odd) { .tableDataVertical > tbody > tr:nth-child(odd) {
background-color: #e8eef4; background-color: #f4f4f4;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
Disco.Web/ClientSource/Style/Dialog.min.css
Vendored
+1 -1
View File
@@ -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}body{padding:0}#main{background-color:#fff;overflow:auto;padding:0;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px} .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}body{padding:0}#main{background-color:#fff;overflow:auto;padding:0;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}
Disco.Web/ClientSource/Style/Fancytree/icons-disco-shrunk.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

Disco.Web/ClientSource/Style/Fancytree/ui.fancytree.css
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Fancytree/ui.fancytree.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Images/Actions/editForm.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 633 B

Disco.Web/ClientSource/Style/Images/Actions/list.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 367 B

Disco.Web/ClientSource/Style/Images/Actions/listAlert.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 652 B

Disco.Web/ClientSource/Style/Images/Actions/remove.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 852 B

Disco.Web/ClientSource/Style/Images/Actions/removeSubtle.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 855 B

Disco.Web/ClientSource/Style/Images/Actions/user16.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

Disco.Web/ClientSource/Style/Images/Actions/userGroup16.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

Disco.Web/ClientSource/Style/Images/Status/error.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 852 B

Disco.Web/ClientSource/Style/Images/Status/information.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 901 B

Disco.Web/ClientSource/Style/Images/Status/jobStatus-Closed.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 700 B

Disco.Web/ClientSource/Style/Images/Status/jobStatus-Insurance.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 773 B

Disco.Web/ClientSource/Style/Images/Status/jobStatus-Open.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 748 B

Disco.Web/ClientSource/Style/Images/Status/jobStatus-Repairs.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 763 B

Disco.Web/ClientSource/Style/Images/Status/jobStatus-User.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 769 B

Disco.Web/ClientSource/Style/Images/Status/ok.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 542 B

Disco.Web/ClientSource/Style/Images/Status/pbar-ani.gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.8 KiB

Disco.Web/ClientSource/Style/Images/Status/save.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 586 B

Disco.Web/ClientSource/Style/Images/Status/success.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 539 B

Disco.Web/ClientSource/Style/Images/Status/updateAvailable.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.4 KiB

Disco.Web/ClientSource/Style/Images/Status/warning.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 726 B

Disco.Web/ClientSource/Style/Images/SubSubMenuIcon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 236 B

Disco.Web/ClientSource/Style/InitialConfig.css
+1 -1
View File
@@ -1,4 +1,4 @@
#dialogWait { #dialogWait {
padding-top: 30px; padding-top: 30px;
} }
#dialogWait .ajaxLoading { #dialogWait .ajaxLoading {
Disco.Web/ClientSource/Style/InitialConfig.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Job.css
+3 -3
View File
@@ -275,7 +275,7 @@
} }
#jobShowResources #Comments div.commentOutput > div span.remove { #jobShowResources #Comments div.commentOutput > div span.remove {
font-size: 1.2em; font-size: 1.2em;
color: #e90000; color: #e51400;
margin-left: 6px; margin-left: 6px;
cursor: pointer; cursor: pointer;
opacity: 0; opacity: 0;
@@ -379,7 +379,7 @@
} }
#jobShowResources #Attachments div.attachmentOutput > a span.remove { #jobShowResources #Attachments div.attachmentOutput > a span.remove {
font-size: 1.2em; font-size: 1.2em;
color: #e90000; color: #e51400;
margin-left: 2px; margin-left: 2px;
cursor: pointer; cursor: pointer;
opacity: 0; opacity: 0;
@@ -434,7 +434,7 @@
} }
#jobComponents tr span.remove { #jobComponents tr span.remove {
font-size: 1.5em; font-size: 1.5em;
color: #e90000; color: #e51400;
cursor: pointer; cursor: pointer;
opacity: .5; opacity: .5;
} }
Disco.Web/ClientSource/Style/Job.less
+3 -3
View File
@@ -297,7 +297,7 @@
span.remove span.remove
{ {
font-size: 1.2em; font-size: 1.2em;
color: @ButtonAlertColour; color: @StatusRemove;
margin-left: 6px; margin-left: 6px;
cursor: pointer; cursor: pointer;
opacity: 0; opacity: 0;
@@ -434,7 +434,7 @@
span.remove span.remove
{ {
font-size: 1.2em; font-size: 1.2em;
color: @ButtonAlertColour; color: @StatusRemove;
margin-left: 2px; margin-left: 2px;
cursor: pointer; cursor: pointer;
opacity: 0; opacity: 0;
@@ -504,7 +504,7 @@
span.remove span.remove
{ {
font-size: 1.5em; font-size: 1.5em;
color: @ButtonAlertColour; color: @StatusRemove;
cursor: pointer; cursor: pointer;
opacity: .5; opacity: .5;
Disco.Web/ClientSource/Style/Job.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Site.css
+69 -58
View File
@@ -154,13 +154,16 @@ header nav ul#menu > li > a,
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
} }
header nav ul#menu > li > a:hover,
#header nav ul#menu > li > a:hover,
header nav ul#menu > li > a:active, header nav ul#menu > li > a:active,
#header nav ul#menu > li > a:active { #header nav ul#menu > li > a:active {
color: #cddbec; color: #cddbec;
text-decoration: none; text-decoration: none;
} }
header nav ul#menu > li:hover > a,
#header nav ul#menu > li:hover > a {
color: #cddbec;
text-decoration: none;
}
header nav ul#menu > li > ul, header nav ul#menu > li > ul,
#header nav ul#menu > li > ul { #header nav ul#menu > li > ul {
z-index: 100000; z-index: 100000;
@@ -194,13 +197,6 @@ header nav ul#menu > li > ul li:hover:not(:first-child),
#header nav ul#menu > li > ul li:hover:not(:first-child) { #header nav ul#menu > li > ul li:hover:not(:first-child) {
border-top: 1px solid #d9d9d9; border-top: 1px solid #d9d9d9;
} }
header nav ul#menu > li > ul li.hasSubMenu,
#header nav ul#menu > li > ul li.hasSubMenu {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAKCAYAAAC9vt6cAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QoRASA2m51WBgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAUElEQVQoz6XMMQ3AMBBD0S9TKJWCKIlDZxLh0FAJhy6tFGWL6+XOgx+2b9sHYQScQEsRvTdGNP0RoqVvI+JnVqADV1WNBNgez0A0/oB4DPAAhbAcw1qVNTUAAAAASUVORK5CYII=) /*Images/SubSubMenuIcon.png*/;
background-position: center right;
background-repeat: no-repeat;
padding-right: 14px;
}
header nav ul#menu > li > ul li a, header nav ul#menu > li > ul li a,
#header nav ul#menu > li > ul li a { #header nav ul#menu > li > ul li a {
display: block; display: block;
@@ -217,6 +213,20 @@ header nav ul#menu > li > ul li a:active,
#header nav ul#menu > li > ul li a:active { #header nav ul#menu > li > ul li a:active {
text-decoration: none; text-decoration: none;
} }
header nav ul#menu > li > ul li i.fa,
#header nav ul#menu > li > ul li i.fa {
cursor: pointer;
color: #848484;
font-size: 16px;
position: absolute;
display: block;
right: 12px;
top: 7px;
}
header nav ul#menu > li > ul li:hover i.fa,
#header nav ul#menu > li > ul li:hover i.fa {
color: #515151;
}
header nav ul#menu > li > ul ul, header nav ul#menu > li > ul ul,
#header nav ul#menu > li > ul ul { #header nav ul#menu > li > ul ul {
display: none; display: none;
@@ -429,7 +439,7 @@ a.button.disabled {
} }
a.button.alert { a.button.alert {
border-color: #990000; border-color: #990000;
background-color: #e90000; background-color: #e51400;
} }
a.button.small { a.button.small {
padding: 2px 5px; padding: 2px 5px;
@@ -712,47 +722,39 @@ table.genericData td.id a {
.dataTables_wrapper table > thead tr > th.sorting_disabled { .dataTables_wrapper table > thead tr > th.sorting_disabled {
background-image: none; background-image: none;
} }
span.icon { .jobStatus {
display: inline-block; color: #515151;
height: 16px;
width: 16px;
margin-left: 2px;
cursor: pointer;
cursor: default;
} }
span.icon.JobStatusClosed, .jobStatus.Closed {
span.icon.DeviceStatusDecommissioned { color: #9e9e9e;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACg0lEQVQ4y3VTTWsaURR9M35EDWqMxhBoUIrFD0h+QIuIWLPrrkhWiuAiuHCRIsmuaaEEau0yUFDX/oIuQjZBLBbsQhtSqEiLIFqDiVFj/RjHnvdoili9MMzMnXvPOXPufRyZH3KNRuMwGAyboijy19fX1Xa7/RX5wWwhN/u+tbW1HwwGw06n86Fer2fJZrNJstlsJZVKfSgWi2+REv4DkEgkBjSmo9GoB+zk9vZ2LJfLJRzHkeFwKOp0Oh45Eo/HPyUSieeCINSmAWSBQODjwcHB01arNVpaWpLRRlbw9z6ZTMhgMBAAJI3FYp+TyaQb6d/s6/b29v7x8XG83++PZAhaPN14HzzPk/F4LIBAenh4eFQoFF5xSMojkch3h8NhAgBrvG+eF/QbAAi8qJ+cnDziIMkWDoe/3d3diSDn4QVjWhSYChmNRiI84NPp9GPOYrF43G73GXUappHl5WUilUrnNkM+9YHdaS0ms8vZbDaP1Wo9q9VqRKFQkNXVVQIlcwHATKCUqaC/Uq1Wdzmz2bzp9Xor+Xx+AukcBVikALLvAUS1Ws1XKpUn1AOJ3+/vnJ6eKldWVphBVB71YXoSlBX7QKjRdB+wcL9yuZyFVezs7LxwuVzvMpmMCJm8Uqkk9KJKKAj9Z9rY7XYpkADVUsh/DdKXDGBtbY3b29urgn2jXC6LaOQhkahUKqaEGocFI71ejy0SgPIgc5VKpd6/gZtMJnkoFPppNBo3rq6uCA7SRKvV0j2hkicwmT03Go0v5+fnz7AHtXmHifh8vihMPbLb7SoAsNzNzQ25vLxsg/U9tu/NxcWFsOg0soBBkvX19Qc4jRaw8p1Op1Kv139gUsPZ2j85BjJj8dYkIwAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Closed.png*/;
} }
span.icon.JobStatusOpen, .jobStatus.Open {
span.icon.DeviceStatusActive { color: #60a917;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACs0lEQVQ4y4WTXUiTURjHJ9Wi6PKc9z3vtnebm9vcNNM0v2fldKI2tS7SyqRMceRXS8qlhjgpUjQ0KlAsow+yboq6iKwb+wCjvOkqLxKVsC686UIL5/bvrMIwZj3w48Dz/5/nOTycR6EIE4QQpWgm8YZM2WXI0BSLFpLEcxsV/wtuirDtiWyqfXLw48BCF+5jEPcwgMvfOuEeLZ2xuSJbuGd9+MuMkLze5Ofn4cElnEM32pb74EM/OtGL9sANXOFZD/L6k18TiUh/d96Q3RX/rBlH4V4sW6pfrkBj4AjqgxWoRTnqcBjHg4dQ832//wyqsLtn2zihZNNKAWuR9mT5fDaKpuxLrtksuGY4/CyczUTBbMYKrk92FE/v9JfNO2Apkdt/XqYiVdpvGqcTJnRIHItC4gsTxxyWpJdm7HhlQeKEESnX9Z+pRLcoVFYxOuWhBuYhFjAMizDcYjDc/gdcNw2zwNZhBk2CmKaI3KV2JF5VQe8VoG6jUF+gUPWsQRfXfRS6Dgprr4jIHFaqMORqHNu9euhKBbByCuYhEJvDwzwUUjWFzDHX8QL5vIAqnckZQ/wF+4SgtJcbqwgEd3hCmnSAQC6jgZgGCXKOmK4g0WSdfUS9yJxcLOPGCgJazanhuH9T8ysX0lTcE/Im+DRfhBQ+xFDE1mmb4kYF6OtpgB3jxjre7TSnlZtbBai8IlijALGSQFNJ/XF9DNG16o4/HymWROQ9ss2ljQkwdgsBmQ9MP8gQdUcDy10dTNe00Pbwqfuo3zggIKlf+5Zm0c2rfiNNoUrnU9ucc0oN+QFB+rg1mP8hFfmTach4ExsURwhMjwlSh7XvWIEgrblQMS2GU65J68IJFOIiGjiNqA+4UPg+9mtMp9xOnGss06rdyKPrpEpRJ3tVDt1ZlivV8oUuocpw3h+OzGWzs/zxOgAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Open.png*/;
} }
span.icon.JobStatusAwaitingWarrantyRepair, .jobStatus.AwaitingWarrantyRepair,
span.icon.JobStatusAwaitingRepairs { .jobStatus.AwaitingRepairs {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACwklEQVQ4y4WTX0jTURTHJ5pR+Hjv7/ebzqlZ6kzJhbj8N6dzmqb5J3NWOtJmav7LTBNTbNPAlVY+FGyYk0ryJfr3YJk+WAlGZlQECWkqYT340oMW6vbtmtE/Zh74cC7nfM+53HvPFYkcGCHElXj7hXjKo1Il8sg04uMfymIbResZEzn5qFKqD1r6Jkwv52GZAczTQPPYV2gt/dM+qtR6pnFxXMwJJKy6faDqDXB2HGgYw7LxLStmNL2C7fIHYCUXVtMxTHix+N+dN4RUmh7ljwI5fQuLuoFlHB60QTdoR+4gkMc4NGBH9oNvS/oxYEdl2wihdNOvBtLYvSfi7s4h2jq5qLTOQGmdxoqP6ppB5B9Ed39ETPfUkvrWHDxj05t+FFOOd/VtvDbl1foCWw1D2GZ8DD/DGjQ/gX/LU/gyrXdt1yfKi91EvK8sQGK4A6G408YftTJ/nXHjP7B8idUmHLeCl8nDRR6hKrV71RVwGXWgaQ2gWa2g+9sck2UCzTSytQG8vh2CIl4rkig0am9dHTiVFjQyFySxCiTplENoQhVobCGophB8RhmEiCStSNge4ene0AlOmWknigyQGD2IqtgxK7moA6DKHJs4uwJ8aHyEiEgDnD1aeheIPAEkMoehA1EWMnERo/gnRauxlVwU0zCtRG/8TP0VbqvPuK+smjvTD5pSbiOqIyBxZSC7a0H2nAbH4JPZETWVrEkBaFzBknDsEjzSSw2/B8k7yCnw/L1Z7uIQuLxzNprTBiHfAklJD7xKb0KqvwqBxdgFLnGFZkjLO57TQOXmv6aR+ilcAy88nPXonQQpvQ2ZacS+y/wO4eZxBJme2Ul+L8jJ+5DWWUe5ncniNT/UFm19jaxnfH4PG+uKCaDyPZA6bENQ1+svnrrmJhKc4LL+rwxOdOaVBV7uKXVqIbNRw6tL/Yk83dWR9jsKtpCP82kfBAAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Repairs.png*/; color: #1e6dab;
} }
span.icon.JobStatusAwaitingDeviceReturn, .jobStatus.AwaitingDeviceReturn,
span.icon.JobStatusAwaitingUserAction, .jobStatus.AwaitingUserAction,
span.icon.JobStatusAwaitingAccountingPayment, .jobStatus.AwaitingAccountingPayment,
span.icon.JobStatusAwaitingAccountingCharge, .jobStatus.AwaitingAccountingCharge {
span.icon.DeviceStatusNotEnrolled { color: #f0a30a;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACyElEQVQ4y4WTWUhUYRTHRyqj6PH77r2j46hZbgxkEOM+huPW4lqkuUzuVm5M5jg5iqm51RgpWSnagKbZU6HZovWgFSklhEbkg6JS2oNhPTiaOvPv3gKpGOnAj+9wzv+cDw7niEQWjBBi7exEPPy87MJ95ZJIFydygI9tF/3PeJHVUaVjweOu+Mmlz3XASgvwoxnLc5Xovxc7Ex7kWMxrtlos5jhC6nXyZzCqAVQBxpJ1rFcApkpgucwENPHN1Gi4KH8lFhPxvz9vq9N4DGApBca5uNX1ryqYFpNhXlQB3xJ5kng/ASvzJ9awnA69bt8wpWTHRoMIpfTcwlggpkb9V2fHFZgZU0B4Z8f9MDvmu8Gn9/6YfhewtvBBiahgu7JfxSxLrdtrnaZHB+wx2LsHQw/3YqjP2SIveF4+csHocyfcrnGYF4vpLpGbM+v6oEmC1qucyXCdRcctDndaNkfIGxp57RUO+2Wst+igj63yRqkNtHkMSjQUtRUU+hrL1F2iqNBRlBdR1OtYBPlysaLgAIlSm+mA2AgGifEU6lyCovOWUedRZKTwJFHkJLI4FMA38PHi7Fp1NogJY8zR4QTpKQSnMy0j5E4eJ4iLpqa8BDGCFKyPyNWVbOmusjWGBPKJYwSqRIKMNIKsDL4o6zeCL8SEXFwMgaCtyJV88ZTzQxQsRyUt6G9nkJtKTWkqgpyzBJoCAp2W5wIDrYZFfg6D1FMEqQl07Voxh2yVbfnGHshkxKqnyX1usI3B5VLGpOeH1dLIobNVgrsGe7TdlEJfzQkDXGvWM2jQSd8oFHTnX9vo6Umtn7a6z0312OJ+F8HwEzfzx9demBjxxsiAzNzdSdDbQWColr49HMaINz2oYvXuwok+tyVMHQEW8njyYZoMx1iv7HtloV1ZSMgmx/SnhYaSLanJrL220EZZquGCs8+wLpFRxNqS9ifnTKmvqTT0WwAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-User.png*/;
} }
span.icon.JobStatusAwaitingInsuranceProcessing { .jobStatus.AwaitingInsuranceProcessing {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACzElEQVQ4y4WTbUiTURTHJ9mi8OO9z/NM59Q0p2ZkEJrv1jYly7Q3Z2XLmWalqcvS+ZJDpfCVNEhwacO0NAqK+lBqQWaBkfZBiGaUqIm9+cVQC+ezf88MjGLigR/3cM7/3AvnniMS2TFCiNiLeAcEu4bFBUlD472IfKsQWyNayQSRg9Jjd97tw48+fq2axYIR4JuAbxU/cVfdPabyiCsSNI52iznCkdLAuicWHYCLgKUECygX/ApgwQAeVwGrkKsIbHgpIRLJ/y+vLgyo6rFoge9Jc/M/NAuYSeExo7FiNhmYPQrMHLFiKvGXhU8DSjfX9lNC1y5doJLtOWveMYWh8JF5c8Q43kWMwXYOh43DHPqX9+ETeBs5avmgmEKMa4JhsZilrLjW88Zor9sgHnv1omvDc3R7L0cfeuQv0Oc5iBr3658lVOIkkrO+PkbpfVzhmvkm1oQWrg0mrn1ZbPlGzsRf5kzYxG4JFoW6RCnKnBuhY/QopCW4RCtRQ2vtUkmrYKDlKKZlMLB1COOUalGUVKU45a5HAqNGMk1GLtGhgBTYRUd1SKPpSBE4xmZhO7dTLQrmQlwNzs2IZfZZ48lepJE0nCQZdrHlEskh7KdJvEaSjUhWGSLyIfJV1S6dc0oSjYMkCRqiQbogzCAnhKI/2HxbzJY7IGhs2lxp+ZcgGuS0+BNaWVZeB9ONdHqG15LjyCKZyCf5KCbFKGaKoGcLkMPkIJWkQkNTLaVcPbQumWVLc+BPNjoY/R5MtjG9KGOq+UqhYY2cEa3Sm2h368A1WQuquVpbAy31TBMMsobXETR83T/TGEQDxa1+XZNdLiO4Q+7hqW+/dWCbGW+Ch/HM/5W1k9xCJ3mIaplpIJaJlSy7UOfWF53v8R2endgFTGcL5ACf4nh0+Q9N610rDNFE6bjiVsYQ1apUVuumd9YrCrkLqkz2tDyBxIntaX8D6jqsQHV9jFEAAAAASUVORK5CYII=) /*Images/Status/jobStatus-Insurance.png*/; color: #6a00ff;
} }
span.icon.success { .deviceStatus {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB4klEQVQ4y2P4//8/AyWYZA0ckxlYyDaAcy4Dt0SZ0FnBWP7tJBvAOZuBW7xC4MLe67v+x84L+8/ky7CFaAM4pgE1lwtc3Hl92/+o+UH/HWda/Q+c7Pmf0ZVxE1yRyFJWYZElbKbomnnnM3CLlPNd3H5ny/+oTYH/Reax/Refyv1fKFjgLrcHiwBYEftkBhGrfpO3LpPsf3LNZ3CEaZZcy8UjWS94cfvjzf8TjoT+V90u+l9hsfB/Vi+m22xuDJxgL4i2cop59ru82XV36/91t1b+N+3X/ya+mt1Gaaswm1yr+MVVj5b+z7qQ8N/8pMZ//Q1K/1l9mO+weTBwwAORPYh1SdqW2H+VF/P/L74/9//8+zP+azQrf1GtVXi04OnM/yW3M/973rD8b3vI8D9bOPNdjjSIzSixwOHPvsdgocrP+OvB/yc+6fg/7Wnf/6Wv5v+veV74P/K513+fa/b/uZM47grOZOLEmZCY/Bl3G2xU+Rn30v9/y/uK/y2fKv+nf434HwY0QCCH9672XhkOgimRJYRxr8N+sx/5/xL+V/zP/J/6IeK/WJHQXc9bVpxEJ2X2CJbd4af9fja+K/+vVKJwp+hbCgfJeYE3nmufcoP82Tn/J3CSnZnSf0Sy0iQ3omMAFlyLENN9tK8AAAAASUVORK5CYII=) /*Images/Status/success.png*/; color: #515151;
} }
span.icon.error { .deviceStatus.Decommissioned {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Status/error.png*/; color: #9e9e9e;
} }
span.icon.warning { .deviceStatus.Active {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC) /*Images/Status/warning.png*/; color: #60a917;
} }
span.icon.information { .deviceStatus.NotEnrolled {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==) /*Images/Status/information.png*/; color: #f0a30a;
} }
#layout_Page > div.jobTable:first-child { #layout_Page > div.jobTable:first-child {
padding-top: 30px; padding-top: 30px;
@@ -891,7 +893,7 @@ button.button {
input[type="submit"].button.alert, input[type="submit"].button.alert,
button.button.alert { button.button.alert {
border-color: #990000; border-color: #990000;
background-color: #e90000; background-color: #e51400;
} }
input[type="submit"].button.small, input[type="submit"].button.small,
button.button.small { button.button.small {
@@ -1031,31 +1033,28 @@ td.subtleHighlight {
.validation-summary-valid { .validation-summary-valid {
display: none; display: none;
} }
.ajaxHelperIcon { .ajaxLoading {
height: 16px; height: 11px;
width: 16px; width: 16px;
display: inline-block; display: inline-block;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-bottom: -4px;
}
.ajaxLoading {
height: 11px;
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*/; 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; margin-bottom: 0;
} }
.ajaxSave {
cursor: pointer;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEUlEQVQ4y52Su05UURSGv33mzDlzc1CpBBI7fAArTWjEyyMY7U14AzsLn8DagicwEk0kEBOjYoBCQmJlSKQTSMB4IsOcy15rL4uZkQBqwd/u7C//ZbmJianbXsP87Oyt6OGD+wXgLBh/U+ScqQW3vPz2wtr653xzY+1q3C+KztjY+FS323X37t4hSVL+p19ZxsLCK9rdywDEDgtJkqpZFPtKEAVRBdyJj2ZGmiYEM8zAl+UAYAaVrwgqiBk+rxBVnDsLCOZQMzQoGnQEMFQVCYG+D/jKo/IPAI4QDFVDvB8AwhCgIVAUQpEXqCrRKUAwQ9RwzhE0IF4GAAyCKFVZYeZod7r44eNpB41mg6OjQypf4UcOLChJmrK19ZWnTx7TaLSGJYL7U6RhQBzH9I96bG9/I0nT4whxvYbXGh8/rlPkfaLIkdbTYVkBCKgEolpE2miSpilpWhs5MMQLIQSarRYzN68zfW0aNWg3m9TrMQ6oxzEbm1/48GmdPM8Jw2OLDRDxHPUOabWazM094sXL1ywuvWP++bMTPZQivF9ZxXvBReXxjCICUUVVRgDs7uyxt7N7psjsZ0ZVVqh6LMSjFUKsqjHeI/EgV6/Xo8h7ZwC+EsQLoorZMIKXar8o+lm/t3+x3WnyZnGJmZkbTE5eYWVllfHxS6gqnU6bLMv4cfCdssg5IBkuNYghnFNuZOW8+g2XUFURWZwj0wAAAABJRU5ErkJggg==) /*Images/Status/save.png*/;
}
.ajaxOk { .ajaxOk {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB5UlEQVQ4y2NgGJyAiYGZQ4pVS8JUKFrCWDCCTYxFjYERKEoM4JRjMfOab3G28V3hv75/9f/7/tb/r3uZ/89xguEhVlEmbbyaueVZLUPP2X7P/h/9P+1H+P/Ub2H/U7+H/8/4Ffk/93/Mf+/dZm9ZhRl1sOtmZ+AwXyB/2/GW4X+78/r/HS8a/Xe6ZPzf6bIxmHa4aPjf5a7Jf50OyRNY9fPrsfkoreX+L7qI/b/UKu7/cuv4/ytsFPyvCMTyGwT+y67l+y+xgvO//BLu/5zyzLYYBkiH8vQJljP/5ypj+M/TzPCftweIJwDxRCDuBYq1M/znqmH4L1TP9F/Ejb0AwwCZMJ4ZPI7M/9m9gQpTGf5zFwE1VQJxNZANNJQ7h+E/ZzTQsBCm/6LeHCUYBoh4ciYLh7P+Z3Vg+M8RDFQcBzQoBWIYZwJQLIzhP6szw3/BQNb/fLasgRgGsOkyi6s2835gDwdqSoe4AGxzGYTNlQFxgUwhxwMmdUYurAEpEceToTSZ8z9XKVATMBwEpjP/F5zJ/J+nDcivYPgv180OdAF7BN60IJnFk6u6iOubxk6B/45X9f47XzP4r7lb+L/iHM4PQnEc8USlRrYAFhnZRoEK0xVKy0yWKy2VquUrZPNjFhuc+Q4ABEOzcbMMpzIAAAAASUVORK5CYII=) /*Images/Status/ok.png*/; color: #60a917;
}
.ajaxSave {
color: #1e6dab;
cursor: pointer;
} }
.ajaxRemove { .ajaxRemove {
color: #e51400;
cursor: pointer; cursor: pointer;
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*/; opacity: .8;
} }
.ajaxRemove:hover { .ajaxRemove:hover {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/; opacity: 1;
} }
#layout_Page div.hiddenDialog { #layout_Page div.hiddenDialog {
display: none; display: none;
@@ -1082,11 +1081,23 @@ div.columnHost .column50 {
float: left; float: left;
width: 50%; width: 50%;
} }
.hidden {
display: none;
}
.success {
color: #60a917;
}
.information {
color: #1e6dab;
}
.warning {
color: #f0a30a;
}
.error { .error {
color: Red; color: #e51400;
} }
.alert { .alert {
color: #ff5e00; color: #fa6800;
} }
.smallText { .smallText {
font-size: 0.9em; font-size: 0.9em;
Disco.Web/ClientSource/Style/Site.less
+74 -51
View File
@@ -2,12 +2,12 @@
// Document Layout // Document Layout
body { body {
font-size: 12px; font-size: @FontSizeDefault;
font-family: @FontFamilyBody; font-family: @FontFamilyBody;
margin: 0; margin: 0;
padding: 0; padding: 0;
color: @FontBodyColour; color: @FontBodyColour;
&.layout { &.layout {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAIAAAD8Hs23AAAIvUlEQVRoQ4VQCUIUSwzN/W8HArIKiAyC4Bl+vSVLN4M/9FQlb0tp/P1nxR5wfegK30cKTOD8+EDLY43ToHCys/uA6kPhKfdtHS/RTifqHQD/fmC3KBFMTffHR0gsnik2Sxxs1Iudx1+4zR4p0FtgtiN8Ej2Lft8QnAWVuxTv725xmZ5QWt/X33xacxUVFL3zKzjZ9/fYBFtDP9vItGLQoijGbjFaUSwj4SbhMOLmUWE2F5pPTwypHrcp0fZvimO69zbPoP8Y+oOuvqSzTc2s+TSUzRb9Cbb8GSw7gPAi75WGJ+8Q0T9GlErhwrll0O+iCdutTIYDI42Oc8Z7wNMyMmXZsWL0rJYxfAfv6pN7W/H2522PsYC+gR7zp2K4lHm43uhu8A0AjiTXXoYXRDYjcAdNheOusDe8nBPQLuY4vLBNhnZyt9BhFI1ebhtEzWWmeXblBtF7tquf9rleX0m/7nHX68Y9VNXGK0JwbATs7H6F4BUTbmixlkhQJIEs7NUwXD7N3pL6V++mt/+sBl1J1ujwkpBrIBmW9BidnNEbeldbOpdu62s3q+jf/HrQFLh/r2rqd0l/z3DJpIMAXQAEXjacmGe44NyQIQrXxFNoywNmIeZ1WcLdHlJkBHeM2Yldr8udtIhjdA5bEjXoI/Uy6JeX7o3I/cK/4jmYVpczFUVz9xZ5kcZJ3i3g03KEG35BOcpCPC3X8aLAQnyhLksxfsELXi59WltNAO4qKvwKAQpPQ+NGN27hs/a063DQvacNpyAOBzaHIg75kXYnyU51EG3uBUnOAkc6DZ2YotVh91BnYwXoNoqRH9ABL894YMJtXQ3/YRlmqsK3dBL5ukPSNWYlsHV/qg39vL3XFQltiKpyP7dluueM7jmn5ww3JP+gDwx/Trz4TsvdApXTgSucIwG3aDg9e7da8aa48/k5dGWllQbQAqeguoPpXTkCdYweRfrXHq0C/QULeIT/wh+OgSQN/JcZXhpEy0M7iJL+Co5CspOZewJyJ0nDGE+Ldk8ZaYcTCIXkgub0CzNGq3M83J9LUrz8KFE16Kc6n3LYuA3NHrTbpzY54GnROIkqln8gKQBd2g6y4SmmFQ6ehhaNkVmY2HuJwgUZSA0nFGij2pgLku5pwLkhNmiHazXDx9J9wb3HRsnd9XNzPcVqfubgGiPpwn+6z3uGJ4MjTctdPQ76vHD1IRCx+EyY/rnCi0GVUQhpeUeAH7H6EMudpcp13F1MbijVCpd30vKqFP5lDfqx26o4Dmd9Cn/c6OPn4yPGdTQqyDQBedpK9SPpR8nNmyHyGGQZmDlFP4JGkdRHIRgWd8vRilbCzWgt90oGenctKo4B/Gm32VpZZbpqp9jTuyL94CHvbqL6B9zqeWJ+AP3ADiAPACmy+0FEMU4k/UCUZkUpB3fIUIvLrjuYgUkqWJTAMfKxikxZSkKble/3mcMVMmQpviuM0vy5YjvuJeH7fpyjAuAqj2imJjjxd08yp6IXXA4EpRZHTHHL1NzfhyJrg77KCK7k6CVsE0R4vqhKqgpPoHkLEK5HpqZUbOTeWD2W21jTXU0fraP0jx840IXvPnyqDRPU/7jHX1Jo0z3qB4SODw4Nt4J/eJqCFa07P7sdRlo+t3jaMClWMyrEeW0bBcGtYpiHvFa4Rnk6tHYP5EgVfVfHRCIhXRv+x86dv1LdHafXeXeH36D9t3j8iC36TjpQ6ePIoADL2Qo70a2/8FRmanmjhTvxynXIHXfrmYLVeFqfdjfiJrsNva+de1MM+Jpm7enbcd6BrraaSVs+XLf+I+1Ov9uEEwuet6gUIknj3S2fxmgAwqzAGDRSXMVWKtAOL2xUubu0WL/Qyp2pariPSY6Ez/p/+obfbZ514wqe/hVeQrnRmb65QZciua2toBuocMOtTlwOPBHePVmnGguyZiwTxDKdY7HccoOndXlraW/lbnCKUab3cBbo6z3IIlrhDc3ZdOLX+bkUvv6ucRaTGrrBeqYsvxWOgz+c2TroGu4hNq6CIKrLDXwHr6S9Xjrhfl7Y5jyfeZOW25nOtt67Neza63zal9X01UDdXx2hcV9deQqMHvLEn4YruKGlRx8n9ldXUVOaEyAUcmaaad44280rewfQ3Rbj+JROt4FqmAzAT1M2S1eeoLOUMPorhu/KAlbRlwPs2ro3msury8ukQVyaTdFluglQkYTkyy20jfpcwUz+maoQ4HGJEo+0ziIKt4wEM0GORbvB1T+FKFxzEk4zGkW2bCB8mrZNOG+9/MsC/X0PdsWO4/j9e1rsTpFYD6sTbY90ZV13GJ4ap+EXAFRemfkcoqLIA/bD2EcJMwATR7kz2JpcoU50uimbFeQGvhU4/Kv6P/rCTd7qc6L7Ij+TfTrc+hnBAr0FLzDq+H4RnXVxQZCNkEUD5OLCxgW3GFt1AOMGuyHhzSC+lAB2+xlDJ8hPIyFrt7oV7qGlmHA0PZiemz6vbhTo8/NjHKF0n1P1qQIgP2TsBOdwIxp4/STiSu5ObaIVdK5wAJaQpRNduCVvix5CGWiXAPccGV7TJofYor1647JshY/EXUE6dh8r0mc9u00k3WcAmjtzH2dgUqxuKEMNRabFnJ0BMT0shL0NNBosQFMRpM/Ogmkk/cuPEQjXPri1MLvVh20Dkl5w0inR3XSHzhTR53SnZVB5k/66/kl/O4tv39TUqdZFNyRAzchR9LeNbZHkeWi35vp9Y4EI3AxHBlF/HPk0smos4rmOSCb9Xu6QsDkTXPlC7DYi16wz7O6hH53ToI9V0qcbNOdT0pM79SgsTps8Nd4A6Kqkazw9jVOBRspLGO5m0Qkli79gRoOAdRCwm9q0kBTA3ZZmjG90DjdmMsX4X0u2AyTkgfBcPPDcSPrrSvrk5PRkQ6hMFzU1q4+dZ6cLNCcrmlcTBEQPgq3FCtebeGZLKcq7pW9/1klIlQkVJfiEu5WLU6DP9dktzKbsTrF7onuV3GNW+YknJ/8B9KCQK8XraVEAAAAASUVORK5CYII=) /*Images/BackgroundDocument.png*/ left top repeat-x @BackgroundColour; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAIAAAD8Hs23AAAIvUlEQVRoQ4VQCUIUSwzN/W8HArIKiAyC4Bl+vSVLN4M/9FQlb0tp/P1nxR5wfegK30cKTOD8+EDLY43ToHCys/uA6kPhKfdtHS/RTifqHQD/fmC3KBFMTffHR0gsnik2Sxxs1Iudx1+4zR4p0FtgtiN8Ej2Lft8QnAWVuxTv725xmZ5QWt/X33xacxUVFL3zKzjZ9/fYBFtDP9vItGLQoijGbjFaUSwj4SbhMOLmUWE2F5pPTwypHrcp0fZvimO69zbPoP8Y+oOuvqSzTc2s+TSUzRb9Cbb8GSw7gPAi75WGJ+8Q0T9GlErhwrll0O+iCdutTIYDI42Oc8Z7wNMyMmXZsWL0rJYxfAfv6pN7W/H2522PsYC+gR7zp2K4lHm43uhu8A0AjiTXXoYXRDYjcAdNheOusDe8nBPQLuY4vLBNhnZyt9BhFI1ebhtEzWWmeXblBtF7tquf9rleX0m/7nHX68Y9VNXGK0JwbATs7H6F4BUTbmixlkhQJIEs7NUwXD7N3pL6V++mt/+sBl1J1ujwkpBrIBmW9BidnNEbeldbOpdu62s3q+jf/HrQFLh/r2rqd0l/z3DJpIMAXQAEXjacmGe44NyQIQrXxFNoywNmIeZ1WcLdHlJkBHeM2Yldr8udtIhjdA5bEjXoI/Uy6JeX7o3I/cK/4jmYVpczFUVz9xZ5kcZJ3i3g03KEG35BOcpCPC3X8aLAQnyhLksxfsELXi59WltNAO4qKvwKAQpPQ+NGN27hs/a063DQvacNpyAOBzaHIg75kXYnyU51EG3uBUnOAkc6DZ2YotVh91BnYwXoNoqRH9ABL894YMJtXQ3/YRlmqsK3dBL5ukPSNWYlsHV/qg39vL3XFQltiKpyP7dluueM7jmn5ww3JP+gDwx/Trz4TsvdApXTgSucIwG3aDg9e7da8aa48/k5dGWllQbQAqeguoPpXTkCdYweRfrXHq0C/QULeIT/wh+OgSQN/JcZXhpEy0M7iJL+Co5CspOZewJyJ0nDGE+Ldk8ZaYcTCIXkgub0CzNGq3M83J9LUrz8KFE16Kc6n3LYuA3NHrTbpzY54GnROIkqln8gKQBd2g6y4SmmFQ6ehhaNkVmY2HuJwgUZSA0nFGij2pgLku5pwLkhNmiHazXDx9J9wb3HRsnd9XNzPcVqfubgGiPpwn+6z3uGJ4MjTctdPQ76vHD1IRCx+EyY/rnCi0GVUQhpeUeAH7H6EMudpcp13F1MbijVCpd30vKqFP5lDfqx26o4Dmd9Cn/c6OPn4yPGdTQqyDQBedpK9SPpR8nNmyHyGGQZmDlFP4JGkdRHIRgWd8vRilbCzWgt90oGenctKo4B/Gm32VpZZbpqp9jTuyL94CHvbqL6B9zqeWJ+AP3ADiAPACmy+0FEMU4k/UCUZkUpB3fIUIvLrjuYgUkqWJTAMfKxikxZSkKble/3mcMVMmQpviuM0vy5YjvuJeH7fpyjAuAqj2imJjjxd08yp6IXXA4EpRZHTHHL1NzfhyJrg77KCK7k6CVsE0R4vqhKqgpPoHkLEK5HpqZUbOTeWD2W21jTXU0fraP0jx840IXvPnyqDRPU/7jHX1Jo0z3qB4SODw4Nt4J/eJqCFa07P7sdRlo+t3jaMClWMyrEeW0bBcGtYpiHvFa4Rnk6tHYP5EgVfVfHRCIhXRv+x86dv1LdHafXeXeH36D9t3j8iC36TjpQ6ePIoADL2Qo70a2/8FRmanmjhTvxynXIHXfrmYLVeFqfdjfiJrsNva+de1MM+Jpm7enbcd6BrraaSVs+XLf+I+1Ov9uEEwuet6gUIknj3S2fxmgAwqzAGDRSXMVWKtAOL2xUubu0WL/Qyp2pariPSY6Ez/p/+obfbZ514wqe/hVeQrnRmb65QZciua2toBuocMOtTlwOPBHePVmnGguyZiwTxDKdY7HccoOndXlraW/lbnCKUab3cBbo6z3IIlrhDc3ZdOLX+bkUvv6ucRaTGrrBeqYsvxWOgz+c2TroGu4hNq6CIKrLDXwHr6S9Xjrhfl7Y5jyfeZOW25nOtt67Neza63zal9X01UDdXx2hcV9deQqMHvLEn4YruKGlRx8n9ldXUVOaEyAUcmaaad44280rewfQ3Rbj+JROt4FqmAzAT1M2S1eeoLOUMPorhu/KAlbRlwPs2ro3msury8ukQVyaTdFluglQkYTkyy20jfpcwUz+maoQ4HGJEo+0ziIKt4wEM0GORbvB1T+FKFxzEk4zGkW2bCB8mrZNOG+9/MsC/X0PdsWO4/j9e1rsTpFYD6sTbY90ZV13GJ4ap+EXAFRemfkcoqLIA/bD2EcJMwATR7kz2JpcoU50uimbFeQGvhU4/Kv6P/rCTd7qc6L7Ij+TfTrc+hnBAr0FLzDq+H4RnXVxQZCNkEUD5OLCxgW3GFt1AOMGuyHhzSC+lAB2+xlDJ8hPIyFrt7oV7qGlmHA0PZiemz6vbhTo8/NjHKF0n1P1qQIgP2TsBOdwIxp4/STiSu5ObaIVdK5wAJaQpRNduCVvix5CGWiXAPccGV7TJofYor1647JshY/EXUE6dh8r0mc9u00k3WcAmjtzH2dgUqxuKEMNRabFnJ0BMT0shL0NNBosQFMRpM/Ogmkk/cuPEQjXPri1MLvVh20Dkl5w0inR3XSHzhTR53SnZVB5k/66/kl/O4tv39TUqdZFNyRAzchR9LeNbZHkeWi35vp9Y4EI3AxHBlF/HPk0smos4rmOSCb9Xu6QsDkTXPlC7DYi16wz7O6hH53ToI9V0qcbNOdT0pM79SgsTps8Nd4A6Kqkazw9jVOBRspLGO5m0Qkli79gRoOAdRCwm9q0kBTA3ZZmjG90DjdmMsX4X0u2AyTkgfBcPPDcSPrrSvrk5PRkQ6hMFzU1q4+dZ6cLNCcrmlcTBEQPgq3FCtebeGZLKcq7pW9/1klIlQkVJfiEu5WLU6DP9dktzKbsTrF7onuV3GNW+YknJ/8B9KCQK8XraVEAAAAASUVORK5CYII=) /*Images/BackgroundDocument.png*/ left top repeat-x @BackgroundColour;
background: linear-gradient(to bottom, @BackgroundColourGradient 0px, @BackgroundColour 370px) left top repeat-x @BackgroundColour; background: linear-gradient(to bottom, @BackgroundColourGradient 0px, @BackgroundColour 370px) left top repeat-x @BackgroundColour;
@@ -79,12 +79,17 @@ header, #header {
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
&:hover, &:active { &:active {
color: @MenuHoverColour; color: @MenuHoverColour;
text-decoration: none; text-decoration: none;
} }
} }
&:hover > a {
color: @MenuHoverColour;
text-decoration: none;
}
& > ul { & > ul {
z-index: 100000; z-index: 100000;
display: none; display: none;
@@ -116,13 +121,6 @@ header, #header {
background-color: hsla(hue(@BackgroundColour), saturation(@BackgroundColour), 90%, 1); background-color: hsla(hue(@BackgroundColour), saturation(@BackgroundColour), 90%, 1);
} }
&.hasSubMenu {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAKCAYAAAC9vt6cAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QoRASA2m51WBgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAUElEQVQoz6XMMQ3AMBBD0S9TKJWCKIlDZxLh0FAJhy6tFGWL6+XOgx+2b9sHYQScQEsRvTdGNP0RoqVvI+JnVqADV1WNBNgez0A0/oB4DPAAhbAcw1qVNTUAAAAASUVORK5CYII=) /*Images/SubSubMenuIcon.png*/;
background-position: center right;
background-repeat: no-repeat;
padding-right: 14px;
}
a { a {
display: block; display: block;
color: @black; color: @black;
@@ -138,6 +136,20 @@ header, #header {
text-decoration: none; text-decoration: none;
} }
} }
i.fa {
cursor: pointer;
color: lighten(@HeaderBackgroundColour, 20%);
font-size: 16px;
position: absolute;
display: block;
right: 12px;
top: 7px;
}
&:hover i.fa {
color: @HeaderBackgroundColour;
}
} }
ul { ul {
@@ -665,44 +677,43 @@ table {
} }
} }
span.icon { .jobStatus {
.icon16; color: @StatusUnknown;
cursor: default;
&.JobStatusClosed, &.DeviceStatusDecommissioned { &.Closed {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACg0lEQVQ4y3VTTWsaURR9M35EDWqMxhBoUIrFD0h+QIuIWLPrrkhWiuAiuHCRIsmuaaEEau0yUFDX/oIuQjZBLBbsQhtSqEiLIFqDiVFj/RjHnvdoili9MMzMnXvPOXPufRyZH3KNRuMwGAyboijy19fX1Xa7/RX5wWwhN/u+tbW1HwwGw06n86Fer2fJZrNJstlsJZVKfSgWi2+REv4DkEgkBjSmo9GoB+zk9vZ2LJfLJRzHkeFwKOp0Oh45Eo/HPyUSieeCINSmAWSBQODjwcHB01arNVpaWpLRRlbw9z6ZTMhgMBAAJI3FYp+TyaQb6d/s6/b29v7x8XG83++PZAhaPN14HzzPk/F4LIBAenh4eFQoFF5xSMojkch3h8NhAgBrvG+eF/QbAAi8qJ+cnDziIMkWDoe/3d3diSDn4QVjWhSYChmNRiI84NPp9GPOYrF43G73GXUappHl5WUilUrnNkM+9YHdaS0ms8vZbDaP1Wo9q9VqRKFQkNXVVQIlcwHATKCUqaC/Uq1Wdzmz2bzp9Xor+Xx+AukcBVikALLvAUS1Ws1XKpUn1AOJ3+/vnJ6eKldWVphBVB71YXoSlBX7QKjRdB+wcL9yuZyFVezs7LxwuVzvMpmMCJm8Uqkk9KJKKAj9Z9rY7XYpkADVUsh/DdKXDGBtbY3b29urgn2jXC6LaOQhkahUKqaEGocFI71ejy0SgPIgc5VKpd6/gZtMJnkoFPppNBo3rq6uCA7SRKvV0j2hkicwmT03Go0v5+fnz7AHtXmHifh8vihMPbLb7SoAsNzNzQ25vLxsg/U9tu/NxcWFsOg0soBBkvX19Qc4jRaw8p1Op1Kv139gUsPZ2j85BjJj8dYkIwAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Closed.png*/; color: @StatusClosed;
} }
&.JobStatusOpen, &.DeviceStatusActive { &.Open {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACs0lEQVQ4y4WTXUiTURjHJ9Wi6PKc9z3vtnebm9vcNNM0v2fldKI2tS7SyqRMceRXS8qlhjgpUjQ0KlAsow+yboq6iKwb+wCjvOkqLxKVsC686UIL5/bvrMIwZj3w48Dz/5/nOTycR6EIE4QQpWgm8YZM2WXI0BSLFpLEcxsV/wtuirDtiWyqfXLw48BCF+5jEPcwgMvfOuEeLZ2xuSJbuGd9+MuMkLze5Ofn4cElnEM32pb74EM/OtGL9sANXOFZD/L6k18TiUh/d96Q3RX/rBlH4V4sW6pfrkBj4AjqgxWoRTnqcBjHg4dQ832//wyqsLtn2zihZNNKAWuR9mT5fDaKpuxLrtksuGY4/CyczUTBbMYKrk92FE/v9JfNO2Apkdt/XqYiVdpvGqcTJnRIHItC4gsTxxyWpJdm7HhlQeKEESnX9Z+pRLcoVFYxOuWhBuYhFjAMizDcYjDc/gdcNw2zwNZhBk2CmKaI3KV2JF5VQe8VoG6jUF+gUPWsQRfXfRS6Dgprr4jIHFaqMORqHNu9euhKBbByCuYhEJvDwzwUUjWFzDHX8QL5vIAqnckZQ/wF+4SgtJcbqwgEd3hCmnSAQC6jgZgGCXKOmK4g0WSdfUS9yJxcLOPGCgJazanhuH9T8ysX0lTcE/Im+DRfhBQ+xFDE1mmb4kYF6OtpgB3jxjre7TSnlZtbBai8IlijALGSQFNJ/XF9DNG16o4/HymWROQ9ss2ljQkwdgsBmQ9MP8gQdUcDy10dTNe00Pbwqfuo3zggIKlf+5Zm0c2rfiNNoUrnU9ucc0oN+QFB+rg1mP8hFfmTach4ExsURwhMjwlSh7XvWIEgrblQMS2GU65J68IJFOIiGjiNqA+4UPg+9mtMp9xOnGss06rdyKPrpEpRJ3tVDt1ZlivV8oUuocpw3h+OzGWzs/zxOgAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Open.png*/; color: @StatusOpen;
} }
&.JobStatusAwaitingWarrantyRepair, &.JobStatusAwaitingRepairs { &.AwaitingWarrantyRepair, &.AwaitingRepairs {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACwklEQVQ4y4WTX0jTURTHJ5pR+Hjv7/ebzqlZ6kzJhbj8N6dzmqb5J3NWOtJmav7LTBNTbNPAlVY+FGyYk0ryJfr3YJk+WAlGZlQECWkqYT340oMW6vbtmtE/Zh74cC7nfM+53HvPFYkcGCHElXj7hXjKo1Il8sg04uMfymIbResZEzn5qFKqD1r6Jkwv52GZAczTQPPYV2gt/dM+qtR6pnFxXMwJJKy6faDqDXB2HGgYw7LxLStmNL2C7fIHYCUXVtMxTHix+N+dN4RUmh7ljwI5fQuLuoFlHB60QTdoR+4gkMc4NGBH9oNvS/oxYEdl2wihdNOvBtLYvSfi7s4h2jq5qLTOQGmdxoqP6ppB5B9Ed39ETPfUkvrWHDxj05t+FFOOd/VtvDbl1foCWw1D2GZ8DD/DGjQ/gX/LU/gyrXdt1yfKi91EvK8sQGK4A6G408YftTJ/nXHjP7B8idUmHLeCl8nDRR6hKrV71RVwGXWgaQ2gWa2g+9sck2UCzTSytQG8vh2CIl4rkig0am9dHTiVFjQyFySxCiTplENoQhVobCGophB8RhmEiCStSNge4ene0AlOmWknigyQGD2IqtgxK7moA6DKHJs4uwJ8aHyEiEgDnD1aeheIPAEkMoehA1EWMnERo/gnRauxlVwU0zCtRG/8TP0VbqvPuK+smjvTD5pSbiOqIyBxZSC7a0H2nAbH4JPZETWVrEkBaFzBknDsEjzSSw2/B8k7yCnw/L1Z7uIQuLxzNprTBiHfAklJD7xKb0KqvwqBxdgFLnGFZkjLO57TQOXmv6aR+ilcAy88nPXonQQpvQ2ZacS+y/wO4eZxBJme2Ul+L8jJ+5DWWUe5ncniNT/UFm19jaxnfH4PG+uKCaDyPZA6bENQ1+svnrrmJhKc4LL+rwxOdOaVBV7uKXVqIbNRw6tL/Yk83dWR9jsKtpCP82kfBAAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-Repairs.png*/; color: @StatusAwaitingRepair;
} }
&.JobStatusAwaitingDeviceReturn, &.JobStatusAwaitingUserAction, &.JobStatusAwaitingAccountingPayment, &.JobStatusAwaitingAccountingCharge, &.DeviceStatusNotEnrolled { &.AwaitingDeviceReturn, &.AwaitingUserAction, &.AwaitingAccountingPayment, &.AwaitingAccountingCharge {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACyElEQVQ4y4WTWUhUYRTHRyqj6PH77r2j46hZbgxkEOM+huPW4lqkuUzuVm5M5jg5iqm51RgpWSnagKbZU6HZovWgFSklhEbkg6JS2oNhPTiaOvPv3gKpGOnAj+9wzv+cDw7niEQWjBBi7exEPPy87MJ95ZJIFydygI9tF/3PeJHVUaVjweOu+Mmlz3XASgvwoxnLc5Xovxc7Ex7kWMxrtlos5jhC6nXyZzCqAVQBxpJ1rFcApkpgucwENPHN1Gi4KH8lFhPxvz9vq9N4DGApBca5uNX1ryqYFpNhXlQB3xJ5kng/ASvzJ9awnA69bt8wpWTHRoMIpfTcwlggpkb9V2fHFZgZU0B4Z8f9MDvmu8Gn9/6YfhewtvBBiahgu7JfxSxLrdtrnaZHB+wx2LsHQw/3YqjP2SIveF4+csHocyfcrnGYF4vpLpGbM+v6oEmC1qucyXCdRcctDndaNkfIGxp57RUO+2Wst+igj63yRqkNtHkMSjQUtRUU+hrL1F2iqNBRlBdR1OtYBPlysaLgAIlSm+mA2AgGifEU6lyCovOWUedRZKTwJFHkJLI4FMA38PHi7Fp1NogJY8zR4QTpKQSnMy0j5E4eJ4iLpqa8BDGCFKyPyNWVbOmusjWGBPKJYwSqRIKMNIKsDL4o6zeCL8SEXFwMgaCtyJV88ZTzQxQsRyUt6G9nkJtKTWkqgpyzBJoCAp2W5wIDrYZFfg6D1FMEqQl07Voxh2yVbfnGHshkxKqnyX1usI3B5VLGpOeH1dLIobNVgrsGe7TdlEJfzQkDXGvWM2jQSd8oFHTnX9vo6Umtn7a6z0312OJ+F8HwEzfzx9demBjxxsiAzNzdSdDbQWColr49HMaINz2oYvXuwok+tyVMHQEW8njyYZoMx1iv7HtloV1ZSMgmx/SnhYaSLanJrL220EZZquGCs8+wLpFRxNqS9ifnTKmvqTT0WwAAAABJRU5ErkJggg==) /*Images/Status/jobStatus-User.png*/; color: @StatusAwaitingUser;
} }
&.JobStatusAwaitingInsuranceProcessing { &.AwaitingInsuranceProcessing {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACzElEQVQ4y4WTbUiTURTHJ9mi8OO9z/NM59Q0p2ZkEJrv1jYly7Q3Z2XLmWalqcvS+ZJDpfCVNEhwacO0NAqK+lBqQWaBkfZBiGaUqIm9+cVQC+ezf88MjGLigR/3cM7/3AvnniMS2TFCiNiLeAcEu4bFBUlD472IfKsQWyNayQSRg9Jjd97tw48+fq2axYIR4JuAbxU/cVfdPabyiCsSNI52iznCkdLAuicWHYCLgKUECygX/ApgwQAeVwGrkKsIbHgpIRLJ/y+vLgyo6rFoge9Jc/M/NAuYSeExo7FiNhmYPQrMHLFiKvGXhU8DSjfX9lNC1y5doJLtOWveMYWh8JF5c8Q43kWMwXYOh43DHPqX9+ETeBs5avmgmEKMa4JhsZilrLjW88Zor9sgHnv1omvDc3R7L0cfeuQv0Oc5iBr3658lVOIkkrO+PkbpfVzhmvkm1oQWrg0mrn1ZbPlGzsRf5kzYxG4JFoW6RCnKnBuhY/QopCW4RCtRQ2vtUkmrYKDlKKZlMLB1COOUalGUVKU45a5HAqNGMk1GLtGhgBTYRUd1SKPpSBE4xmZhO7dTLQrmQlwNzs2IZfZZ48lepJE0nCQZdrHlEskh7KdJvEaSjUhWGSLyIfJV1S6dc0oSjYMkCRqiQbogzCAnhKI/2HxbzJY7IGhs2lxp+ZcgGuS0+BNaWVZeB9ONdHqG15LjyCKZyCf5KCbFKGaKoGcLkMPkIJWkQkNTLaVcPbQumWVLc+BPNjoY/R5MtjG9KGOq+UqhYY2cEa3Sm2h368A1WQuquVpbAy31TBMMsobXETR83T/TGEQDxa1+XZNdLiO4Q+7hqW+/dWCbGW+Ch/HM/5W1k9xCJ3mIaplpIJaJlSy7UOfWF53v8R2endgFTGcL5ACf4nh0+Q9N610rDNFE6bjiVsYQ1apUVuumd9YrCrkLqkz2tDyBxIntaX8D6jqsQHV9jFEAAAAASUVORK5CYII=) /*Images/Status/jobStatus-Insurance.png*/; color: @StatusAwaitingProcessing;
}
}
.deviceStatus {
color: @StatusUnknown;
&.Decommissioned {
color: @StatusClosed;
} }
&.success { &.Active {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB4klEQVQ4y2P4//8/AyWYZA0ckxlYyDaAcy4Dt0SZ0FnBWP7tJBvAOZuBW7xC4MLe67v+x84L+8/ky7CFaAM4pgE1lwtc3Hl92/+o+UH/HWda/Q+c7Pmf0ZVxE1yRyFJWYZElbKbomnnnM3CLlPNd3H5ny/+oTYH/Reax/Refyv1fKFjgLrcHiwBYEftkBhGrfpO3LpPsf3LNZ3CEaZZcy8UjWS94cfvjzf8TjoT+V90u+l9hsfB/Vi+m22xuDJxgL4i2cop59ru82XV36/91t1b+N+3X/ya+mt1Gaaswm1yr+MVVj5b+z7qQ8N/8pMZ//Q1K/1l9mO+weTBwwAORPYh1SdqW2H+VF/P/L74/9//8+zP+azQrf1GtVXi04OnM/yW3M/973rD8b3vI8D9bOPNdjjSIzSixwOHPvsdgocrP+OvB/yc+6fg/7Wnf/6Wv5v+veV74P/K513+fa/b/uZM47grOZOLEmZCY/Bl3G2xU+Rn30v9/y/uK/y2fKv+nf434HwY0QCCH9672XhkOgimRJYRxr8N+sx/5/xL+V/zP/J/6IeK/WJHQXc9bVpxEJ2X2CJbd4af9fja+K/+vVKJwp+hbCgfJeYE3nmufcoP82Tn/J3CSnZnSf0Sy0iQ3omMAFlyLENN9tK8AAAAASUVORK5CYII=) /*Images/Status/success.png*/; color: @StatusOpen;
} }
&.error { &.NotEnrolled {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Status/error.png*/; color: @StatusAwaitingUser;
}
&.warning {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACnUlEQVQ4y3WTy29UVRjAf98599zHTKeXax8M05ahpIK1OKYZCylM4qIRI4QEEDUhcaEbdaOJikj4i9y50b0bjQsTDArRaKJGDS32Qae9c+/MPfe4GJVQ6pf8Nt8r31M+WmBfKQYw+2zzlNJlvt3t3yrd/n6e+x+DtRDXgpezft69++P2rX4JSvZJ0OvtH1yN1MoLK3PXuttp/smnv36+1eMbox/3VQjspSiQE+2pG/VDo8wdj4OzZ8au+wIV/3HU3oyuhFqsLix15lfyjftIus7Fc80r8QidvoXCPYraW0AxoLKwOPPx+FhE14bk/ZBjs74st5Ob6z3YsY+i+jn8Sy+FWuJdPHnq6LLsrlJZvom3dAPSe7x2dvzFI+PqvCcQmYf814JzUFqiZxZnrs80QvKNNRRCKQHZ72s8Gd+XMyeCa6lF9R0M/kE5ASdgHSQT3uud080WO+t4xQPE9bA7m2Q/paitLS6f1s8nI3Kpb6EohyitQXsgQrzYbrw1PalQzhKrFN9m+FgCAy6D+amScy3/PSNUQgOhAd05OBzegQPq6qXLx99OghSz8Rv+xjZl91tY/QKTrYICiYSx0bD59Z389sDyfeCB8g0Yg99enPzgcPQAfv4Onf6Fm6xglz6kbL2DJBFSCSAXjjWhM++9r8F4AkpZ4qQqbz7X2F1Qv/yAkhKSOpLU8Y1gjIGkDvEEiEaXAy609clayKs9VKSvtswbrcPybvtgNkFV4NATUJ+G6QWwfwD3YKwBXgmuB9kO44mjm0Uzm5ne9DZVMPVnIRXoQmt5uNN4CqrJw/M00VAHMDkLX32JVx1tBCP2aXllzpwfDdVLvs2fUiK5aA2inVOec9ob/pYtlC2shGLNbM1WAuXCu7v+ndtr5Wd/A5I7+deTd2A2AAAAAElFTkSuQmCC) /*Images/Status/warning.png*/;
}
&.information {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADTElEQVQ4EQXBy08cdQDA8e/vMbM7j4V9wC5lBXFtqYBFq5W2URPSmqAejJrYeNAePXjwpPgnaPToX2DSq02MTUxqTRpOBUmtxlJrlQLdJaU8BpZhZ2d2Hn4+IscHmG4Jw7GJooQjby9XGho8O1wfPFcdGhhDCLn9eGe91dy+tb/t3TJMGSThISJNAdAAAHHUw7Ds83NvvT3/zqXzc+PH65adN0FAEPR48G8rvHZ16cbNn25+Ewa7CwYaAKWZIhMmdqn/vctffnzlw8tvvFzpKxn+kWK/Db4PvZ6iWivqV16bGi+PPf3u/d//Ww987y+FQkkmyLmFmfc//+TKqdPP15ob0HwC3mHCzLjgWCnj9oOUh48le3tQf6ZqFepjF/5ZuruURN01nZHlJy+8Pl8Zbgz9cXsboSRJKsgbMcePlZFSsLVzwK4vMVQKLSjXG+WpC7Pzt3/8YVn3VWovVcYn5lbu/E0chRiGRkiFkoKvv9/FyktW13t0wxQhUuI4QbY0pcazF91y7Zx2ak/NPPY6bru1QS5norUGBKZp0GoBAAAAQBiG9KKIXLFoWrX6GS1da/TJxj38bY98XwXTMAjChMZIkWvfvYljaS59cYPFP7dwLUWcpITdEKOXIh1rVCNF5jcX8NbvY1Ym0fYAcWLTLYyQZhkZAr99QHtnkygHceQTtpvk3RyO1UDHGetWaQzv4QqRv0nU9SGQROWMOE1JM0Gwu0m3uULXAZID8Ddx3FMg5Ibs+PuLztDEoSqMgC5BrgJGEaQFAGQgDVA2aAd0H8Iexhl+MYyCcEke7e/dQeifB56bhcQEVQCjiDJcnLyBnVdowwajCEYR4hyF0dMop/RL0DlY1FmahLvN1W+PTZ97NQhEvd1qgtJEQnD111VcJ0eUCTA09BLs6gmqU9NPvLV7X6VpfKR0/1mEbW4qV98fPDk9q3V/wZAphcogK2spyyuHdMKMTEms6giDL0xt+17z01774Hrsd1Cqbwazz0W5+QdHwc6CXR/oH5uaHJ2cOJGbONlgdGyYQm0AWS37gZVe63S2Pov9w+uEPXqHPhoAQEpF0O0sHzy6+5HX3ZppReUzA3FpVAjBzo73qO3tLXd3vd8sbUVSKgAA/gc10GJSGh5/4AAAAABJRU5ErkJggg==) /*Images/Status/information.png*/;
} }
} }
@@ -1002,35 +1013,31 @@ td.subtleHighlight {
display: none; display: none;
} }
.ajaxHelperIcon { .ajaxLoading {
height: 16px; height: 11px;
width: 16px; width: 16px;
display: inline-block; display: inline-block;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-bottom: -4px;
}
.ajaxLoading {
height: 11px;
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*/; 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; margin-bottom: 0;
} }
.ajaxSave { .ajaxOk {
cursor: pointer; color: @StatusSuccess;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACEUlEQVQ4y52Su05UURSGv33mzDlzc1CpBBI7fAArTWjEyyMY7U14AzsLn8DagicwEk0kEBOjYoBCQmJlSKQTSMB4IsOcy15rL4uZkQBqwd/u7C//ZbmJianbXsP87Oyt6OGD+wXgLBh/U+ScqQW3vPz2wtr653xzY+1q3C+KztjY+FS323X37t4hSVL+p19ZxsLCK9rdywDEDgtJkqpZFPtKEAVRBdyJj2ZGmiYEM8zAl+UAYAaVrwgqiBk+rxBVnDsLCOZQMzQoGnQEMFQVCYG+D/jKo/IPAI4QDFVDvB8AwhCgIVAUQpEXqCrRKUAwQ9RwzhE0IF4GAAyCKFVZYeZod7r44eNpB41mg6OjQypf4UcOLChJmrK19ZWnTx7TaLSGJYL7U6RhQBzH9I96bG9/I0nT4whxvYbXGh8/rlPkfaLIkdbTYVkBCKgEolpE2miSpilpWhs5MMQLIQSarRYzN68zfW0aNWg3m9TrMQ6oxzEbm1/48GmdPM8Jw2OLDRDxHPUOabWazM094sXL1ywuvWP++bMTPZQivF9ZxXvBReXxjCICUUVVRgDs7uyxt7N7psjsZ0ZVVqh6LMSjFUKsqjHeI/EgV6/Xo8h7ZwC+EsQLoorZMIKXar8o+lm/t3+x3WnyZnGJmZkbTE5eYWVllfHxS6gqnU6bLMv4cfCdssg5IBkuNYghnFNuZOW8+g2XUFURWZwj0wAAAABJRU5ErkJggg==) /*Images/Status/save.png*/;
} }
.ajaxOk { .ajaxSave {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB5UlEQVQ4y2NgGJyAiYGZQ4pVS8JUKFrCWDCCTYxFjYERKEoM4JRjMfOab3G28V3hv75/9f/7/tb/r3uZ/89xguEhVlEmbbyaueVZLUPP2X7P/h/9P+1H+P/Ub2H/U7+H/8/4Ffk/93/Mf+/dZm9ZhRl1sOtmZ+AwXyB/2/GW4X+78/r/HS8a/Xe6ZPzf6bIxmHa4aPjf5a7Jf50OyRNY9fPrsfkoreX+L7qI/b/UKu7/cuv4/ytsFPyvCMTyGwT+y67l+y+xgvO//BLu/5zyzLYYBkiH8vQJljP/5ypj+M/TzPCftweIJwDxRCDuBYq1M/znqmH4L1TP9F/Ejb0AwwCZMJ4ZPI7M/9m9gQpTGf5zFwE1VQJxNZANNJQ7h+E/ZzTQsBCm/6LeHCUYBoh4ciYLh7P+Z3Vg+M8RDFQcBzQoBWIYZwJQLIzhP6szw3/BQNb/fLasgRgGsOkyi6s2835gDwdqSoe4AGxzGYTNlQFxgUwhxwMmdUYurAEpEceToTSZ8z9XKVATMBwEpjP/F5zJ/J+nDcivYPgv180OdAF7BN60IJnFk6u6iOubxk6B/45X9f47XzP4r7lb+L/iHM4PQnEc8USlRrYAFhnZRoEK0xVKy0yWKy2VquUrZPNjFhuc+Q4ABEOzcbMMpzIAAAAASUVORK5CYII=) /*Images/Status/ok.png*/; color: @StatusInformation;
cursor: pointer;
} }
.ajaxRemove { .ajaxRemove {
color: @StatusRemove;
cursor: pointer; cursor: pointer;
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*/; opacity: .8;
&:hover { &:hover {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/; opacity: 1;
} }
} }
@@ -1067,12 +1074,28 @@ div.columnHost {
} }
// Misc // Misc
.hidden {
display: none;
}
.success {
color: @StatusSuccess;
}
.information {
color: @StatusInformation;
}
.warning {
color: @StatusWarning;
}
.error { .error {
color: Red; color: @StatusError;
} }
.alert { .alert {
color: #ff5e00; color: @StatusAlert;
} }
.smallText { .smallText {
Disco.Web/ClientSource/Style/Site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/User.css
+29 -5
View File
@@ -213,14 +213,38 @@
#UserDetailTab-Authorization .fancytree-container { #UserDetailTab-Authorization .fancytree-container {
border: none; border: none;
} }
#UserDetailTab-Authorization span.fancytree-ico-c > span.fancytree-icon { #UserDetailTab-Authorization span.fancytree-node {
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*/; padding: 1px;
border: none;
} }
#UserDetailTab-Authorization span.fancytree-ico-c.fancytree-selected > span.fancytree-icon { #UserDetailTab-Authorization span.fancytree-node > 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: none;
display: inline-block;
font-family: FontAwesome;
font-size: 1.2em;
width: 14px;
}
#UserDetailTab-Authorization span.fancytree-ico-ef > span.fancytree-icon:before {
color: #9e9e9e;
font-size: 1em;
content: "\f07c";
}
#UserDetailTab-Authorization span.fancytree-ico-cf > span.fancytree-icon:before {
color: #9e9e9e;
font-size: 1em;
content: "\f07b";
}
#UserDetailTab-Authorization span.fancytree-ico-c > span.fancytree-icon:before {
color: #e51400;
content: "\f023";
}
#UserDetailTab-Authorization span.fancytree-ico-c.fancytree-selected > span.fancytree-icon:before {
color: #60a917;
content: "\f09c";
} }
#UserDetailTab-Authorization span.fancytree-node.fancytree-selected { #UserDetailTab-Authorization span.fancytree-node.fancytree-selected {
font-style: normal; font-style: normal;
background: none;
} }
#UserDetailTab-Authorization span.fancytree-checkbox { #UserDetailTab-Authorization span.fancytree-checkbox {
margin-left: 3px; margin-left: 3px;
@@ -318,7 +342,7 @@
} }
#userShowResources #Attachments div.attachmentOutput > a span.remove { #userShowResources #Attachments div.attachmentOutput > a span.remove {
font-size: 1.4em; font-size: 1.4em;
color: #e90000; color: #e51400;
margin-left: 6px; margin-left: 6px;
cursor: pointer; cursor: pointer;
opacity: 0; opacity: 0;
Disco.Web/ClientSource/Style/User.less
+29 -5
View File
@@ -182,16 +182,40 @@
border: none; border: none;
} }
span.fancytree-ico-c > span.fancytree-icon { span.fancytree-node {
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*/; padding: 1px;
border: none;
} }
span.fancytree-ico-c.fancytree-selected > span.fancytree-icon { span.fancytree-node > 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: none;
display: inline-block;
font-family: FontAwesome;
font-size: 1.2em;
width: 14px;
}
span.fancytree-ico-ef > span.fancytree-icon:before{
color: @StatusClosed;
font-size: 1em;
content: "\f07c";
}
span.fancytree-ico-cf > span.fancytree-icon:before{
color: @StatusClosed;
font-size: 1em;
content: "\f07b";
}
span.fancytree-ico-c > span.fancytree-icon:before{
color: @StatusRemove;
content: "\f023";
}
span.fancytree-ico-c.fancytree-selected > span.fancytree-icon:before{
color: @StatusSuccess;
content: "\f09c";
} }
span.fancytree-node.fancytree-selected { span.fancytree-node.fancytree-selected {
font-style: normal; font-style: normal;
background: none;
} }
span.fancytree-checkbox { span.fancytree-checkbox {
@@ -312,7 +336,7 @@
span.remove { span.remove {
font-size: 1.4em; font-size: 1.4em;
color: @ButtonAlertColour; color: @StatusRemove;
margin-left: 6px; margin-left: 6px;
cursor: pointer; cursor: pointer;
opacity: 0; opacity: 0;
Disco.Web/ClientSource/Style/User.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/Disco.Web.csproj
+5 -24
View File
@@ -1180,24 +1180,18 @@
<None Include="ClientSource\Style\Images\Actions\dataTablePrev.png" /> <None Include="ClientSource\Style\Images\Actions\dataTablePrev.png" />
<None Include="ClientSource\Style\Images\Actions\dataTablePrevDisabled.png" /> <None Include="ClientSource\Style\Images\Actions\dataTablePrevDisabled.png" />
<None Include="ClientSource\Style\Images\Actions\dataTableSort.png" /> <None Include="ClientSource\Style\Images\Actions\dataTableSort.png" />
<None Include="ClientSource\Style\Images\Actions\editForm.png" />
<None Include="ClientSource\Style\Images\Actions\expressionBrowser.png" /> <None Include="ClientSource\Style\Images\Actions\expressionBrowser.png" />
<None Include="ClientSource\Style\Images\Actions\expressionBrowser256.png" /> <None Include="ClientSource\Style\Images\Actions\expressionBrowser256.png" />
<None Include="ClientSource\Style\Images\Actions\list.png" />
<None Include="ClientSource\Style\Images\Actions\listAlert.png" />
<None Include="ClientSource\Style\Images\Actions\locked.png" /> <None Include="ClientSource\Style\Images\Actions\locked.png" />
<None Include="ClientSource\Style\Images\Actions\remove.png" />
<None Include="ClientSource\Style\Images\Actions\removeSubtle.png" />
<None Include="ClientSource\Style\Images\Actions\unlocked.png" /> <None Include="ClientSource\Style\Images\Actions\unlocked.png" />
<None Include="ClientSource\Style\Fancytree\icons.gif" /> <None Include="ClientSource\Style\Fancytree\icons.gif" />
<None Include="ClientSource\Style\Fancytree\loading.gif" /> <None Include="ClientSource\Style\Fancytree\loading.gif" />
<None Include="ClientSource\Style\Fancytree\ui.fancytree.css" /> <None Include="ClientSource\Style\Fancytree\ui.fancytree.css" />
<None Include="ClientSource\Style\Fancytree\icons-DiscoMod.png" /> <None Include="ClientSource\Style\Fancytree\icons-DiscoMod.png" />
<None Include="ClientSource\Style\Fancytree\icons-disco-shrunk.png" />
<Content Include="ClientSource\Style\Fancytree\ui.fancytree.min.css"> <Content Include="ClientSource\Style\Fancytree\ui.fancytree.min.css">
<DependentUpon>ui.fancytree.css</DependentUpon> <DependentUpon>ui.fancytree.css</DependentUpon>
</Content> </Content>
<None Include="ClientSource\Style\Images\Actions\user16.png" />
<None Include="ClientSource\Style\Images\Actions\userGroup16.png" />
<Content Include="ClientSource\Style\Images\AttachmentTypes\document.png" /> <Content Include="ClientSource\Style\Images\AttachmentTypes\document.png" />
<Content Include="ClientSource\Style\Images\AttachmentTypes\expressionBrowserIcons.png" /> <Content Include="ClientSource\Style\Images\AttachmentTypes\expressionBrowserIcons.png" />
<Content Include="ClientSource\Style\Images\AttachmentTypes\image.png" /> <Content Include="ClientSource\Style\Images\AttachmentTypes\image.png" />
@@ -1216,24 +1210,11 @@
<Content Include="ClientSource\Style\Images\DeviceTypes\Unknown.png" /> <Content Include="ClientSource\Style\Images\DeviceTypes\Unknown.png" />
<Content Include="ClientSource\Style\Images\DeviceTypes\Workstation.png" /> <Content Include="ClientSource\Style\Images\DeviceTypes\Workstation.png" />
<Content Include="ClientSource\Style\Images\Heading.png" /> <Content Include="ClientSource\Style\Images\Heading.png" />
<None Include="ClientSource\Style\Images\Status\error.png" /> <Content Include="ClientSource\Style\Images\Status\fail32.png" />
<None Include="ClientSource\Style\Images\Status\fail32.png" />
<None Include="ClientSource\Style\Images\Status\fileBroken256.png" /> <None Include="ClientSource\Style\Images\Status\fileBroken256.png" />
<None Include="ClientSource\Style\Images\Status\information.png" />
<None Include="ClientSource\Style\Images\Status\jobStatus-Closed.png" />
<None Include="ClientSource\Style\Images\Status\jobStatus-Insurance.png" />
<None Include="ClientSource\Style\Images\Status\jobStatus-Open.png" />
<None Include="ClientSource\Style\Images\Status\jobStatus-Repairs.png" />
<None Include="ClientSource\Style\Images\Status\jobStatus-User.png" />
<None Include="ClientSource\Style\Images\Status\loading.gif" /> <None Include="ClientSource\Style\Images\Status\loading.gif" />
<None Include="ClientSource\Style\Images\Status\ok.png" /> <None Include="ClientSource\Style\Images\Status\progressBar.png" />
<None Include="ClientSource\Style\Images\Status\pbar-ani.gif" /> <Content Include="ClientSource\Style\Images\Status\warning32.png" />
<None Include="ClientSource\Style\Images\Status\save.png" />
<None Include="ClientSource\Style\Images\Status\success.png" />
<None Include="ClientSource\Style\Images\Status\updateAvailable.png" />
<None Include="ClientSource\Style\Images\Status\warning.png" />
<None Include="ClientSource\Style\Images\Status\warning32.png" />
<None Include="ClientSource\Style\Images\SubSubMenuIcon.png" />
<None Include="ClientSource\Style\InitialConfig.css"> <None Include="ClientSource\Style\InitialConfig.css">
<DependentUpon>InitialConfig.less</DependentUpon> <DependentUpon>InitialConfig.less</DependentUpon>
</None> </None>
@@ -1983,7 +1964,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" 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_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Web/T4MVC.cs
+2 -21
View File
@@ -538,6 +538,7 @@ namespace Links
private const string URLPATH = "~/ClientSource/Style/Fancytree"; private const string URLPATH = "~/ClientSource/Style/Fancytree";
public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); } public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); } public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); }
public static readonly string icons_disco_shrunk_png = Url("icons-disco-shrunk.png");
public static readonly string icons_DiscoMod_png = Url("icons-DiscoMod.png"); public static readonly string icons_DiscoMod_png = Url("icons-DiscoMod.png");
public static readonly string icons_gif = Url("icons.gif"); public static readonly string icons_gif = Url("icons.gif");
public static readonly string loading_gif = Url("loading.gif"); public static readonly string loading_gif = Url("loading.gif");
@@ -579,17 +580,10 @@ namespace Links
public static readonly string dataTablePrev_png = Url("dataTablePrev.png"); public static readonly string dataTablePrev_png = Url("dataTablePrev.png");
public static readonly string dataTablePrevDisabled_png = Url("dataTablePrevDisabled.png"); public static readonly string dataTablePrevDisabled_png = Url("dataTablePrevDisabled.png");
public static readonly string dataTableSort_png = Url("dataTableSort.png"); public static readonly string dataTableSort_png = Url("dataTableSort.png");
public static readonly string editForm_png = Url("editForm.png");
public static readonly string expressionBrowser_png = Url("expressionBrowser.png"); public static readonly string expressionBrowser_png = Url("expressionBrowser.png");
public static readonly string expressionBrowser256_png = Url("expressionBrowser256.png"); public static readonly string expressionBrowser256_png = Url("expressionBrowser256.png");
public static readonly string list_png = Url("list.png");
public static readonly string listAlert_png = Url("listAlert.png");
public static readonly string locked_png = Url("locked.png"); public static readonly string locked_png = Url("locked.png");
public static readonly string remove_png = Url("remove.png");
public static readonly string removeSubtle_png = Url("removeSubtle.png");
public static readonly string unlocked_png = Url("unlocked.png"); public static readonly string unlocked_png = Url("unlocked.png");
public static readonly string user16_png = Url("user16.png");
public static readonly string userGroup16_png = Url("userGroup16.png");
} }
[GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode] [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
@@ -629,26 +623,13 @@ namespace Links
private const string URLPATH = "~/ClientSource/Style/Images/Status"; private const string URLPATH = "~/ClientSource/Style/Images/Status";
public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); } public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); } public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); }
public static readonly string error_png = Url("error.png");
public static readonly string fail32_png = Url("fail32.png"); public static readonly string fail32_png = Url("fail32.png");
public static readonly string fileBroken256_png = Url("fileBroken256.png"); public static readonly string fileBroken256_png = Url("fileBroken256.png");
public static readonly string information_png = Url("information.png");
public static readonly string jobStatus_Closed_png = Url("jobStatus-Closed.png");
public static readonly string jobStatus_Insurance_png = Url("jobStatus-Insurance.png");
public static readonly string jobStatus_Open_png = Url("jobStatus-Open.png");
public static readonly string jobStatus_Repairs_png = Url("jobStatus-Repairs.png");
public static readonly string jobStatus_User_png = Url("jobStatus-User.png");
public static readonly string loading_gif = Url("loading.gif"); public static readonly string loading_gif = Url("loading.gif");
public static readonly string ok_png = Url("ok.png"); public static readonly string progressBar_png = Url("progressBar.png");
public static readonly string pbar_ani_gif = Url("pbar-ani.gif");
public static readonly string save_png = Url("save.png");
public static readonly string success_png = Url("success.png");
public static readonly string updateAvailable_png = Url("updateAvailable.png");
public static readonly string warning_png = Url("warning.png");
public static readonly string warning32_png = Url("warning32.png"); public static readonly string warning32_png = Url("warning32.png");
} }
public static readonly string SubSubMenuIcon_png = Url("SubSubMenuIcon.png");
} }
public static readonly string InitialConfig_less = Url("InitialConfig.less"); public static readonly string InitialConfig_less = Url("InitialConfig.less");
Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
+1 -2
View File
@@ -240,8 +240,7 @@
</div> </div>
<div id="dialogRemoveAttachment" title="Remove this Attachment?"> <div id="dialogRemoveAttachment" title="Remove this Attachment?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
Are you sure?
</p> </p>
</div> </div>
<script> <script>
Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
+6 -8
View File
@@ -705,18 +705,16 @@ WriteLiteral(" id=\"dialogRemoveAttachment\"");
WriteLiteral(" title=\"Remove this Attachment?\""); WriteLiteral(" title=\"Remove this Attachment?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;Are you sure?\r\n </p>\r\n </div>\r\n <script>\r\n $(\'#Dev" +
"iceDetailTabItems\').append(\'<li><a href=\"#DeviceDetailTab-Resources\" id=\"DeviceD" +
WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n </div>\r\n <script>\r\n " + "etailTab-ResourcesLink\">Attachments [");
" $(\'#DeviceDetailTabItems\').append(\'<li><a href=\"#DeviceDetailTab-Resources\" " +
"id=\"DeviceDetailTab-ResourcesLink\">Attachments [");
#line 248 "..\..\Views\Device\DeviceParts\_Resources.cshtml" #line 247 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
Write(Model.Device.DeviceAttachments == null ? 0 : Model.Device.DeviceAttachments.Count); Write(Model.Device.DeviceAttachments == null ? 0 : Model.Device.DeviceAttachments.Count);
Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
+19 -25
View File
@@ -135,10 +135,9 @@
var spanProgress = null; var spanProgress = null;
$.getJSON('@(Url.Action(MVC.API.Device.LastNetworkLogonDate(Model.Device.SerialNumber)))', function (response, result) { $.getJSON('@(Url.Action(MVC.API.Device.LastNetworkLogonDate(Model.Device.SerialNumber)))', function (response, result) {
updated = true; updated = true;
if (spanProgress) if (spanProgress)
spanProgress.hide(); spanProgress.remove();
if (result != 'success') { if (result != 'success') {
alert('Unable to retrieve latest network logon date:\n' + response); alert('Unable to retrieve latest network logon date:\n' + response);
@@ -149,7 +148,7 @@
}); });
window.setTimeout(function () { window.setTimeout(function () {
if (!updated) { if (!updated) {
spanProgress = $('<span>').addClass('ajaxHelperIcon ajaxLoading ajaxShowInitially').attr('title', 'Loading...').appendTo(span); spanProgress = $('<i>').addClass('ajaxLoading showInitially').attr('title', 'Loading...').appendTo(span);
} }
}, 250); }, 250);
}); });
@@ -197,15 +196,15 @@
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
var generatePdfUrl = '@Url.Action(MVC.API.Device.GeneratePdf(Model.Device.SerialNumber.ToString(), null))?DocumentTemplateId='; var generatePdfUrl = '@Url.Action(MVC.API.Device.GeneratePdf(Model.Device.SerialNumber.ToString(), null))?DocumentTemplateId=';
var $documentTemplates = $('#Device_Show_GenerateDocument'); var $documentTemplates = $('#Device_Show_GenerateDocument');
$documentTemplates.change(function () { $documentTemplates.change(function () {
var v = $documentTemplates.val(); var v = $documentTemplates.val();
if (v) { if (v) {
window.location.href = generatePdfUrl + v; window.location.href = generatePdfUrl + v;
$documentTemplates.val('').blur(); $documentTemplates.val('').blur();
} }
});
}); });
});
</script> </script>
</div> </div>
} }
@@ -451,11 +450,9 @@
{ {
@Html.ActionLinkSmallButton("Update Assignment", MVC.API.Device.UpdateAssignedUserId(Model.Device.SerialNumber, null, true), "Device_Show_User_Actions_Assign_Button") @Html.ActionLinkSmallButton("Update Assignment", MVC.API.Device.UpdateAssignedUserId(Model.Device.SerialNumber, null, true), "Device_Show_User_Actions_Assign_Button")
<div id="Device_Show_User_Actions_Assign_Dialog" class="dialog" title="Assign this Device?"> <div id="Device_Show_User_Actions_Assign_Dialog" class="dialog" title="Assign this Device?">
<p> <h4><i class="fa fa-info-circle information"></i>&nbsp;Assign to User:</h4>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <br />
Assign to User: <input id="Device_Show_User_Actions_Assign_UserId" type="text" />
<input id="Device_Show_User_Actions_Assign_UserId" type="text" />
</p>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
@@ -498,7 +495,7 @@
buttonDialog = $('#Device_Show_User_Actions_Assign_Dialog') buttonDialog = $('#Device_Show_User_Actions_Assign_Dialog')
.dialog({ .dialog({
resizable: false, resizable: false,
height: 160, height: 180,
modal: true, modal: true,
autoOpen: false, autoOpen: false,
buttons: dialogButtons buttons: dialogButtons
@@ -535,7 +532,7 @@
<div class="ui-widget"> <div class="ui-widget">
<div class="ui-state-highlight ui-corner-all" style="padding: 6px;"> <div class="ui-state-highlight ui-corner-all" style="padding: 6px;">
<div style="padding-bottom: 6px;"> <div style="padding-bottom: 6px;">
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;
This action will allow a device <em>claiming</em> to have the Serial Number '@(Model.Device.SerialNumber)' to be enrolled without authentication. This action will allow a device <em>claiming</em> to have the Serial Number '@(Model.Device.SerialNumber)' to be enrolled without authentication.
</div> </div>
<strong>Are you sure you want to allow an unauthenticated enrolment?</strong> <strong>Are you sure you want to allow an unauthenticated enrolment?</strong>
@@ -581,8 +578,7 @@
@Html.ActionLinkSmallButton("Untrust Enrol", MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, false.ToString(), true), "Device_Show_Device_Actions_UntrustEnrol_Button") @Html.ActionLinkSmallButton("Untrust Enrol", MVC.API.Device.UpdateAllowUnauthenticatedEnrol(Model.Device.SerialNumber, false.ToString(), true), "Device_Show_Device_Actions_UntrustEnrol_Button")
<div id="Device_Show_Device_Actions_UntrustEnrol_Dialog" title="Untrust this Device?"> <div id="Device_Show_Device_Actions_UntrustEnrol_Dialog" title="Untrust this Device?">
<div style="padding-bottom: 6px;"> <div style="padding-bottom: 6px;">
<span class="ui-icon ui-icon-info" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-info-circle information"></i>&nbsp;This action will require the device to enrol with authentication (for example: domain joined).
This action will require the device to enrol with authentication (for example: domain joined).
</div> </div>
<strong>Are you sure you want to require an authenticated enrolment?</strong> <strong>Are you sure you want to require an authenticated enrolment?</strong>
</div> </div>
@@ -621,8 +617,7 @@
@Html.ActionLinkSmallButton("Decommission", MVC.API.Device.Decommission(), "Device_Show_Device_Actions_Decommission_Button") @Html.ActionLinkSmallButton("Decommission", MVC.API.Device.Decommission(), "Device_Show_Device_Actions_Decommission_Button")
<div id="Device_Show_Device_Actions_Decommission_Dialog" class="dialog" title="Device Decommissioning"> <div id="Device_Show_Device_Actions_Decommission_Dialog" class="dialog" title="Device Decommissioning">
<div class="clearfix" style="margin-bottom: 10px;"> <div class="clearfix" style="margin-bottom: 10px;">
<span class="ui-icon ui-icon-info" style="float: left; margin: 0 7px 0 0;"></span> <i class="fa fa-question-circle fa-lg information"></i>&nbsp;Why was this Device Decommissioned?
Why was this Device Decommissioned?
</div> </div>
<div> <div>
<ul class="none"> <ul class="none">
@@ -683,8 +678,7 @@
@Html.ActionLinkSmallButton("Recommission", MVC.API.Device.Recommission(Model.Device.SerialNumber, true), "Device_Show_Device_Actions_Recommission_Button") @Html.ActionLinkSmallButton("Recommission", MVC.API.Device.Recommission(Model.Device.SerialNumber, true), "Device_Show_Device_Actions_Recommission_Button")
<div id="Device_Show_Device_Actions_Recommission_Dialog" title="Recommission this Device?"> <div id="Device_Show_Device_Actions_Recommission_Dialog" title="Recommission this Device?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
Are you sure?
</p> </p>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
@@ -722,7 +716,7 @@
@Html.ActionLinkSmallButton("Delete Device", MVC.API.Device.Delete(Model.Device.SerialNumber, true), "Device_Show_Device_Actions_Delete_Button") @Html.ActionLinkSmallButton("Delete Device", MVC.API.Device.Delete(Model.Device.SerialNumber, true), "Device_Show_Device_Actions_Delete_Button")
<div id="Device_Show_Device_Actions_Delete_Dialog" title="Delete this Device?"> <div id="Device_Show_Device_Actions_Delete_Dialog" title="Delete this Device?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;
This item will be permanently deleted and cannot be recovered.<br /> This item will be permanently deleted and cannot be recovered.<br />
Jobs linked to this Device (but not to a User) will be deleted also.<br /> Jobs linked to this Device (but not to a User) will be deleted also.<br />
Are you sure? Are you sure?
Disco.Web/Views/Device/DeviceParts/_Subject.generated.cs
+194 -209
View File
File diff suppressed because it is too large Load Diff
Disco.Web/Views/Device/Show.cshtml
+1 -3
View File
@@ -1,12 +1,10 @@
@model Disco.Web.Models.Device.ShowModel @model Disco.Web.Models.Device.ShowModel
@{ @{
ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), string.Format("Device: {0}", Model.Device.SerialNumber)); ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), string.Format("Device: {0}", Model.Device.SerialNumber));
var deviceStatus = Model.Device.Status();
} }
<div id="Device_Show"> <div id="Device_Show">
<div id="Device_Show_Status"> <div id="Device_Show_Status">
<span class="icon DeviceStatus@(deviceStatus.Replace(" ", string.Empty))"></span>@deviceStatus <i class="fa fa-square deviceStatus @(Model.Device.StatusCode())"></i>&nbsp;@Model.Device.Status()
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$('#Device_Show_Status').appendTo('#layout_PageHeading') $('#Device_Show_Status').appendTo('#layout_PageHeading')
Disco.Web/Views/Device/Show.generated.cs
+28 -29
View File
@@ -48,8 +48,6 @@ namespace Disco.Web.Views.Device
ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), string.Format("Device: {0}", Model.Device.SerialNumber)); ViewBag.Title = Html.ToBreadcrumb("Devices", MVC.Device.Index(), string.Format("Device: {0}", Model.Device.SerialNumber));
var deviceStatus = Model.Device.Status();
#line default #line default
#line hidden #line hidden
@@ -61,25 +59,26 @@ WriteLiteral(">\r\n <div");
WriteLiteral(" id=\"Device_Show_Status\""); WriteLiteral(" id=\"Device_Show_Status\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 298), Tuple.Create("\"", 365) WriteAttribute("class", Tuple.Create(" class=\"", 246), Tuple.Create("\"", 308)
, Tuple.Create(Tuple.Create("", 306), Tuple.Create("icon", 306), true) , Tuple.Create(Tuple.Create("", 254), Tuple.Create("fa", 254), true)
, Tuple.Create(Tuple.Create(" ", 310), Tuple.Create("DeviceStatus", 311), true) , Tuple.Create(Tuple.Create(" ", 256), Tuple.Create("fa-square", 257), true)
, Tuple.Create(Tuple.Create(" ", 266), Tuple.Create("deviceStatus", 267), true)
#line 9 "..\..\Views\Device\Show.cshtml" #line 7 "..\..\Views\Device\Show.cshtml"
, Tuple.Create(Tuple.Create("", 323), Tuple.Create<System.Object, System.Int32>(deviceStatus.Replace(" ", string.Empty) , Tuple.Create(Tuple.Create(" ", 279), Tuple.Create<System.Object, System.Int32>(Model.Device.StatusCode()
#line default #line default
#line hidden #line hidden
, 323), false) , 280), false)
); );
WriteLiteral("></span>"); WriteLiteral("></i>&nbsp;");
#line 9 "..\..\Views\Device\Show.cshtml" #line 7 "..\..\Views\Device\Show.cshtml"
Write(deviceStatus); Write(Model.Device.Status());
#line default #line default
@@ -94,7 +93,7 @@ WriteLiteral(">\r\n $(function () {\r\n $(\'#Device_Sh
WriteLiteral(" "); WriteLiteral(" ");
#line 16 "..\..\Views\Device\Show.cshtml" #line 14 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Subject, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Subject, Model));
@@ -135,13 +134,13 @@ WriteLiteral(" id=\"DeviceDetailTabItems\"");
WriteLiteral("></ul>\r\n"); WriteLiteral("></ul>\r\n");
#line 52 "..\..\Views\Device\Show.cshtml" #line 50 "..\..\Views\Device\Show.cshtml"
#line default #line default
#line hidden #line hidden
#line 52 "..\..\Views\Device\Show.cshtml" #line 50 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowJobs)) if (Authorization.Has(Claims.Device.ShowJobs))
{ {
@@ -149,14 +148,14 @@ WriteLiteral("></ul>\r\n");
#line default #line default
#line hidden #line hidden
#line 54 "..\..\Views\Device\Show.cshtml" #line 52 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Jobs, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Jobs, Model));
#line default #line default
#line hidden #line hidden
#line 54 "..\..\Views\Device\Show.cshtml" #line 52 "..\..\Views\Device\Show.cshtml"
} }
@@ -166,7 +165,7 @@ WriteLiteral("></ul>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 56 "..\..\Views\Device\Show.cshtml" #line 54 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowDetails)) if (Authorization.Has(Claims.Device.ShowDetails))
{ {
@@ -174,14 +173,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 58 "..\..\Views\Device\Show.cshtml" #line 56 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model));
#line default #line default
#line hidden #line hidden
#line 58 "..\..\Views\Device\Show.cshtml" #line 56 "..\..\Views\Device\Show.cshtml"
} }
@@ -191,7 +190,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 60 "..\..\Views\Device\Show.cshtml" #line 58 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowAssignmentHistory)) if (Authorization.Has(Claims.Device.ShowAssignmentHistory))
{ {
@@ -199,14 +198,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 62 "..\..\Views\Device\Show.cshtml" #line 60 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model));
#line default #line default
#line hidden #line hidden
#line 62 "..\..\Views\Device\Show.cshtml" #line 60 "..\..\Views\Device\Show.cshtml"
} }
@@ -216,7 +215,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 64 "..\..\Views\Device\Show.cshtml" #line 62 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowAttachments)) if (Authorization.Has(Claims.Device.ShowAttachments))
{ {
@@ -224,14 +223,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 66 "..\..\Views\Device\Show.cshtml" #line 64 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model));
#line default #line default
#line hidden #line hidden
#line 66 "..\..\Views\Device\Show.cshtml" #line 64 "..\..\Views\Device\Show.cshtml"
} }
@@ -241,7 +240,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 68 "..\..\Views\Device\Show.cshtml" #line 66 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowCertificates)) if (Authorization.Has(Claims.Device.ShowCertificates))
{ {
@@ -249,14 +248,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 70 "..\..\Views\Device\Show.cshtml" #line 68 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model)); Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model));
#line default #line default
#line hidden #line hidden
#line 70 "..\..\Views\Device\Show.cshtml" #line 68 "..\..\Views\Device\Show.cshtml"
} }
Disco.Web/Views/InitialConfig/Complete.cshtml
+5 -5
View File
@@ -9,7 +9,7 @@
<table> <table>
<tr> <tr>
<td> <td>
<h3><span class="icon @(Model.RegistryDatabaseResult == null ? "success" : "error")"></span>Database</h3> <h3><i class="fa @(Model.RegistryDatabaseResult == null ? "fa-check-square success" : "fa-exclamation-circle error")"></i>&nbsp;Database</h3>
<div class="testResult"> <div class="testResult">
@{ @{
if (Model.RegistryDatabaseResult == null) if (Model.RegistryDatabaseResult == null)
@@ -42,7 +42,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<h3><span class="icon @(Model.DiscoDnsTestResult.Item2 == null ? "success" : "warning")"></span>Disco DNS Entry</h3> <h3><i class="fa @(Model.DiscoDnsTestResult.Item2 == null ? "fa-check-square success" : "fa-exclamation-circle error")"></i>&nbsp;Disco DNS Entry</h3>
<div class="testResult"> <div class="testResult">
@{ @{
if (Model.DiscoDnsTestResult.Item1 != null) if (Model.DiscoDnsTestResult.Item1 != null)
@@ -105,7 +105,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<h3><span class="icon @(Model.DiscoIctComAuWebResult == null ? "success" : "warning")"></span>Connectivity to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a></h3> <h3><i class="fa @(Model.DiscoIctComAuWebResult == null ? "fa-check-square success" : "fa-exclamation-circle error")"></i>&nbsp;Connectivity to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a></h3>
<div class="testResult"> <div class="testResult">
@{ @{
if (Model.DiscoIctComAuWebResult == null) if (Model.DiscoIctComAuWebResult == null)
@@ -138,7 +138,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<h3><span class="icon information"></span>Unblock ICMP (Ping) for the Disco server</h3> <h3><i class="fa fa-info-circle information"></i>&nbsp;Unblock ICMP (Ping) for the Disco server</h3>
<div class="testResult"> <div class="testResult">
The Disco Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please insure any firewall rules are updated accordingly. The Disco Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please insure any firewall rules are updated accordingly.
</div> </div>
@@ -146,7 +146,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<h3><span class="icon information"></span>Configure a regularly scheduled Backup</h3> <h3><i class="fa fa-info-circle information"></i>&nbsp;Configure a regularly scheduled Backup</h3>
<div class="testResult"> <div class="testResult">
Please ensure both the SQL Database and File Store are backed up regularly. Please ensure both the SQL Database and File Store are backed up regularly.
</div> </div>
Disco.Web/Views/InitialConfig/Complete.generated.cs
+31 -30
View File
@@ -71,20 +71,20 @@ WriteLiteral(" class=\"form\"");
WriteLiteral(" style=\"width: 650px\""); WriteLiteral(" style=\"width: 650px\"");
WriteLiteral(">\r\n <h2>Verification Results</h2>\r\n <table>\r\n <tr>\r\n " + WriteLiteral(">\r\n <h2>Verification Results</h2>\r\n <table>\r\n <tr>\r\n " +
" <td>\r\n <h3><span"); " <td>\r\n <h3><i");
WriteAttribute("class", Tuple.Create(" class=\"", 412), Tuple.Create("\"", 486) WriteAttribute("class", Tuple.Create(" class=\"", 409), Tuple.Create("\"", 519)
, Tuple.Create(Tuple.Create("", 420), Tuple.Create("icon", 420), true) , Tuple.Create(Tuple.Create("", 417), Tuple.Create("fa", 417), true)
#line 12 "..\..\Views\InitialConfig\Complete.cshtml" #line 12 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create(" ", 424), Tuple.Create<System.Object, System.Int32>(Model.RegistryDatabaseResult == null ? "success" : "error" , Tuple.Create(Tuple.Create(" ", 419), Tuple.Create<System.Object, System.Int32>(Model.RegistryDatabaseResult == null ? "fa-check-square success" : "fa-exclamation-circle error"
#line default #line default
#line hidden #line hidden
, 425), false) , 420), false)
); );
WriteLiteral("></span>Database</h3>\r\n <div"); WriteLiteral("></i>&nbsp;Database</h3>\r\n <div");
WriteLiteral(" class=\"testResult\""); WriteLiteral(" class=\"testResult\"");
@@ -196,20 +196,20 @@ WriteLiteral("\r\n </div>\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " + WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " +
" <tr>\r\n <td>\r\n <h3><span"); " <tr>\r\n <td>\r\n <h3><i");
WriteAttribute("class", Tuple.Create(" class=\"", 2040), Tuple.Create("\"", 2118) WriteAttribute("class", Tuple.Create(" class=\"", 2073), Tuple.Create("\"", 2185)
, Tuple.Create(Tuple.Create("", 2048), Tuple.Create("icon", 2048), true) , Tuple.Create(Tuple.Create("", 2081), Tuple.Create("fa", 2081), true)
#line 45 "..\..\Views\InitialConfig\Complete.cshtml" #line 45 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create(" ", 2052), Tuple.Create<System.Object, System.Int32>(Model.DiscoDnsTestResult.Item2 == null ? "success" : "warning" , Tuple.Create(Tuple.Create(" ", 2083), Tuple.Create<System.Object, System.Int32>(Model.DiscoDnsTestResult.Item2 == null ? "fa-check-square success" : "fa-exclamation-circle error"
#line default #line default
#line hidden #line hidden
, 2053), false) , 2084), false)
); );
WriteLiteral("></span>Disco DNS Entry</h3>\r\n <div"); WriteLiteral("></i>&nbsp;Disco DNS Entry</h3>\r\n <div");
WriteLiteral(" class=\"testResult\""); WriteLiteral(" class=\"testResult\"");
@@ -441,20 +441,20 @@ WriteLiteral("\r\n </div>\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " + WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " +
" <tr>\r\n <td>\r\n <h3><span"); " <tr>\r\n <td>\r\n <h3><i");
WriteAttribute("class", Tuple.Create(" class=\"", 4945), Tuple.Create("\"", 5021) WriteAttribute("class", Tuple.Create(" class=\"", 5012), Tuple.Create("\"", 5122)
, Tuple.Create(Tuple.Create("", 4953), Tuple.Create("icon", 4953), true) , Tuple.Create(Tuple.Create("", 5020), Tuple.Create("fa", 5020), true)
#line 108 "..\..\Views\InitialConfig\Complete.cshtml" #line 108 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create(" ", 4957), Tuple.Create<System.Object, System.Int32>(Model.DiscoIctComAuWebResult == null ? "success" : "warning" , Tuple.Create(Tuple.Create(" ", 5022), Tuple.Create<System.Object, System.Int32>(Model.DiscoIctComAuWebResult == null ? "fa-check-square success" : "fa-exclamation-circle error"
#line default #line default
#line hidden #line hidden
, 4958), false) , 5023), false)
); );
WriteLiteral("></span>Connectivity to <a"); WriteLiteral("></i>&nbsp;Connectivity to <a");
WriteLiteral(" href=\"https://discoict.com.au\""); WriteLiteral(" href=\"https://discoict.com.au\"");
@@ -585,11 +585,12 @@ WriteLiteral("\r\n </div>\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " + WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " +
" <tr>\r\n <td>\r\n <h3><span"); " <tr>\r\n <td>\r\n <h3><i");
WriteLiteral(" class=\"icon information\""); WriteLiteral(" class=\"fa fa-info-circle information\"");
WriteLiteral("></span>Unblock ICMP (Ping) for the Disco server</h3>\r\n <div"); WriteLiteral("></i>&nbsp;Unblock ICMP (Ping) for the Disco server</h3>\r\n <di" +
"v");
WriteLiteral(" class=\"testResult\""); WriteLiteral(" class=\"testResult\"");
@@ -600,11 +601,11 @@ WriteLiteral(@">
</tr> </tr>
<tr> <tr>
<td> <td>
<h3><span"); <h3><i");
WriteLiteral(" class=\"icon information\""); WriteLiteral(" class=\"fa fa-info-circle information\"");
WriteLiteral("></span>Configure a regularly scheduled Backup</h3>\r\n <div"); WriteLiteral("></i>&nbsp;Configure a regularly scheduled Backup</h3>\r\n <div");
WriteLiteral(" class=\"testResult\""); WriteLiteral(" class=\"testResult\"");
@@ -633,14 +634,14 @@ WriteLiteral(">\r\n");
#line hidden #line hidden
WriteLiteral(" <a"); WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 7797), Tuple.Create("\"", 7852) WriteAttribute("href", Tuple.Create(" href=\"", 7927), Tuple.Create("\"", 7982)
#line 161 "..\..\Views\InitialConfig\Complete.cshtml" #line 161 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create("", 7804), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.RestartWebApp()) , Tuple.Create(Tuple.Create("", 7934), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.RestartWebApp())
#line default #line default
#line hidden #line hidden
, 7804), false) , 7934), false)
); );
WriteLiteral(" class=\"button\""); WriteLiteral(" class=\"button\"");
@@ -660,14 +661,14 @@ WriteLiteral(" <a");
WriteLiteral(" id=\"tryAgain\""); WriteLiteral(" id=\"tryAgain\"");
WriteAttribute("href", Tuple.Create(" href=\"", 7962), Tuple.Create("\"", 8012) WriteAttribute("href", Tuple.Create(" href=\"", 8092), Tuple.Create("\"", 8142)
#line 165 "..\..\Views\InitialConfig\Complete.cshtml" #line 165 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create("", 7969), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.Complete()) , Tuple.Create(Tuple.Create("", 8099), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.Complete())
#line default #line default
#line hidden #line hidden
, 7969), false) , 8099), false)
); );
WriteLiteral(" class=\"button\""); WriteLiteral(" class=\"button\"");
Disco.Web/Views/Job/JobParts/Components.cshtml
+1 -2
View File
@@ -75,8 +75,7 @@
{ {
<div id="dialogRemoveComponent" title="Remove this Component?"> <div id="dialogRemoveComponent" title="Remove this Component?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
Are you sure?
</p> </p>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
Disco.Web/Views/Job/JobParts/Components.generated.cs
+7 -9
View File
@@ -319,13 +319,11 @@ WriteLiteral(" id=\"dialogRemoveComponent\"");
WriteLiteral(" title=\"Remove this Component?\""); WriteLiteral(" title=\"Remove this Component?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral(" <script"); WriteLiteral(" <script");
@@ -355,7 +353,7 @@ WriteLiteral(">\r\n $(function () {\r\n var $jobComponents = $
" $.ajax({\r\n url: \'"); " $.ajax({\r\n url: \'");
#line 120 "..\..\Views\Job\JobParts\Components.cshtml" #line 119 "..\..\Views\Job\JobParts\Components.cshtml"
Write(Url.Action(MVC.API.Job.ComponentRemove())); Write(Url.Action(MVC.API.Job.ComponentRemove()));
@@ -396,7 +394,7 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
" url: \'"); " url: \'");
#line 177 "..\..\Views\Job\JobParts\Components.cshtml" #line 176 "..\..\Views\Job\JobParts\Components.cshtml"
Write(Url.Action(MVC.API.Job.ComponentUpdate())); Write(Url.Action(MVC.API.Job.ComponentUpdate()));
@@ -429,7 +427,7 @@ WriteLiteral(@"',
url: '"); url: '");
#line 201 "..\..\Views\Job\JobParts\Components.cshtml" #line 200 "..\..\Views\Job\JobParts\Components.cshtml"
Write(Url.Action(MVC.API.Job.ComponentAdd(Model.Job.Id, null, null))); Write(Url.Action(MVC.API.Job.ComponentAdd(Model.Job.Id, null, null)));
@@ -462,7 +460,7 @@ WriteLiteral(@"',
"); ");
#line 225 "..\..\Views\Job\JobParts\Components.cshtml" #line 224 "..\..\Views\Job\JobParts\Components.cshtml"
} }
#line default #line default
Disco.Web/Views/Job/JobParts/Resources.cshtml
+2 -4
View File
@@ -77,8 +77,7 @@
{ {
<div id="dialogRemoveLog" class="hiddenDialog" title="Remove this Comment?"> <div id="dialogRemoveLog" class="hiddenDialog" title="Remove this Comment?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
Are you sure?
</p> </p>
</div> </div>
} }
@@ -93,8 +92,7 @@
{ {
<div id="dialogRemoveAttachment" class="hiddenDialog" title="Remove this Attachment?"> <div id="dialogRemoveAttachment" class="hiddenDialog" title="Remove this Attachment?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
Are you sure?
</p> </p>
</div> </div>
} }
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+60 -64
View File
@@ -581,23 +581,21 @@ WriteLiteral(" class=\"hiddenDialog\"");
WriteLiteral(" title=\"Remove this Comment?\""); WriteLiteral(" title=\"Remove this Comment?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n </div>\r\n");
#line 84 "..\..\Views\Job\JobParts\Resources.cshtml" #line 83 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 85 "..\..\Views\Job\JobParts\Resources.cshtml" #line 84 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canShowAttachments && canAddAttachments) if (canShowAttachments && canAddAttachments)
{ {
@@ -619,14 +617,14 @@ WriteLiteral(" id=\"silverlightHostUploadAttachment\"");
WriteLiteral(">\r\n </div>\r\n </div>\r\n"); WriteLiteral(">\r\n </div>\r\n </div>\r\n");
#line 91 "..\..\Views\Job\JobParts\Resources.cshtml" #line 90 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 92 "..\..\Views\Job\JobParts\Resources.cshtml" #line 91 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canShowAttachments && (canRemoveAnyAttachments || canRemoveOwnAttachments)) if (canShowAttachments && (canRemoveAnyAttachments || canRemoveOwnAttachments))
{ {
@@ -641,23 +639,21 @@ WriteLiteral(" class=\"hiddenDialog\"");
WriteLiteral(" title=\"Remove this Attachment?\""); WriteLiteral(" title=\"Remove this Attachment?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n </div>\r\n");
#line 100 "..\..\Views\Job\JobParts\Resources.cshtml" #line 98 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 101 "..\..\Views\Job\JobParts\Resources.cshtml" #line 99 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canShowLogs) if (canShowLogs)
{ {
@@ -669,7 +665,7 @@ WriteLiteral(" <script>\r\n if (!document.DiscoFunctions) {\r\n
"arseInt(\'"); "arseInt(\'");
#line 109 "..\..\Views\Job\JobParts\Resources.cshtml" #line 107 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id); Write(Model.Job.Id);
@@ -694,13 +690,13 @@ WriteLiteral(@"');
"); ");
#line 125 "..\..\Views\Job\JobParts\Resources.cshtml" #line 123 "..\..\Views\Job\JobParts\Resources.cshtml"
#line default #line default
#line hidden #line hidden
#line 125 "..\..\Views\Job\JobParts\Resources.cshtml" #line 123 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canAddLogs) if (canAddLogs)
{ {
@@ -727,7 +723,7 @@ WriteLiteral(@"
url: '"); url: '");
#line 144 "..\..\Views\Job\JobParts\Resources.cshtml" #line 142 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null))); Write(Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null)));
@@ -758,7 +754,7 @@ WriteLiteral(@"',
"); ");
#line 166 "..\..\Views\Job\JobParts\Resources.cshtml" #line 164 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
@@ -767,7 +763,7 @@ WriteLiteral(@"',
WriteLiteral(" "); WriteLiteral(" ");
#line 167 "..\..\Views\Job\JobParts\Resources.cshtml" #line 165 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canRemoveAnyLogs || canRemoveOwnLogs) if (canRemoveAnyLogs || canRemoveOwnLogs)
{ {
@@ -801,7 +797,7 @@ WriteLiteral(@"
url: '"); url: '");
#line 193 "..\..\Views\Job\JobParts\Resources.cshtml" #line 191 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.CommentRemove())); Write(Url.Action(MVC.API.Job.CommentRemove()));
@@ -839,7 +835,7 @@ WriteLiteral(@"',
"); ");
#line 222 "..\..\Views\Job\JobParts\Resources.cshtml" #line 220 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
@@ -849,7 +845,7 @@ WriteLiteral("\r\n function loadLiveComment(key) {\r\n
"obId) {\r\n $.ajax({\r\n url: \'"); "obId) {\r\n $.ajax({\r\n url: \'");
#line 227 "..\..\Views\Job\JobParts\Resources.cshtml" #line 225 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.Comment())); Write(Url.Action(MVC.API.Job.Comment()));
@@ -860,13 +856,13 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
" if (d && d.JobId == jobId) {\r\n"); " if (d && d.JobId == jobId) {\r\n");
#line 232 "..\..\Views\Job\JobParts\Resources.cshtml" #line 230 "..\..\Views\Job\JobParts\Resources.cshtml"
#line default #line default
#line hidden #line hidden
#line 232 "..\..\Views\Job\JobParts\Resources.cshtml" #line 230 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canRemoveAnyLogs) if (canRemoveAnyLogs)
{ {
@@ -875,7 +871,7 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
WriteLiteral("addComment(d, false, true);"); WriteLiteral("addComment(d, false, true);");
#line 233 "..\..\Views\Job\JobParts\Resources.cshtml" #line 231 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
else if (canRemoveOwnLogs) else if (canRemoveOwnLogs)
{ {
@@ -885,7 +881,7 @@ WriteLiteral("addComment(d, false, true);");
WriteLiteral("addComment(d, false, (d.AuthorId === \'"); WriteLiteral("addComment(d, false, (d.AuthorId === \'");
#line 235 "..\..\Views\Job\JobParts\Resources.cshtml" #line 233 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(CurrentUser.Id); Write(CurrentUser.Id);
@@ -894,7 +890,7 @@ WriteLiteral("addComment(d, false, (d.AuthorId === \'");
WriteLiteral("\'));"); WriteLiteral("\'));");
#line 235 "..\..\Views\Job\JobParts\Resources.cshtml" #line 233 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
else else
{ {
@@ -904,7 +900,7 @@ WriteLiteral("\'));");
WriteLiteral("addComment(d, false, false);"); WriteLiteral("addComment(d, false, false);");
#line 237 "..\..\Views\Job\JobParts\Resources.cshtml" #line 235 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
@@ -941,7 +937,7 @@ WriteLiteral(@"
commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href="""); commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href=""");
#line 266 "..\..\Views\Job\JobParts\Resources.cshtml" #line 264 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.Job.Show(null))); Write(Url.Action(MVC.Job.Show(null)));
@@ -969,14 +965,14 @@ WriteLiteral(@"?id=$1"">#$1</a>');
"); ");
#line 285 "..\..\Views\Job\JobParts\Resources.cshtml" #line 283 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 286 "..\..\Views\Job\JobParts\Resources.cshtml" #line 284 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canShowAttachments) if (canShowAttachments)
{ {
@@ -997,7 +993,7 @@ WriteLiteral(@" <script>
var jobId = parseInt('"); var jobId = parseInt('");
#line 299 "..\..\Views\Job\JobParts\Resources.cshtml" #line 297 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id); Write(Model.Job.Id);
@@ -1008,13 +1004,13 @@ WriteLiteral("\');\r\n\r\n //#region Attachments\r\n var $
"tput\');\r\n\r\n"); "tput\');\r\n\r\n");
#line 305 "..\..\Views\Job\JobParts\Resources.cshtml" #line 303 "..\..\Views\Job\JobParts\Resources.cshtml"
#line default #line default
#line hidden #line hidden
#line 305 "..\..\Views\Job\JobParts\Resources.cshtml" #line 303 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canAddAttachments) if (canAddAttachments)
{ {
@@ -1045,7 +1041,7 @@ WriteLiteral(@"
'"); '");
#line 328 "..\..\Views\Job\JobParts\Resources.cshtml" #line 326 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap); Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
@@ -1066,7 +1062,7 @@ WriteLiteral(@"',
'UploadUrl="); 'UploadUrl=");
#line 340 "..\..\Views\Job\JobParts\Resources.cshtml" #line 338 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null))); Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)));
@@ -1101,7 +1097,7 @@ WriteLiteral(@"');
"); ");
#line 366 "..\..\Views\Job\JobParts\Resources.cshtml" #line 364 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
@@ -1110,13 +1106,13 @@ WriteLiteral(@"');
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 368 "..\..\Views\Job\JobParts\Resources.cshtml" #line 366 "..\..\Views\Job\JobParts\Resources.cshtml"
#line default #line default
#line hidden #line hidden
#line 368 "..\..\Views\Job\JobParts\Resources.cshtml" #line 366 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canRemoveAnyAttachments || canRemoveOwnAttachments) if (canRemoveAnyAttachments || canRemoveOwnAttachments)
{ {
@@ -1151,7 +1147,7 @@ WriteLiteral(@"
url: '"); url: '");
#line 395 "..\..\Views\Job\JobParts\Resources.cshtml" #line 393 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentRemove())); Write(Url.Action(MVC.API.Job.AttachmentRemove()));
@@ -1179,7 +1175,7 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
" }\r\n\r\n //#endregion\r\n\r\n "); " }\r\n\r\n //#endregion\r\n\r\n ");
#line 428 "..\..\Views\Job\JobParts\Resources.cshtml" #line 426 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
@@ -1190,7 +1186,7 @@ WriteLiteral("\r\n function addAttachment(key, quick) {\r\n\r\n
" $.ajax({\r\n url: \'"); " $.ajax({\r\n url: \'");
#line 436 "..\..\Views\Job\JobParts\Resources.cshtml" #line 434 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.Attachment())); Write(Url.Action(MVC.API.Job.Attachment()));
@@ -1202,13 +1198,13 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
""); "");
#line 442 "..\..\Views\Job\JobParts\Resources.cshtml" #line 440 "..\..\Views\Job\JobParts\Resources.cshtml"
#line default #line default
#line hidden #line hidden
#line 442 "..\..\Views\Job\JobParts\Resources.cshtml" #line 440 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canRemoveAnyAttachments) if (canRemoveAnyAttachments)
{ {
@@ -1222,7 +1218,7 @@ WriteLiteral("buildAttachment(a, true, quick);");
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 445 "..\..\Views\Job\JobParts\Resources.cshtml" #line 443 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
else if (canRemoveOwnAttachments) else if (canRemoveOwnAttachments)
{ {
@@ -1235,7 +1231,7 @@ WriteLiteral(" ");
WriteLiteral("buildAttachment(a, (a.AuthorId === \'"); WriteLiteral("buildAttachment(a, (a.AuthorId === \'");
#line 448 "..\..\Views\Job\JobParts\Resources.cshtml" #line 446 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(CurrentUser.Id); Write(CurrentUser.Id);
@@ -1246,7 +1242,7 @@ WriteLiteral("\'), quick);");
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 449 "..\..\Views\Job\JobParts\Resources.cshtml" #line 447 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
else else
{ {
@@ -1261,7 +1257,7 @@ WriteLiteral("buildAttachment(a, false, quick);");
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 453 "..\..\Views\Job\JobParts\Resources.cshtml" #line 451 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
@@ -1289,7 +1285,7 @@ WriteLiteral(@" } else {
e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '"); e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
#line 473 "..\..\Views\Job\JobParts\Resources.cshtml" #line 471 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentDownload())); Write(Url.Action(MVC.API.Job.AttachmentDownload()));
@@ -1298,7 +1294,7 @@ WriteLiteral(@" } else {
WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'"); WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'");
#line 474 "..\..\Views\Job\JobParts\Resources.cshtml" #line 472 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentThumbnail())); Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
@@ -1331,14 +1327,14 @@ WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.C
" </script>\r\n"); " </script>\r\n");
#line 520 "..\..\Views\Job\JobParts\Resources.cshtml" #line 518 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 521 "..\..\Views\Job\JobParts\Resources.cshtml" #line 519 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canShowLogs && canShowAttachments) if (canShowLogs && canShowAttachments)
{ {
@@ -1348,7 +1344,7 @@ WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.C
WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'"); WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'");
#line 525 "..\..\Views\Job\JobParts\Resources.cshtml" #line 523 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id); Write(Model.Job.Id);
@@ -1377,7 +1373,7 @@ WriteLiteral("\');\r\n\r\n //#region LiveEvents\r\n functi
" var liveMessagesConnection = $.connection(\'"); " var liveMessagesConnection = $.connection(\'");
#line 558 "..\..\Views\Job\JobParts\Resources.cshtml" #line 556 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications")); Write(Url.Content("~/API/Repository/Notifications"));
@@ -1396,7 +1392,7 @@ WriteLiteral(@"', { addToGroups: 'JobLog,JobAttachment' })
"); ");
#line 568 "..\..\Views\Job\JobParts\Resources.cshtml" #line 566 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
else if (canShowLogs) else if (canShowLogs)
{ {
@@ -1407,7 +1403,7 @@ else if (canShowLogs)
WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'"); WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'");
#line 573 "..\..\Views\Job\JobParts\Resources.cshtml" #line 571 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id); Write(Model.Job.Id);
@@ -1435,7 +1431,7 @@ WriteLiteral(@"');
var liveMessagesConnection = $.connection('"); var liveMessagesConnection = $.connection('");
#line 592 "..\..\Views\Job\JobParts\Resources.cshtml" #line 590 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications")); Write(Url.Content("~/API/Repository/Notifications"));
@@ -1454,7 +1450,7 @@ WriteLiteral(@"', { addToGroups: 'JobLog' })
"); ");
#line 602 "..\..\Views\Job\JobParts\Resources.cshtml" #line 600 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
else if (canShowAttachments) else if (canShowAttachments)
{ {
@@ -1465,7 +1461,7 @@ else if (canShowAttachments)
WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'"); WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'");
#line 607 "..\..\Views\Job\JobParts\Resources.cshtml" #line 605 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id); Write(Model.Job.Id);
@@ -1491,7 +1487,7 @@ WriteLiteral(@"');
var liveMessagesConnection = $.connection('"); var liveMessagesConnection = $.connection('");
#line 624 "..\..\Views\Job\JobParts\Resources.cshtml" #line 622 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications")); Write(Url.Content("~/API/Repository/Notifications"));
@@ -1510,7 +1506,7 @@ WriteLiteral(@"', { addToGroups: 'JobAttachment' })
"); ");
#line 634 "..\..\Views\Job\JobParts\Resources.cshtml" #line 632 "..\..\Views\Job\JobParts\Resources.cshtml"
} }
Disco.Web/Views/Job/JobParts/Warranty.cshtml
+2 -1
View File
@@ -118,12 +118,13 @@
</tr> </tr>
@if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails)) @if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
{ {
Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
<tr id="jobWarrantyProviderDetailContainer" style="display: none"> <tr id="jobWarrantyProviderDetailContainer" style="display: none">
<th style="width: 200px;">Provider Details <th style="width: 200px;">Provider Details
</th> </th>
<td> <td>
<div id="jobWarrantyProviderDetailLoading"> <div id="jobWarrantyProviderDetailLoading">
<span class="ajaxHelperIcon ajaxLoading" title="Loading..."></span>Loading... <span class="ajaxLoading" title="Loading..."></span>Loading...
</div> </div>
<div id="jobWarrantyProviderDetailHost" class="clearfix" style="display: none"> <div id="jobWarrantyProviderDetailHost" class="clearfix" style="display: none">
</div> </div>
Disco.Web/Views/Job/JobParts/Warranty.generated.cs
+8 -7
View File
@@ -515,6 +515,7 @@ WriteLiteral(" </td>\r\n </tr>\r\n");
#line 119 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 119 "..\..\Views\Job\JobParts\Warranty.cshtml"
if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails)) if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
{ {
Html.BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons");
#line default #line default
@@ -536,7 +537,7 @@ WriteLiteral(" id=\"jobWarrantyProviderDetailLoading\"");
WriteLiteral(">\r\n <span"); WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"ajaxHelperIcon ajaxLoading\""); WriteLiteral(" class=\"ajaxLoading\"");
WriteLiteral(" title=\"Loading...\""); WriteLiteral(" title=\"Loading...\"");
@@ -551,7 +552,7 @@ WriteLiteral(" style=\"display: none\"");
WriteLiteral(">\r\n </div>\r\n </td>\r\n </tr>\r\n"); WriteLiteral(">\r\n </div>\r\n </td>\r\n </tr>\r\n");
#line 132 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 133 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
@@ -565,13 +566,13 @@ WriteLiteral(">\r\n $(\'#jobDetailTabItems\').append(\'<li><a href=\"#jobDeta
"nty</a></li>\');\r\n"); "nty</a></li>\');\r\n");
#line 137 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 138 "..\..\Views\Job\JobParts\Warranty.cshtml"
#line default #line default
#line hidden #line hidden
#line 137 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 138 "..\..\Views\Job\JobParts\Warranty.cshtml"
if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails)) if (Authorization.Has(Claims.Job.Properties.WarrantyProperties.ProviderDetails))
{ {
@@ -598,7 +599,7 @@ WriteLiteral(@"
'"); '");
#line 156 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 157 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Url.Action(MVC.Job.WarrantyProviderJobDetails())); Write(Url.Action(MVC.Job.WarrantyProviderJobDetails()));
@@ -607,7 +608,7 @@ WriteLiteral(@"
WriteLiteral("\',\r\n { id: \'"); WriteLiteral("\',\r\n { id: \'");
#line 157 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 158 "..\..\Views\Job\JobParts\Warranty.cshtml"
Write(Model.Job.Id); Write(Model.Job.Id);
@@ -630,7 +631,7 @@ WriteLiteral(@"' },
"); ");
#line 171 "..\..\Views\Job\JobParts\Warranty.cshtml" #line 172 "..\..\Views\Job\JobParts\Warranty.cshtml"
} }
Disco.Web/Views/Job/JobParts/_Subject.cshtml
+5 -10
View File
@@ -383,8 +383,7 @@
@using (Html.BeginForm(MVC.API.Job.ForceClose(Model.Job.Id, null, true))) @using (Html.BeginForm(MVC.API.Job.ForceClose(Model.Job.Id, null, true)))
{ {
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
Are you sure?
</p> </p>
<h3>Reason:</h3> <h3>Reason:</h3>
<p> <p>
@@ -430,8 +429,7 @@
@Html.ActionLinkSmallButton("Close Job", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_Close_Button") @Html.ActionLinkSmallButton("Close Job", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_Close_Button")
<div id="Job_Show_Job_Actions_Close_Dialog" class="dialog" title="Close this Job?"> <div id="Job_Show_Job_Actions_Close_Dialog" class="dialog" title="Close this Job?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
Are you sure?
</p> </p>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
@@ -471,8 +469,7 @@
@Html.ActionLinkSmallButton("Reopen Job", MVC.API.Job.Reopen(Model.Job.Id, true), "Job_Show_Job_Actions_Reopen_Button") @Html.ActionLinkSmallButton("Reopen Job", MVC.API.Job.Reopen(Model.Job.Id, true), "Job_Show_Job_Actions_Reopen_Button")
<div id="Job_Show_Job_Actions_Reopen_Dialog" class="dialog" title="Reopen this Job?"> <div id="Job_Show_Job_Actions_Reopen_Dialog" class="dialog" title="Reopen this Job?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
Are you sure?
</p> </p>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
@@ -513,8 +510,7 @@
@Html.ActionLinkSmallButton("Delete Job", MVC.API.Job.Delete(Model.Job.Id, true), "Job_Show_Job_Actions_Delete_Button") @Html.ActionLinkSmallButton("Delete Job", MVC.API.Job.Delete(Model.Job.Id, true), "Job_Show_Job_Actions_Delete_Button")
<div id="Job_Show_Job_Actions_Delete_Dialog" class="dialog" title="Delete this Job?"> <div id="Job_Show_Job_Actions_Delete_Dialog" class="dialog" title="Delete this Job?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;This item will be permanently deleted and cannot be recovered. Are you sure?
This item will be permanently deleted and cannot be recovered. Are you sure?
</p> </p>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
@@ -624,8 +620,7 @@
@Html.ActionLinkSmallButton("Convert to Non-Warranty", MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true), "Job_Show_Job_Actions_ConvertToHNWar_Button") @Html.ActionLinkSmallButton("Convert to Non-Warranty", MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true), "Job_Show_Job_Actions_ConvertToHNWar_Button")
<div id="Job_Show_Job_Actions_ConvertToHNWar_Dialog" class="dialog" title="Convert this Job?"> <div id="Job_Show_Job_Actions_ConvertToHNWar_Dialog" class="dialog" title="Convert this Job?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;This process is not reversible.<br />
This process is not reversible.<br />
Are you sure? Are you sure?
</p> </p>
</div> </div>
Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+81 -96
View File
@@ -1635,14 +1635,11 @@ WriteLiteral(">\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral(" <p>\r\n <span"); WriteLiteral(" <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;Are you sure?\r\n </p>\r\n");
WriteLiteral("></span>\r\n Are you sure?\r\n </p>" +
"\r\n");
WriteLiteral(" <h3>Reason:</h3>\r\n"); WriteLiteral(" <h3>Reason:</h3>\r\n");
@@ -1655,7 +1652,7 @@ WriteLiteral(" class=\"block\"");
WriteLiteral("></textarea>\r\n </p>\r\n"); WriteLiteral("></textarea>\r\n </p>\r\n");
#line 393 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 392 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -1688,7 +1685,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n });\r\n </script>\r\n"); " });\r\n });\r\n </script>\r\n");
#line 426 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 425 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -1697,13 +1694,13 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 428 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 427 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default #line default
#line hidden #line hidden
#line 428 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 427 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanClose()) if (Model.Job.CanClose())
{ {
@@ -1711,14 +1708,14 @@ WriteLiteral("\r\n");
#line default #line default
#line hidden #line hidden
#line 430 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 429 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Close Job", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_Close_Button")); Write(Html.ActionLinkSmallButton("Close Job", MVC.API.Job.Close(Model.Job.Id, true), "Job_Show_Job_Actions_Close_Button"));
#line default #line default
#line hidden #line hidden
#line 430 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 429 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -1732,14 +1729,11 @@ WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Close this Job?\""); WriteLiteral(" title=\"Close this Job?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n " +
" </div>\r\n");
WriteLiteral(" <script"); WriteLiteral(" <script");
@@ -1767,7 +1761,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n });\r\n </script>\r\n"); " });\r\n });\r\n </script>\r\n");
#line 468 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 466 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -1776,7 +1770,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" "); WriteLiteral(" ");
#line 469 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 467 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanReopen()) if (Model.Job.CanReopen())
{ {
@@ -1784,14 +1778,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 471 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Reopen Job", MVC.API.Job.Reopen(Model.Job.Id, true), "Job_Show_Job_Actions_Reopen_Button")); Write(Html.ActionLinkSmallButton("Reopen Job", MVC.API.Job.Reopen(Model.Job.Id, true), "Job_Show_Job_Actions_Reopen_Button"));
#line default #line default
#line hidden #line hidden
#line 471 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 469 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -1805,14 +1799,11 @@ WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Reopen this Job?\""); WriteLiteral(" title=\"Reopen this Job?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;Are you sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n " +
" </div>\r\n");
WriteLiteral(" <script"); WriteLiteral(" <script");
@@ -1841,7 +1832,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n </script>\r\n"); " });\r\n </script>\r\n");
#line 510 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 507 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -1850,7 +1841,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" "); WriteLiteral(" ");
#line 511 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 508 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanDelete()) if (Model.Job.CanDelete())
{ {
@@ -1858,14 +1849,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 513 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 510 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Delete Job", MVC.API.Job.Delete(Model.Job.Id, true), "Job_Show_Job_Actions_Delete_Button")); Write(Html.ActionLinkSmallButton("Delete Job", MVC.API.Job.Delete(Model.Job.Id, true), "Job_Show_Job_Actions_Delete_Button"));
#line default #line default
#line hidden #line hidden
#line 513 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 510 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -1879,15 +1870,12 @@ WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Delete this Job?\""); WriteLiteral(" title=\"Delete this Job?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;This item will be permanently deleted and cannot be recovered. Are you" +
" sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n This item will be permanently deleted and canno" +
"t be recovered. Are you sure?\r\n </p>\r\n </div>\r" +
"\n");
WriteLiteral(" <script"); WriteLiteral(" <script");
@@ -1916,7 +1904,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" </script>\r\n"); " </script>\r\n");
#line 552 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 548 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -1925,7 +1913,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" "); WriteLiteral(" ");
#line 553 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 549 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanLogWarranty()) if (Model.Job.CanLogWarranty())
{ {
@@ -1933,14 +1921,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 555 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 551 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Log Warranty", MVC.Job.LogWarranty(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogWarranty_Button")); Write(Html.ActionLinkSmallButton("Log Warranty", MVC.Job.LogWarranty(Model.Job.Id, null, null), "Job_Show_Job_Actions_LogWarranty_Button"));
#line default #line default
#line hidden #line hidden
#line 555 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 551 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -1950,7 +1938,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 557 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 553 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanWarrantyCompleted()) if (Model.Job.CanWarrantyCompleted())
{ {
@@ -1958,14 +1946,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 559 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 555 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Warranty Complete", MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_WarrantyComplete_Button", "alert")); Write(Html.ActionLinkSmallButton("Warranty Complete", MVC.API.Job.UpdateWarrantyExternalCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_WarrantyComplete_Button", "alert"));
#line default #line default
#line hidden #line hidden
#line 559 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 555 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -1975,7 +1963,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 561 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 557 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanInsuranceClaimFormSent()) if (Model.Job.CanInsuranceClaimFormSent())
{ {
@@ -1983,14 +1971,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 563 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 559 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Insurance Claim Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimSent_Button", "alert")); Write(Html.ActionLinkSmallButton("Insurance Claim Sent", MVC.API.Job.UpdateInsuranceClaimFormSentDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_InsuranceClaimSent_Button", "alert"));
#line default #line default
#line hidden #line hidden
#line 563 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 559 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2000,7 +1988,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 565 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 561 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanLogRepair()) if (Model.Job.CanLogRepair())
{ {
@@ -2008,14 +1996,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 567 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 563 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Repairs Logged", MVC.API.Job.LogRepair(Model.Job.Id, null, null, true), "Job_Show_Job_Actions_LogRepair_Button")); Write(Html.ActionLinkSmallButton("Repairs Logged", MVC.API.Job.LogRepair(Model.Job.Id, null, null, true), "Job_Show_Job_Actions_LogRepair_Button"));
#line default #line default
#line hidden #line hidden
#line 567 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 563 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -2032,13 +2020,13 @@ WriteLiteral(" title=\"Repairs Logged\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 569 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 565 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default #line default
#line hidden #line hidden
#line 569 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 565 "..\..\Views\Job\JobParts\_Subject.cshtml"
using (Html.BeginForm(MVC.API.Job.LogRepair(Model.Job.Id, null, null, true))) using (Html.BeginForm(MVC.API.Job.LogRepair(Model.Job.Id, null, null, true)))
{ {
@@ -2070,7 +2058,7 @@ WriteLiteral(" name=\"RepairerReference\"");
WriteLiteral(" />\r\n </p>\r\n"); WriteLiteral(" />\r\n </p>\r\n");
#line 579 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 575 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2108,7 +2096,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n });\r\n </script>\r\n"); " });\r\n });\r\n </script>\r\n");
#line 617 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 613 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2117,7 +2105,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" "); WriteLiteral(" ");
#line 618 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 614 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanRepairComplete()) if (Model.Job.CanRepairComplete())
{ {
@@ -2125,14 +2113,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 620 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 616 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Repairs Complete", MVC.API.Job.UpdateNonWarrantyRepairerCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_RepairComplete_Button", "alert")); Write(Html.ActionLinkSmallButton("Repairs Complete", MVC.API.Job.UpdateNonWarrantyRepairerCompletedDate(Model.Job.Id, "Now", true), "Job_Show_Job_Actions_RepairComplete_Button", "alert"));
#line default #line default
#line hidden #line hidden
#line 620 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 616 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2142,7 +2130,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 622 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 618 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanConvertHWarToHNWar()) if (Model.Job.CanConvertHWarToHNWar())
{ {
@@ -2150,14 +2138,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 624 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 620 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Convert to Non-Warranty", MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true), "Job_Show_Job_Actions_ConvertToHNWar_Button")); Write(Html.ActionLinkSmallButton("Convert to Non-Warranty", MVC.API.Job.ConvertHWarToHNWar(Model.Job.Id, true), "Job_Show_Job_Actions_ConvertToHNWar_Button"));
#line default #line default
#line hidden #line hidden
#line 624 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 620 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -2171,15 +2159,12 @@ WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Convert this Job?\""); WriteLiteral(" title=\"Convert this Job?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <i");
WriteLiteral(" class=\"ui-icon ui-icon-alert\""); WriteLiteral(" class=\"fa fa-exclamation-triangle fa-lg\"");
WriteLiteral(" style=\"float: left; margin: 0 7px 20px 0;\""); WriteLiteral("></i>&nbsp;This process is not reversible.<br />\r\n Are you" +
" sure?\r\n </p>\r\n </div>\r\n");
WriteLiteral("></span>\r\n This process is not reversible.<br />\r\n " +
" Are you sure?\r\n </p>\r\n </div>\r" +
"\n");
WriteLiteral(" <script"); WriteLiteral(" <script");
@@ -2208,7 +2193,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" \r\n });\r\n </script>\r\n"); " \r\n });\r\n </script>\r\n");
#line 665 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 660 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2217,13 +2202,13 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" </td>\r\n"); WriteLiteral(" </td>\r\n");
#line 667 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 662 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default #line default
#line hidden #line hidden
#line 667 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 662 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.Device != null) if (Model.Job.Device != null)
{ {
@@ -2237,13 +2222,13 @@ WriteLiteral(" id=\"Job_Show_Device_Actions\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 670 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 665 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default #line default
#line hidden #line hidden
#line 670 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 665 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanDeviceHeld()) if (Model.Job.CanDeviceHeld())
{ {
@@ -2251,14 +2236,14 @@ WriteLiteral(">\r\n");
#line default #line default
#line hidden #line hidden
#line 672 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 667 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Held", MVC.API.Job.DeviceHeld(Model.Job.Id, true), "Job_Show_Device_Actions_Held_Button")); Write(Html.ActionLinkSmallButton("Held", MVC.API.Job.DeviceHeld(Model.Job.Id, true), "Job_Show_Device_Actions_Held_Button"));
#line default #line default
#line hidden #line hidden
#line 672 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 667 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2268,7 +2253,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 674 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 669 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanDeviceReadyForReturn()) if (Model.Job.CanDeviceReadyForReturn())
{ {
@@ -2276,14 +2261,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 676 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 671 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Ready For Return", MVC.API.Job.DeviceReadyForReturn(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReadyForReturn_Button", "alert")); Write(Html.ActionLinkSmallButton("Ready For Return", MVC.API.Job.DeviceReadyForReturn(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReadyForReturn_Button", "alert"));
#line default #line default
#line hidden #line hidden
#line 676 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 671 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2293,7 +2278,7 @@ WriteLiteral(" ");
WriteLiteral(" "); WriteLiteral(" ");
#line 678 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 673 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanDeviceReturned()) if (Model.Job.CanDeviceReturned())
{ {
@@ -2301,14 +2286,14 @@ WriteLiteral(" ");
#line default #line default
#line hidden #line hidden
#line 680 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 675 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Html.ActionLinkSmallButton("Returned", MVC.API.Job.DeviceReturned(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReturned_Button", Model.Job.CanDeviceReadyForReturn() ? null : "alert")); Write(Html.ActionLinkSmallButton("Returned", MVC.API.Job.DeviceReturned(Model.Job.Id, true), "Job_Show_Device_Actions_DeviceReturned_Button", Model.Job.CanDeviceReadyForReturn() ? null : "alert"));
#line default #line default
#line hidden #line hidden
#line 680 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 675 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2318,7 +2303,7 @@ WriteLiteral(" ");
WriteLiteral(" </td>\r\n"); WriteLiteral(" </td>\r\n");
#line 683 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 678 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2327,7 +2312,7 @@ WriteLiteral(" </td>\r\n");
WriteLiteral(" "); WriteLiteral(" ");
#line 684 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 679 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.User != null) if (Model.Job.User != null)
{ {
@@ -2341,13 +2326,13 @@ WriteLiteral(" id=\"Job_Show_User_Actions\"");
WriteLiteral(">\r\n\r\n\r\n"); WriteLiteral(">\r\n\r\n\r\n");
#line 689 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 684 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default #line default
#line hidden #line hidden
#line 689 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 684 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanWaitingForUserAction()) if (Model.Job.CanWaitingForUserAction())
{ {
@@ -2375,13 +2360,13 @@ WriteLiteral(" title=\"Waiting for User Action\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 693 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 688 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default #line default
#line hidden #line hidden
#line 693 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 688 "..\..\Views\Job\JobParts\_Subject.cshtml"
using (Html.BeginForm(MVC.API.Job.WaitingForUserAction(Model.Job.Id, null, true))) using (Html.BeginForm(MVC.API.Job.WaitingForUserAction(Model.Job.Id, null, true)))
{ {
@@ -2399,7 +2384,7 @@ WriteLiteral(" class=\"block\"");
WriteLiteral("></textarea>\r\n </p>\r\n"); WriteLiteral("></textarea>\r\n </p>\r\n");
#line 699 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 694 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2434,7 +2419,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n </script>\r\n"); " });\r\n </script>\r\n");
#line 732 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 727 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2443,7 +2428,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral(" "); WriteLiteral(" ");
#line 733 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 728 "..\..\Views\Job\JobParts\_Subject.cshtml"
if (Model.Job.CanNotWaitingForUserAction()) if (Model.Job.CanNotWaitingForUserAction())
{ {
@@ -2471,13 +2456,13 @@ WriteLiteral(" title=\"Not Waiting for User Action\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 737 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 732 "..\..\Views\Job\JobParts\_Subject.cshtml"
#line default #line default
#line hidden #line hidden
#line 737 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 732 "..\..\Views\Job\JobParts\_Subject.cshtml"
using (Html.BeginForm(MVC.API.Job.NotWaitingForUserAction(Model.Job.Id, null, true))) using (Html.BeginForm(MVC.API.Job.NotWaitingForUserAction(Model.Job.Id, null, true)))
{ {
@@ -2495,7 +2480,7 @@ WriteLiteral(" class=\"block\"");
WriteLiteral("></textarea>\r\n </p>\r\n"); WriteLiteral("></textarea>\r\n </p>\r\n");
#line 743 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 738 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2531,7 +2516,7 @@ WriteLiteral(">\r\n $(function () {\r\n
" });\r\n </script>\r\n"); " });\r\n </script>\r\n");
#line 777 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 772 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
@@ -2540,7 +2525,7 @@ WriteLiteral(">\r\n $(function () {\r\n
WriteLiteral("\r\n </td>\r\n"); WriteLiteral("\r\n </td>\r\n");
#line 780 "..\..\Views\Job\JobParts\_Subject.cshtml" #line 775 "..\..\Views\Job\JobParts\_Subject.cshtml"
} }
Disco.Web/Views/Job/Show.cshtml
+1 -1
View File
@@ -14,7 +14,7 @@
<div id="Job_Show"> <div id="Job_Show">
<div id="Job_Show_Status"> <div id="Job_Show_Status">
@{ var jobStatusInfo = Model.Job.Status();} @{ var jobStatusInfo = Model.Job.Status();}
<span class="icon JobStatus@(jobStatusInfo.Item1)"></span>@jobStatusInfo.Item2 @if (Model.LongRunning.HasValue) <i class="fa fa-square jobStatus @(jobStatusInfo.Item1)"></i>&nbsp;@jobStatusInfo.Item2 @if (Model.LongRunning.HasValue)
{<span class="smallMessage">(Long Running: @Model.LongRunning.Value.Humanize(false))</span>} {<span class="smallMessage">(Long Running: @Model.LongRunning.Value.Humanize(false))</span>}
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {

Some files were not shown because too many files have changed in this diff Show More