OpenStack Dashboard (Horizon)

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

  1. templates-cleanup
  2. Merge into trunk
Proposed by Jake Dahn
Status: Merged
Approved by: Devin Carlen
Approved revision: 9
Merge reported by: Devin Carlen
Merged at revision: not available
Proposed branch: lp:~jakedahn/horizon/templates-cleanup
Merge into: lp:~devcamcar/horizon/trunk
Diff against target: 109 lines (+13/-27)
7 files modified
dashboard/templates/403.html (+0/-8)
dashboard/templates/404.html (+0/-8)
dashboard/templates/500.html (+0/-8)
dashboard/templates/base-root.html (+0/-1)
dashboard/templates/index.html (+1/-1)
dashboard/templates/unavailable.html (+11/-0)
dashboard/urls.py (+1/-1)
To merge this branch: bzr merge lp:~jakedahn/horizon/templates-cleanup
Reviewer Review Type Date Requested Status
Devin Carlen Approve
Review via email: mp+47217@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
22 {% block nav_projects %}22 {% block nav_projects %}
23 <li><h3><a href="/">Projects</a></h3></li>23 <li><h3><a href="/">Projects</a></h3></li>
24 {% endblock %}24 {% endblock %}
25
26 {% block nav_forum %}
27 <li><h3><a href="/forum">Forums</a></h3></li>
28 {% endblock %}
29
30 {% block nav_kb %}
31 <li><h3><a href="/kb/show/Start/">Knowledge Base</a></h3></li>
32 {% endblock %}
33 </ul>25 </ul>
34 </div> <!-- end sidebar -->26 </div> <!-- end sidebar -->
35{% endblock %}27{% endblock %}
3628
=== 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 @@
21 {% block nav_projects %}21 {% block nav_projects %}
22 <li><h3><a href="/">Projects</a></h3></li>22 <li><h3><a href="/">Projects</a></h3></li>
23 {% endblock %}23 {% endblock %}
24
25 {% block nav_forum %}
26 <li><h3><a href="/forum">Forums</a></h3></li>
27 {% endblock %}
28
29 {% block nav_kb %}
30 <li><h3><a href="/kb/show/Start/">Knowledge Base</a></h3></li>
31 {% endblock %}
32 </ul>24 </ul>
33 </div> <!-- end sidebar -->25 </div> <!-- end sidebar -->
34{% endblock %}26{% endblock %}
3527
=== 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 @@
21 {% block nav_projects %}21 {% block nav_projects %}
22 <li><h3><a href="/">Projects</a></h3></li>22 <li><h3><a href="/">Projects</a></h3></li>
23 {% endblock %}23 {% endblock %}
24
25 {% block nav_forum %}
26 <li><h3><a href="/forum">Forums</a></h3></li>
27 {% endblock %}
28
29 {% block nav_kb %}
30 <li><h3><a href="/kb/show/Start/">Knowledge Base</a></h3></li>
31 {% endblock %}
32 </ul>24 </ul>
33 </div> <!-- end sidebar -->25 </div> <!-- end sidebar -->
34{% endblock %}26{% endblock %}
3527
=== 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 @@
37 <div id="content_wrap">37 <div id="content_wrap">
38 {% block sidebar %}{% endblock %}38 {% block sidebar %}{% endblock %}
39 {% block region %}{% endblock %}39 {% block region %}{% endblock %}
40 {% block forum_breadcrumbs %}{% endblock %}
41 <div id="content" class="{% block pageclass %}{% endblock %}">40 <div id="content" class="{% block pageclass %}{% endblock %}">
42 {% block rootcontent %}{% endblock %}41 {% block rootcontent %}{% endblock %}
43 </div><!-- end content -->42 </div><!-- end content -->
4443
=== 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 @@
46 <input type="hidden" name="next" value="/" />46 <input type="hidden" name="next" value="/" />
47 <div class="button">47 <div class="button">
48 <input id="home_login_btn" type="submit" value="Sign In">48 <input id="home_login_btn" type="submit" value="Sign In">
49 <span id="forgot_password">or <a id="forgot_password_link" href="{% url auth_password_reset %}">Forgot Password?</a></span>49 <span id="forgot_password"><a id="forgot_password_link" href="{% url auth_password_reset %}">Forgot Password?</a></span>
50 </div>50 </div>
51 </fieldset>51 </fieldset>
52 </form>52 </form>
5353
=== 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 @@
1{% extends "dashboard/base.html" %}
2
3{% block title %} - Service Unavailable{% endblock %}
4{% block pageclass %}unavailable{% endblock %}
5
6{% block content %}
7 <div id="page_head">
8 <h2 id="page_heading">Service Unavailable</h2>
9 <p id="page_description">This service is temporarily unavailable, please check back soon.</p>
10 </div>
11{% endblock %}
012
=== 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 @@
50 name='dashboard_permission_denied'),50 name='dashboard_permission_denied'),
51 url(r'^unavailable/$',51 url(r'^unavailable/$',
52 'direct_to_template',52 'direct_to_template',
53 {'template': 'django_nova/unavailable.html'},53 {'template': 'unavailable.html'},
54 name='nova_unavailable'),54 name='nova_unavailable'),
55)55)
5656

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: