From 0abf6a2374f9a8afcabf0eae13d82234787b0499 Mon Sep 17 00:00:00 2001 From: Jonathan Wall Date: Wed, 7 Jul 2010 15:43:05 -0700 Subject: [PATCH] Updated Cultures page UI. --HG-- branch : dev --- .../Core/Settings/Styles/admin.css | 5 ++-- .../Core/Settings/Views/Admin/Culture.ascx | 23 ++++++++++--------- .../Themes/TheAdmin/Styles/site.css | 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/Orchard.Web/Core/Settings/Styles/admin.css b/src/Orchard.Web/Core/Settings/Styles/admin.css index 53fc62882..6da6aeff1 100644 --- a/src/Orchard.Web/Core/Settings/Styles/admin.css +++ b/src/Orchard.Web/Core/Settings/Styles/admin.css @@ -1,5 +1,6 @@ .site-cultures { - font-size:1.2em; + font-size:1.4em; + line-height:1.8em; overflow:auto; } .site-cultures li { @@ -14,5 +15,5 @@ } .site-cultures div { float:left; - width:6em; + width:8em; } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Culture.ascx b/src/Orchard.Web/Core/Settings/Views/Admin/Culture.ascx index 8d8a70261..b7b42cc34 100644 --- a/src/Orchard.Web/Core/Settings/Views/Admin/Culture.ascx +++ b/src/Orchard.Web/Core/Settings/Views/Admin/Culture.ascx @@ -1,18 +1,19 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Core.Settings.ViewModels" %><% Html.RegisterStyle("admin.css"); %> -

<%:Html.TitleForPage(T("Supported Cultures").ToString()) %>

+

<%:Html.TitleForPage(T("Cultures").ToString()) %>

-

<%:T("Cultures this site supports") %>

+

<%:T("Available Cultures") %>

+<% using (Html.BeginFormAntiForgeryPost("AddCulture")) { %> +<%:Html.ValidationSummary() %> +
+ + <%:Html.DropDownList("CultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture))%> + +
+<% } %> +

<%:T("Cultures this site supports") %>

<%: Html.UnorderedList( Model.SiteCultures.OrderBy(s => s), (s, i) => Html.DisplayFor(scvm => s, s == Model.CurrentCulture ? "CurrentCulture" : "RemovableCulture", ""), - "site-cultures", "culture", "odd")%> -<% using (Html.BeginFormAntiForgeryPost("AddCulture")) { %> -<%:Html.ValidationSummary() %> -
- - <%:Html.DropDownList("CultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture)) %> - -
-<% } %> \ No newline at end of file + "site-cultures", "culture", "odd")%> \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index a106bbd64..ef5973f6f 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -397,8 +397,8 @@ label input { } /* todo: (heskew) try to get .text on stuff like .text-box */ select, textarea, input.text, input.textMedium, input.text-box { - padding:2px; - border:1px solid #bdbcbc; + padding:1px; + border:1px solid #bdbcbc; } input.text, input.textMedium, input.text-box { line-height:1.2em;