OpenStack Dashboard (Horizon)

Merge lp:~devcamcar/horizon/lp711024 into lp:~hudson-openstack/horizon/trunk

  1. lp711024
  2. Merge into trunk
Proposed by Devin Carlen
Status: Merged
Approved by: Devin Carlen
Approved revision: 16
Merged at revision: 14
Proposed branch: lp:~devcamcar/horizon/lp711024
Merge into: lp:~hudson-openstack/horizon/trunk
Diff against target: 180 lines (+40/-30)
7 files modified
dashboard/templates/admin/index.html (+3/-2)
dashboard/templates/base-root.html (+3/-2)
dashboard/templates/index.html (+9/-5)
dashboard/templates/registration/activation_email.txt (+16/-16)
dashboard/templates/registration/activation_email_subject.txt (+1/-1)
dashboard/templates/registration/login.html (+3/-1)
dashboard/templates/registration/password_reset_email.html (+5/-3)
To merge this branch: bzr merge lp:~devcamcar/horizon/lp711024
Reviewer Review Type Date Requested Status
Devin Carlen Pending
Review via email: mp+48235@code.launchpad.net

Description of the change

Added site branding tags to reduce number of templates that must be overridden in containing projects.

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

resubmited this proposal hoping that I could fix the fact that I don't have an approve option on this branch.

Revision history for this message
Devin Carlen (devcamcar) wrote :

