[SCM] live-studio branch, master, updated. 8bc4777e2834196c7e6943f12168359fef8e9e93

[Chris Lamb]

The following commit has been merged in the master branch:
commit 5c92043640019d0bde47245c6aa069a57b96b367
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 21:49:04 2010 -0400

    Don't show "home" link on home page

diff --git a/templates/base.html b/templates/base.html
index 3f2c9c4..8b52f33 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,11 +24,13 @@
 
   <div id="navbar">
     <ul>
+      {% block home_link %}
       {% if request.user.is_authenticated %}
       <li><a href="{% url config:configs %}">My configurations</a></li>
       {% else %}
       <li><a href="{% url static:welcome %}">Home</a></li>
       {% endif %}
+      {% endblock %}
 
       <li><a href="{% url static:faq %}">FAQ</a></li>
 
diff --git a/templates/static/welcome.html b/templates/static/welcome.html
index be66a5c..32cd41a 100644
--- a/templates/static/welcome.html
+++ b/templates/static/welcome.html
@@ -4,6 +4,7 @@
   <link rel="stylesheet" href="{% static "css/debhome.css" %}" type="text/css" />
 {% endblock %}
 
+{% block home_link %}{% endblock %}
 {% block breadcrumbs %}&nbsp;{% endblock %}
 
 {% block content %}

-- 
live-studio