Updated times/classic theme css and added ascx overrides.

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045418

src/Orchard.Web/Packages/Orchard.Users/Views/Account/LogOn.ascx

@@ -1,23 +1,27 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<LogOnViewModel>" %>
 <%@ Import Namespace="Orchard.Users.ViewModels"%>
-<h1><%=Html.TitleForPage(Model.Title) %></h1>
+<h1><%=Html.TitleForPage(Model.Title)%></h1>
-<p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink("Register", "Register") %><%=_Encoded(" if you don't have an account.")%></p>
+<p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink("Register", "Register")%><%=_Encoded(" if you don't have an account.")%></p>
-<%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString()) %>
+<%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())%>
-<% using (Html.BeginForm(new {Action="LogOn"})) { %>
+<% using (Html.BeginForm(new { Action = "LogOn" }))
+   { %>
     <fieldset>
         <legend><%=_Encoded("Account Information")%></legend>
+        <div>
             <label for="username"><%=_Encoded("Username:")%></label>
-            <%= Html.TextBox("username") %>
+            <%= Html.TextBox("username")%>
-            <%= Html.ValidationMessage("username") %>
+            <%= Html.ValidationMessage("username")%>
-
+        </div>
+        <div>
             <label for="password"><%=_Encoded("Password:")%></label>
-            <%= Html.Password("password") %>
+            <%= Html.Password("password")%>
-            <%= Html.ValidationMessage("password") %>
+            <%= Html.ValidationMessage("password")%>
-
+        </div>
-            <%= Html.CheckBox("rememberMe") %><label class="forcheckbox" for="rememberMe"><%=_Encoded("Remember me?")%></label>
+        <div>
-
+            <%= Html.CheckBox("rememberMe")%><label class="forcheckbox" for="rememberMe"><%=_Encoded("Remember me?")%></label>
-            <%=Html.HiddenFor(m=>m.ReturnUrl) %>
+        </div>
-            <%=Html.AntiForgeryTokenOrchard() %>
+            <%=Html.HiddenFor(m => m.ReturnUrl)%>
+            <%=Html.AntiForgeryTokenOrchard()%>
             <input type="submit" value="<%=_Encoded("Log On") %>" />
     </fieldset>
 <% } %>

src/Orchard.Web/Themes/Times/Styles/blog.css

@@ -1,15 +1,15 @@
 /*Blog specific styles
 ----------------------------------------------------------*/
 
-.metadata, .manage {
+.meta, .manage, .posted, div.comment {
-    margin: 0 0 24px 0;
+    margin: 0 0 8px 0;
     font:80% Verdana, Geneva, Tahoma, sans-serif;
 }
 
-.metadata a, .manage a {
+.meta, .manage {
     float:right;
 }
 
-ul.blogs p {
+.blogdescription, .postsummary {
     clear:both;
-}
+    }

src/Orchard.Web/Themes/Times/Styles/site.css

@@ -28,7 +28,7 @@ body {
 
 /* ---------- Headings and defaults ---------- */
 
-h1,h2,h3,h4,h5,h6,h1 a,h2 a,h3 a,h4 a,h5 a,h6 a,legend {font-weight:normal; font-style: normal; margin:12px 0 12px 0; color:#670404; border-bottom:1px solid #f1f1f1;}
+h1,h2,h3,h4,h5,h6, legend {font-weight:normal; font-style: normal; margin:12px 0 6px 0; color:#670404; border-bottom:1px solid #f1f1f1;}
 
 h1 {font-size: 190%;}
 h2 {font-size: 160%;}
@@ -42,6 +42,7 @@ p.small {line-height:22px; font-size:85%;}
 
 a {
 	color:#004386;
+	color:#05325f;
 	text-decoration:none;
 }
 
@@ -49,44 +50,6 @@ ul.square {list-style:square; list-style-position:inside; line-height:24px; marg
 ol.decimal {list-style:decimal; list-style-position:inside; line-height:24px; margin:0 0 0 12px;}
 
 
-/* Forms
-----------------------------------------------------------
-
-input[type="text"], #commenttext, #password {
-    border:1px solid #DDDEDF;
-    display: block;
-}
-
-fieldset {margin: 20px 0;}
-
-label {
-    display: block;
-    margin:20px 0 2px 10px;
-    }
-
-input[type="text"], #commenttext, #password {
-    border-color:#cacec6;
-    padding:2px;
-    margin:2px 0 20px 10px;
-    width:80%;
-    }
-
-input[type="checkbox"] {
-    margin:2px 0 20px 10px;
-}
-
-input[type="submit"], input[type="button"] {
-    padding:2px 14px;
-    display: block;
-    margin:2px 0 20px 10px;
-    font-weight:600;
-    }
-  
-.forcheckbox {
-    margin:0 0 0 4px;
-    display:inline;
-}*/
-
 /* Forms
 ----------------------------------------------------------*/
 
@@ -176,25 +139,25 @@ input[type="submit"], input[type="button"], .button {
 }
 
 
-#contentMain {
+#content {
 	float:left;
 	margin:0 0 0 27px;
 	width:520px;
 	min-height:555px;
 }
 
-#sideBar1 {
+#sidebar {
 	float:right;
 	margin:8px 12px 0 0;
 	width:325px;
 }
 
-#sideBar1 h3 {
+#sidebar h3 {
 	border-bottom:1px solid #f1f1f1;
 }
 
 
-#contentMain ul,#sideBar1 ul {
+#content ul,#sideBar1 ul {
 	list-style:none;
 	line-height:normal;
 }

src/Orchard.Web/Themes/Times/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx

@@ -0,0 +1,7 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Blog>>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<%@ Import Namespace="Orchard.Blogs.Extensions"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
+<div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
+<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>

src/Orchard.Web/Themes/Times/Views/DisplayTemplates/Items/Blogs.Blog.ascx

@@ -0,0 +1,9 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Blog>>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<%@ Import Namespace="Orchard.Blogs.Extensions"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<h1><%=Html.TitleForPage(Model.Item.Name) %></h1>
+<div class="manage"><a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit"><%=_Encoded("Edit") %></a></div>
+<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>
+<% Html.Zone("primary");
+   Html.ZonesAny(); %>

src/Orchard.Web/Themes/Times/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx

@@ -0,0 +1,9 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
+<%@ Import Namespace="Orchard.ContentManagement"%>
+<%@ Import Namespace="Orchard.Core.Common.Models"%>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<%@ Import Namespace="Orchard.Blogs.Extensions"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<h3><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug)) %></h3>
+<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%=Html.Link(_Encoded("?? comments").ToString(), "") %></div>
+<div class="postsummary"><%=Model.Item.As<BodyAspect>().Text ?? string.Format("<p><em>{0}</em></p>", _Encoded("there's no content for this blog post"))%></div>

src/Orchard.Web/Themes/Times/Views/DisplayTemplates/Items/Pages.Page.ascx

@@ -0,0 +1,12 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
+<%@ Import Namespace="Orchard.Mvc.Html"%>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
+<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {pageSlug = Model.Item.Slug}) %>" class="ibutton edit"><%=_Encoded("edit")%></a></div>
+<div class="metadata">
+    <div class="posted">Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%></div>
+</div>
+<% Html.Zone("primary");
+   Html.ZonesAny(); %>
+
+   

