From 20263905f9cb6fd0d9e4a307401ed27f82427ad4 Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Tue, 24 Dec 2013 16:22:26 +1100 Subject: [PATCH] Feature: FontAwesome Added FontAwesome 4.0.3.1 Added, and an initial pass to replace bitmap icons. --- .../Areas/Config/Views/Config/Index.cshtml | 22 +- .../Config/Views/Config/Index.generated.cs | 204 ++- .../Areas/Config/Views/Plugins/Index.cshtml | 3 +- .../Config/Views/Plugins/Index.generated.cs | 78 +- .../Areas/Config/Views/Plugins/Install.cshtml | 4 +- .../Config/Views/Plugins/Install.generated.cs | 36 +- .../Views/HeldDevices/Noticeboard.cshtml | 2 +- .../HeldDevices/Noticeboard.generated.cs | 6 +- .../Areas/Public/Views/Public/Index.cshtml | 8 +- .../Public/Views/Public/Index.generated.cs | 33 +- .../Views/UserHeldDevices/Noticeboard.cshtml | 2 +- .../UserHeldDevices/Noticeboard.generated.cs | 6 +- Disco.Web/ClientSource/Style/BundleSite.css | 1371 ++++++++++++++++- .../ClientSource/Style/BundleSite.css.bundle | 1 + .../ClientSource/Style/BundleSite.min.css | 2 +- Disco.Web/ClientSource/Style/Config.css | 25 +- Disco.Web/ClientSource/Style/Config.less | 33 +- Disco.Web/ClientSource/Style/Config.min.css | 2 +- Disco.Web/ClientSource/Style/Device.css | 37 +- Disco.Web/ClientSource/Style/Device.less | 44 +- Disco.Web/ClientSource/Style/Device.min.css | 2 +- .../Style/FontAwesome/FontAwesome.otf | Bin 0 -> 62856 bytes .../Style/FontAwesome/font-awesome.css | 1338 ++++++++++++++++ .../Style/FontAwesome/fontawesome-webfont.eot | Bin 0 -> 38205 bytes .../Style/FontAwesome/fontawesome-webfont.svg | 414 +++++ .../Style/FontAwesome/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes .../FontAwesome/fontawesome-webfont.woff | Bin 0 -> 44432 bytes .../Style/Images/Actions/attach.png | Bin 1398 -> 0 bytes .../Images/Actions/pageMenuConfigIcon.png | Bin 745 -> 0 bytes .../Actions/pageMenuConfigIconHover.png | Bin 705 -> 0 bytes .../Style/Images/Actions/pageMenuIcon.png | Bin 509 -> 0 bytes .../Images/Actions/pageMenuIconHover.png | Bin 696 -> 0 bytes .../Actions/pageMenuNoticeboardIcon.png | Bin 569 -> 0 bytes .../Actions/pageMenuNoticeboardIconHover.png | Bin 681 -> 0 bytes .../Images/Actions/pageMenuReportIcon.png | Bin 1282 -> 0 bytes .../Actions/pageMenuReportIconHover.png | Bin 562 -> 0 bytes .../Style/Images/Actions/photo.png | Bin 2904 -> 0 bytes .../Images/Actions/pluginDownloadIcon16.png | Bin 795 -> 0 bytes .../Actions/pluginDownloadIconHover16.png | Bin 795 -> 0 bytes .../Style/Images/Actions/post.png | Bin 1345 -> 0 bytes .../Style/Images/BackgroundPage-Old.png | Bin 869 -> 0 bytes .../ClientSource/Style/Images/Icon32.png | Bin 2291 -> 0 bytes .../Style/Images/SubMenuBackground.png | Bin 90 -> 0 bytes Disco.Web/ClientSource/Style/Job.css | 72 +- Disco.Web/ClientSource/Style/Job.less | 81 +- Disco.Web/ClientSource/Style/Job.min.css | 2 +- Disco.Web/ClientSource/Style/Site.css | 32 +- Disco.Web/ClientSource/Style/Site.less | 41 +- Disco.Web/ClientSource/Style/Site.min.css | 2 +- Disco.Web/ClientSource/Style/User.css | 47 +- Disco.Web/ClientSource/Style/User.less | 47 +- Disco.Web/ClientSource/Style/User.min.css | 2 +- Disco.Web/Disco.Web.csproj | 22 +- Disco.Web/T4MVC.cs | 64 +- .../Device/DeviceParts/_Resources.cshtml | 6 +- .../DeviceParts/_Resources.generated.cs | 22 +- .../Views/Job/JobParts/Components.cshtml | 4 +- .../Job/JobParts/Components.generated.cs | 40 +- Disco.Web/Views/Job/JobParts/Resources.cshtml | 12 +- .../Views/Job/JobParts/Resources.generated.cs | 64 +- .../Views/User/UserParts/_Resources.cshtml | 6 +- .../User/UserParts/_Resources.generated.cs | 22 +- Disco.Web/packages.config | 1 + 63 files changed, 3682 insertions(+), 580 deletions(-) create mode 100644 Disco.Web/ClientSource/Style/FontAwesome/FontAwesome.otf create mode 100644 Disco.Web/ClientSource/Style/FontAwesome/font-awesome.css create mode 100644 Disco.Web/ClientSource/Style/FontAwesome/fontawesome-webfont.eot create mode 100644 Disco.Web/ClientSource/Style/FontAwesome/fontawesome-webfont.svg create mode 100644 Disco.Web/ClientSource/Style/FontAwesome/fontawesome-webfont.ttf create mode 100644 Disco.Web/ClientSource/Style/FontAwesome/fontawesome-webfont.woff delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/attach.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pageMenuConfigIcon.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pageMenuConfigIconHover.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pageMenuIcon.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pageMenuIconHover.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pageMenuNoticeboardIcon.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pageMenuNoticeboardIconHover.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pageMenuReportIcon.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pageMenuReportIconHover.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/photo.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pluginDownloadIcon16.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/pluginDownloadIconHover16.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Actions/post.png delete mode 100644 Disco.Web/ClientSource/Style/Images/BackgroundPage-Old.png delete mode 100644 Disco.Web/ClientSource/Style/Images/Icon32.png delete mode 100644 Disco.Web/ClientSource/Style/Images/SubMenuBackground.png diff --git a/Disco.Web/Areas/Config/Views/Config/Index.cshtml b/Disco.Web/Areas/Config/Views/Config/Index.cshtml index 89867f36..7a36bd31 100644 --- a/Disco.Web/Areas/Config/Views/Config/Index.cshtml +++ b/Disco.Web/Areas/Config/Views/Config/Index.cshtml @@ -12,28 +12,28 @@

