Merge lp:~jakedahn/horizon/templates-cleanup into lp:~devcamcar/horizon/trunk

[Jake Dahn]

Cleaning up templates, and adding unavailable.html to templates.

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'dashboard/templates/403.html'
--- dashboard/templates/403.html	2011-01-12 21:43:31 +0000
+++ dashboard/templates/403.html	2011-01-24 05:42:14 +0000
@@ -22,14 +22,6 @@
       {% block nav_projects %}
       <li><h3><a href="/">Projects</a></h3></li>
       {% endblock %}
-
-      {% block nav_forum %}
-      <li><h3><a href="/forum">Forums</a></h3></li>
-      {% endblock %}
-
-      {% block nav_kb %}
-      <li><h3><a href="/kb/show/Start/">Knowledge Base</a></h3></li>
-      {% endblock %}
     </ul>
   </div> <!-- end sidebar -->
 {% endblock %}

=== modified file 'dashboard/templates/404.html'
--- dashboard/templates/404.html	2011-01-12 21:43:31 +0000
+++ dashboard/templates/404.html	2011-01-24 05:42:14 +0000
@@ -21,14 +21,6 @@
       {% block nav_projects %}
       <li><h3><a href="/">Projects</a></h3></li>
       {% endblock %}
-
-      {% block nav_forum %}
-      <li><h3><a href="/forum">Forums</a></h3></li>
-      {% endblock %}
-
-      {% block nav_kb %}
-      <li><h3><a href="/kb/show/Start/">Knowledge Base</a></h3></li>
-      {% endblock %}
     </ul>
   </div> <!-- end sidebar -->
 {% endblock %}

=== modified file 'dashboard/templates/500.html'
--- dashboard/templates/500.html	2011-01-12 21:43:31 +0000
+++ dashboard/templates/500.html	2011-01-24 05:42:14 +0000
@@ -21,14 +21,6 @@
       {% block nav_projects %}
       <li><h3><a href="/">Projects</a></h3></li>
       {% endblock %}
-
-      {% block nav_forum %}
-      <li><h3><a href="/forum">Forums</a></h3></li>
-      {% endblock %}
-
-      {% block nav_kb %}
-      <li><h3><a href="/kb/show/Start/">Knowledge Base</a></h3></li>
-      {% endblock %}
     </ul>
   </div> <!-- end sidebar -->
 {% endblock %}

=== modified file 'dashboard/templates/base-root.html'
--- dashboard/templates/base-root.html	2011-01-17 09:59:30 +0000
+++ dashboard/templates/base-root.html	2011-01-24 05:42:14 +0000
@@ -37,7 +37,6 @@
       <div id="content_wrap">
         {% block sidebar %}{% endblock %}
         {% block region %}{% endblock %}
-        {% block forum_breadcrumbs %}{% endblock %}
         <div id="content" class="{% block pageclass %}{% endblock %}">
           {% block rootcontent %}{% endblock %}
         </div><!-- end content -->

=== modified file 'dashboard/templates/index.html'
--- dashboard/templates/index.html	2011-01-12 21:43:31 +0000
+++ dashboard/templates/index.html	2011-01-24 05:42:14 +0000
@@ -46,7 +46,7 @@
         <input type="hidden" name="next" value="/" />
         <div class="button">
           <input id="home_login_btn" type="submit" value="Sign In">
-          <span id="forgot_password">or <a id="forgot_password_link" href="{% url auth_password_reset %}">Forgot Password?</a></span>
+          <span id="forgot_password"><a id="forgot_password_link" href="{% url auth_password_reset %}">Forgot Password?</a></span>
         </div>
       </fieldset>
     </form>

=== added file 'dashboard/templates/unavailable.html'
--- dashboard/templates/unavailable.html	1970-01-01 00:00:00 +0000
+++ dashboard/templates/unavailable.html	2011-01-24 05:42:14 +0000
@@ -0,0 +1,11 @@
+{% extends "dashboard/base.html" %}
+
+{% block title %} - Service Unavailable{% endblock %}
+{% block pageclass %}unavailable{% endblock %}
+
+{% block content %}
+  <div id="page_head">
+    <h2 id="page_heading">Service Unavailable</h2>
+    <p id="page_description">This service is temporarily unavailable, please check back soon.</p>
+  </div>
+{% endblock %}

=== modified file 'dashboard/urls.py'
--- dashboard/urls.py	2011-01-15 09:05:54 +0000
+++ dashboard/urls.py	2011-01-24 05:42:14 +0000
@@ -50,7 +50,7 @@
         name='dashboard_permission_denied'),
     url(r'^unavailable/$',
         'direct_to_template',
-        {'template': 'django_nova/unavailable.html'},
+        {'template': 'unavailable.html'},
         name='nova_unavailable'),
 )