diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css index 6aae18937..a73b60fa4 100644 --- a/src/Orchard.Web/Content/Admin/css/base.css +++ b/src/Orchard.Web/Content/Admin/css/base.css @@ -206,11 +206,11 @@ a:hover, a:active, a:focus { margin:20px 20px 0 0; white-space:nowrap; } -#login a, #login a:visited, #login a:active { +#login a, #login a:link, #login a:visited { color:#e2e4dd; padding:0; } -#login a:hover, #login a:focus { +#login a:hover, #login a:active, #login a:focus { color:#ffea9b; } @@ -232,10 +232,22 @@ a:hover, a:active, a:focus { 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 ul a { +#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; @@ -244,7 +256,7 @@ a:hover, a:active, a:focus { padding:0 0 0 12px; text-decoration:none; } -#navigation ul a:hover, #navigation ul a:focus { +#navigation ul a:hover, #navigation ul a:active, #navigation ul a:focus { background:#f0ecd2; color: #3e4301; text-decoration:underline; @@ -270,6 +282,9 @@ a:hover, a:active, a:focus { #main h2 { border-bottom:1px dashed #e4e7dc; } +#main h3 { + border-bottom:1px solid #e4e7dc; +} /* Confirmations, Messages and the like ----------------------------------------------------------*/ @@ -383,6 +398,7 @@ a.button, a.button:link, a.button:visited { padding:.2em .6em; } button:hover, .button:hover, +button:active, .button:active, button:focus, .button:focus { background:#8a8f7a; border-color:#666d51; @@ -390,6 +406,7 @@ button:focus, .button:focus { text-decoration:none; } button.remove:hover, .remove.button:hover, +button.remove:active, .remove.button:active, button.remove:focus, .remove.button:focus { background:#8f7c79; border-color:#6e5551; @@ -431,7 +448,7 @@ button.remove:focus, .remove.button:focus { /* Icon buttons ----------------------------------------------------------*/ -a.ibutton { +a.ibutton, a.ibutton:link, a.ibutton:visited { background:url(images/icons.png) 0 -20px; border:none; display:inline; @@ -441,23 +458,27 @@ a.ibutton { padding:0 0 0 17px; width:0; } -a.ibutton:hover, -a.ibutton:focus { background-position:0 0; } -a.ibutton.remove:hover, -a.ibutton.remove:focus { background-position:-20px 0; } -a.ibutton.remove { background-position:-20px -20px; } -a.ibutton.view:hover, -a.ibutton.view:focus { background-position:-40px 0; } -a.ibutton.view { background-position:-40px -20px; } -a.ibutton.add.page:hover, -a.ibutton.add.page:focus { background-position:-60px 0; } -a.ibutton.add.page { background-position:-60px -20px; } -a.ibutton.edit:hover, -a.ibutton.edit:focus { background-position:-80px 0; } -a.ibutton.edit { background-position:-80px -20px; } -a.ibutton.publish:hover, -a.ibutton.publish:focus { background-position:-100px 0; } -a.ibutton.publish { background-position:-100px -20px; } +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; } /* todo: (heskew) needs attention */ @@ -508,6 +529,7 @@ ul.contentItems li.last { border-bottom:0; } #main ul.contentItems li h3 { + border-bottom:0; margin:0 0 .1em; } #main ul.contentItems li .actions { @@ -646,4 +668,9 @@ ul.contentItems, .message { -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/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 4fb1e1794..102fa1dff 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -166,6 +166,7 @@ + diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs index deb71f4f2..c6a65f9a0 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/AdminMenu.cs @@ -8,7 +8,7 @@ namespace Orchard.Blogs { builder.Add("Blogs", "2", menu => menu .Add("Manage Blogs", "1.0", item => item.Action("ListForAdmin", "Blog", new { area = "Orchard.Blogs" })) - .Add("Create a Blog", "1.1", item => item.Action("Create", "Blog", new { area = "Orchard.Blogs" }))); + .Add("Add Blog", "1.1", item => item.Action("Create", "Blog", new { area = "Orchard.Blogs" }))); } } } diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx index 0141bce64..5dbf21f47 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Create.aspx @@ -3,8 +3,7 @@ <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> -

Create a Blog

-

Manage Blogs > Create a Blog

+

Add Blog

<% using (Html.BeginForm()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForModel() %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx index b3a8831e1..4b344a175 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/Edit.aspx @@ -4,7 +4,6 @@ <%@ Import Namespace="Orchard.Blogs.ViewModels"%> <% Html.Include("AdminHead"); %>

Edit Blog

-

Manage Blogs > Editing <%=Html.Encode(Model.Name)%>

<% using (Html.BeginForm()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForModel() %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx index b5415bdd4..af837d50d 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx @@ -4,8 +4,7 @@ <%@ Import Namespace="Orchard.Security" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <% Html.Include("AdminHead"); %> -

Create a Blog Post

-

Manage Blogs > <%=Html.Encode(Model.Blog.Name) %> > Create a Blog Post

+

Add Post

<%using (Html.BeginForm()) { %> <%= Html.ValidationSummary() %> <%= Html.EditorForModel() %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx index 63c5ddde9..b443dcf97 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Edit.aspx @@ -4,7 +4,6 @@ <%@ Import Namespace="Orchard.Blogs.ViewModels"%> <% Html.Include("AdminHead"); %>

Edit Blog Post

-

Manage Blogs > <%=Html.Encode(Model.Blog.Name)%> > <%=Model.Title %>

<% using (Html.BeginForm()) { %> <%=Html.ValidationSummary() %> <%=Html.EditorForModel() %> diff --git a/src/Orchard.Web/Views/Shared/AdminFoot.aspx b/src/Orchard.Web/Views/Shared/AdminFoot.aspx index a64d05d48..ddd18bc7e 100644 --- a/src/Orchard.Web/Views/Shared/AdminFoot.aspx +++ b/src/Orchard.Web/Views/Shared/AdminFoot.aspx @@ -3,10 +3,16 @@ <%-- .wrapper --%> <%-- #main --%>