From 274b96449b6bf104170a6f4b530bc822ad4392ae Mon Sep 17 00:00:00 2001
From: Michael Dorian Bach <mibach@microsoft.com>
Date: Tue, 9 Mar 2010 20:55:06 -0800
Subject: [PATCH] Updated Cotoso theme CSS. Fixed triple site name in page
 title. Removed trailing "Author" content at the end of blog pages.

--HG--
branch : dev
---
 src/Orchard.Web/Themes/Contoso/Styles/site.css                 | 2 +-
 .../Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx       | 3 +--
 .../Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx   | 3 +--
 src/Orchard.Web/Themes/Contoso/Views/Footer.ascx               | 2 +-
 src/Orchard.Web/Themes/Contoso/Views/Header.ascx               | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Orchard.Web/Themes/Contoso/Styles/site.css b/src/Orchard.Web/Themes/Contoso/Styles/site.css
index e7c787138..a35cd399b 100644
--- a/src/Orchard.Web/Themes/Contoso/Styles/site.css
+++ b/src/Orchard.Web/Themes/Contoso/Styles/site.css
@@ -59,7 +59,7 @@ blockquote, q {
     visibility: hidden;
 }
 
-.group {display: inline-block;}  /* for IE/Mac */
+
 
 
 /*========= General Typography =========*/
diff --git a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx
index 4c85a96f6..59495fb28 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx
@@ -10,5 +10,4 @@
 <% Html.RegisterLink(new LinkEntry { Rel = "wlwmanifest", Type = "application/wlwmanifest+xml", Href = Url.BlogLiveWriterManifest(Model.Item.Slug) });%>
 <% Html.RegisterLink(new LinkEntry { Rel = "EditURI", Type = "application/rsd+xml", Title = "RSD", Href = Url.BlogRsd(Model.Item.Slug) });%>
 
-<% Html.Zone("primary", ":manage :metadata");
-   Html.ZonesAny(); %>
+<% Html.Zone("primary"); %>
diff --git a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
index 3a65cdeb5..fa145a0a6 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
@@ -3,5 +3,4 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h1 class="page-title"><%=Html.TitleForPage(Model.Item.Title)%></h1>
-<% Html.Zone("primary", ":manage :metadata");
-   Html.ZonesAny(); %>>
\ No newline at end of file
+<% Html.Zone("primary"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx b/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
index 8ec4420bb..d771324a5 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/Footer.ascx
@@ -2,7 +2,7 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels" %>
 <div class="footer group">
     <ul class="group">
-        <li>&copy 2010 <%=Html.TitleForPage(Html.SiteName()) %>. All rights reserved.</li>
+        <li>&copy;2010 <%= Html.Encode(Html.SiteName()) %>. All rights reserved.</li>
         <li><a href="http://www.orchardproject.net" title="Orchard Project">Powered by Orchard</a></li>
     </ul>
 </div>
diff --git a/src/Orchard.Web/Themes/Contoso/Views/Header.ascx b/src/Orchard.Web/Themes/Contoso/Views/Header.ascx
index a851da389..8e7dd961d 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/Header.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/Header.ascx
@@ -2,7 +2,7 @@
 
 <div class="header">
     <div class="brand group">
-        <div class="title"><%=Html.TitleForPage(Html.SiteName()) %></div>
+        <div class="title"><%=Html.Encode(Html.SiteName()) %></div>
         <% Html.Include("User"); %>
     </div>
 </div>