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.Web/Views/Device/DeviceParts/_Resources.cshtml
+1 -2
View File
@@ -240,8 +240,7 @@
</div>
<div id="dialogRemoveAttachment" title="Remove this Attachment?">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
Are you sure?
<i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
</p>
</div>
<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(">\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("></span>\r\n Are you sure?\r\n </p>\r\n </div>\r\n <script>\r\n " +
" $(\'#DeviceDetailTabItems\').append(\'<li><a href=\"#DeviceDetailTab-Resources\" " +
"id=\"DeviceDetailTab-ResourcesLink\">Attachments [");
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" +
"etailTab-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);
Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
+19 -25
View File
@@ -135,10 +135,9 @@
var spanProgress = null;
$.getJSON('@(Url.Action(MVC.API.Device.LastNetworkLogonDate(Model.Device.SerialNumber)))', function (response, result) {
updated = true;
if (spanProgress)
spanProgress.hide();
spanProgress.remove();
if (result != 'success') {
alert('Unable to retrieve latest network logon date:\n' + response);
@@ -149,7 +148,7 @@
});
window.setTimeout(function () {
if (!updated) {
spanProgress = $('<span>').addClass('ajaxHelperIcon ajaxLoading ajaxShowInitially').attr('title', 'Loading...').appendTo(span);
spanProgress = $('<i>').addClass('ajaxLoading showInitially').attr('title', 'Loading...').appendTo(span);
}
}, 250);
});
@@ -197,15 +196,15 @@
<script type="text/javascript">
$(function () {
var generatePdfUrl = '@Url.Action(MVC.API.Device.GeneratePdf(Model.Device.SerialNumber.ToString(), null))?DocumentTemplateId=';
var $documentTemplates = $('#Device_Show_GenerateDocument');
$documentTemplates.change(function () {
var v = $documentTemplates.val();
if (v) {
window.location.href = generatePdfUrl + v;
$documentTemplates.val('').blur();
}
var $documentTemplates = $('#Device_Show_GenerateDocument');
$documentTemplates.change(function () {
var v = $documentTemplates.val();
if (v) {
window.location.href = generatePdfUrl + v;
$documentTemplates.val('').blur();
}
});
});
});
</script>
</div>
}
@@ -451,11 +450,9 @@
{
@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?">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
Assign to User:
<input id="Device_Show_User_Actions_Assign_UserId" type="text" />
</p>
<h4><i class="fa fa-info-circle information"></i>&nbsp;Assign to User:</h4>
<br />
<input id="Device_Show_User_Actions_Assign_UserId" type="text" />
</div>
<script type="text/javascript">
$(function () {
@@ -498,7 +495,7 @@
buttonDialog = $('#Device_Show_User_Actions_Assign_Dialog')
.dialog({
resizable: false,
height: 160,
height: 180,
modal: true,
autoOpen: false,
buttons: dialogButtons
@@ -535,7 +532,7 @@
<div class="ui-widget">
<div class="ui-state-highlight ui-corner-all" style="padding: 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.
</div>
<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")
<div id="Device_Show_Device_Actions_UntrustEnrol_Dialog" title="Untrust this Device?">
<div style="padding-bottom: 6px;">
<span class="ui-icon ui-icon-info" style="float: left; margin: 0 7px 20px 0;"></span>
This action will require the device to enrol with authentication (for example: domain joined).
<i class="fa fa-info-circle information"></i>&nbsp;This action will require the device to enrol with authentication (for example: domain joined).
</div>
<strong>Are you sure you want to require an authenticated enrolment?</strong>
</div>
@@ -621,8 +617,7 @@
@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 class="clearfix" style="margin-bottom: 10px;">
<span class="ui-icon ui-icon-info" style="float: left; margin: 0 7px 0 0;"></span>
Why was this Device Decommissioned?
<i class="fa fa-question-circle fa-lg information"></i>&nbsp;Why was this Device Decommissioned?
</div>
<div>
<ul class="none">
@@ -683,8 +678,7 @@
@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?">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
Are you sure?
<i class="fa fa-exclamation-triangle fa-lg"></i>&nbsp;Are you sure?
</p>
</div>
<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")
<div id="Device_Show_Device_Actions_Delete_Dialog" title="Delete this Device?">
<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 />
Jobs linked to this Device (but not to a User) will be deleted also.<br />
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
@{
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_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">
$(function () {
$('#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));
var deviceStatus = Model.Device.Status();
#line default
#line hidden
@@ -61,25 +59,26 @@ WriteLiteral(">\r\n <div");
WriteLiteral(" id=\"Device_Show_Status\"");
WriteLiteral(">\r\n <span");
WriteLiteral(">\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 298), Tuple.Create("\"", 365)
, Tuple.Create(Tuple.Create("", 306), Tuple.Create("icon", 306), true)
, Tuple.Create(Tuple.Create(" ", 310), Tuple.Create("DeviceStatus", 311), true)
WriteAttribute("class", Tuple.Create(" class=\"", 246), Tuple.Create("\"", 308)
, Tuple.Create(Tuple.Create("", 254), Tuple.Create("fa", 254), 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"
, Tuple.Create(Tuple.Create("", 323), Tuple.Create<System.Object, System.Int32>(deviceStatus.Replace(" ", string.Empty)
#line 7 "..\..\Views\Device\Show.cshtml"
, Tuple.Create(Tuple.Create(" ", 279), Tuple.Create<System.Object, System.Int32>(Model.Device.StatusCode()
#line default
#line hidden
, 323), false)
, 280), false)
);
WriteLiteral("></span>");
WriteLiteral("></i>&nbsp;");
#line 9 "..\..\Views\Device\Show.cshtml"
Write(deviceStatus);
#line 7 "..\..\Views\Device\Show.cshtml"
Write(Model.Device.Status());
#line default
@@ -94,7 +93,7 @@ WriteLiteral(">\r\n $(function () {\r\n $(\'#Device_Sh
WriteLiteral(" ");
#line 16 "..\..\Views\Device\Show.cshtml"
#line 14 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Subject, Model));
@@ -135,13 +134,13 @@ WriteLiteral(" id=\"DeviceDetailTabItems\"");
WriteLiteral("></ul>\r\n");
#line 52 "..\..\Views\Device\Show.cshtml"
#line 50 "..\..\Views\Device\Show.cshtml"
#line default
#line hidden
#line 52 "..\..\Views\Device\Show.cshtml"
#line 50 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowJobs))
{
@@ -149,14 +148,14 @@ WriteLiteral("></ul>\r\n");
#line default
#line hidden
#line 54 "..\..\Views\Device\Show.cshtml"
#line 52 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Jobs, Model));
#line default
#line hidden
#line 54 "..\..\Views\Device\Show.cshtml"
#line 52 "..\..\Views\Device\Show.cshtml"
}
@@ -166,7 +165,7 @@ WriteLiteral("></ul>\r\n");
WriteLiteral(" ");
#line 56 "..\..\Views\Device\Show.cshtml"
#line 54 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowDetails))
{
@@ -174,14 +173,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 58 "..\..\Views\Device\Show.cshtml"
#line 56 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Details, Model));
#line default
#line hidden
#line 58 "..\..\Views\Device\Show.cshtml"
#line 56 "..\..\Views\Device\Show.cshtml"
}
@@ -191,7 +190,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 60 "..\..\Views\Device\Show.cshtml"
#line 58 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowAssignmentHistory))
{
@@ -199,14 +198,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 62 "..\..\Views\Device\Show.cshtml"
#line 60 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._AssignmentHistory, Model));
#line default
#line hidden
#line 62 "..\..\Views\Device\Show.cshtml"
#line 60 "..\..\Views\Device\Show.cshtml"
}
@@ -216,7 +215,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 64 "..\..\Views\Device\Show.cshtml"
#line 62 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowAttachments))
{
@@ -224,14 +223,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 66 "..\..\Views\Device\Show.cshtml"
#line 64 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Resources, Model));
#line default
#line hidden
#line 66 "..\..\Views\Device\Show.cshtml"
#line 64 "..\..\Views\Device\Show.cshtml"
}
@@ -241,7 +240,7 @@ WriteLiteral(" ");
WriteLiteral(" ");
#line 68 "..\..\Views\Device\Show.cshtml"
#line 66 "..\..\Views\Device\Show.cshtml"
if (Authorization.Has(Claims.Device.ShowCertificates))
{
@@ -249,14 +248,14 @@ WriteLiteral(" ");
#line default
#line hidden
#line 70 "..\..\Views\Device\Show.cshtml"
#line 68 "..\..\Views\Device\Show.cshtml"
Write(Html.Partial(MVC.Device.Views.DeviceParts._Certificates, Model));
#line default
#line hidden
#line 70 "..\..\Views\Device\Show.cshtml"
#line 68 "..\..\Views\Device\Show.cshtml"
}