From 0c71dc6611a5f38920a04db054a068162b3faf77 Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Wed, 27 Jan 2010 23:10:27 +0000
Subject: [PATCH] Some Comments UI work

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4046029
---
 src/Orchard.Web/Core/Themes/Styles/site.css   | 29 ++++++++-----------
 .../Items/Blogs.Blog.Summary.ascx             |  4 +--
 .../Parts/Comments.HasComments.ascx           | 13 ++++-----
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/Orchard.Web/Core/Themes/Styles/site.css b/src/Orchard.Web/Core/Themes/Styles/site.css
index 03fdeaaef..0840a125e 100644
--- a/src/Orchard.Web/Core/Themes/Styles/site.css
+++ b/src/Orchard.Web/Core/Themes/Styles/site.css
@@ -49,13 +49,12 @@ h1, h2, h3, h4, h5, h6
 
 .home h1
 {
-    font-size: 2em;
     padding-bottom: 0;
     margin-bottom: 0;
 }
 h1
 {
-    padding: 0 0 10px 0;
+    font-size: 2em;
 }
 h3
 {
@@ -70,13 +69,6 @@ h5, h6
     font-size: 1em;
 }
 
-/* this rule styles <h2> tags that are the 
-first child of the left and right table columns */
-.rightColumn > h1, .rightColumn > h2, .leftColumn > h1, .leftColumn > h2
-{
-    margin-top: 0;
-}
-
 /* PRIMARY LAYOUT ELEMENTS   
 ----------------------------------------------------------*/
 
@@ -111,7 +103,7 @@ page width. Or, you can specify an exact pixel width. */
 
 #main
 {
-    padding: 30px 30px 15px 30px;
+    padding: 15px 30px 30px;
     background-color: #fff;
     margin-bottom: 30px;
     overflow:auto;
@@ -341,10 +333,7 @@ div#title
 }
 .metadata {
     color:#999;
-    margin-top:-2em;
-}
-.blog.metadata {
-    margin-top:-1.5em;
+    margin-top:-1em;
 }
 .metadata, p.tags {
     font-size:95%;
@@ -457,9 +446,14 @@ form.comment fieldset.who, form.comment fieldset.what {
     float:left;
     margin-right:15px;
 }
+form.comment  p.who {
+    font-weight:bold;
+    margin:0;
+}
 form.comment label {
     font-weight:bold;
     margin-top:15px;
+    line-height:1.6em;
 }
 form.comment .button {
     margin-top:15px;
@@ -480,18 +474,19 @@ ul.tagCloud li {
 ----------------------------------------------------------*/
 .contentItems {
     background:#FFF;
-    margin:1.4em 0;
-    padding:2px;
+    margin:0;
+    padding:0;
 }
 .contentItems li {
     background:#FFF;
     border-bottom:1px solid #E0E8EF;
     margin:0;
     overflow:hidden;
-    padding:.7em 0;
+    padding:0 0 .7em;
 }
 .contentItems li.last {
     border-bottom:0;
+    padding-bottom:0;
 }
 .contentItems li h3 {
     border-bottom:0;
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
index 80fd49000..14be9a7ca 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
@@ -3,5 +3,5 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h2><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h2>
-<div class="blog metadata"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%Html.Zone("meta");%><%--<%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%>--%></a></div>
-<p><%=Html.Encode(Model.Item.Description) %></p>
\ No newline at end of file
+<% if (!string.IsNullOrEmpty(Model.Item.Description)) { %><p><%=Html.Encode(Model.Item.Description) %></p><% } %>
+<div class="blog metadata"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%> | <%Html.Zone("meta");%></div>
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
index 121fd9f8d..bcd215698 100644
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
@@ -7,10 +7,9 @@ if (Model.CommentsActive == false) { %>
 } else { %>
     <% using(Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { %>
         <%=Html.ValidationSummary() %>
-        <fieldset class="who"><% 
-    if (Request.IsAuthenticated) { %>
-            <p><%=Html.Encode(Page.User.Identity.Name)%></p><%
-    } else { %>
+        <% 
+    if (!Request.IsAuthenticated) { %>
+        <fieldset class="who">
             <div>
                 <label for="Name"><%=_Encoded("Name") %></label>
                 <input id="Name" class="text" name="Name" type="text" />
@@ -22,12 +21,12 @@ if (Model.CommentsActive == false) { %>
             <div>
                 <label for="SiteName"><%=_Encoded("Url") %></label>
                 <input id="SiteName" class="text" name="SiteName" type="text" />
-            </div><%    
+            </div>
+        </fieldset><%    
     } %>
-        </fieldset>
         <fieldset class="what">
             <div>
-                <label for="CommentText"><%=_Encoded("Leave a comment") %></label>
+                <label for="CommentText"><% if (Request.IsAuthenticated) { %><%=T("Hi, {0}!", Html.Encode(Page.User.Identity.Name)) %><br /><% } %><%=_Encoded("Leave a comment") %></label>
                 <textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
             </div>
             <div>