ps - it didn't

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dashboard/templates/admin/index.html'
2--- dashboard/templates/admin/index.html 2011-01-12 21:43:31 +0000
3+++ dashboard/templates/admin/index.html 2011-02-01 20:19:02 +0000
4@@ -1,5 +1,6 @@
5 {% extends "admin/base_site.html" %}
6 {% load i18n %}
7+{% load django_nova_tags %}
8
9 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/dashboard.css" />{% endblock %}
10
11@@ -14,8 +15,8 @@
12 {% if app_list %}
13
14 <div class="module">
15- <table summary="Models available in the OpenStack application.">
16- <caption><a href="{% url admin_projects %}" class="section">OpenStack</a></caption>
17+ <table summary="Models available in the {% site_branding %} application.">
18+ <caption><a href="{% url admin_projects %}" class="section">{% site_branding %}</a></caption>
19 <tbody>
20 <tr>
21 <th scope="row"><a href="{% url admin_projects %}">Projects</a></th>
22
23=== modified file 'dashboard/templates/base-root.html'
24--- dashboard/templates/base-root.html 2011-01-22 07:40:25 +0000
25+++ dashboard/templates/base-root.html 2011-02-01 20:19:02 +0000
26@@ -1,9 +1,10 @@
27+{% load django_nova_tags %}
28 <!DOCTYPE html>
29 <html lang="en" xml:lang="en">
30 <head>
31 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
32 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
33- <title>OpenStack Dashboard{% block title %}{% endblock %}{% block subtitle %}{% endblock %}</title>
34+ <title>{% site_branding %} Dashboard{% block title %}{% endblock %}{% block subtitle %}{% endblock %}</title>
35 <link rel="stylesheet" type="text/css" href="/media/dashboard/css/openstack.css"/>
36 <link rel="stylesheet" type="text/css" href="/media/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css"/>
37 {% block headercss %}{% endblock %}
38@@ -18,7 +19,7 @@
39 <body>
40 <div id="wrapper">
41 <div id="header">
42- <h1><a href="/">OpenStack<span> Cloud Computing</span></a></h1>
43+ <h1><a href="/">{% site_branding %}<span> Cloud Computing</span></a></h1>
44 {% if user.is_authenticated %}
45 <div id="user_info">
46 <span class="user">Signed in as <strong>{{ request.user.username }}</strong>.</a></span>
47
48=== modified file 'dashboard/templates/index.html'
49--- dashboard/templates/index.html 2011-02-01 09:32:40 +0000
50+++ dashboard/templates/index.html 2011-02-01 20:19:02 +0000
51@@ -1,4 +1,5 @@
52 {% extends "base.html" %}
53+{% load django_nova_tags %}
54
55 {% block headercss %}
56 {% endblock %}
57@@ -8,9 +9,12 @@
58
59 {% block content %}
60 <div id="page_head">
61- <h2>Welcome to the OpenStack Dashboard</h2>
62- <p>Through the OpenStack Dashboard you can manage your cloud through a crisp, clean, and easy to use interface.
63- {% if not request.user.is_authenticated%}To get started <a href="{% url registration_register %}">register</a> or sign in below.{% endif %}</p>
64+ <h2>Welcome to the {% site_branding %} Dashboard</h2>
65+ <p>Through the {% site_branding %} Dashboard you can manage your cloud
66+ through a crisp, clean, and easy to use interface.
67+ {% if not request.user.is_authenticated%}To get started
68+ <a href="{% url registration_register %}">register</a> or sign in below.{% endif %}
69+ </p>
70 </div>
71
72 {% if request.user.is_authenticated %}
73@@ -27,7 +31,7 @@
74 {% endfor %}
75 </ul>
76 </div>
77-
78+
79 <div class="home_block">
80 <h3>OpenStack Resources</h3>
81 <ul>
82@@ -36,7 +40,7 @@
83 <li><a href="https://launchpad.net/django-nova" target="_blank">Django-Nova Launchpad Repository</a></li>
84 </ul>
85 </div>
86-
87+
88 {% else %}
89 <div id="home_login" class="block">
90 <h3>Sign In</h3>
91
92=== modified file 'dashboard/templates/registration/activation_email.txt'
93--- dashboard/templates/registration/activation_email.txt 2011-01-31 21:12:52 +0000
94+++ dashboard/templates/registration/activation_email.txt 2011-02-01 20:19:02 +0000
95@@ -1,21 +1,21 @@
96-{% autoescape off %}
97-Welcome to the OpenStack Dashboard!
98-
99-
100-This message contains information about how to activate your OpenStack Dashboard account.
101-
102-
103-The OpenStack Dashboard is a web based management system that enables to easily manage your OpenStack projects and instances.
104-
105-
106-PLEASE NOTE: Before you can access your Dashboard account, you must first be connected to your OpenStack OpenVPN account. You should receive another message soon with instructions on how to connect to your VPN.
107-
108-
109-When you're ready, connect to your OpenStack OpenVPN and visit the following link to activate your account:
110+{% autoescape off %}{% load django_nova_tags %}
111+Welcome to the {% site_branding %} Dashboard!
112+
113+
114+This message contains information about how to activate your {% site_branding %} Dashboard account.
115+
116+
117+The {% site_branding %} Dashboard is a web based management system that enables to easily manage your {% site_branding %} projects and instances.
118+
119+
120+PLEASE NOTE: Before you can access your Dashboard account, you must first be connected to your {% site_branding %} OpenVPN account. You should receive another message soon with instructions on how to connect to your VPN.
121+
122+
123+When you're ready, connect to your {% site_branding %} OpenVPN and visit the following link to activate your account:
124
125 http://{{ site.domain }}/accounts/activate/{{ activation_key }}
126
127-Please note that this activation invitation will expire in {{ expiration_days }} days. After that time, you will need to re-register your OpenStack Dashboard account.
128+Please note that this activation invitation will expire in {{ expiration_days }} days. After that time, you will need to re-register your {% site_branding %} Dashboard account.
129
130-The OpenStack Team
131+The {% site_branding %} Team
132 {% endautoescape %}
133
134=== modified file 'dashboard/templates/registration/activation_email_subject.txt'
135--- dashboard/templates/registration/activation_email_subject.txt 2011-01-31 21:12:52 +0000
136+++ dashboard/templates/registration/activation_email_subject.txt 2011-02-01 20:19:02 +0000
137@@ -1,1 +1,1 @@
138-Welcome to the OpenStack Dashboard!
139+{% load django_nova_tags %}Welcome to the {% site_branding %} Dashboard!
140
141=== modified file 'dashboard/templates/registration/login.html'
142--- dashboard/templates/registration/login.html 2011-01-31 21:12:52 +0000
143+++ dashboard/templates/registration/login.html 2011-02-01 20:19:02 +0000
144@@ -1,4 +1,6 @@
145 {% extends "base.html" %}
146+{% load django_nova_tags %}
147+
148 {% block region %}{% endblock %}
149
150 {% block headerjs %}
151@@ -11,7 +13,7 @@
152
153 {% block content %}
154 <div id="page_head">
155- <h2>Sign in to the OpenStack Dashboard</h2>
156+ <h2>Sign in to the {% site_branding %} Dashboard</h2>
157 </div>
158
159 <div id="home_login" class="block">
160
161=== modified file 'dashboard/templates/registration/password_reset_email.html'
162--- dashboard/templates/registration/password_reset_email.html 2011-01-31 21:12:52 +0000
163+++ dashboard/templates/registration/password_reset_email.html 2011-02-01 20:19:02 +0000
164@@ -1,5 +1,7 @@
165-{% load i18n %}{% autoescape off %}
166-You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.
167+{% load i18n %}{% load django_nova_tags %}
168+{% autoescape off %}
169+You're receiving this e-mail because you requested a password reset for your
170+user account at {% site_branding %}.
171
172 Please use the following link and choose a new password:
173 {% block reset_link %}
174@@ -9,5 +11,5 @@
175
176 Thanks for using our site!
177
178-The OpenStack Team
179+The {% site_branding %} Team
180 {% endautoescape %}

Subscribers

People subscribed via source and target branches