Reintroduce base_site.html to override individual template blocks

Author: tobami

README.md

@@ -99,8 +99,8 @@ section).
 
 ## Custom Settings
 
-You may override any of the default settings by creating the file
-`sample_project/override/settings.py`. It is strongly recommended that you only override the
+You may override any of the default settings by setting them in
+`sample_project/settings.py`. It is strongly recommended that you only override the
 settings you need by importing the default settings and replacing only the
 values needed for your customizations:
 
@@ -110,13 +110,14 @@ values needed for your customizations:
 
 ### Site-wide Changes
 
-All pages inherit from the `base.html` template. To change every page on the site simply edit (`sample_project/templates/base.html`) and override
+All pages inherit from the `base.html` template. To change every page on the site 
+simply edit (`sample_project/templates/codespeed/base_site.html`) and override
 the appropriate block:
 
 * Custom title: you may replace the default "My Speed Center" for the title
   block with your prefered value:
 
-        {% block title}
+        {% block title %}
             My Project's Speed Center
         {% endblock %}
 
@@ -146,7 +147,7 @@ same name.
 
 * About page: create `sample_project/override/templates/about.html`:
 
-        {% extends "base.html" %}
+        {% extends "codespeed/base_site.html" %}
         {% block title %}{{ block.super }}: About this project{% endblock %}
         {% block body %}
             <div id="sidebar"></div>

sample_project/templates/base.html codespeed/templates/codespeed/base.htmlsample_project/templates/base.html renamed to codespeed/templates/codespeed/base.html

@@ -0,0 +1,3 @@
+{% extends "codespeed/base.html" %}
+
+{# This exists only to be overriden #}

codespeed/templates/codespeed/base_site.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "codespeed/base_site.html" %}
 {% load url from future %}
 {% block title %}{{ block.super }}: Changes{% endblock %}
 

codespeed/templates/codespeed/changes.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "codespeed/base_site.html" %}
 {% load url from future %}
 {% block title %}{{ block.super }}: Comparison{% endblock %}
 

codespeed/templates/codespeed/comparison.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "codespeed/base_site.html" %}
 {% block body %}
 <div id="presentation_wrapper">
 <p>{{ message|safe }}</p>

codespeed/templates/codespeed/nodata.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "codespeed/base_site.html" %}
 {% load url from future %}
 {% block title %}{{ block.super }}: Timeline{% endblock %}
 

codespeed/templates/codespeed/timeline.html

@@ -110,22 +110,22 @@ Assumed you have a [Debian](http://www.debian.org) like system.
 
 ### Using your own Templates
 Just edit your very own Django templates in `speedcenter/templates`. A good
-start is `base.html` the root of all templates.
+start is `codespeed/base.html` the root of all templates.
 
 If you need to change the codespeed templates:
 1. Copy the templates from the codespeed module into your Django project folder.
    `cp -r codespeed/templates/codespeed  speedcenter/templates/`
 2. Edit the templates in speedcenter/templates/codespeed/*html
 Please, also refer to the [Django template docu]
-(http://docs.djangoproject.com/en/1.3/ref/templates/)
+(http://docs.djangoproject.com/en/1.4/ref/templates/)
 
 ### Changing the URL Scheme
 If you don't want to have your speedcenter in the root url you can change urls.py.
 Comment (add a '#' at the beginning) line number 25 `(r'^', include('cod...`
 and uncomment the next line `(r'^speed/', include('cod...` (Note, Python is
 picky about indentation).
 Please, also refer to the [Django URL dispatcher docu]
-(http://docs.djangoproject.com/en/1.3/topics/http/urls/).
+(http://docs.djangoproject.com/en/1.4/topics/http/urls/).
 
 ### Codespeed settings
 The main config file is `settings.py`. There you configure everything related

sample_project/README.md

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "codespeed/base_site.html" %}
 
 {% block title %}Page not found{% endblock %}
 

sample_project/templates/404.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "codespeed/base_site.html" %}
 
 {% block title %}Page unavailable{% endblock %}