Changed simplewiki templates to inherit from main.html and have standard navigation, footer, etc.

c217432a · Bridger Maxwell · 2202ec09 · c217432a · c217432a · c217432a
Commit c217432a authored Jan 09, 2012 by Bridger Maxwell
9 changed files
--- a/main.html
+++ b/main.html
 <!DOCTYPE html>
 <html>
 <head>
-  <title>MITX 6.002</title>
+  <%block name="title"><title>MITX 6.002</title></%block>

  <link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" />
  <link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
@@ -33,11 +33,16 @@ $(function() {
 	});
 });
 </script>
+
+
+<%block name="headextra"/>
+
 </head>

 <body>

  ${self.body()}
+  <%block name="bodyextra"/>

  <footer>
    <p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a> Please give us <a id="inline"

--- a/simplewiki_base.html
+++ b/simplewiki_base.html
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
+##This file is based on the template from the SimpleWiki source which carries the GPL license
+
 <%inherit file="simplewiki_base.html"/>

 <%block name="wiki_page_title">

--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
+##This file is based on the template from the SimpleWiki source which carries the GPL license
+
 <%inherit file="simplewiki_base.html"/>

 <%block name="wiki_page_title">

--- a/simplewiki_error.html
+++ b/simplewiki_error.html
+##This file is based on the template from the SimpleWiki source which carries the GPL license
+
 <%inherit file="simplewiki_base.html"/>

 <%block name="wiki_page_title">

--- a/simplewiki_history.html
+++ b/simplewiki_history.html
+##This file is based on the template from the SimpleWiki source which carries the GPL license
+
 <%inherit file="simplewiki_base.html"/>

 <%block name="wiki_page_title">

--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
+##This file is based on the template from the SimpleWiki source which carries the GPL license
+
 <%inherit file="simplewiki_base.html"/>

 <%block name="wiki_page_title">

--- a/simplewiki_updateprogressbar.html
+++ b/simplewiki_updateprogressbar.html
+##This file is based on the template from the SimpleWiki source which carries the GPL license
+
 <%!
    from django.template.defaultfilters import filesizeformat
 %>

--- a/simplewiki_view.html
+++ b/simplewiki_view.html
+##This file is based on the template from the SimpleWiki source which carries the GPL license
+
 <%inherit file="simplewiki_base.html"/>

 <%block name="wiki_page_title">