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

Feature: FontAwesome Added

Browse Source 
FontAwesome 4.0.3.1 Added, and an initial pass to replace bitmap icons.
This commit is contained in:
Gary Sharp
2013-12-24 16:22:26 +11:00
parent f1ee2937cd
commit 20263905f9
63 changed files with 3682 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.cshtml
+1 -1
View File
@@ -469,7 +469,7 @@
});
</script>
<div id="mainFooter">
<img style="width: 32px; height: 32px; margin-top: -5px; margin-bottom: -15px;" src="@Links.ClientSource.Style.Images.Icon32_png" alt="Disco Logo" />
<img style="width: 34px; height: 34px; margin-top: -5px; margin-bottom: -12px;" src="@Links.ClientSource.Style.Images.Heading_png" alt="Disco Logo" />
powered by Disco
</div>
</body>
Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs
+3 -3
View File
@@ -474,12 +474,12 @@ WriteLiteral(" id=\"mainFooter\"");
WriteLiteral(">\r\n <img");
WriteLiteral(" style=\"width: 32px; height: 32px; margin-top: -5px; margin-bottom: -15px;\"");
WriteLiteral(" style=\"width: 34px; height: 34px; margin-top: -5px; margin-bottom: -12px;\"");
WriteAttribute("src", Tuple.Create(" src=\"", 22627), Tuple.Create("\"", 22676)
WriteAttribute("src", Tuple.Create(" src=\"", 22627), Tuple.Create("\"", 22677)
#line 472 "..\..\Areas\Public\Views\HeldDevices\Noticeboard.cshtml"
, Tuple.Create(Tuple.Create("", 22633), Tuple.Create<System.Object, System.Int32>(Links.ClientSource.Style.Images.Icon32_png
, Tuple.Create(Tuple.Create("", 22633), Tuple.Create<System.Object, System.Int32>(Links.ClientSource.Style.Images.Heading_png
#line default
#line hidden
Disco.Web/Areas/Public/Views/Public/Index.cshtml
+4 -4
View File
@@ -6,13 +6,13 @@
<td style="width: 50%">
<div class="pageMenuArea">
<h2>Technician Held Devices for Users</h2>
@Html.ActionLinkClass("Report", MVC.Public.UserHeldDevices.Index(), "report")
<i class="fa fa-book"></i>@Html.ActionLinkClass("Report", MVC.Public.UserHeldDevices.Index(), "report")
<div class="pageMenuBlurb">
Display users involved in current jobs where the user's device is held by the technicians.
Also displays users which should report to the technicians to collect their device
which is ready to be returned to them.
</div>
@Html.ActionLinkClass("Noticeboard", MVC.Public.UserHeldDevices.Noticeboard(), "noticeboard")
<i class="fa fa-desktop"></i>@Html.ActionLinkClass("Noticeboard", MVC.Public.UserHeldDevices.Noticeboard(), "noticeboard")
<div class="pageMenuBlurb">
Display a full-screen active noticeboard screen which lists users involved in current
jobs where the user's device is held by the technicians. Also displays users which
@@ -24,12 +24,12 @@
<td style="width: 50%">
<div class="pageMenuArea">
<h2>Technician Held Devices</h2>
@Html.ActionLinkClass("Report", MVC.Public.HeldDevices.Index(), "report")
<i class="fa fa-book"></i>@Html.ActionLinkClass("Report", MVC.Public.HeldDevices.Index(), "report")
<div class="pageMenuBlurb">
Display devices involved in current jobs where the device is held by the technicians.
Also displays devices which are ready to be collected.
</div>
@Html.ActionLinkClass("Noticeboard", MVC.Public.HeldDevices.Noticeboard(), "noticeboard")
<i class="fa fa-desktop"></i>@Html.ActionLinkClass("Noticeboard", MVC.Public.HeldDevices.Noticeboard(), "noticeboard")
<div class="pageMenuBlurb">
Display a full-screen active noticeboard screen which lists devices involved in current
jobs where the device is held by the technicians. Also displays devices which are ready to be collected.
Disco.Web/Areas/Public/Views/Public/Index.generated.cs
+21 -12
View File
@@ -62,13 +62,16 @@ WriteLiteral(">\r\n <div");
WriteLiteral(" class=\"pageMenuArea\"");
WriteLiteral(">\r\n <h2>Technician Held Devices for Users</h2>\r\n");
WriteLiteral(">\r\n <h2>Technician Held Devices for Users</h2>\r\n <i" +
"");
WriteLiteral(" ");
WriteLiteral(" class=\"fa fa-book\"");
WriteLiteral("></i>");
#line 9 "..\..\Areas\Public\Views\Public\Index.cshtml"
Write(Html.ActionLinkClass("Report", MVC.Public.UserHeldDevices.Index(), "report"));
Write(Html.ActionLinkClass("Report", MVC.Public.UserHeldDevices.Index(), "report"));
#line default
@@ -82,13 +85,15 @@ WriteLiteral(@">
Also displays users which should report to the technicians to collect their device
which is ready to be returned to them.
</div>
");
<i");
WriteLiteral(" ");
WriteLiteral(" class=\"fa fa-desktop\"");
WriteLiteral("></i>");
#line 15 "..\..\Areas\Public\Views\Public\Index.cshtml"
Write(Html.ActionLinkClass("Noticeboard", MVC.Public.UserHeldDevices.Noticeboard(), "noticeboard"));
Write(Html.ActionLinkClass("Noticeboard", MVC.Public.UserHeldDevices.Noticeboard(), "noticeboard"));
#line default
@@ -113,13 +118,15 @@ WriteLiteral(">\r\n <div");
WriteLiteral(" class=\"pageMenuArea\"");
WriteLiteral(">\r\n <h2>Technician Held Devices</h2>\r\n");
WriteLiteral(">\r\n <h2>Technician Held Devices</h2>\r\n <i");
WriteLiteral(" ");
WriteLiteral(" class=\"fa fa-book\"");
WriteLiteral("></i>");
#line 27 "..\..\Areas\Public\Views\Public\Index.cshtml"
Write(Html.ActionLinkClass("Report", MVC.Public.HeldDevices.Index(), "report"));
Write(Html.ActionLinkClass("Report", MVC.Public.HeldDevices.Index(), "report"));
#line default
@@ -130,13 +137,15 @@ WriteLiteral(" class=\"pageMenuBlurb\"");
WriteLiteral(">\r\n Display devices involved in current jobs where the device " +
"is held by the technicians.\r\n Also displays devices which are" +
" ready to be collected.\r\n </div>\r\n");
" ready to be collected.\r\n </div>\r\n <i");
WriteLiteral(" ");
WriteLiteral(" class=\"fa fa-desktop\"");
WriteLiteral("></i>");
#line 32 "..\..\Areas\Public\Views\Public\Index.cshtml"
Write(Html.ActionLinkClass("Noticeboard", MVC.Public.HeldDevices.Noticeboard(), "noticeboard"));
Write(Html.ActionLinkClass("Noticeboard", MVC.Public.HeldDevices.Noticeboard(), "noticeboard"));
#line default
Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.cshtml
+1 -1
View File
@@ -472,7 +472,7 @@
});
</script>
<div id="mainFooter">
<img style="width: 32px; height: 32px; margin-top: -5px; margin-bottom: -15px;" src="@Links.ClientSource.Style.Images.Icon32_png" alt="Disco Logo" />
<img style="width: 34px; height: 34px; margin-top: -5px; margin-bottom: -12px;" src="@Links.ClientSource.Style.Images.Heading_png" alt="Disco Logo" />
powered by Disco
</div>
</body>
Disco.Web/Areas/Public/Views/UserHeldDevices/Noticeboard.generated.cs
+3 -3
View File
@@ -473,12 +473,12 @@ WriteLiteral(" id=\"mainFooter\"");
WriteLiteral(">\r\n <img");
WriteLiteral(" style=\"width: 32px; height: 32px; margin-top: -5px; margin-bottom: -15px;\"");
WriteLiteral(" style=\"width: 34px; height: 34px; margin-top: -5px; margin-bottom: -12px;\"");
WriteAttribute("src", Tuple.Create(" src=\"", 22642), Tuple.Create("\"", 22691)
WriteAttribute("src", Tuple.Create(" src=\"", 22642), Tuple.Create("\"", 22692)
#line 475 "..\..\Areas\Public\Views\UserHeldDevices\Noticeboard.cshtml"
, Tuple.Create(Tuple.Create("", 22648), Tuple.Create<System.Object, System.Int32>(Links.ClientSource.Style.Images.Icon32_png
, Tuple.Create(Tuple.Create("", 22648), Tuple.Create<System.Object, System.Int32>(Links.ClientSource.Style.Images.Heading_png
#line default
#line hidden