From 2281313966cccd7fe90d97900b8b0e04ddf11dfb Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Wed, 16 Apr 2014 12:59:11 +1000 Subject: [PATCH] App Maintenance Theme Updated to 'Initial Config' theme --- Disco.Web/App_Start/BundleConfig.cs | 2 +- .../{InitialConfig.css => AppMaintenance.css} | 0 ...InitialConfig.less => AppMaintenance.less} | 0 ...lConfig.min.css => AppMaintenance.min.css} | 0 .../Views/InitialConfig/_ViewStart.cshtml | 4 +- .../InitialConfig/_ViewStart.generated.cs | 4 +- Disco.Web/Views/Shared/_PublicLayout.cshtml | 5 +- .../Views/Shared/_PublicLayout.generated.cs | 59 +++++++++--------- Disco.Web/Views/Update/_ViewStart.cshtml | 5 ++ .../Views/Update/_ViewStart.generated.cs | 60 +++++++++++++++++++ 10 files changed, 103 insertions(+), 36 deletions(-) rename Disco.Web/ClientSource/Style/{InitialConfig.css => AppMaintenance.css} (100%) rename Disco.Web/ClientSource/Style/{InitialConfig.less => AppMaintenance.less} (100%) rename Disco.Web/ClientSource/Style/{InitialConfig.min.css => AppMaintenance.min.css} (100%) create mode 100644 Disco.Web/Views/Update/_ViewStart.cshtml create mode 100644 Disco.Web/Views/Update/_ViewStart.generated.cs diff --git a/Disco.Web/App_Start/BundleConfig.cs b/Disco.Web/App_Start/BundleConfig.cs index e9aa1a97..257b10d8 100644 --- a/Disco.Web/App_Start/BundleConfig.cs +++ b/Disco.Web/App_Start/BundleConfig.cs @@ -18,7 +18,7 @@ namespace Disco.Web BundleTable.Add(new Bundle("~/Style/Job", Links.ClientSource.Style.Job_min_css)); BundleTable.Add(new Bundle("~/Style/User", Links.ClientSource.Style.User_min_css)); BundleTable.Add(new Bundle("~/Style/Credits", Links.ClientSource.Style.Credits_min_css)); - BundleTable.Add(new Bundle("~/Style/InitialConfig", Links.ClientSource.Style.InitialConfig_min_css)); + BundleTable.Add(new Bundle("~/Style/AppMaintenance", Links.ClientSource.Style.AppMaintenance_min_css)); BundleTable.Add(new Bundle("~/Style/jQueryUI/dynatree", Links.ClientSource.Style.jQueryUI.dynatree.ui_dynatree_min_css)); BundleTable.Add(new Bundle("~/Style/Fancytree", Links.ClientSource.Style.Fancytree.disco_fancytree_min_css)); BundleTable.Add(new Bundle("~/Style/Shadowbox", Links.ClientSource.Style.Shadowbox_min_css)); diff --git a/Disco.Web/ClientSource/Style/InitialConfig.css b/Disco.Web/ClientSource/Style/AppMaintenance.css similarity index 100% rename from Disco.Web/ClientSource/Style/InitialConfig.css rename to Disco.Web/ClientSource/Style/AppMaintenance.css diff --git a/Disco.Web/ClientSource/Style/InitialConfig.less b/Disco.Web/ClientSource/Style/AppMaintenance.less similarity index 100% rename from Disco.Web/ClientSource/Style/InitialConfig.less rename to Disco.Web/ClientSource/Style/AppMaintenance.less diff --git a/Disco.Web/ClientSource/Style/InitialConfig.min.css b/Disco.Web/ClientSource/Style/AppMaintenance.min.css similarity index 100% rename from Disco.Web/ClientSource/Style/InitialConfig.min.css rename to Disco.Web/ClientSource/Style/AppMaintenance.min.css diff --git a/Disco.Web/Views/InitialConfig/_ViewStart.cshtml b/Disco.Web/Views/InitialConfig/_ViewStart.cshtml index c0e35417..85f95d50 100644 --- a/Disco.Web/Views/InitialConfig/_ViewStart.cshtml +++ b/Disco.Web/Views/InitialConfig/_ViewStart.cshtml @@ -1,5 +1,5 @@ @{ - ViewContext.ViewData.Add("IsInitialConfig", true); + ViewContext.ViewData.Add("IsMaintenanceMode", true); Layout = MVC.Shared.Views._PublicLayout; - Html.BundleDeferred("~/Style/InitialConfig"); + Html.BundleDeferred("~/Style/AppMaintenance"); } \ No newline at end of file diff --git a/Disco.Web/Views/InitialConfig/_ViewStart.generated.cs b/Disco.Web/Views/InitialConfig/_ViewStart.generated.cs index ae2cd335..610feca4 100644 --- a/Disco.Web/Views/InitialConfig/_ViewStart.generated.cs +++ b/Disco.Web/Views/InitialConfig/_ViewStart.generated.cs @@ -47,9 +47,9 @@ namespace Disco.Web.Views.InitialConfig #line 1 "..\..\Views\InitialConfig\_ViewStart.cshtml" - ViewContext.ViewData.Add("IsInitialConfig", true); + ViewContext.ViewData.Add("IsMaintenanceMode", true); Layout = MVC.Shared.Views._PublicLayout; - Html.BundleDeferred("~/Style/InitialConfig"); + Html.BundleDeferred("~/Style/AppMaintenance"); #line default diff --git a/Disco.Web/Views/Shared/_PublicLayout.cshtml b/Disco.Web/Views/Shared/_PublicLayout.cshtml index 8696eddd..e1b04d50 100644 --- a/Disco.Web/Views/Shared/_PublicLayout.cshtml +++ b/Disco.Web/Views/Shared/_PublicLayout.cshtml @@ -1,6 +1,7 @@ @{ Html.BundleDeferred("~/Style/Site"); Html.BundleDeferred("~/ClientScripts/Core"); + bool isMaintenanceMode = ViewContext.ViewData.ContainsKey("IsMaintenanceMode"); } @@ -20,7 +21,7 @@
- @if (!ViewContext.ViewData.ContainsKey("IsInitialConfig")) + @if (!isMaintenanceMode) {