Simplified Theme

_layouts/page-fullwidth.html

@@ -25,9 +25,9 @@ format: page-fullwidth
 				<h1>{{ page.title }}</h1>
 			</header>
 
-			{% if page.description %}
+			{% if page.teaser %}
 			<p class="teaser">
-				{{ page.description }}
+				{{ page.teaser }}
 			</p>
 			{% endif %}
 			

_layouts/page.html

@@ -1,40 +1,48 @@
 ---
 layout: default
-format: page
+format: post
 ---
-{% if page.image.title %}
 <div class="row t30">
-	<div class="small-12 columns">
-		<img src="{{ site.url }}/images/{{ page.image.title }}" width="970" alt="{{ page.title escape_once }}">
-		{% if page.image.url && page.image.credit %}
-		<p class="text-right caption">
-			<a href="{{ page.image.url }}">{{ page.image.credit }}</a>
-		</p>
-		{% endif %}
-	</div><!-- /.small-12.columns -->
-</div><!-- /.row -->
-{% endif %}
+	{% if page.sidebar == "left" %}
+	<div class="medium-4 columns">
+		{% include sidebar.html %}
+	</div><!-- /.medium-4.columns -->
+	{% endif %}
 
 
-<div class="row t30">
-	<div class="medium-offset-2 medium-8 end columns">
-
+	<div class="medium-8 columns{% if page.sidebar == "" %} medium-offset-2 end{% endif %}">
 		<article>
 			<header>
+				{% if page.image.title %}<img src="{{ site.url }}/images/{{ page.image.title }}" width="970" alt="{{ page.title escape_once }}">{% endif %}
+				{% if page.image.url && page.image.credit %}
+				<p class="text-right caption">
+					<a href="{{ page.image.url }}">{{ page.image.credit }}</a>
+				</p>
+				{% endif %}
+
 				{% if page.subheadline %}<p class="subheadline">{{ page.subheadline }}</p>{% endif %}
 				<h1>{{ page.title }}</h1>
 			</header>
 
-			{% if page.description %}
+
+			{% if page.teaser %}
 			<p class="teaser">
-				{{ page.description }}
+				{{ page.teaser }}
 			</p>
 			{% endif %}
-			
+
 			{{ content }}
+
+			{% if page.show_metadata == true %}
+			{% include meta_information.html %}
+			{% endif %}
 		</article>
-
 	</div><!-- /.medium-8.columns -->
+
+
+	{% if page.sidebar == "right" %}
+	<div class="medium-4 columns">
+		{% include sidebar.html %}
+	</div><!-- /.medium-4.columns -->
+	{% endif %}
 </div><!-- /.row -->
-
-

_layouts/post-left-sidebar.html

@@ -1,35 +0,0 @@
----
-layout: default
-format: post-left-sidebar
----
-<div class="row t60">
-	<div class="medium-4 columns">
-		{% include sidebar.html %}
-	</div><!-- /.medium-4.columns -->
-
-
-	<div class="medium-8 columns">
-		<article>
-			<header>
-				{% if page.image.title %}<img src="{{ site.url }}/images/{{ page.image.title }}" width="970" alt="{{ page.title escape_once }}">{% endif %}
-				{% if page.image.url && page.image.credit %}
-				<p class="text-right caption">
-					<a href="{{ page.image.url }}">{{ page.image.credit }}</a>
-				</p>
-				{% endif %}
-
-				{% if page.subheadline %}<p class="subheadline">{{ page.subheadline }}</p>{% endif %}
-				<h1>{{ page.title }}</h1>
-			</header>
-			{% if page.description %}
-			<p class="teaser">
-				{{ page.description }}
-			</p>
-			{% endif %}
-			
-			{{ content }}
-
-			{% include meta_information.html %}
-		</article>
-	</div><!-- /.medium-8.columns -->
-</div><!-- /.row -->

_layouts/post-right-sidebar.html

@@ -1,35 +0,0 @@
----
-layout: default
-format: post-right-sidebar
----
-<div class="row t60">
-	<div class="medium-8 columns">
-		<article>
-			<header>
-				{% if page.image.title %}<img src="{{ site.url }}/images/{{ page.image.title }}" width="970" alt="{{ page.title escape_once }}">{% endif %}
-				{% if page.image.url && page.image.credit %}
-				<p class="text-right caption">
-					<a href="{{ page.image.url }}">{{ page.image.credit }}</a>
-				</p>
-				{% endif %}
-
-				{% if page.subheadline %}<p class="subheadline">{{ page.subheadline }}</p>{% endif %}
-				<h1>{{ page.title }}</h1>
-			</header>
-			{% if page.description %}
-			<p class="teaser">
-				{{ page.description }}
-			</p>
-			{% endif %}
-			
-			{{ content }}
-
-			{% include meta_information.html %}
-		</article>
-	</div><!-- /.medium-8.columns -->
-
-
-	<div class="medium-4 columns">
-		{% include sidebar.html %}
-	</div><!-- /.medium-4.columns -->
-</div><!-- /.row -->

_layouts/post.html

@@ -1,40 +0,0 @@
----
-layout: default
-format: post
----
-{% if page.image.title %}
-<div class="row t30">
-	<div class="small-12 columns">
-		<img src="{{ site.url }}/images/{{ page.image.title }}" width="970" alt="{{ page.title escape_once }}">
-		{% if page.image.url && page.image.credit %}
-		<p class="text-right caption">
-			<a href="{{ page.image.url }}">{{ page.image.credit }}</a>
-		</p>
-		{% endif %}
-	</div><!-- /.small-12.columns -->
-</div><!-- /.row -->
-{% endif %}
-
-<div class="row t30">
-	<div class="medium-offset-2 medium-8 end columns">
-
-		<article>
-			<header>
-				{% if page.subheadline %}<p class="subheadline">{{ page.subheadline }}</p>{% endif %}
-				<h1>{{ page.title }}</h1>
-			</header>
-
-			{% if page.description %}
-			<p class="teaser">
-				{{ page.description }}
-			</p>
-			{% endif %}
-			
-			{{ content }}
-
-			{% include meta_information.html %}
-		</article>
-
-	</div><!-- /.medium-8.columns -->
-</div><!-- /.row -->
-

_layouts/video.html

@@ -22,6 +22,9 @@ format: video
 					{% endif %}
 					
 					{{ content }}
+					{% if page.show_metadata == true %}
+					{% include meta_information.html %}
+					{% endif %}
 				</div><!-- /.medium-8.columns -->
 			</div><!-- /.row -->
 		</article>