From 3aad42eef409158a4e67f8eb3bbd037384393c25 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Wed, 23 Jun 2010 11:05:51 -0700 Subject: [PATCH] More touchup of the parts management UI (when editing a content type) before moving on to fields --HG-- branch : dev --- src/Orchard.Web/Core/Contents/Styles/admin.css | 3 +++ .../Core/Contents/Views/EditorTemplates/Part.ascx | 10 +++++----- src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 1 - 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Styles/admin.css b/src/Orchard.Web/Core/Contents/Styles/admin.css index e2c9d7ad2..5a898fa4e 100644 --- a/src/Orchard.Web/Core/Contents/Styles/admin.css +++ b/src/Orchard.Web/Core/Contents/Styles/admin.css @@ -11,4 +11,7 @@ .manage-part .manage { font-size:1.4em; margin-top:-2.4em; +} +.manage-part .manage.minor { + margin-top:-1.7em; } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Part.ascx b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Part.ascx index 95afcda57..214c22b7c 100644 --- a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Part.ascx +++ b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Part.ascx @@ -3,7 +3,6 @@

<%:Model.PartDefinition.Name %>

- <%:Html.ActionLink(T("Edit").Text, "EditPart", new { area = "Contents", id = Model.PartDefinition.Name }) %><%: T(" | ")%> <%--// these inline forms can't be here. should probably have some JavaScript in here to build up the forms and add the "remove" link. // get the antiforgery token from the edit type form and mark up the part in a semantic way so I can get some info from the DOM --%> <%:Html.Link("[remove]", "#forshowonlyandnotintendedtowork") %> @@ -13,10 +12,11 @@ <% } %> --%>
<%:Html.EditorFor(m => m.Settings, "Settings", "") %><% - if (Model.PartDefinition.Settings.Any()) { %> -

<%:T("Tenant-wide settings") %>

- <%:Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") %><% + if (Model.PartDefinition.Settings.Any() || Model.PartDefinition.Fields.Any()) { %> +

<%:T("Global configuration") %>

+
<%:Html.ActionLink(T("Edit").Text, "EditPart", new { area = "Contents", id = Model.PartDefinition.Name }) %>
+ <%:Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") %> + <%:Html.EditorFor(m => m.PartDefinition.Fields, "Part.Fields") %><% } %> - <%:Html.EditorFor(m => m.PartDefinition.Fields, "Part.Fields") %> <%:Html.Hidden("PartDefinition.Name", Model.PartDefinition.Name) %>
\ 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 19d122b0d..6cf84f249 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -510,7 +510,6 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner { .manage { float:right; margin:0 0 10px 8px; - overflow:hidden; } .actions { clear:right;