there's no content for this blog post
" %>
+ <% Html.RenderPartial("Messages", Model.Messages); %>
+
<%
+ Html.ZoneBody("content");
+%> Edit Settings
- <%using (Html.BeginForm()) { %> - <%= Html.ValidationSummary() %> - <%= Html.EditorForModel() %> - - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Edit Settings
+<%using (Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + <%= Html.EditorForModel() %> + +<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Core/Themes/Services/AdminThemeSelector.cs b/src/Orchard.Web/Core/Themes/Services/AdminThemeSelector.cs new file mode 100644 index 000000000..39678b083 --- /dev/null +++ b/src/Orchard.Web/Core/Themes/Services/AdminThemeSelector.cs @@ -0,0 +1,15 @@ +using System.Globalization; +using System.Web.Routing; +using Orchard.Themes; + +namespace Orchard.Core.Themes.Services { + public class AdminThemeSelector : IThemeSelector { + + public ThemeSelectorResult GetTheme(RequestContext context) { + if (!context.HttpContext.Request.Path.StartsWith("/admin", true, CultureInfo.InvariantCulture)) + return null; + + return new ThemeSelectorResult { Priority = 0, ThemeName = "TheAdmin" }; + } + } +} diff --git a/src/Orchard.Web/Core/Themes/SafeModeThemeSelector.cs b/src/Orchard.Web/Core/Themes/Services/SafeModeThemeSelector.cs similarity index 84% rename from src/Orchard.Web/Core/Themes/SafeModeThemeSelector.cs rename to src/Orchard.Web/Core/Themes/Services/SafeModeThemeSelector.cs index d4689df93..f249f6ff5 100644 --- a/src/Orchard.Web/Core/Themes/SafeModeThemeSelector.cs +++ b/src/Orchard.Web/Core/Themes/Services/SafeModeThemeSelector.cs @@ -1,7 +1,7 @@ using System.Web.Routing; using Orchard.Themes; -namespace Orchard.Core.Themes { +namespace Orchard.Core.Themes.Services { public class SafeModeThemeSelector : IThemeSelector { public ThemeSelectorResult GetTheme(RequestContext context) { return new ThemeSelectorResult {Priority = -100, ThemeName = "Themes"}; diff --git a/src/Orchard.Web/Core/Themes/Styles/site.css b/src/Orchard.Web/Core/Themes/Styles/site.css index e10e1d33e..5f86f341a 100644 --- a/src/Orchard.Web/Core/Themes/Styles/site.css +++ b/src/Orchard.Web/Core/Themes/Styles/site.css @@ -47,13 +47,13 @@ h1, h2, h3, h4, h5, h6 font-family: Arial, Helvetica, sans-serif; } -h1 +.home h1 { font-size: 2em; padding-bottom: 0; margin-bottom: 0; } -h2 +h1 { padding: 0 0 10px 0; } diff --git a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx index a3edbe965..80fb041b1 100644 --- a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx @@ -1,36 +1,34 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageManage Themes
-Current Theme
- <% if (Model.CurrentTheme == null) { - %>There is no current theme in the application. The built-in theme will be used.
<%=Html.ActionLink("Install a new Theme", "Install") %>
<%= Model.CurrentTheme.DisplayName %>
-" alt="<%= Model.CurrentTheme.DisplayName %>" />
- By <%= Model.CurrentTheme.Author %>
- <%= Model.CurrentTheme.Version %>
- <%= Model.CurrentTheme.Description %>
- <%= Model.CurrentTheme.HomePage %>
- <%=Html.ActionLink("Install a new Theme", "Install") %>
-
Available Themes
--
- <% foreach (var theme in Model.Themes) {
- if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {
- %>
-
-
<%= theme.DisplayName %>
-
-" alt="<%= theme.DisplayName %>" />
- By <%= theme.Author %>
- <%= theme.Version %>
- <%= theme.Description %>
- <%= theme.HomePage %>
- <%=Html.ActionLink("Activate", "Activate", new {themeName = theme.ThemeName}) %> | <%=Html.ActionLink("Uninstall", "Uninstall", new {themeName = theme.ThemeName}) %> -
- <% }
- } %>
-
Manage Themes
+Current Theme
+<% if (Model.CurrentTheme == null) { + %>There is no current theme in the application. The built-in theme will be used.
<%=Html.ActionLink("Install a new Theme", "Install") %>
<%= Model.CurrentTheme.DisplayName %>
+" alt="<%= Model.CurrentTheme.DisplayName %>" />
+ By <%= Model.CurrentTheme.Author %>
+ <%= Model.CurrentTheme.Version %>
+ <%= Model.CurrentTheme.Description %>
+ <%= Model.CurrentTheme.HomePage %>
+ <%=Html.ActionLink("Install a new Theme", "Install") %>
+
Available Themes
+-
+<% foreach (var theme in Model.Themes) {
+ if (Model.CurrentTheme == null || theme.ThemeName != Model.CurrentTheme.ThemeName) {
+ %>
-
+
<%= theme.DisplayName %>
+
+
+ By <%= theme.Author %>
+ <%= theme.Version %>
+ <%= theme.Description %>
+ <%= theme.HomePage %>
+ <%=Html.ActionLink("Activate", "Activate", new {themeName = theme.ThemeName}) %> | <%=Html.ActionLink("Uninstall", "Uninstall", new {themeName = theme.ThemeName}) %> +
+ <% }
+} %>
+
Install Theme
- <% using (Html.BeginForm("Install", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%> - <%= Html.ValidationSummary() %> - - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Install Theme
+<% using (Html.BeginForm("Install", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%> + <%= Html.ValidationSummary() %> + +<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 773c8f16f..0780d0f72 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -175,8 +175,6 @@Add Blog
+<% using (Html.BeginFormAntiForgeryPost()) { %> + <%=Html.ValidationSummary() %> + <%=Html.EditorForItem(vm => vm.Blog) %> + <% + } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx deleted file mode 100644 index 5fe49baf6..000000000 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx +++ /dev/null @@ -1,11 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageAdd Blog
- <% using (Html.BeginFormAntiForgeryPost()) { %> - <%=Html.ValidationSummary() %> - <%=Html.EditorForItem(vm => vm.Blog) %> - <% - } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx new file mode 100644 index 000000000..829ab46ed --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.ascx @@ -0,0 +1,9 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControlEdit Blog
+<% using (Html.BeginFormAntiForgeryPost()) { %> + <%=Html.ValidationSummary() %> + <%=Html.EditorForItem(m => m.Blog) %> + <% + } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx deleted file mode 100644 index e3d4a6ee1..000000000 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx +++ /dev/null @@ -1,11 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageEdit Blog
- <% using (Html.BeginFormAntiForgeryPost()) { %> - <%=Html.ValidationSummary() %> - <%=Html.EditorForItem(m => m.Blog) %> - <% - } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.ascx new file mode 100644 index 000000000..ab6cc030a --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Item.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControlBlogs
+All of the blogs.
<% +if (Model.Blogs.Count() > 0) { %> +<%=Html.UnorderedList(Model.Blogs, (b, i) => Html.DisplayForItem(b).ToHtmlString(), "blogs contentItems") %><% +} +else { %> +No blogs found.
<% +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.aspx deleted file mode 100644 index 884887dfc..000000000 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/List.aspx +++ /dev/null @@ -1,17 +0,0 @@ -<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPageBlogs
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
<% - if (Model.Blogs.Count() > 0) { %> - <%=Html.UnorderedList(Model.Blogs, (b, i) => Html.DisplayForItem(b).ToHtmlString(), "blogs contentItems") %><% - } - else { %> -No blogs found.
<% - } %> -Manage Blogs
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
<% +if (Model.Blogs.Count() > 0) { %> + +<%=Html.UnorderedList(Model.Blogs, (b, i) => Html.DisplayForItem(b).ToHtmlString(), "blogs contentItems") %> +<% +} else { %> +<% +} %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.aspx deleted file mode 100644 index 844e0bcbd..000000000 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/ListForAdmin.aspx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageManage Blogs
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
<% -if (Model.Blogs.Count() > 0) { %> - - <%=Html.UnorderedList(Model.Blogs, (b, i) => Html.DisplayForItem(b).ToHtmlString(), "blogs contentItems") %> - <% -} else { %> - <% -} %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx new file mode 100644 index 000000000..ee65304ee --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.ascx @@ -0,0 +1,8 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControlAdd Post
+<% using (Html.BeginFormAntiForgeryPost()) { %> + <%=Html.ValidationSummary() %> + <%=Html.EditorForItem(m => m.BlogPost) %><% + } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx deleted file mode 100644 index 2521dc878..000000000 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageAdd Post
- <% using (Html.BeginFormAntiForgeryPost()) { %> - <%=Html.ValidationSummary() %> - <%=Html.EditorForItem(m => m.BlogPost) %><% - } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx new file mode 100644 index 000000000..6f54b9bac --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.ascx @@ -0,0 +1,8 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControlEdit Post
+<% using (Html.BeginFormAntiForgeryPost()) { %> + <%=Html.ValidationSummary() %> + <%=Html.EditorForItem(m => m.BlogPost) %><% + } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx deleted file mode 100644 index d68f1b35f..000000000 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageEdit Post
- <% using (Html.BeginFormAntiForgeryPost()) { %> - <%=Html.ValidationSummary() %> - <%=Html.EditorForItem(m => m.BlogPost) %><% - } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx new file mode 100644 index 000000000..a889eb14b --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Item.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<%=Html.Encode(Model.Item.Name) %>
+<%=Html.Encode(Model.Item.Description) %>
+<%--TODO: (erikpo) Need to figure out which zones should be displayed in this template--%>
+<%=Html.DisplayZonesAny() %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/DetailAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/DetailAdmin.ascx
new file mode 100644
index 000000000..43836feac
--- /dev/null
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/DetailAdmin.ascx
@@ -0,0 +1,22 @@
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl+ <%=Html.Encode(Model.Item.Name) %> + Edit Blog + Remove Blog
+<%=Model.Item.Description%>
+ +<%--TODO: (erikpo) Need to figure out which zones should be displayed in this template--%> +<%=Html.DisplayZonesAny() %> + +<%--<% +if (Model.Posts.Count() > 0) { %> +<%=Html.UnorderedList(Model.Posts, (p, i) => Html.DisplayFor(blog => p, "BlogPostPreviewForAdmin").ToHtmlString(), "contentItems")%> +<% +} else { %> +<% +} %>--%> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Summary.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Summary.ascx new file mode 100644 index 000000000..2c0cd9a2c --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/Summary.ascx @@ -0,0 +1,10 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %>
+ +<%=Model.Item.Description %>
+<%--TODO: (erikpo) Need to figure out which zones should be displayed in this template--%> +<%--<%=Html.DisplayZonesAny() %>--%> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/SummaryAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/SummaryAdmin.ascx new file mode 100644 index 000000000..6330eddd1 --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/Blog/SummaryAdmin.ascx @@ -0,0 +1,21 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<%=Html.Encode(Model.Item.Name) %>
+ +<%--[list of authors] [modify blog access]
--%> +<%=Model.Item.Description %>
++ <%-- todo: (heskew) make into a ul --%> + + Manage Blog + Edit Blog + View Blog + New Post + + Remove Blog +
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Detail.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Detail.ascx new file mode 100644 index 000000000..cd9b28cfb --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/Detail.ascx @@ -0,0 +1,14 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<%=Html.Encode(Model.Item.Title)%>
+ +<%=Html.DisplayZonesAny() %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/List.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/List.ascx new file mode 100644 index 000000000..874c1d3f5 --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/List.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<%=Html.Encode(Model.Item.Title) %>
+ +<%=Model.Item.As().Text ?? "
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/SummaryAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/SummaryAdmin.ascx
new file mode 100644
index 000000000..a5cadddb8
--- /dev/null
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/DisplayTemplates/BlogPost/SummaryAdmin.ascx
@@ -0,0 +1,23 @@
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<%=Html.Encode(Model.Item.Title)%>
+ +<%=Model.Item.As().Text ?? "
+there's no content for this blog post
"%>+ <%-- todo: (heskew) make into a ul --%> + + Edit Post + View Post<% + if (Model.Item.Published == null) { // todo: (heskew) be smart about this and maybe have other contextual actions - including view/preview for view up there ^^ %> + Publish Post Now + <% } %> + + Remove Post +
\ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Detail.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Detail.ascx new file mode 100644 index 000000000..21dd49db8 --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/Blog/Detail.ascx @@ -0,0 +1,6 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl
+
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/FieldsPrimary.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/FieldsPrimary.ascx
new file mode 100644
index 000000000..6b7a6ccde
--- /dev/null
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/EditorTemplates/BlogPost/FieldsPrimary.ascx
@@ -0,0 +1,12 @@
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl
+ <%=Html.EditorZone("primary") %>
+ <%=Html.EditorZonesExcept("secondary") %>
+
+
+ <%=Html.EditorZone("secondary")%>
+
+
+Delete pages
-Are you sure you want to delete the pages?
- <% using (Html.BeginForm()) { %> - <%= Html.ValidationSummary() %> - - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Delete pages
+Are you sure you want to delete the pages?
+<% using (Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + +<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx index 934c23529..a1ab17b77 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx @@ -3,23 +3,21 @@ <%@ Import Namespace="Orchard.Utility"%> <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("AdminHead"); %> - <% using (Html.BeginForm()) { %> -Publish later
-Enter the scheduled publication date:
- <%=Html.ValidationSummary() %> - - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +<% using (Html.BeginForm()) { %> +Publish later
+Enter the scheduled publication date:
+ <%=Html.ValidationSummary() %> + +<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx index 93be07868..17aa3a608 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx @@ -1,23 +1,21 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageChange Template
-Select your layout from one of the templates below.
- <% using (Html.BeginForm()) { - %><%= Html.ValidationSummary() %> -- <%
- foreach (var template in Model.Templates) {
- var t = template; %>
-
- <%= - Html.EditorFor(m => t) %> - <% - } %> -
- - <%-- todo: (heskew) should pull to give the browser some chance of rehydrating the edit page form state --%> - <%=Html.ActionLink("Cancel", "Edit", new { Id = ViewContext.RouteData.GetRequiredString("id") }, new { @class = "cancel" })%> -
<% - } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Change Template
+Select your layout from one of the templates below.
+<% using (Html.BeginForm()) { + %><%= Html.ValidationSummary() %> +- <%
+ foreach (var template in Model.Templates) {
+ var t = template; %>
+
- <%= + Html.EditorFor(m => t) %> + <% + } %> +
+ + <%-- todo: (heskew) should pull to give the browser some chance of rehydrating the edit page form state --%> + <%=Html.ActionLink("Cancel", "Edit", new { Id = ViewContext.RouteData.GetRequiredString("id") }, new { @class = "cancel" })%> +
<% + } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx index 80875e296..434797786 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx @@ -1,10 +1,8 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageAdd a Page
-Select your layout from one of the templates below.
- <% using (Html.BeginForm()) { %> - <%=Html.ValidationSummary() %> - <%=Html.EditorForModel() %> - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Add a Page
+Select your layout from one of the templates below.
+<% using (Html.BeginForm()) { %> + <%=Html.ValidationSummary() %> + <%=Html.EditorForModel() %> +<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx index b0aedc5aa..20d70150d 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx @@ -1,50 +1,48 @@ <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<%=_Encoded("Edit Page") %>
-<%=_Encoded("about setting up a page") %>
- <%=Html.ValidationSummary() %> -
- <% using (Html.BeginForm()) { %>
- >" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("AdminHead"); %>
- " %>
<%@ Import Namespace="Orchard.Comments.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("AdminHead"); %>
- " %>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("AdminHead"); %>
- " %>
<%@ Import Namespace="Orchard.Roles.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("AdminHead"); %>
-
+<% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/background_header.jpg b/src/Orchard.Web/Themes/TheAdmin/Styles/images/background_header.jpg
new file mode 100644
index 000000000..df404f605
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/background_header.jpg differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.png b/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.png
new file mode 100644
index 000000000..9db203a53
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.png differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.psd b/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.psd
new file mode 100644
index 000000000..ea412b1df
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.psd differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.jpg b/src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.jpg
new file mode 100644
index 000000000..e378d549f
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/orchardLogo.jpg differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/tableHeaderBackground.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/tableHeaderBackground.gif
new file mode 100644
index 000000000..2a92ab80c
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/tableHeaderBackground.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/tableHeaderBackgroundRed.gif b/src/Orchard.Web/Themes/TheAdmin/Styles/images/tableHeaderBackgroundRed.gif
new file mode 100644
index 000000000..b5330cbfd
Binary files /dev/null and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/tableHeaderBackgroundRed.gif differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
new file mode 100644
index 000000000..57def5de6
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -0,0 +1,662 @@
+/* begin: reset
+ todo: (heskew) pare down and combine with existing selectors where appropriate */
+/* http://meyerweb.com/eric/tools/css/reset/ */
+/* v1.0 | 20080212 */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+ border:0;
+ font-size:100%;
+ margin:0;
+ padding:0;
+ vertical-align:baseline;
+}
+ol, ul {
+ list-style:none;
+}
+blockquote, q {
+ quotes:none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content:'';
+ content:none;
+}
+ins {
+ text-decoration:none;
+}
+del {
+ text-decoration:line-through;
+}
+table {
+ border-collapse:collapse;
+ border-spacing:0;
+}
+/* end: reset */
+
+
+/* Base setup
+----------------------------------------------------------*/
+html {
+ background:#8a8f7a;
+ color:#525e50;
+}
+body {
+ color:#5a5b32;
+ font-family:Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size:62.5%; /* 10px */
+ line-height:1.6em;
+ margin:0 auto 1em;
+ min-width:94.6em; /* 946px */
+ padding:0 .4em;
+}
+body#preview {
+ min-width:0;
+}
+#content {
+ background:#f9faf5;
+}
+
+
+/* Layout
+
+number of columns: 24; actual width: 946; column width: 26; gutter width:14
+
+ | 24| 23| 22| 21| 20| 19| 18| 17| 16| 15| 14| 13| 12| 11| 10| 9| 8| 7| 6| 5| 4| 3| 2
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+.5g| 0.759| 0.793| 0.829| 0.870| 0.914| 0.963| 1.017| 1.079| 1.148| 1.226| 1.316| 1.420| 1.542| 1.687| 1.862| 2.077| 2.349| 2.703| 3.182| 3.867| 4.930| 6.796| 10.938
+ 24|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 23| 95.770|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 22| 91.540| 95.583|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 21| 87.310| 91.166| 95.379|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 20| 83.080| 86.750| 90.758| 95.155|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 19| 78.850| 82.333| 86.137| 90.311| 94.909|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 18| 74.620| 77.916| 81.517| 85.466| 89.817| 94.635|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 17| 70.390| 73.499| 76.896| 80.621| 84.726| 89.271| 94.331|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 16| 66.161| 69.083| 72.275| 75.776| 79.634| 83.906| 88.663| 93.991|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 15| 61.931| 64.666| 67.654| 70.932| 74.543| 78.542| 82.994| 87.982| 93.607|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 14| 57.701| 60.249| 63.033| 66.087| 69.452| 73.177| 77.326| 81.972| 87.213| 93.170|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 13| 53.471| 55.832| 58.412| 61.242| 64.360| 67.813| 71.657| 75.963| 80.820| 86.340| 92.669|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 12| 49.241| 51.416| 53.791| 56.398| 59.269| 62.448| 65.988| 69.954| 74.426| 79.510| 85.338| 92.089|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 11| 45.011| 46.999| 49.171| 51.553| 54.178| 57.084| 60.320| 63.945| 68.033| 72.680| 78.008| 84.178| 91.410|100.000| ---| ---| ---| ---| ---| ---| ---| ---| ---
+ 10| 40.781| 42.582| 44.550| 46.708| 49.086| 51.719| 54.651| 57.935| 61.639| 65.849| 70.677| 76.268| 82.819| 90.602|100.000| ---| ---| ---| ---| ---| ---| ---| ---
+ 9| 36.551| 38.165| 39.929| 41.863| 43.995| 46.355| 48.983| 51.926| 55.246| 59.019| 63.346| 68.357| 74.229| 81.205| 89.628|100.000| ---| ---| ---| ---| ---| ---| ---
+ 8| 32.321| 33.749| 35.308| 37.019| 38.903| 40.990| 43.314| 45.917| 48.852| 52.189| 56.015| 60.446| 65.639| 71.807| 79.255| 88.427|100.000| ---| ---| ---| ---| ---| ---
+ 7| 28.091| 29.332| 30.687| 32.174| 33.812| 35.626| 37.645| 39.908| 42.459| 45.359| 48.684| 52.535| 57.048| 62.410| 68.883| 76.855| 86.913|100.000| ---| ---| ---| ---| ---
+ 6| 23.861| 24.915| 26.066| 27.329| 28.721| 30.261| 31.977| 33.898| 36.066| 38.529| 41.353| 44.625| 48.458| 53.012| 58.511| 65.282| 73.826| 84.942|100.000| ---| ---| ---| ---
+ 5| 19.631| 20.498| 21.445| 22.484| 23.629| 24.897| 26.308| 27.889| 29.672| 31.699| 34.023| 36.714| 39.868| 43.614| 48.138| 53.709| 60.738| 69.884| 82.273|100.000| ---| ---| ---
+ 4| 15.401| 16.082| 16.825| 17.640| 18.538| 19.532| 20.640| 21.880| 23.279| 24.869| 26.692| 28.803| 31.278| 34.217| 37.766| 42.136| 47.651| 54.826| 64.545| 78.453|100.000| ---| ---
+ 3| 11.171| 11.665| 12.204| 12.795| 13.446| 14.168| 14.971| 15.871| 16.885| 18.039| 19.361| 20.892| 22.687| 24.819| 27.394| 30.564| 34.564| 39.768| 46.818| 56.906| 72.535|100.000| ---
+ 2| 6.941| 7.248| 7.583| 7.950| 8.355| 8.803| 9.302| 9.861| 10.492| 11.208| 12.030| 12.982| 14.097| 15.422| 17.021| 18.991| 21.477| 24.710| 29.091| 35.359| 45.070| 62.136|100.000
+ 1| 2.711| 2.831| 2.962| 3.106| 3.264| 3.439| 3.634| 3.852| 4.098| 4.378| 4.699| 5.071| 5.507| 6.024| 6.649| 7.418| 8.389| 9.653| 11.364| 13.812| 17.606| 24.272| 39.063
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ | 24| 23| 22| 21| 20| 19| 18| 17| 16| 15| 14| 13| 12| 11| 10| 9| 8| 7| 6| 5| 4| 3| 2
+
+----------------------------------------------------------*/
+#header, #footer {
+ width:100%;
+}
+#header {
+ overflow:hidden;
+}
+#content {
+ overflow:auto;
+ padding:1.4em;
+}
+#main {
+ display:inline;
+ float:right;
+ width:83.08%;
+}
+#navigation {
+ display:inline;
+ float:left;
+ width:15.401%;
+}
+.wrapper, .sections {
+ overflow:hidden;
+}
+.sections .primary {
+ display:inline;
+ float:left;
+ width:74.543%;
+}
+.sections .secondary {
+ display:inline;
+ float:left;
+ margin-left:1.71%;
+ width:23.629%;
+}
+
+
+/* Headings and defaults
+----------------------------------------------------------*/
+h1, h2, h3, h4, h5, legend {
+ padding:.4em 0;
+ font-family:"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif;
+ font-style: normal;
+ font-weight:normal;
+}
+h1 { font-size:2.8em; } /* 28px */
+h2 { font-size:2.4em; } /* 24px */
+h3 { font-size:2.1em; } /* 21px */
+h3 span { font-size:.57em; } /* 12px */
+h4 { font-size:1.8em; } /* 18px */
+h5 { font-size:1.6em; } /* 16px */
+
+h6, p, legend, label, input, select, .button,
+.message, .validation-summary-errors,
+table.items th, table.items td, table.items caption { font-size:1.5em; line-height:1.5em; } /* 15px */
+p .button { font-size:inherit; }
+.meta { font-size:1.2em; } /* 12px */
+
+
+
+/* Links
+----------------------------------------------------------*/
+a, a:link, a:visited {
+ color:#1e5d7d;
+ text-decoration:none;
+}
+a:hover, a:active, a:focus {
+ color:#1e5d7d;
+ text-decoration:underline;
+}
+
+
+/* Header - Branding and Login
+----------------------------------------------------------*/
+#header {
+ background:#8a8f7a url(images/background_header.jpg) no-repeat bottom right;
+ height:60px;
+}
+#header h1 {
+ float:left;
+}
+#header h1 a {
+ background:url(images/orchardLogo.jpg) no-repeat;
+ display:block;
+ height:60px;
+ margin:-11px 0 0 14px;
+ text-indent:-9999px;
+ width:105px;
+}
+#site, #login {
+ font-size:1.5em;
+}
+#site a, #site a:visited, #site a:active {
+ color:#e2e4dd;
+ float:left;
+ line-height:2.2em;
+ padding:14px 0 0 12px;
+ position:relative;
+}
+#login {
+ color:#1a1505;
+ display:block;
+ float:right;
+ margin:20px 20px 0 0;
+ white-space:nowrap;
+}
+#login a, #login a:link, #login a:visited {
+ color:#e2e4dd;
+ padding:0;
+}
+#login a:hover, #login a:active, #login a:focus {
+ color:#ffea9b;
+}
+
+
+/* Navigation
+----------------------------------------------------------*/
+#navshortcut {
+ height:0;
+ overflow:hidden;
+ width:0;
+}
+
+#navigation li {
+ background:#fff;
+ border:1px solid #d2d6c6;
+ margin:10px 0 15px 0;
+}
+#navigation ul li {
+ border:0;
+ margin:0;
+}
+#navigation li h4 {
+ padding:0;
+}
+#navigation li h4 a, #navigation li h4 span {
+ background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
+ display:block;
+ padding:6px 4px 8px 8px;
+}
+#navigation li h4 a, #navigation li h4 a:link, #navigation li h4 a:visited {
+ color:inherit;
+}
+#navigation li h4 a:hover, #navigation li h4 a:active, #navigation li h4 a:focus {
+ background:#8a8f7a;
+ color:#f6faea;
+ text-decoration:none;
+}
+#navigation ul a, #navigation ul a:link, #navigation ul a:visited {
+ color:#5a5b32;
+ display:block;
+ font-size:1.5em;
+ height:28px;
+ line-height:28px;
+ padding:0 0 0 12px;
+ text-decoration:none;
+}
+#navigation ul a:hover, #navigation ul a:active, #navigation ul a:focus {
+ background:#f0ecd2;
+ color: #3e4301;
+ text-decoration:underline;
+}
+
+
+/* Content
+----------------------------------------------------------*/
+#main h2 {
+ margin:.23em 0 1em;
+}
+#main h3, #main h4 {
+ margin:.5em 0;
+}
+#main p {
+ margin:0 0 1.5em;
+}
+#main .main.actions {
+ margin:0 0 1.4em;
+}
+#main .meta {
+ margin:-.4em 0 .4em;
+}
+#main form {
+ margin:.345em 0 1.5em;
+}
+#main h2 {
+ border-bottom:1px dashed #e4e7dc;
+}
+#main h3 {
+ border-bottom:1px solid #e4e7dc;
+}
+
+
+/* Confirmations, Messages and the like
+----------------------------------------------------------*/
+.message, .validation-summary-errors {
+ margin:10px 0 4px 0;
+ padding:4px;
+}
+span.message {
+ display:block;
+ margin:4px 0 4px 4px;
+}
+.message a {
+ font-weight:bold;
+}
+
+.confirmation.message {
+ background:#e6f1c9; /* green */
+ border:1px solid #cfe493;
+}
+.warning.message {
+ background:#fdf5bc; /* yellow */
+ border:1px solid #ffea9b;
+}
+/* todo: (heskew) what else (other inputs) needs this? */
+.critical.message, .validation-summary-errors,
+.input-validation-error.text-box, .input-validation-error.text {
+ border:1px solid #990808;
+}
+.critical.message, .validation-summary-errors {
+ background:#e68585; /* red */
+ color:#fff;
+}
+.info.message {
+ background:#fff; /* orange :P */
+ border:1px dashed #D2D6C6;
+}
+.debug.message {
+ background:#eee;
+ border:1px dashed #D2D6C6;
+ color:#7a7a7a;
+ margin:20px 0 14px 0;
+}
+.debug.message:before {
+ content:"DEBUG » ";
+}
+
+
+/* Forms
+----------------------------------------------------------*/
+fieldset.bulk.actions {
+ display:inline;
+ height:auto;
+ margin:0 1.4em -.7em 0;
+ padding-top:0;
+}
+
+label {
+ display: block;
+ font-weight:700;
+}
+fieldset.bulk.actions label, label.sub {
+ display:inline;
+}
+label span {
+ font-weight:normal;
+}
+label input {
+ vertical-align:text-top;
+}
+/* todo: (heskew) try to get .text on stuff like .text-box */
+select, textarea, input.text, input.text-box {
+ padding:2px;
+ border:1px solid #d2d6c6;
+ color:#5a5b32;
+}
+input.text, input.text-box {
+ line-height:1.2em;
+}
+select:focus, textarea:focus, input.text:focus, input.text-box:focus {
+ border-color:#666d51;
+}
+.permalink input {
+ background:transparent;
+ border-color:#EAE9D9;
+ border-style:dashed;
+ margin-left:0;
+ width:350px;
+}
+.permalink input:focus {
+ background:#FFF;
+ border-color:#666d51;
+ border-style:solid;
+}
+input.large.text, textarea, fieldset {
+ clear:both;
+}
+fieldset {
+ margin:.7em 0 .4em;
+}
+textarea {
+ min-height:8em;
+}
+.primary input.large.text, .primary textarea {
+ margin:0;
+ padding:4px;
+ width:98%;
+}
+
+/* todo: (heskew) move editor specific style elsewhere */
+.primary .mceEditor {
+ display:block;
+ margin:0;
+}
+.secondary fieldset {
+ margin:.446% 0 .446% .446%;
+ padding:4px;
+ width:98.662%;
+}
+
+button, .button, .button:link, .button:visited {
+ background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
+ border:1px solid #d2d6c6;
+ color:#5a5b32;
+ cursor:pointer;
+ height:26px;
+ padding:0 8px 3px;
+ text-align:center;
+}
+button.remove, .remove.button, .remove.button:link, .remove.button:visited {
+ background-color:#DECCCA;
+ background-image:url(images/tableHeaderBackgroundRed.gif);
+ border-color:#d6c9c7;
+ color:#5c3732;
+}
+a.button, a.button:link, a.button:visited {
+ line-height:1em;
+ padding:.2em .6em;
+}
+button:hover, .button:hover,
+button:active, .button:active,
+button:focus, .button:focus {
+ background:#8a8f7a;
+ border-color:#666d51;
+ color:#f6faea;
+ text-decoration:none;
+}
+button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
+ border-color:#8a8f7a;
+}
+button.remove:hover, .remove.button:hover,
+button.remove:active, .remove.button:active,
+button.remove:focus, .remove.button:focus {
+ background:#8f7c79;
+ border-color:#6e5551;
+ color:#faedeb;
+}
+button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
+ border-color:#8f7c79;
+}
+.delete.button {
+ float:right;
+}
+.cancel {
+ margin:0 0 0 .93em;
+}
+.manage {
+ float:right;
+ margin:4px 0 6px 4px;
+ overflow:hidden;
+}
+.actions {
+ height:2em;
+ overflow:hidden;
+ padding:.6em 0 .1em;
+ text-align:right;
+}
+.actions .construct {
+ float:left;
+}
+.actions .destruct {
+ float:right;
+}
+.manage a.button {
+ float:right;
+ height:inherit;
+ margin-left:.3em;
+ padding-bottom:.3em;
+ padding-top:.3em;
+}
+
+
+/* Icon buttons
+----------------------------------------------------------*/
+a.ibutton, a.ibutton:link, a.ibutton:visited {
+ background:url(images/icons.png) 0 -20px;
+ border:none;
+ display:inline;
+ float:left;
+ height:17px;
+ overflow:hidden;
+ padding:0 0 0 17px;
+ width:0;
+}
+a.ibutton:hover, a.ibutton:active, a.ibutton:focus { background-position:0 0; }
+a.ibutton.remove,
+a.ibutton.remove:link,
+a.ibutton.remove:visited { background-position:-20px -20px; }
+a.ibutton.remove:hover, a.ibutton.remove:active, a.ibutton.remove:focus { background-position:-20px 0; }
+a.ibutton.view,
+a.ibutton.view:link,
+a.ibutton.view:visited { background-position:-40px -20px; }
+a.ibutton.view:hover, a.ibutton.view:active, a.ibutton.view:focus { background-position:-40px 0; }
+a.ibutton.add.page,
+a.ibutton.add.page:link,
+a.ibutton.add.page:visited { background-position:-60px -20px; }
+a.ibutton.add.page:hover, a.ibutton.add.page:active, a.ibutton.add.page:focus { background-position:-60px 0; }
+a.ibutton.edit,
+a.ibutton.edit:link,
+a.ibutton.edit:visited { background-position:-80px -20px; }
+a.ibutton.edit:hover, a.ibutton.edit:active, a.ibutton.edit:focus { background-position:-80px 0; }
+a.ibutton.publish,
+a.ibutton.publish:link,
+a.ibutton.publish:visited { background-position:-100px -20px; }
+a.ibutton.publish:hover, a.ibutton.publish:active, a.ibutton.publish:focus { background-position:-100px 0; }
+a.ibutton.blog,
+a.ibutton.blog:link,
+a.ibutton.blog:visited { background-position:-120px -20px; }
+a.ibutton.blog:hover, a.ibutton.blog:active, a.ibutton.blog:focus { background-position:-120px 0; }
+
+
+/* todo: (heskew) needs attention */
+.withActions {
+ overflow:hidden;
+}
+.withActions a {
+ display:inline;
+ float:left;
+ margin-right:7px;
+}
+
+
+/* Content item lists
+----------------------------------------------------------*/
+.contentItems {
+ background:#FFF;
+ border:1px solid #B0B083;
+ margin:1.4em 0;
+ padding:2px;
+}
+.contentItems li {
+ background:#FFF;
+ border-bottom:1px solid #EAE9D9;
+ margin:0;
+ overflow:hidden;
+ padding:.7em 1.4em;
+}
+.contentItems li.last {
+ border-bottom:0;
+}
+#main .contentItems li h3 {
+ border-bottom:0;
+ margin-top:0;
+}
+#main .contentItems li .actions {
+ color:#EAE9D9;
+ height:auto;
+ margin:-1.3em 0 0;
+ padding:0 0 .1em;
+}
+#main .contentItems li .actions .ibutton {
+ margin-right:6px;
+}
+#main .contentItems li .actions .destruct .ibutton {
+ margin-left:8px;
+ margin-right:0;
+}
+#main .contentItems li:hover { background:#fafbed; }
+#main .contentItems li:hover a.ibutton { background-position:0 0; }
+#main .contentItems li:hover a.ibutton.remove { background-position:-20px 0; }
+#main .contentItems li:hover a.ibutton.view { background-position:-40px 0; }
+#main .contentItems li:hover a.ibutton.add.page { background-position:-60px 0; }
+#main .contentItems li:hover a.ibutton.edit { background-position:-80px 0; }
+#main .contentItems li:hover a.ibutton.publish { background-position:-100px 0; }
+#main .contentItems li:hover a.ibutton.blog { background-position:-120px 0; }
+
+
+/* (Items) Tables
+----------------------------------------------------------*/
+table.items {
+ background:#fff;
+ border:1px solid #B0B083;
+ border-collapse:separate;
+ border-spacing:0;
+ width:100%;
+}
+table.items caption {
+ padding:8px 0;
+ text-indent:0;
+}
+table.items col {
+ border-spacing:0;
+ display:table-column;
+}
+table.items colgroup
+{
+ border-spacing:0;
+ display:table-column-group;
+}
+table.items tbody {
+ border-spacing:0;
+ vertical-align:middle;
+}
+table.items thead, table.items th {
+ background:url(images/tableHeaderBackground.gif) repeat-x top left #dddfcb;
+ font-weight:700;
+ overflow:hidden;
+ text-align:left;
+}
+/* todo: (heskew) hook back up */
+table.items tr.hover {
+ background-color:#f0f3d6;
+}
+table.items tr.critical {background:#e68585; border:inherit;}
+table.items tr.warning {background:#fdf5bc; border:inherit;}
+table.items th, table.items td {
+ border-bottom:1px solid #EAE9D9;
+ border-spacing:0px;
+ display:table-cell;
+ padding:8px 12px;
+ vertical-align:middle;
+}
+
+
+/* MISC.
+todo: (heskew) pull out into relevant modules where appropriate
+----------------------------------------------------------*/
+
+/* CMSPages
+----------------------------------------------------------*/
+.templates fieldset {
+ margin:0 0 .933%;
+}
+.templates p {
+ overflow:hidden;
+}
+.templates p img {
+ float:left;
+ height:144px;
+ margin:.27em .93em .93em .54em;
+ width:124px;
+}
+.previewImage {
+ border:1px solid #525e50;
+ height:70%;
+ width:70%;
+}
+
+/* Rounded borders and other "works in some browsers" additions
+----------------------------------------------------------*/
+#content, #navigation li, button, .button,
+table.items, textarea, input.text, input.text-box,
+.contentItems, .message, .validation-summary-errors {
+ -moz-border-radius:4px;
+ -webkit-border-radius:4px;
+ border-radius:4px;
+}
+#navigation li h4 a {
+ -moz-border-radius:3px 3px 0 0;
+ -webkit-border-radius:3px 3px 0 0;
+ border-radius:3px 3px 0 0;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Theme.txt b/src/Orchard.Web/Themes/TheAdmin/Theme.txt
new file mode 100644
index 000000000..6d4dba2d2
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Theme.txt
@@ -0,0 +1 @@
+name: The Admin
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Shared/document.aspx b/src/Orchard.Web/Themes/TheAdmin/Views/Shared/document.aspx
new file mode 100644
index 000000000..b1b2c9887
--- /dev/null
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Shared/document.aspx
@@ -0,0 +1,33 @@
+<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage
-
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
index e5b06fd55..36c8f06b7 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
@@ -1,19 +1,17 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<%=_Encoded("Page Content") %>
- <%-- todo: (heskew) change the editors to be self-contained (fieldset > editor) --%> - <%=Html.EditorFor(m => m.Revision.Title, "inputTextLarge") %> - <%=Html.EditorFor(m => m.Revision.Slug, "inputTextPermalink") %> - <% foreach (ContentItem content in Model.Revision.Contents) { - %><% +<%=_Encoded("Edit Page") %>
+<%=_Encoded("about setting up a page") %>
+<%=Html.ValidationSummary() %> +
+ <% using (Html.BeginForm()) { %>
+
-<% Html.Include("AdminFoot"); %>
\ No newline at end of file
+
+
- <%=_Encoded("Page Content") %>
+ <%-- todo: (heskew) change the editors to be self-contained (fieldset > editor) --%> + <%=Html.EditorFor(m => m.Revision.Title, "inputTextLarge") %> + <%=Html.EditorFor(m => m.Revision.Slug, "inputTextPermalink") %> + <% foreach (ContentItem content in Model.Revision.Contents) { + %>
-
- <% } %>
+ <%= Html.TextArea("Revision.Contents[" + content.ZoneName + "].Content", content.Content, new { @class = "html" }) %>
+ <%
+ } %>
+
<%=_Encoded("Publish Settings") %>
- - - - -
+
+ <% } %>
+<%=_Encoded("Publish Settings") %>
+ + + + +Export
-Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.
--
- <% foreach (var page in Model) {
- %>
- Page Id <%=page.Id %>
-
-
- <% foreach (var revision in page.Revisions) {
- %>
- Revision <%=revision.Number %> <%=revision.Title %> ~/<%=revision.Slug %>
-
Modified: <%=revision.ModifiedDate %> -
Published: <%=revision.PublishedDate %> <%
- } %>
-
<%
- } %>
- - Revision <%=revision.Number %> <%=revision.Title %> ~/<%=revision.Slug %>
-
Export
+Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.
+-
+ <% foreach (var page in Model) {
+ %>
- Page Id <%=page.Id %>
+
-
+ <% foreach (var revision in page.Revisions) {
+ %>
- Revision <%=revision.Number %> <%=revision.Title %> ~/<%=revision.Slug %>
+
Modified: <%=revision.ModifiedDate %> +
Published: <%=revision.PublishedDate %> <%
+ } %>
+
<%
+ } %>
+ - Revision <%=revision.Number %> <%=revision.Title %> ~/<%=revision.Slug %>
+
Manage Pages
-Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.
- <% using (Html.BeginForm()) { %> - <%=Html.ValidationSummary() %> - - -<%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button" }) %>
-
+ <%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %>
+<% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx
index a2de6f90f..d60828fe1 100644
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Create.aspx
@@ -1,22 +1,20 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageAdd Comment
- <% using(Html.BeginForm()) { %> - <%= Html.ValidationSummary() %> - - - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Add Comment
+<% using(Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + + +<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx index a3e0d557f..a9c3cb742 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Details.aspx @@ -2,92 +2,90 @@ <%@ Import Namespace="Orchard.Comments.Models"%> <%@ Import Namespace="Orchard.Comments.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> -<% Html.Include("AdminHead"); %> -Comments for <%= Model.DisplayNameForCommentedItem %>
- <% Html.BeginForm(); %> - <%=Html.ValidationSummary() %> - - -
- <% if (Model.CommentsClosedOnItem) {
- %><%=Html.ActionLink("Enable Comments", "Enable", new { commentedItemId = Model.CommentedItemId }, new { @class = "button" })%><%
- } else {
- %><%=Html.ActionLink("Close Comments", "Close", new { commentedItemId = Model.CommentedItemId }, new { @class = "button remove" })%><%
- } %>
-
-
-
- <% if (Model.CommentsClosedOnItem) {
- %><%=Html.ActionLink("Enable Comments", "Enable", new { commentedItemId = Model.CommentedItemId }, new { @class = "button" })%><%
- } else {
- %><%=Html.ActionLink("Close Comments", "Close", new { commentedItemId = Model.CommentedItemId }, new { @class = "button remove" })%><%
- } %>
-
- <% Html.EndForm(); %>
-<% Html.Include("AdminFoot"); %>
\ No newline at end of file
+Comments for <%= Model.DisplayNameForCommentedItem %>
+<% Html.BeginForm(); %> + <%=Html.ValidationSummary() %> + + +
+ <% if (Model.CommentsClosedOnItem) {
+ %><%=Html.ActionLink("Enable Comments", "Enable", new { commentedItemId = Model.CommentedItemId }, new { @class = "button" })%><%
+ } else {
+ %><%=Html.ActionLink("Close Comments", "Close", new { commentedItemId = Model.CommentedItemId }, new { @class = "button remove" })%><%
+ } %>
+
+
+
+ <% if (Model.CommentsClosedOnItem) {
+ %><%=Html.ActionLink("Enable Comments", "Enable", new { commentedItemId = Model.CommentedItemId }, new { @class = "button" })%><%
+ } else {
+ %><%=Html.ActionLink("Close Comments", "Close", new { commentedItemId = Model.CommentedItemId }, new { @class = "button remove" })%><%
+ } %>
+
+<% Html.EndForm(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx
index feea7f6b5..abf6ce007 100644
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Edit.aspx
@@ -2,33 +2,31 @@
<%@ Import Namespace="Orchard.Comments.Models"%>
<%@ Import Namespace="Orchard.Comments.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("AdminHead"); %>
- Edit Comment
- <% using(Html.BeginForm()) { %> - <%= Html.ValidationSummary() %> - - - - - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Edit Comment
+<% using(Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + + + + +<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx index 1199f7b28..d7263bf77 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx @@ -2,81 +2,79 @@ <%@ Import Namespace="Orchard.Comments.Models"%> <%@ Import Namespace="Orchard.Comments.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> -<% Html.Include("AdminHead"); %> -Manage Comments
- <% Html.BeginForm(); %> - <%=Html.ValidationSummary() %> - - - - <% Html.EndForm(); %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Manage Comments
+<% Html.BeginForm(); %> + <%=Html.ValidationSummary() %> + + + +<% Html.EndForm(); %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx index b6f6b6288..39fac8eac 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Add.aspx @@ -3,25 +3,23 @@ <%@ Import Namespace="Orchard.Media.Models"%> <%@ Import Namespace="Orchard.Media.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("AdminHead"); %> -Add Media
-- <%=Html.ActionLink("Media Folders", "Index")%> > - <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> - <%=Html.ActionLink(navigation.FolderName, "Edit", - new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > - - <% } %> - Add Media
- <% using (Html.BeginForm("Add", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%> - <%= Html.ValidationSummary() %> - - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Add Media
++ <%=Html.ActionLink("Media Folders", "Index")%> > + <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> + <%=Html.ActionLink(navigation.FolderName, "Edit", + new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > + + <% } %> + Add Media
+<% using (Html.BeginForm("Add", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) {%> + <%= Html.ValidationSummary() %> + +<% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx index a6e4c64ce..82f9aceb1 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Create.aspx @@ -3,21 +3,19 @@ <%@ Import Namespace="Orchard.Media.Helpers"%> <%@ Import Namespace="Orchard.Media.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html" %> -<% Html.Include("AdminHead"); %> -Add a Folder
-<%=Html.ActionLink("Media Folders", "Index")%> > - <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> - <%=Html.ActionLink(navigation.FolderName, "Edit", - new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > - <% } %> - Add a Folder
- <%using (Html.BeginForm()) { %> - <%= Html.ValidationSummary() %> - - <% } %> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Add a Folder
+<%=Html.ActionLink("Media Folders", "Index")%> > + <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> + <%=Html.ActionLink(navigation.FolderName, "Edit", + new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > + <% } %> + Add a Folder
+<%using (Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + + <% } %> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx index 3af5b4d3b..23a16284d 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Edit.aspx @@ -3,91 +3,89 @@ <%@ Import Namespace="Orchard.Media.Helpers"%> <%@ Import Namespace="Orchard.Media.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> -<% Html.Include("AdminHead"); %> -Manage Folder
-<%=Html.ActionLink("Folder Properties", "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%>
- <%=Html.ActionLink("Media Folders", "Index")%> > - <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> - <%=Html.ActionLink(navigation.FolderName, "Edit", - new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > - - <% } %> - Manage Folder
- <% Html.BeginForm(); %> - -
- <%=Html.ActionLink("Add media", "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
- <%=Html.ActionLink("Add a folder", "Create", new { Model.MediaPath }, new { @class = "button" })%>
-
-
-
- <%=Html.ActionLink("Add media", "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
- <%=Html.ActionLink("Add a folder", "Create", new { Model.MediaPath }, new { @class = "button" })%>
-
- <% Html.EndForm(); %>
-<% Html.Include("AdminFoot"); %>
\ No newline at end of file
+Manage Folder
+<%=Html.ActionLink("Folder Properties", "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%>
+<%=Html.ActionLink("Media Folders", "Index")%> > + <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> + <%=Html.ActionLink(navigation.FolderName, "Edit", + new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > + + <% } %> + Manage Folder
+<% Html.BeginForm(); %> + +
+ <%=Html.ActionLink("Add media", "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
+ <%=Html.ActionLink("Add a folder", "Create", new { Model.MediaPath }, new { @class = "button" })%>
+
+
+
+ <%=Html.ActionLink("Add media", "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
+ <%=Html.ActionLink("Add a folder", "Create", new { Model.MediaPath }, new { @class = "button" })%>
+
+<% Html.EndForm(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx
index a9c7090e6..28e7ecb01 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditMedia.aspx
@@ -3,52 +3,50 @@
<%@ Import Namespace="Orchard.Media.Helpers"%>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("AdminHead"); %>
- Edit Media - <%= Model.Name %>
-- <%=Html.ActionLink("Media Folders", "Index")%> > - <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> - <%=Html.ActionLink(navigation.FolderName, "Edit", - new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > - - <% } %> - Edit Media
-
- <%using (Html.BeginForm()) { %>
- <%= Html.ValidationSummary() %>
-
-<% Html.Include("AdminFoot"); %>
\ No newline at end of file
+
-
- About this media
- - -
- 
" class="previewImage" alt="<%= Model.Caption %>" />
-
- <% } %>
- Preview
--
-
- Dimensions: 500 x 375 pixels -
- Size: <%= Model.Size %> -
- Added on: <%= Model.LastUpdated %> by Orchard User -
-
-
- " width="500" height="375" alt="<%= Model.Caption %>" />" />
-
Copy this html to add this image to your site.
-
-
Edit Media - <%= Model.Name %>
++ <%=Html.ActionLink("Media Folders", "Index")%> > + <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> + <%=Html.ActionLink(navigation.FolderName, "Edit", + new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > + + <% } %> + Edit Media
+
+ <%using (Html.BeginForm()) { %>
+ <%= Html.ValidationSummary() %>
+
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx
index 4857a1725..9a25944c6 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/EditProperties.aspx
@@ -3,23 +3,21 @@
<%@ Import Namespace="Orchard.Media.Helpers"%>
<%@ Import Namespace="Orchard.Media.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html" %>
-<% Html.Include("AdminHead"); %>
-
+
+ About this media
+ + +
+ " class="previewImage" alt="<%= Model.Caption %>" />
+
+ <% } %>
+Preview
+-
+
- Dimensions: 500 x 375 pixels +
- Size: <%= Model.Size %> +
- Added on: <%= Model.LastUpdated %> by Orchard User +
-
+
+ " width="500" height="375" alt="<%= Model.Caption %>" />" />
+
Copy this html to add this image to your site.
+
+
Folder Properties
-<%=Html.ActionLink("Media Folders", "Index")%> > - <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> - <%=Html.ActionLink(navigation.FolderName, "Edit", - new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > - - <% } %> - Folder Properties
- <%using (Html.BeginForm()) { %> - <%= Html.ValidationSummary() %> - - <%}%> -<% Html.Include("AdminFoot"); %> \ No newline at end of file +Folder Properties
+<%=Html.ActionLink("Media Folders", "Index")%> > + <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%> + <%=Html.ActionLink(navigation.FolderName, "Edit", + new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> > + + <% } %> + Folder Properties
+<%using (Html.BeginForm()) { %> + <%= Html.ValidationSummary() %> + +<%}%> \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx index 6d11d4d58..447e69da9 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Media/Views/Admin/Index.aspx @@ -1,54 +1,52 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageManage Media Folders
-<%=Html.ActionLink("Media Folders", "Index")%> > Manage Media Folders
- <% Html.BeginForm(); %> - <%=Html.ValidationSummary() %> - -<%=Html.ActionLink("Add a folder", "Create", new {}, new { @class = "button"}) %>
-
- <%=Html.ActionLink("Add a folder", "Create", new {}, new { @class = "button"}) %>
- <% Html.EndForm(); %>
-<% Html.Include("AdminFoot"); %>
\ No newline at end of file
+Manage Media Folders
+<%=Html.ActionLink("Media Folders", "Index")%> > Manage Media Folders
+<% Html.BeginForm(); %> + <%=Html.ValidationSummary() %> + +<%=Html.ActionLink("Add a folder", "Create", new {}, new { @class = "button"}) %>
+
+ <%=Html.ActionLink("Add a folder", "Create", new {}, new { @class = "button"}) %>
+<% Html.EndForm(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
index d0850d5cf..51d0ef66a 100644
--- a/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Views/Admin/Create.aspx
@@ -1,43 +1,41 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPageAdd Role
- <% using (Html.BeginForm()) { %> - <%=Html.ValidationSummary()%> +Add Role
+<% using (Html.BeginForm()) { %> + <%=Html.ValidationSummary()%> + +
+ | a:logoff"
+ %>
+<%=Html.ActionLink("Project Orchard", "Index", new { Area = "", Controller = "Home" })%>
+<%=Html.ActionLink("Your Site", "Index", new { Area = "", Controller = "Home" })%>
+ <% if (Model.CurrentUser != null) { //todo: (heskew) localize the string format "User: <%="User"%>: <%=Html.Encode(Model.CurrentUser.UserName)%> | <%=Html.ActionLink("Logout", "LogOff", new { Area = "", Controller = "Account" }) %>
<%
+ } %>
+
+
+
+
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config
new file mode 100644
index 000000000..1bf8c875d
--- /dev/null
+++ b/src/Orchard.Web/Themes/Web.config
@@ -0,0 +1,35 @@
+
+
+
+
+