diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.ascx b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.ascx index 32f6ff1b4..bc27f602a 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.ascx +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Container.ascx @@ -1,7 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Core.Common.ViewModels" %>
- <%: Html.LabelFor(m=>m.ContainerId) %> - <%: Html.EditorFor(m=>m.ContainerId) %> - <%: Html.ValidationMessageFor(m=>m.ContainerId) %> -
+ <%: Html.HiddenFor(m=>m.ContainerId) %> + \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Styles/admin.css b/src/Orchard.Web/Core/Localization/Styles/admin.css index cac4f7c6d..cd7a5d458 100644 --- a/src/Orchard.Web/Core/Localization/Styles/admin.css +++ b/src/Orchard.Web/Core/Localization/Styles/admin.css @@ -1,4 +1,7 @@ -.content-localization .content-localizations li, +.summary .content-localization { + margin: .7em 0; +} +.content-localization .content-localizations li, .content-localization .add-localization { font-size:1.4em; } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs index 4f4b02213..75a8b074c 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs @@ -77,7 +77,7 @@ namespace Orchard.Blogs.Drivers { ContentItemTemplate("Items/Blogs.Blog").LongestMatch(displayType, "Summary", "DetailAdmin", "SummaryAdmin"), ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Manage").Location("manage"), ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Metadata").Location("metadata"), - ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Description").Location("primary"), + ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Description").Location("manage", "after"), blogPosts == null ? null : ContentPartTemplate( diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css index 55925d659..ee764226d 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/admin.css @@ -1,3 +1,3 @@ -.blogdescription { - margin-top:1em; +#main .blog-description p { + margin-bottom:1em; } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx index 989adf53a..f6e7ff4c2 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.ViewModels"%> -

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

+

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

<% using (Html.BeginFormAntiForgeryPost()) { %> <%: Html.ValidationSummary() %> <%: Html.EditorForItem(m => m.Blog) %><% diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx index 1c04f5025..d813b99c2 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx @@ -3,18 +3,6 @@ <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

<%: Html.TitleForPage(Model.Item.Name) %>

-<% Html.Zone("manage"); %><%-- -
-
-
- - - "/> -
-
-
--%> +<% Html.Zone("manage"); %> <% Html.Zone("primary"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx index a3a9a5ddd..5e5e3f6ba 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Models"%> -
+

<%: Model.Description %>

\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx index d5f124834..eeb2863b0 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx @@ -4,7 +4,7 @@ <%@ Import Namespace="Orchard.Blogs.Models"%><% Html.RegisterStyle("admin.css"); if (AuthorizedFor(Permissions.ManageBlogs)) { %> -
-

<%: T("Edit") %>

+<% } %> \ 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 a0847f825..ea65bfb22 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -559,13 +559,19 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner { } .manage { float:right; - margin:0 0 10px 8px; + margin:0 0 1em .8em; } .actions { clear:right; padding:0; text-align:right; } +.item-properties.actions { + margin-bottom:.5em; + margin-top:-5em; + overflow:hidden; + padding:1px; +} .contentItems .actions li { background:inherit; border:0; @@ -726,7 +732,7 @@ table .button { .contentItems .summary { overflow:auto; - padding:1.2em .4em; + padding:1.2em .4em .5em; } .contentItems .properties { float:left; @@ -738,7 +744,8 @@ table .button { display:inline; } .contentItems.bulk-items .metadata, .contentItems.bulk-items .primary { - margin:.6em 0 0 2em; + margin:.7em 0 .7em 2em; + overflow:auto; } .contentItems.bulk-items .primary { clear:both; @@ -803,7 +810,7 @@ table .button { /* Fields ----------------------------------------------------------*/ /* TextField */ -#main .summary .text-field { +#main .summary p.text-field { margin:.5em 0; }