From 256d1b41a3733538c93a811be8319158489969e8 Mon Sep 17 00:00:00 2001 From: Michael Bach Date: Thu, 22 Jul 2010 21:03:34 -0700 Subject: [PATCH] Remove the responsibility of styling the language selection on the front-end from core to the themes. Add the neccessary styles too all included themes. Additionally, added a view to override in Contoso, as Blog.etc appears to be deprecated. --HG-- branch : dev --- .../Core/Localization/Styles/admin.css | 6 ++++ .../Core/Localization/Styles/base.css | 9 +++++- .../Localization/Views/CultureSelection.ascx | 2 +- src/Orchard.Web/Orchard.Web.csproj | 1 + .../Themes/Classic/Styles/site.css | 29 +++++++++++++++++ .../Themes/ClassicDark/Styles/site.css | 31 ++++++++++++++++++- .../Themes/Contoso/Styles/site.css | 30 ++++++++++++++++++ .../DisplayTemplates/Items/Contents.Item.ascx | 6 ++++ .../Themes/Corporate/Styles/site.css | 29 +++++++++++++++++ src/Orchard.Web/Themes/Green/Styles/site.css | 30 ++++++++++++++++++ 10 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Contents.Item.ascx diff --git a/src/Orchard.Web/Core/Localization/Styles/admin.css b/src/Orchard.Web/Core/Localization/Styles/admin.css index 7da94d32e..cac4f7c6d 100644 --- a/src/Orchard.Web/Core/Localization/Styles/admin.css +++ b/src/Orchard.Web/Core/Localization/Styles/admin.css @@ -26,6 +26,12 @@ .culture-selection fieldset { padding-top:0; } + +.culture-selection label { + padding-top:0; + display: inline; +} + .culture-selection div { font-size:1.4em; } diff --git a/src/Orchard.Web/Core/Localization/Styles/base.css b/src/Orchard.Web/Core/Localization/Styles/base.css index a8d97db8e..bf1d7d384 100644 --- a/src/Orchard.Web/Core/Localization/Styles/base.css +++ b/src/Orchard.Web/Core/Localization/Styles/base.css @@ -16,15 +16,22 @@ .content-localization .content-localizations>* { display:inline; } + +/* + +Removing the commas put in by the system by default and various other styling elements and putting the responsibility into the themes. [mibach] + .content-localization .content-localizations li { border-bottom:0; display:inline; margin-left:.5em; padding:0; } + .content-localization .content-localizations li::after { content:", "; } .content-localization .content-localizations li:last-child::after { content:""; -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Views/CultureSelection.ascx b/src/Orchard.Web/Core/Localization/Views/CultureSelection.ascx index 3f792ff3c..4cfb34fbe 100644 --- a/src/Orchard.Web/Core/Localization/Views/CultureSelection.ascx +++ b/src/Orchard.Web/Core/Localization/Views/CultureSelection.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
- + <%:Html.DropDownList("SelectedCulture", new SelectList(Model.SiteCultures, Model.SelectedCulture)) %>
\ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index adb1cc542..250287865 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -99,6 +99,7 @@ + diff --git a/src/Orchard.Web/Themes/Classic/Styles/site.css b/src/Orchard.Web/Themes/Classic/Styles/site.css index 239ecd460..c45638981 100644 --- a/src/Orchard.Web/Themes/Classic/Styles/site.css +++ b/src/Orchard.Web/Themes/Classic/Styles/site.css @@ -313,6 +313,35 @@ span.message { content:"DEBUG » "; } +/* Localization +-------------------------------------------------------------- */ + +.content-localization .content-localizations ul { + overflow: auto; +} + + +.content-localization .content-localizations li { + border-bottom: 1px; + float: left; + margin-left:.5em; + padding: 3px; + border: 1px solid #CCC; +} + +.content-localization .content-localizations li:hover { + background-color: #ebebeb; +} + + +.content-localization .content-localizations li a { + text-decoration: none; +} + +.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited { + text-decoration: none; +} + /* Misc classes -------------------------------------------------------------- */ diff --git a/src/Orchard.Web/Themes/ClassicDark/Styles/site.css b/src/Orchard.Web/Themes/ClassicDark/Styles/site.css index 7fcef67c8..ecb44e782 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Styles/site.css +++ b/src/Orchard.Web/Themes/ClassicDark/Styles/site.css @@ -333,4 +333,33 @@ span.message { /* ---------- Hide the edit link for blogs hack ---------- */ .manage { display:none; -} \ No newline at end of file +} + +/* Localization +-------------------------------------------------------------- */ + +.content-localization .content-localizations ul { + overflow: auto; +} + + +.content-localization .content-localizations li { + border-bottom: 1px; + float: left; + margin-left:.5em; + padding: 3px; + border: 1px solid #CCC; +} + +.content-localization .content-localizations li:hover { + background-color: #ebebeb; +} + + +.content-localization .content-localizations li a { + text-decoration: none; +} + +.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited { + text-decoration: none; +} diff --git a/src/Orchard.Web/Themes/Contoso/Styles/site.css b/src/Orchard.Web/Themes/Contoso/Styles/site.css index d92dd7aa8..9c10187fd 100644 --- a/src/Orchard.Web/Themes/Contoso/Styles/site.css +++ b/src/Orchard.Web/Themes/Contoso/Styles/site.css @@ -372,6 +372,36 @@ body { background: #f3f4f4 url('../Content/Images/bkg.jpg') repeat-x; } .tagCloud a:hover { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #a5cc7a; color: #668b3e; text-shadow: 1px 1px 0px #c8e6a6; -moz-border-radius: 5px; -webkit-border-radius: 5px; margin: 0px 10px 0px 0px; } + +/* Localization +-------------------------------------------------------------- */ + +.content-localization .content-localizations ul { + overflow: auto; +} + + +.content-localization .content-localizations li { + border-bottom: 1px; + float: left; + margin-left:.5em; + padding: 3px; + border: 1px solid #CCC; +} + +.content-localization .content-localizations li:hover { + background-color: #ebebeb; +} + + +.content-localization .content-localizations li a { + text-decoration: none; +} + +.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited { + text-decoration: none; +} + /*========= PLUGINS =========*/ /*- Easy Slider -*/ diff --git a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Contents.Item.ascx b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Contents.Item.ascx new file mode 100644 index 000000000..8a18ea2d6 --- /dev/null +++ b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Contents.Item.ascx @@ -0,0 +1,6 @@ +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Import Namespace="Orchard.Mvc.ViewModels" %> +

<%:Html.ItemDisplayText(Model.Item)%>

+<% Html.Zone("metadata"); + Html.Zone("primary", ":manage :metadata"); + Html.ZonesAny(); %> diff --git a/src/Orchard.Web/Themes/Corporate/Styles/site.css b/src/Orchard.Web/Themes/Corporate/Styles/site.css index 5d76a2214..be5d6afeb 100644 --- a/src/Orchard.Web/Themes/Corporate/Styles/site.css +++ b/src/Orchard.Web/Themes/Corporate/Styles/site.css @@ -383,6 +383,35 @@ html, body {background-color: #FFFFFF; background-image: url(../Content/Images/b .tagCloud a:hover { display: block; float: left; padding: 3px 5px 5px 5px; background-color: #b7b7b7; color: #668b3e; text-shadow: 1px 1px 0px #c8e6a6; -moz-border-radius: 5px; -webkit-border-radius: 5px; margin: 0px 10px 0px 0px; } +/* Localization +-------------------------------------------------------------- */ + +.content-localization .content-localizations ul { + overflow: auto; +} + + +.content-localization .content-localizations li { + border-bottom: 1px; + float: left; + margin-left:.5em; + padding: 3px; + border: 1px solid #CCC; +} + +.content-localization .content-localizations li:hover { + background-color: #ebebeb; +} + + +.content-localization .content-localizations li a { + text-decoration: none; +} + +.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited { + text-decoration: none; +} + /*========= PLUGINS =========*/ /*- Easy Slider -*/ diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css index d603834f2..ee3ca9bf6 100644 --- a/src/Orchard.Web/Themes/Green/Styles/site.css +++ b/src/Orchard.Web/Themes/Green/Styles/site.css @@ -343,6 +343,36 @@ span.message { content:"DEBUG » "; } +/* Localization +-------------------------------------------------------------- */ + +.content-localization .content-localizations ul { + overflow: auto; +} + + +.content-localization .content-localizations li { + border-bottom: 1px; + float: left; + margin-left:.5em; + padding: 3px; + border: 1px solid #CCC; +} + +.content-localization .content-localizations li:hover { + background-color: #ebebeb; +} + + +.content-localization .content-localizations li a { + text-decoration: none; +} + +.content-localization .content-localizations li a:hover, .content-localization .content-localizations li a:visited { + text-decoration: none; +} + + /* Edit mode ----------------------------------------------------------*/ #yui-main div.managewrapper:hover, div.managewrapper:hover .manage {