Updates to the new theme.

--HG--
branch : dev

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

@@ -103,7 +103,7 @@ h4 img, h5 img, h6 img {
 }
 
 p {
-	font-size:1.2em;
+	font-size:1.3em;
 	line-height:2em;
 }
 
@@ -145,6 +145,51 @@ nav ul li a {
 /* Forms
 ***************************************************************/
 
+input[type=text],
+input.text, input.title, 
+textarea, select { 
+  background-color:#fff; 
+  border:1px solid #bbb; 
+}
+input[type=text]:focus, 
+input.text:focus, input.title:focus, 
+textarea:focus, select:focus { 
+  border-color:#a5cc7a;
+  background-color: #fbfff7;
+}
+
+input[type=text], 
+input.text, input.title,
+textarea, select {
+  margin:0.5em 0;
+}
+
+input.text, 
+input.title   { width: 300px; padding:5px; }
+input.title   { font-size:1.5em; }
+textarea      { padding:5px; }
+
+input[type=checkbox], input[type=radio], 
+input.checkbox, input.radio { 
+  position:relative; top:.25em; 
+}
+
+/* TODO: Causes form rendering issues with theme preview, had to add line-height: normal */
+form.inline { line-height: normal; }
+form.inline p { margin-bottom:0; }
+
+
+/*- Login Control -*/
+
+.login-form { border: solid 1px #e2e2e2; padding: 20px; font-size: 1.2em; font-weight: normal; }
+.login-form div { padding: 5px 0px 5px 0px; }
+.login-form input[type=submit] { margin: 5px 0px 5px 0px; }
+.validation-summary-errors { padding: 20px 20px 0px 20px; border: solid 1px #fff54f; background-color: #fffcca; margin-bottom: 20px; }
+
+.edit-form { display: none; }
+.static_text_div { border: dashed 1px #CCCCCC; display:block; color: inherit; }
+.static_text_div:hover { border: dashed 1px red; color: inherit; }
+
 /* Misc
 ***************************************************************/
 
@@ -154,28 +199,49 @@ nav ul li a {
 	border:1px solid #CCC;
 }
 
-
 /* Sidebar off - Content Zone 960 */
 #content {
-	background-color:#e8e8e8;
-	width: 960px;
     clear:both;
+    padding:12px;
 }
 
-/* Sidebar on - Content Zone 640 */
-.icanhassidebar #content {
+/* Sidebar on - Content Zone 600 */
+.has-sidebar #content {
 	background-color:#e8e8e8;
-	width: 640px;
+	width: 582px;
+    padding:12px 6px 6px 12px;
 	float:left;
     clear:both;
 }
 
 .sidebar {
     background-color:#f6f6f6;
-    width: 320px;
+    width: 360px;
 	float:right;
 }
 
 #sitemap {
     clear:both;
+}
+
+.zone {
+    padding:6px;
+}
+
+/* Featured Zone - switch to an image */
+
+.featuredimage {
+    float:left;
+    border: 1px solid #ccc;
+    width: 462px;
+    height: 240px;
+    margin: 6px;
+}
+
+/* Recent Zone */
+
+#zone-recent ul li {
+    float:left;
+    width: 462px;
+    margin: 6px;
 }

src/Orchard.Web/Themes/TheThemeMachine/Theme.txt

@@ -4,4 +4,4 @@ Description: It's a *really* good theme, yo.
 Version: 0.1
 Tags: Awesome
 Website: http://orchardproject.net
-Zones: Header, Navigation, Messages, Featured, ..., Footer
+Zones: Header, Navigation, Messages, Featured, Recent, Footer

src/Orchard.Web/Themes/TheThemeMachine/Views/Content.cshtml

@@ -0,0 +1 @@
+Chili

src/Orchard.Web/Themes/TheThemeMachine/Views/Featured.cshtml

@@ -0,0 +1,15 @@
+<!-- zone: featured -->
+<div class="featuredimage">Image</div>
+    <article class="featured-blogpost">
+        <header>
+            <!-- // example // -->
+            @if(HasText(Model.Title)) {
+            <h1>@Model.Title</h1>
+            }
+            else {
+            <h1>@Model.insertMessage</h1>
+            }
+        </header>
+        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ultrices vehicula nibh quis varius. Donec tincidunt, purus at tincidunt elementum, justo nisi rhoncus metus, quis bibendum lorem nunc at dolor. Sed scelerisque aliquet leo sed semper. Donec accumsan, nibh at consectetur rhoncus, odio justo imperdiet risus, quis pretium tortor dolor vel dolor.</p>
+    </article>
+<!-- /zone: featured -->

