From b2cb4e691e5cec574d266aa5a3e65c4be0312f99 Mon Sep 17 00:00:00 2001
From: Jonathan Wall <jowall@microsoft.com>
Date: Mon, 8 Mar 2010 17:10:12 -0800
Subject: [PATCH] Added widgets to the green theme home page. Removed sidebar
 files.

--HG--
branch : dev
---
 .../Themes/Green/DesignerNotes/Sidebar.html   |  8 ------
 .../Themes/Green/DesignerNotes/Sidebar1.html  |  7 -----
 .../Themes/Green/DesignerNotes/Widget.html    |  2 ++
 .../Themes/Green/DesignerNotes/Widget1.html   |  2 ++
 src/Orchard.Web/Themes/Green/Styles/site.css  | 26 ++++++++++++-------
 .../Themes/Green/Views/Layout.HomePage.ascx   | 16 ++++++++++++
 .../Themes/Green/Views/Layout.ascx            | 12 +++++----
 7 files changed, 44 insertions(+), 29 deletions(-)
 delete mode 100644 src/Orchard.Web/Themes/Green/DesignerNotes/Sidebar.html
 delete mode 100644 src/Orchard.Web/Themes/Green/DesignerNotes/Sidebar1.html
 create mode 100644 src/Orchard.Web/Themes/Green/DesignerNotes/Widget.html
 create mode 100644 src/Orchard.Web/Themes/Green/DesignerNotes/Widget1.html

diff --git a/src/Orchard.Web/Themes/Green/DesignerNotes/Sidebar.html b/src/Orchard.Web/Themes/Green/DesignerNotes/Sidebar.html
deleted file mode 100644
index 17b4d1c8c..000000000
--- a/src/Orchard.Web/Themes/Green/DesignerNotes/Sidebar.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-   <li>
-        <h4 class="collapsible">Item 1</h4>
-        <p class="small">
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor
-            vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur
-            blandit leo nec magna dictum vitae mollis tellus gravida.</p>
-    </li>
diff --git a/src/Orchard.Web/Themes/Green/DesignerNotes/Sidebar1.html b/src/Orchard.Web/Themes/Green/DesignerNotes/Sidebar1.html
deleted file mode 100644
index d0daff819..000000000
--- a/src/Orchard.Web/Themes/Green/DesignerNotes/Sidebar1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-    <li>
-        <h4 class="collapsible">Item 2</h4>
-        <p class="small">
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor
-            vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur
-            blandit leo nec magna dictum vitae mollis tellus gravida.</p>
-    </li>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Green/DesignerNotes/Widget.html b/src/Orchard.Web/Themes/Green/DesignerNotes/Widget.html
new file mode 100644
index 000000000..1481077ae
--- /dev/null
+++ b/src/Orchard.Web/Themes/Green/DesignerNotes/Widget.html
@@ -0,0 +1,2 @@
+<h4 class="collapsible">Lorem ipsum</h4>
+<p class="small">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur blandit leo nec magna dictum vitae mollis tellus gravida.</p>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Green/DesignerNotes/Widget1.html b/src/Orchard.Web/Themes/Green/DesignerNotes/Widget1.html
new file mode 100644
index 000000000..90adce2c5
--- /dev/null
+++ b/src/Orchard.Web/Themes/Green/DesignerNotes/Widget1.html
@@ -0,0 +1,2 @@
+<h4 class="collapsible">Lorem ipsum</h4>
+<p class="small">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas adipiscing dolor vel nunc molestie laoreet. Curabitur vitae elit et massa consequat interdum. Curabitur blandit leo nec magna dictum vitae mollis tellus gravida.</p>
diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css
index 6b9043c5d..2cbd51e72 100644
--- a/src/Orchard.Web/Themes/Green/Styles/site.css
+++ b/src/Orchard.Web/Themes/Green/Styles/site.css
@@ -175,7 +175,7 @@ colgroup
 #bd {
     min-height:500px;
     background:#fff;
-    padding: 20px;
+    padding: 20px 0 20px 20px;
     -webkit-border-top-left-radius: 6px;    /* for Safari */
     -webkit-border-top-right-radius: 6px;
 	-moz-border-radius-topleft: 6px;       /* for Firefox */
@@ -208,27 +208,35 @@ colgroup
 	}
 
 #subcolumn {
-    padding:4px 0 12px 0;
+    padding:4px 20px 12px 0;
     }
     
-#subcolumn h4 {
-    /*margin:6px 0 0 6px;*/
+#subcolumn h4, .homeWidget h4 {
     padding:6px 0 8px 6px;
     background:#CED5CE;
-    }
+}
+
+#subcolumn h4:hover, .homeWidget h4:hover {
+    padding:6px 0 8px 6px;
+    background:#CED5CE;
+    cursor:pointer;
+    }  
     
 #subcolumn p {
     padding:8px;
     }
     
-#subcolumn ul li {
+#subcolumn ul li, .homeWidget {
      border:1px solid #CACEC6;
+     background:#EAF0E8;
     -webkit-border-radius: 6px;
     -moz-border-radius: 6px;
-	/*padding:8px;*/
-	margin: 0 0 12px 0;
+	margin: 0 0 18px 0;
     }
-
+    
+div.homeWidget {
+	margin:24px 0;
+}
 
 /* contentItems is the generic class for all content items - e.g. blogs uses this for the unordered lists to display posts */
     
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
index 6015190d5..fcaf3d51f 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
@@ -7,6 +7,15 @@
     Html.RegisterStyle("site.css");
     Html.RegisterStyle("blog.css");
     %>
+    
+<script type="text/javascript"> 
+$(document).ready(function(){
+$(".collapsible").click(function() {
+$(this).next().slideToggle(600);
+return false;
+ });
+}); 
+</script>
 
 <div id="doc4" class="yui-t6">
 
@@ -36,6 +45,13 @@
         <div class="yui-g">
           <%--Main Content--%>
           <%Html.ZoneBody("content");%>
+           <div class="yui-u first homeWidget">
+               <%Html.Zone("Widget"); %>
+	    </div>
+        <div class="yui-u homeWidget">
+                <%Html.Zone("Widget1"); %>
+	    </div>
+
         </div>
       </div>
     </div>
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.ascx
index c88049db9..00da09e8f 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.ascx
@@ -14,8 +14,7 @@ $(".collapsible").click(function() {
 $(this).next().slideToggle(600);
 return false;
  });
-});
-     
+}); 
 </script>
 
 <div id="doc4" class="yui-t6">
@@ -52,10 +51,13 @@ return false;
     <div id="subcolumn" class="yui-b">
     
 <div>
-<h3>Sidebar</h3>
 <ul>
-    <%Html.Zone("Sidebar"); %>
-    <%Html.Zone("Sidebar1"); %>
+<li>
+    <%Html.Zone("Widget"); %>
+</li>
+<li>
+    <%Html.Zone("Widget1"); %>
+</li>
 </ul>
 </div>