Hosting

@if (Authorization.Has(Claims.Config.System.Show)) { - @Html.ActionLinkClass("System", MVC.Config.SystemConfig.Index(), "config") + @Html.ActionLinkClass("System", MVC.Config.SystemConfig.Index(), "config") } @if (Authorization.Has(Claims.Config.Organisation.Show)) { - @Html.ActionLinkClass("Organisation Details", MVC.Config.Organisation.Index(), "config") + @Html.ActionLinkClass("Organisation Details", MVC.Config.Organisation.Index(), "config") } @if (Authorization.Has(Claims.DiscoAdminAccount)) { - @Html.ActionLinkClass("Authorization Roles", MVC.Config.AuthorizationRole.Index(), "config") + @Html.ActionLinkClass("Authorization Roles", MVC.Config.AuthorizationRole.Index(), "config") } @if (Authorization.Has(Claims.Config.Logging.Show)) { - @Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config") + @Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config") @@ -48,21 +48,21 @@

Devices

@if (Authorization.Has(Claims.Config.DeviceModel.Show)) { - @Html.ActionLinkClass("Models", MVC.Config.DeviceModel.Index(), "config") + @Html.ActionLinkClass("Models", MVC.Config.DeviceModel.Index(), "config") } @if (Authorization.Has(Claims.Config.DeviceBatch.Show)) { - @Html.ActionLinkClass("Batches", MVC.Config.DeviceBatch.Index(), "config") + @Html.ActionLinkClass("Batches", MVC.Config.DeviceBatch.Index(), "config") } @if (Authorization.Has(Claims.Config.DeviceProfile.Show)) { - @Html.ActionLinkClass("Profiles", MVC.Config.DeviceProfile.Index(), "config") + @Html.ActionLinkClass("Profiles", MVC.Config.DeviceProfile.Index(), "config") \r\n"); +WriteLiteral(">\r\n \r\n"); - #line 56 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 57 "..\..\Areas\Config\Views\Plugins\Index.cshtml" } @@ -280,7 +290,7 @@ WriteLiteral(">More Information\r\n \r\n"); - #line 58 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 59 "..\..\Areas\Config\Views\Plugins\Index.cshtml" } @@ -289,7 +299,7 @@ WriteLiteral(" \r\n"); WriteLiteral("\r\n \r\n"); - #line 61 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 62 "..\..\Areas\Config\Views\Plugins\Index.cshtml" } @@ -298,7 +308,7 @@ WriteLiteral("\r\n \r\n"); WriteLiteral(" \r\n \r\n"); - #line 64 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 65 "..\..\Areas\Config\Views\Plugins\Index.cshtml" if (canUninstall) { @@ -316,7 +326,7 @@ WriteLiteral(">\r\n
\r\n"); WriteLiteral(" "); - #line 68 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 69 "..\..\Areas\Config\Views\Plugins\Index.cshtml" Write(Html.DropDownList("uninstallPlugin", Model.PluginManifests.ToSelectListItems(null, true, "Select a Plugin to Uninstall"))); @@ -392,7 +402,7 @@ WriteLiteral(" \r\n"); - #line 169 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 170 "..\..\Areas\Config\Views\Plugins\Index.cshtml" } if (Model.PluginUpdates.Count > 0) { @@ -453,7 +463,7 @@ WriteLiteral(" id=\"updateAvailableContainer\""); WriteLiteral(">\r\n
"); - #line 173 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 174 "..\..\Areas\Config\Views\Plugins\Index.cshtml" Write(Model.PluginUpdates.Count); @@ -462,7 +472,7 @@ WriteLiteral(">\r\n
"); WriteLiteral(" plugin update"); - #line 173 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 174 "..\..\Areas\Config\Views\Plugins\Index.cshtml" Write(Model.PluginUpdates.Count == 1 ? " is" : "s are"); @@ -471,13 +481,13 @@ WriteLiteral(" plugin update"); WriteLiteral(" available
\r\n"); - #line 174 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 175 "..\..\Areas\Config\Views\Plugins\Index.cshtml" #line default #line hidden - #line 174 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 175 "..\..\Areas\Config\Views\Plugins\Index.cshtml" if (canInstall) { @@ -485,14 +495,14 @@ WriteLiteral(" available
\r\n"); #line default #line hidden - #line 176 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 177 "..\..\Areas\Config\Views\Plugins\Index.cshtml" Write(Html.ActionLinkButton("Update Now", MVC.API.Plugin.UpdateAll())); #line default #line hidden - #line 176 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 177 "..\..\Areas\Config\Views\Plugins\Index.cshtml" } else @@ -508,7 +518,7 @@ WriteLiteral(" class=\"smallMessage\""); WriteLiteral(">You do not have sufficient permission to install these updates.
\r\n"); - #line 181 "..\..\Areas\Config\Views\Plugins\Index.cshtml" + #line 182 "..\..\Areas\Config\Views\Plugins\Index.cshtml" } @@ -528,7 +538,7 @@ WriteLiteral(@"
- Disco Logo + Disco Logo powered by Disco
diff --git a/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs b/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs index 49ced547..8a996a29 100644 --- a/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs +++ b/Disco.Web/Areas/Public/Views/HeldDevices/Noticeboard.generated.cs @@ -474,12 +474,12 @@ WriteLiteral(" id=\"mainFooter\""); WriteLiteral(">\r\n (Links.ClientSource.Style.Images.Icon32_png + , Tuple.Create(Tuple.Create("", 22633), Tuple.Create(Links.ClientSource.Style.Images.Heading_png #line default #line hidden diff --git a/Disco.Web/Areas/Public/Views/Public/Index.cshtml b/Disco.Web/Areas/Public/Views/Public/Index.cshtml index 35c0f0b3..fe6d46e9 100644 --- a/Disco.Web/Areas/Public/Views/Public/Index.cshtml +++ b/Disco.Web/Areas/Public/Views/Public/Index.cshtml @@ -6,13 +6,13 @@