src/Orchard.Web/Themes/TheThemeMachine/Views/Layout-Blog.cshtml

@@ -0,0 +1,79 @@
+@{
+    Style.Include("site.css");
+
+    // cool stuff goes up here
+    var homeUrl = Href("~/");
+
+    // Zone is an alias for Display
+    Func<dynamic, dynamic> Zone = x => Display(x);
+
+    if (Model.Sidebar != null) {
+        Html.AddPageClassNames(new[]{"icanhassidebar"});
+    }
+}
+<div id="layout-wrapper">
+    <header id="layout-header">
+        @* needs to be the page title, not page (head) title... *@
+        <h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
+        @if(Model.Header != null) {
+        <div id="header">
+            @Zone(Model.Header)
+        </div>
+        }
+        @if(Model.Navigation != null) {
+        <div id="navigation">
+            @Zone(Model.Navigation)
+        </div>
+        }
+    </header>
+    @if(Model.Messages != null) {
+    <div id="messages">
+        @Zone(Model.Messages)
+    </div>
+    }
+
+   @* This code would inject text into the Featured zone.
+    @{WorkContext.Layout.Featured.Add("just some text in featured");}
+  *@
+
+  @{
+  WorkContext.Layout.Featured.Add(New.Featured(insertMessage:"This is a featured blog post."));
+  }
+
+    @if(Model.Featured != null) {
+    <div id="featured" class="group">
+        @Zone(Model.Featured)
+    </div>
+    }
+
+    @* the model content for the page is in the Content zone @ the default position (nothing, zero, zilch) *@
+    @if(Model.Content == null) {
+    <div id="content">
+        @Zone(Model.Content)
+    </div>
+    }
+    else {
+    <div id="content">
+        Let's take over the home page
+    </div>
+    }
+
+    @if(Model.Sidebar != null) {
+    <aside class="sidebar">
+        @Zone(Model.Sidebar)
+    </aside>
+    }
+
+    @if(Model.Footer != null) {
+    <footer>
+        @Zone(Model.Footer)
+    </footer>
+    }
+    else {
+    <footer id="sitemap">
+    Powered by Orchard @Display.User()
+    </footer>
+}
+
+
+</div>

src/Orchard.Web/Themes/TheThemeMachine/Views/Layout-homePage.cshtml

@@ -0,0 +1,87 @@
+@{
+    Style.Include("site.css");
+
+    // cool stuff goes up here
+    var homeUrl = Href("~/");
+
+    // Zone is an alias for Display
+    Func<dynamic, dynamic> Zone = x => Display(x);
+
+    if (Model.Sidebar != null) {
+        Html.AddPageClassNames(new[]{"has-sidebar"});
+    }
+}
+<div id="layout-wrapper">
+    <header id="layout-header">
+        @* needs to be the page title, not page (head) title... *@
+        <h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
+        @if(Model.Header != null) {
+        <div id="header">
+            @Zone(Model.Header)
+        </div>
+        }
+        @if(Model.Navigation != null) {
+        <div id="navigation">
+            @Zone(Model.Navigation)
+        </div>
+        }
+    </header>
+    @if(Model.Messages != null) {
+    <div id="messages">
+        @Zone(Model.Messages)
+    </div>
+    }
+
+ @* This code would inject text into the Featured zone.
+    @{WorkContext.Layout.Featured.Add("just some text in featured");}
+*@
+
+  @{
+  WorkContext.Layout.Featured.Add(New.Featured(insertMessage:"This is a featured blog post."));
+  }
+  @if(Model.Featured != null) {
+    <div class="group">
+        @Zone(Model.Featured)
+    </div>
+    }
+
+  @{
+  WorkContext.Layout.Recent.Add(New.Recent());
+  }
+  @if(Model.Featured != null) {
+     <div class="zone-featured zone group">
+        @Zone(Model.Recent)
+    </div>
+    }
+
+    @* the model content for the page is in the Content zone @ the default position (nothing, zero, zilch) *@
+    @if(Model.Content != null) {
+    <div id="content" class="group">
+        @Zone(Model.Content)
+    </div>
+    }
+    else {
+    <div id="content" class="group">
+        Let's take over the home page
+    </div>
+    }
+
+    @if(Model.Sidebar != null) {
+    <aside class="sidebar">
+        @Zone(Model.Sidebar)
+    </aside>
+    }
+
+    @if(Model.Footer != null) {
+    <footer>
+        @Zone(Model.Footer)
+    </footer>
+    }
+    else {
+    <footer id="sitemap">
+    Powered by Orchard @Display.User()
+    </footer>
+}
+
+
+</div>

