Commits

Chris Ridgway committed 9206349

* Moved sidebar into a template.
* Fixed error page.

  • Participants
  • Parent commits 6f0d424

Comments (0)

Files changed (5)

 
 	<!-- Masthead
 	=========================================== -->
-	<div id="masthead">
+	<div class="hero-unit">
 		<div class="inner">
 			<div class="container">
 				<h1>Chris Ridgway</h1>
 					<br/>
 					<a class="indent" href="{{ ROOT_URL }}/archives.html">All Posts Archive</a>
 				</div>
+				<br/>
+				<br/>
+				<a href="{{ ROOT_URL }}/index.html">← Back to the homepage</a>
+				<br/>
+				<br/>
 			</div>
 			<div class="span2 columns">
 				&nbsp;
 		</div>
 	</div>
 
-<br/>
-<br/>
-<a href="{{ ROOT_URL }}/index.html">← Back to the homepage</a>
-<br/>
-<br/>
 {% endblock %}
 {% extends "page.html" %}
-{% block content %}
 
+{% block masthead %}
 	<div class="container">
 
-	<!-- Masthead
-	=========================================== -->
-		<div class="row">
-			<div class="span9 columns">
+
 				<div class="hero-unit">
 					<h1>{{ SITE_NAME }}</h1>
 					<p class="lead">
 						{{ SITE_LEAD }}<br/>
 					</p>
-				</div>
-			</div>
+
 		</div>
+	</div>
 
-	<!-- Page Content
-	============================================ -->
+{% endblock %}
+
+
+{% block content %}
+	<div class="container">
 		<div class="row">
 			<div class="span9 columns">
 				<div class="inner">

static/css/styles.css

 */
 
 .sidebar {
-	margin: 20px 10px 10px 10px;
+	margin: 20px 10px 10px 0;
 }
 
 .sidebar h1 {
 }
 
 
-/*
 #error {
 	margin-top: 10px;
 }
 #error a.indent {
 	padding-left: 10px;
 }
-*/
 
 /*
 -----------------------------------------------

templates/includes/sidebar.html

+<!-- Sidebar
+=========================================== -->
+<div class="span3 columns">
+    <div class="sidebar">
+        <div class="sidebar-masthead">
+            <div style="width:100px; height:100px; border:4px solid #bbb; border-radius:200px;
+                        background: url('http://www.gravatar.com/avatar/b5fba2f517d483b266ccd6d7a37d3a2c');
+                        background-size:100% 100%;
+                        background-repeat: no-repeat;
+                        margin-bottom: 10px; margin-left: auto; margin-right: auto;">
+            </div>
+            <a href="{{ ROOT_URL }}/index.html"><h1>Chris Ridgway</h1></a>
+            <p>
+                I'm Chris.  A real-time embedded software engineer,
+                interested in web and mobile app development,
+                large scale computing, networking, and all things Python.
+                Read <a href="{{ ROOT_URL }}/about.html">more about me.</a>
+            </p>
+        </div>
+
+        <div class="sidebar-links">
+            <h2>Contact</h2>
+            <a href="mailto:ckridgway@gmail.com">ckridgway@gmail.com</a><br/>
+
+            <h2>Social</h2>
+            <a href="http://twitter.com/cridgway">Twitter</a><br/>
+            <a href="https://plus.google.com/114382913609569476532">Google+</a><br/>
+            <a href="http://www.linkedin.com/in/ckridgway">LinkedIn</a><br/>
+            <a href="http://www.delicious.com/cridgway">Delicious</a><br/>
+
+            <h2>Sharing</h2>
+            <a href="https://bitbucket.org/ckridgway">Bitbucket</a><br/>
+            <a href="https://github.com/ckridgway">GitHub</a><br/>
+        </div>
+    </div>
+</div>

templates/page.html

 {% extends "base.html" %}
 {% block page %}
 
+	{% block masthead %}
+	{% endblock %}
+
 	<div class="container">
 		<div class="row">
 
 			<!-- Sidebar
 			=========================================== -->
-			<div class="span3 columns">
-				<div class="sidebar">
-					<div class="sidebar-masthead">
-						<div style="width:100px; height:100px; border:4px solid #bbb; border-radius:200px;
-									background: url('http://www.gravatar.com/avatar/b5fba2f517d483b266ccd6d7a37d3a2c');
-									background-size:100% 100%;
-									background-repeat: no-repeat;
-									margin-bottom: 10px; margin-left: auto; margin-right: auto;">
-						</div>
-						<a href="{{ ROOT_URL }}/index.html"><h1>Chris Ridgway</h1></a>
-						<p>
-							I'm Chris.  A real-time embedded software engineer,
-							interested in web and mobile app development,
-							large scale computing, networking, and all things Python.
-							Read <a href="{{ ROOT_URL }}/about.html">more about me.</a>
-						</p>
-					</div>
-
-					<div class="sidebar-links">
-						<h2>Contact</h2>
-						<a href="mailto:ckridgway@gmail.com">ckridgway@gmail.com</a><br/>
-
-						<h2>Social</h2>
-						<a href="http://twitter.com/cridgway">Twitter</a><br/>
-						<a href="https://plus.google.com/114382913609569476532">Google+</a><br/>
-						<a href="http://www.linkedin.com/in/ckridgway">LinkedIn</a><br/>
-						<a href="http://www.delicious.com/cridgway">Delicious</a><br/>
-
-						<h2>Sharing</h2>
-						<a href="https://bitbucket.org/ckridgway">Bitbucket</a><br/>
-						<a href="https://github.com/ckridgway">GitHub</a><br/>
-					</div>
-				</div>
-			</div>
+			{% include "includes/sidebar.html" %}
 
 			<!-- Article Content
 			=========================================== -->