src/Orchard.Web/Themes/Times/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx

@@ -0,0 +1,5 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<ContentItemViewModel<BlogPost>>>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<%=Html.UnorderedList(Model, (bp, i) => Html.DisplayForItem(bp).ToHtmlString(), "blogPosts contentItems") %>
+<% if (Model.Count() < 1) { %><p><%=_Encoded("There are no posts for this blog.") %></p><% } %>

src/Orchard.Web/Themes/Times/Views/layout.ascx

@@ -15,13 +15,13 @@
         <% Html.Include("user"); %>
     </div>
     <div id="main">
-        <div id="contentMain">
+        <div id="content">
 
                     <%--Main Content--%>
                     <%Html.ZoneBody("content");%>
 
         </div>
-        <div id="sideBar1">
+        <div id="sidebar">
             <ul>
                 <li>
                     <h3>

src/Orchard.Web/Views/Home/Index.ascx

@@ -1,5 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
 <% Html.AddPageClassNames("home"); %>
-<h1><%=Html.Encode(Html.SiteName()) %></h1>
+<h1>Welcome to Orchard</h1>
-<h2><%=Html.Encode(ViewData["Message"]) %></h2>
 <p>To learn more about Orchard visit <a href="http://orchardproject.net" title="Orchard Project">http://orchardproject.net</a>.</p>