src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml

@@ -8,14 +8,10 @@
     Func<dynamic, dynamic> Zone = x => Display(x);
 
     if (Model.Sidebar != null) {
-        Html.AddPageClassNames(new[]{"icanhassidebar"});
+        Html.AddPageClassNames(new[]{"has-sidebar"});
     }
-
-    WorkContext.Layout.Featured.Add(New.TempFeatured(Hello:"bob"));
-    WorkContext.Layout.Featured.Add("just some text in featured");
 }
 <div id="layout-wrapper">
-@Display.User()
     <header id="layout-header">
         @* needs to be the page title, not page (head) title... *@
         <h1><a href="@homeUrl">@WorkContext.CurrentSite.SiteName</a></h1>
@@ -35,25 +31,57 @@
         @Zone(Model.Messages)
     </div>
     }
-    @if(Model.Featured != null) {
-    <div id="featured">
+
+ @* This code would inject text into the Featured zone.
+    @{WorkContext.Layout.Featured.Add("just some text in featured");}
+*@
+
+  @{
+  WorkContext.Layout.Featured.Add(New.Featured(insertMessage:"This is a featured blog post."));
+  }
+  @if(Model.Featured != null) {
+     <div class="zone-featured group">
         @Zone(Model.Featured)
     </div>
     }
+
+  @{
+  WorkContext.Layout.Recent.Add(New.Recent());
+  }
+  @if(Model.Featured != null) {
+    <div class="group">
+        @Zone(Model.Recent)
+    </div>
+    }
+
     @* the model content for the page is in the Content zone @ the default position (nothing, zero, zilch) *@
     @if(Model.Content != null) {
-    <div id="content">
+    <div id="content" class="group">
         @Zone(Model.Content)
     </div>
     }
+    else {
+    <div id="content" class="group">
+        Let's take over the home page
+    </div>
+    }
+
     @if(Model.Sidebar != null) {
     <aside class="sidebar">
         @Zone(Model.Sidebar)
     </aside>
     }
 
-    <footer id="sitemap">
-       Powered by Awesomeness...
+    @if(Model.Footer != null) {
+    <footer>
+        @Zone(Model.Footer)
     </footer>
+    }
+    else {
+    <footer id="sitemap">
+    Powered by Orchard @Display.User()
+    </footer>
+}
+
 
 </div>

src/Orchard.Web/Themes/TheThemeMachine/Views/Recent.cshtml

@@ -0,0 +1,22 @@
+<!-- zone: recent -->
+<section class="posts-recent">
+    <ul>
+        <li class="first">
+            <article>
+                <header>
+                    <h1>Another recent post title</h1>
+                </header>
+                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent magna ante, accumsan at blandit et, posuere imperdiet sapien. Praesent condimentum laoreet justo non semper. Cras molestie fermentum turpis, in ornare eros mollis non. Sed a ligula sit amet mauris ultrices hendrerit ac vitae quam. Integer sit amet lorem vitae velit accumsan suscipit. Nulla mi nulla, congue eget euismod eget, ultrices in mauris. Mauris leo turpis, malesuada mattis feugiat ut, convallis in neque. Maecenas iaculis consequat interdum. Sed fermentum dolor quis ante interdum in sollicitudin lorem sollicitudin. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
+            </article>
+        </li>
+        <li class="last">
+            <article>
+                <header>
+                    <h1>Another recent post title</h1>
+                </header>
+                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent magna ante, accumsan at blandit et, posuere imperdiet sapien. Praesent condimentum laoreet justo non semper. Cras molestie fermentum turpis, in ornare eros mollis non. Sed a ligula sit amet mauris ultrices hendrerit ac vitae quam. Integer sit amet lorem vitae velit accumsan suscipit. Nulla mi nulla, congue eget euismod eget, ultrices in mauris. Mauris leo turpis, malesuada mattis feugiat ut, convallis in neque. Maecenas iaculis consequat interdum. Sed fermentum dolor quis ante interdum in sollicitudin lorem sollicitudin. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
+            </article>
+        </li>
+    </ul>
+</section>
+<!-- /zone: recent -->

src/Orchard.Web/Themes/TheThemeMachine/Views/TempFeatured.cshtml

@@ -1 +0,0 @@
-<h1>I am temp featured!! Hello, @Model.Hello</h1>