From d703cfbc105bd77604926503e83458e15468bc11 Mon Sep 17 00:00:00 2001
From: jowall <jowall@microsoft.com>
Date: Tue, 2 Mar 2010 15:19:28 -0800
Subject: [PATCH] Made page titles on manage pages links. Removed branding from
 green theme.

--HG--
branch : dev
---
 .../Modules/Orchard.Pages/Views/Admin/List.aspx   |  2 +-
 src/Orchard.Web/Themes/Green/Styles/site.css      | 15 +++++----------
 src/Orchard.Web/Themes/Green/Views/Footer.ascx    |  6 +++---
 .../Themes/Green/Views/Layout.HomePage.ascx       |  2 +-
 src/Orchard.Web/Themes/Green/Views/Layout.ascx    |  2 +-
 src/Orchard.Web/Themes/TheAdmin/Styles/site.css   |  3 +++
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx
index 4f1048773..692ee6faa 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx
@@ -42,7 +42,7 @@ foreach (var pageEntry in Model.PageEntries)
         <input type="hidden" value="<%=Model.PageEntries[pageIndex].PageId %>" name="<%=Html.NameOf(m => m.PageEntries[pi].PageId) %>"/>
                     <input type="checkbox" value="true" name="<%=Html.NameOf(m => m.PageEntries[pi].IsChecked) %>"/>
                     
-                    <h3 style="display:inline;"><%=Html.Encode(pageEntry.Page.Title ?? T("(no title)").ToString())%></h3>
+                    <h3><%=Html.ActionLink(pageEntry.Page.Title, "Edit", new { id = pageEntry.PageId })%></h3>
      
         <ul class="pageStatus">
             <li><%--Published or not--%>
diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css
index 5055311d8..ae1bfa9bd 100644
--- a/src/Orchard.Web/Themes/Green/Styles/site.css
+++ b/src/Orchard.Web/Themes/Green/Styles/site.css
@@ -183,19 +183,14 @@ colgroup
     }
     
 #hd  h1 {
-	margin: 0px;	
+	margin: 18px 0 0 20px;
+	font-size: 240%;
+	font-weight:700;
 }
 
 #hd  h1 a {
-	background:url(../Content/Images/logo.png) no-repeat top left;
-	display: block;
-	float:left;
-	width:270px;
-	height:80px;
-	top:0px;
-	margin: 0px;
-	position:relative;
-	z-index:0;
+    color:#547753;
+    text-decoration:none;
 }
 
 #branding {
diff --git a/src/Orchard.Web/Themes/Green/Views/Footer.ascx b/src/Orchard.Web/Themes/Green/Views/Footer.ascx
index 8839f3248..a7ecfbea2 100644
--- a/src/Orchard.Web/Themes/Green/Views/Footer.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Footer.ascx
@@ -7,13 +7,13 @@
  <div id="ft" role="contentinfo">
   <div id="innerft" class="yui-g">
 	<div class="yui-u first">
-	<h5>About AdventureWorks</h5>
+	<h5>About <%=Html.Encode(Html.SiteName()) %></h5>
             <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam nec nisi vel eros ornare auctor. Aenean vitae nulla. Sed in velit sit amet metus sollicitudin porttitor. Fusce non tortor. Nunc ornare imperdiet mauris. Nulla facilisi. In hac habitasse platea dictumst. Praesent pellentesque iaculis orci. Ut imperdiet dolor non turpis. In hac habitasse platea dictumst. <a href="#">More...</a>
             </p>
 	</div>
     <div class="yui-g">
         <div class="yui-u first">
-	<h5>Need Help?</h5>
+	<h5>Lorem ipsum</h5>
             <ul  class="square">
                 <li><a href="#">Lorem ipsum</a></li>
                 <li><a href="#">Lorem ipsum</a></li>
@@ -23,7 +23,7 @@
             </ul>
 	        </div>
         <div class="yui-u">
-	<h5>Company Info</h5>
+	<h5>Lorem ipsum</h5>
             <ul  class="square">
                 <li><a href="#">Lorem ipsum</a></li>
                 <li><a href="#">Lorem ipsum</a></li>
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
index 0a2d9daa2..0115d6f84 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
@@ -15,7 +15,7 @@
 <div id="hd" role="banner">
     <div class="yui-g" id="branding">
         <div class="yui-u first">
-            <h1><a href="/" title="Go to Home"><span class="displayText">AdventureWorks</span></a></h1>
+            <h1><a href="/" title="Go to Home"><%=Html.Encode(Html.SiteName()) %></a></h1>
         </div>
         <div class="yui-u">
             <div id="logIn">
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.ascx
index 380d685c3..3a7881187 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.ascx
@@ -15,7 +15,7 @@
 <div id="hd" role="banner">
     <div class="yui-g" id="branding">
         <div class="yui-u first">
-            <h1><a href="/" title="Go to Home"><span class="displayText">AdventureWorks</span></a></h1>
+            <h1><a href="/" title="Go to Home"><%=Html.Encode(Html.SiteName()) %></a></h1>
         </div>
         <div class="yui-u">
             <div id="logIn">
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 76a626915..603ed0f24 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -813,4 +813,7 @@ table.items, textarea, input.text, input.text-box,
 .contentItems .properties ul.pageStatus li {
     margin:0;
     padding:0 0 .1em 0;
+}
+.properties h3 {
+    display:inline;
 }
\ No newline at end of file