[SCM] live-studio branch, master, updated. 3a5ece889e8e0abe86437994a4f02c59cd35f626

[Chris Lamb]

The following commit has been merged in the master branch:
commit d4102aba8bc036bf9491407aa152244b99fa69a6
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 12:03:22 2010 -0400

    Add breadcrumbs around the site

diff --git a/templates/base.html b/templates/base.html
index 0d3153a..ab8aacd 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -35,7 +35,7 @@
     </ul>
   </div>
 
-   <p id="breadcrumbs">{% block breadcrumbs %}&nbsp;{% endblock %}</p> 
+   <p id="breadcrumbs">{% block breadcrumbs %}<a href="{% url static:welcome %}">Home</a>{% endblock %}</p> 
 </div>
 
 <div id="outer">
diff --git a/templates/config/add.html b/templates/config/add.html
index 19524fe..c78317d 100644
--- a/templates/config/add.html
+++ b/templates/config/add.html
@@ -1,5 +1,9 @@
 {% extends "base.html" %}
 
+{% block breadcrumbs %}
+{{ block.super }} &raquo; <a href="{% url config:configs %}">Configurations</a> &raquo; Add new configuration
+{% endblock %}
+
 {% block content %}
 
 <h3>Add new configuration</h3>
diff --git a/templates/config/configs.html b/templates/config/configs.html
index 58a2277..a83dc8d 100644
--- a/templates/config/configs.html
+++ b/templates/config/configs.html
@@ -1,5 +1,9 @@
 {% extends "base.html" %}
 
+{% block breadcrumbs %}
+{{ block.super }} &raquo; Configurations
+{% endblock %}
+
 {% block content %}
 <h1>List of configurations</h1>
 
diff --git a/templates/config/view.html b/templates/config/view.html
index e69228c..deef1e0 100644
--- a/templates/config/view.html
+++ b/templates/config/view.html
@@ -1,8 +1,10 @@
 {% extends "base.html" %}
 
-{% block content %}
+{% block breadcrumbs %}
+{{ block.super }} &raquo; <a href="{% url config:configs %}">Configurations</a> &raquo; "{{ config.name }}"
+{% endblock %}
 
-<p><a href="{% url config:configs %}">&laquo; Back to list of configurations</a></p>
+{% block content %}
 
 <h1>Config: <em>{{ config.name }}</em></h1>
 
diff --git a/templates/static/welcome.html b/templates/static/welcome.html
index 137a1a0..be66a5c 100644
--- a/templates/static/welcome.html
+++ b/templates/static/welcome.html
@@ -4,6 +4,8 @@
   <link rel="stylesheet" href="{% static "css/debhome.css" %}" type="text/css" />
 {% endblock %}
 
+{% block breadcrumbs %}&nbsp;{% endblock %}
+
 {% block content %}
 
 <div id="splash" style="text-align: center;">

-- 
live-studio