Merge

--HG--
branch : dev

src/Orchard.Web/Themes/Orchard.Themes.csproj

@@ -217,6 +217,10 @@
     <Content Include="TheAdmin\Theme.png" />
     <Content Include="TheAdmin\Views\User.cshtml" />
     <Content Include="TheAdmin\Views\Header.cshtml" />
+    <Content Include="TheThemeMachine\Views\Items\BlogPost.Summary.cshtml" />
+    <Content Include="TheThemeMachine\Views\Items\BlogPost.cshtml">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="TheThemeMachine\Views\Layout.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -192,6 +192,11 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
    border-top: 1px solid #dbdbdb;    
 }
 
+#layout-before-main 
+{
+	border-bottom: 1px solid #dbdbdb;
+}
+
 #layout-main 
 {
     border-top: 1px solid #fff;
@@ -199,7 +204,7 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:
 
 #layout-after-main 
 {
-    border-top: 1px solid #dbdbdb;    
+	 
 }
 
 
@@ -245,6 +250,10 @@ nav ul
 {
 	border-top: 1px solid #dbdbdb;              
 }
+	#footer-sig 
+	{
+		
+	}
 
 /* Zones */
 /*.zone {
@@ -299,6 +308,11 @@ nav ul
 	float:left;
 }
 
+/* Blogs */
+
+.blog-post {}
+.blog-post-title {}
+.meta {}
 
 
 /* Secondary
@@ -468,33 +482,25 @@ article.comment p.text {
 
 #layout-tripel div {
      float:left;
+     width:960px;
      /*padding:12px 6px 0 6px;*/
 }
 
-/*1 zone on */
-.tripel-1 #tripel-first { width:960px; }
-
-/*2 zone on */
-.tripel-2 #tripel-second { width:960px; }
-
-/*3 zone on */
-.tripel-3 #tripel-third { width:960px; }
-
 /*2 zones on */
 
 /* If zones 1, 2 are on */
-.tripel-12 #tripel-first, .tripel-12 #tripel-second { width:480px; }
+.tripel-12 #layout-tripel div { width:480px; }
 
 /* If zones 2, 3 are on */
-.tripel-23 #tripel-second, .tripel-23 #tripel-third { width:480px; }
+.tripel-23 #layout-tripel div { width:480px; }
 
 /* If zones 1, 3 are on */
-.tripel-13 #tripel-first, .tripel-13 #tripel-third { width:480px; }
+.tripel-13 #layout-tripel div { width:480px; }
 
 /*3 zones on */
 
 /* If zones 1, 2, 3 are on */
-.tripel-123 #tripel-first, .tripel-123 #tripel-second, .tripel-123 #tripel-third { width:320px; }
+.tripel-123 #layout-tripel div { width:320px; }
 
 
 

src/Orchard.Web/Themes/TheThemeMachine/Views/Items/BlogPost.Summary.cshtml

@@ -0,0 +1,15 @@
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
+@using Orchard.Core.Common.Extensions;
+@using Orchard.Core.Common.Models;
+@using Orchard.Core.Common.ViewModels;
+
+<h2>@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h2>
+
+<!-- TODO: Meta should be it's own shape and not part of the blog summary view. Theme authors will need access to it. -->
+<div class="meta">
+    @Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T)
+    @Display(Model.meta)
+</div>
+
+<div class="content">@Display(Model.Content)</div>

src/Orchard.Web/Themes/TheThemeMachine/Views/Items/BlogPost.cshtml

@@ -0,0 +1,11 @@
+<div class="blog-post @Display(Model.Slug)">
+    <h1 class="blog-post-title">@Html.TitleForPage((string)Model.Title)</h1>
+    @if (Model.Meta != null) {
+    <div class="meta">
+        @Display(Model.Meta)
+    </div>
+    }
+    <div class="content">
+        @Display(Model.Content)
+    </div>
+</div>