From ee340247310d04d5041ec8a7bbd3fce46e4649cc Mon Sep 17 00:00:00 2001 From: Nicholas Mayne Date: Sun, 10 Aug 2014 15:02:56 +0100 Subject: [PATCH] Adding culture selector to Admin theme --- .../Themes/TheAdmin/Styles/site.css | 6 +++- .../Themes/TheAdmin/Views/Layout.cshtml | 5 +++ .../TheAdmin/Views/UICultureSelector.cshtml | 32 +++++++++++++++++++ src/Orchard.Web/Themes/Themes.csproj | 3 ++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 src/Orchard.Web/Themes/TheAdmin/Views/UICultureSelector.cshtml diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index e44801b2e..fdd714a76 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -212,7 +212,7 @@ form.link button:hover, button.link:hover { ol.decimal {list-style:decimal inside; margin:12px 0;} ul.disc {list-style:disc inside; margin:12px 0;} -/* Header - Branding and Login +/* Header - Branding, Login and Culture Selection ***************************************************************/ #header { height:50px; @@ -226,6 +226,10 @@ ul.disc {list-style:disc inside; margin:12px 0;} height:50px; float:left; } +#culture-selection { + float: right; + margin: 10px 20px 0 0; +} #header #app { float:left; font-size:2.4em; diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml index 954bc51f8..f14e71384 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml @@ -1,4 +1,5 @@ @model dynamic +@using Orchard.Environment.Descriptor.Models @using Orchard.Security; @using Orchard.DisplayManagement.Descriptors; @using Orchard.UI.Resources; @@ -27,6 +28,10 @@ Model.Header.Add(Display.Header()); Model.Header.Add(Display.User(CurrentUser: WorkContext.CurrentUser)); + + var shellDescriptor = WorkContext.Resolve(); + if (shellDescriptor.Features.Any(x => x.Name == "Orchard.Localization.CutlureSelector")) { Model.Header.Add(Display.UICultureSelector()); } + Model.Footer.Add(Display.OrchardVersion()); if (Model.Title != null) { diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/UICultureSelector.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/UICultureSelector.cshtml new file mode 100644 index 000000000..f8bbafc88 --- /dev/null +++ b/src/Orchard.Web/Themes/TheAdmin/Views/UICultureSelector.cshtml @@ -0,0 +1,32 @@ +@using System.Globalization +@using Orchard.Localization.Services +@{ + var currentCulture = WorkContext.CurrentCulture; + var supportedCultures = WorkContext.Resolve().ListCultures(); +} + +@if (supportedCultures.Count() > 1) { +
+ +
+} +@using (Script.Foot()) { + +} \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj index 6a1dcf558..25dad197d 100644 --- a/src/Orchard.Web/Themes/Themes.csproj +++ b/src/Orchard.Web/Themes/Themes.csproj @@ -169,6 +169,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)