consolidate redundant parts of site and index base templates

chnm · Aug 8, 2013 · 1f6316f · 1f6316f
1 parent 7ea11db
commit 1f6316f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 56 deletions.
diff --git a/smartstash/core/templates/core/site_index.html b/smartstash/core/templates/core/site_index.html
@@ -2,7 +2,6 @@
 {% load static %}
 
 {% block content %}
-<div class="main">
 <hr/>
 	<div class="nine columns">
 
@@ -51,7 +50,6 @@ <h5>Need <a href="https://docs.google.com/document/d/1okQAQfqTdDeCA8FNIDv5GGQcu0
 	 </div>
 <img src="{% static 'img/feedthebeast.gif' %}" id="loader" alt="Loading" style="display:none;" />
 </div>
-</div>
 
 </form>
 

diff --git a/templates/index_base.html b/templates/index_base.html
@@ -1,37 +1,13 @@
+{% extends 'site_base.html' %}
 {% comment %}
 This is the base template for the site index page.
 
 (NOTE: probably could consolidate with site_index.html, since other
 pages are unlikely to repeat the larger header...)
 {% endcomment %}
 {% load static %}
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"> <![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"> <![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"> <![endif]-->
-<!--[if (gte IE 9)|!(IE)]><!-->
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <title>Serendip-o-matic: Let Your Sources Surprise You{% block page-subtitle %}{% endblock %}</title>
-  <meta name="description" content="">
-  <meta name="author" content="">
-  <!-- Mobile Specific Metas
- ================================================== -->
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-  <!-- CSS
-  ================================================== -->
-  <link href="{% static 'css/styles.css' %}" rel="stylesheet" media="screen" />
-  <link href="{% static 'css/base.css' %}" rel="stylesheet" media="screen" />
-  <link href="{% static 'css/skeleton.css' %}" rel="stylesheet" media="screen" />
-  <link href="{% static 'css/layout.css' %}" rel="stylesheet" media="screen" />
-  <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700' rel='stylesheet' type='text/css'>
-  <link href='http://fonts.googleapis.com/css?family=Merriweather:400,300italic' rel='stylesheet' type='text/css'>
-
-  <!--[if lt IE 9]>
-  <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
 
+{% block extra-head %} {# extra fonts & styles only used on the home page #}
  <!-- Web fonts -->
 <!-- <script type="text/javascript" src="//use.typekit.net/uej1ygs.js"></script>-->
  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
@@ -45,32 +21,15 @@
   display: none;
 }
 </style>
-  <!-- Favicons
-  ================================================== -->
-  <link rel="shortcut icon" href="{% static 'img/favicon.ico' %}">
+{# primary favicon shortcut link included in site_base #}
   <link rel="apple-touch-icon" href="{% static 'img/apple-touch-icon.png' %}">
   <link rel="apple-touch-icon" sizes="72x72" href="{% static 'img/apple-touch-icon-72x72.png' %}">
   <link rel="apple-touch-icon" sizes="114x114" href="{% static 'img/apple-touch-icon-114x114.png' %}">
+{% endblock %}
 
-  {% block extra-head %}{% endblock %} {# extend for pages that need extra css/js #}
-</head>
-<body>
-<a name="top"></a>
-<!-- Primary Page Layout
-================================================== -->
-
-<!-- Delete everything in this .container and get started on your own site! -->
+{% block main-col-attrs %}"top"{% endblock %}
 
-<div class="container">
-		<div class="sixteen columns" "top">
-			<menu class="bar">
-			<ul>
-            <li id="skip"><a class="skip" href="#content" tabindex="1">Skip to Content</a></li>
-			<li><a href="{% url 'site-index' %}" tabindex="2">home</a></li>
-			<li><a href="{% url 'about' %}" tabindex="3">about</a></li>
-			<li><a href="{% url 'connect' %}" tabindex="4">connect</a></li>
-			</ul>
-		</menu>
+{% block header %}
 			<header>
 			<img class="scale-with-grid" src="{% static 'img/serendip-o-matic.png' %}" alt="Serendip-o-matic" />
 			</header>
@@ -95,11 +54,9 @@ <h5 class="intro">Be amazed by what turns up.</h5>
 			</div>
 
 
-		</div>
-<a name="content"></a>
-<div>
-{% block content %}{% endblock %}
-</div>
+		</div>  {# extra? #}
+
+{% endblock %}
 
 <footer>
 <div id="footermenu">

diff --git a/templates/site_base.html b/templates/site_base.html
@@ -45,7 +45,7 @@
 <!-- Delete everything in this .container and get started on your own site! -->
 
 <div class="container">
-<div class="sixteen columns">
+<div class="sixteen columns" {% block main-col-attrs %}{% endblock %}>
 <menu class="bar">
 			<ul>
             <li id="skip"><a class="skip" href="#content" tabindex="1">Skip to Content</a></li>
@@ -62,7 +62,7 @@
 {% block content %}{% endblock %}
 </div>
 
-<footer style="margin-left:-30px;">
+<footer {% block footer-attrs %}{%endblock %}>
 <div id="footermenu">
     <a href="{% url 'site-index' %}">Home</a>|<a href="{% url 'about' %}">About</a>|<a href="{% url 'connect' %}">Connect</a></div>
     <img class="footimg" src="{% static 'img/burst.png' %}" alt="Burst Image" />