Merge lp:~jakedahn/horizon/homepage-additions into lp:~devcamcar/horizon/trunk

Proposed by Jake Dahn
Status: Merged
Approved by: Devin Carlen
Approved revision: 15
Merged at revision: 13
Proposed branch: lp:~jakedahn/horizon/homepage-additions
Merge into: lp:~devcamcar/horizon/trunk
Diff against target: 343 lines (+108/-127)
3 files modified
dashboard/templates/index.html (+44/-26)
media/dashboard/css/ie7.css (+12/-82)
media/dashboard/css/openstack.css (+52/-19)
To merge this branch: bzr merge lp:~jakedahn/horizon/homepage-additions
Reviewer Review Type Date Requested Status
Devin Carlen Approve
Review via email: mp+48120@code.launchpad.net

Description of the change

Replaced lorem ipsum text on the homepage with useful resource links and a registration link.

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
1=== modified file 'dashboard/templates/index.html'
2--- dashboard/templates/index.html 2011-01-22 07:41:20 +0000
3+++ dashboard/templates/index.html 2011-02-01 09:37:00 +0000
4@@ -8,14 +8,9 @@
5
6 {% block content %}
7 <div id="page_head">
8- <h2>Welcome to the Openstack Dashboard</h2>
9- <p>Lorem ipsum oblique praesent theophrastus ut eos. No altera eirmod
10- graecis ius. Pri mucius salutandi at, usu admodum neglegentur ad.
11- In qui propriae fabellas comprehensam.
12- {% if not request.user.is_authenticated %}
13- <a id="lnk_register" href="{% url registration_register %}">Register</a>
14- {% endif %}
15- </p>
16+ <h2>Welcome to the OpenStack Dashboard</h2>
17+ <p>Through the OpenStack Dashboard you can manage your cloud through a crisp, clean, and easy to use interface.
18+ {% if not request.user.is_authenticated%}To get started <a href="{% url registration_register %}">register</a> or sign in below.{% endif %}</p>
19 </div>
20
21 {% if request.user.is_authenticated %}
22@@ -32,25 +27,48 @@
23 {% endfor %}
24 </ul>
25 </div>
26+
27+ <div class="home_block">
28+ <h3>OpenStack Resources</h3>
29+ <ul>
30+ <li><a href="http://openstack.org" target="_blank">OpenStack.org</a></li>
31+ <li><a href="https://launchpad.net/openstack-dashboard" target="_blank">OpenStack Dashboard Launchpad Repository</a></li>
32+ <li><a href="https://launchpad.net/django-nova" target="_blank">Django-Nova Launchpad Repository</a></li>
33+ </ul>
34+ </div>
35+
36 {% else %}
37- <div id="home_login" class="block">
38- <h3>Sign In</h3>
39- <form action="{% url auth_login %}" method="post">
40- {% csrf_token %}
41- <fieldset>
42- {% if form.errors %}
43- <p class="error">Your username and password didn't match. Please try again.</p>
44- {% endif %}
45- <label for="username">Username:</label><input id="username" type="text" name="username" />
46- <label for="password">Password:</label><input id="password" type="password" name="password" />
47- <input type="hidden" name="next" value="/" />
48- <div class="button">
49- <input id="home_login_btn" type="submit" value="Sign In">
50- <span id="forgot_password"><a id="forgot_password_link" href="{% url auth_password_reset %}">Forgot Password?</a></span>
51- </div>
52- </fieldset>
53- </form>
54- </div>
55+ <div id="home_login" class="block">
56+ <h3>Sign In</h3>
57+ <form action="{% url auth_login %}" method="post">
58+ {% csrf_token %}
59+ <fieldset>
60+ {% if form.errors %}
61+ <p class="error">Your username and password didn't match. Please try again.</p>
62+ {% endif %}
63+ <label for="username">Username:</label><input id="username" type="text" name="username" />
64+ <label for="password">Password:</label><input id="password" type="password" name="password" />
65+ <input type="hidden" name="next" value="/" />
66+ <div class="button">
67+ <input id="home_login_btn" type="submit" value="Sign In">
68+ <span id="forgot_password"><a id="forgot_password_link" href="{% url auth_password_reset %}">Forgot Password?</a></span>
69+ </div>
70+ </fieldset>
71+ </form>
72+ </div>
73+ {% if not request.user.is_authenticated %}
74+ <div class="home_block">
75+ <h3>Don't have an account? <a id="lnk_register" href="{% url registration_register %}">Register</a></h3>
76+ </div>
77+ {% endif %}
78+ <div class="home_block">
79+ <h3>OpenStack Resources</h3>
80+ <ul>
81+ <li><a href="http://openstack.org" target="_blank">OpenStack.org</a></li>
82+ <li><a href="https://launchpad.net/openstack-dashboard" target="_blank">OpenStack Dashboard Launchpad Repository</a></li>
83+ <li><a href="https://launchpad.net/django-nova" target="_blank">Django-Nova Launchpad Repository</a></li>
84+ </ul>
85+ </div>
86 {% endif %}
87 {% endblock %}
88
89
90=== modified file 'media/dashboard/css/ie7.css'
91--- media/dashboard/css/ie7.css 2011-01-12 21:43:31 +0000
92+++ media/dashboard/css/ie7.css 2011-02-01 09:37:00 +0000
93@@ -1,85 +1,15 @@
94-#home_login input[type="submit"] { border: none !important; }
95-#resources.block h3 {
96- width: 329px !important;
97-}
98-
99-#frm_launch input[type="submit"]{
100- margin-right: -2px !important;
101-}
102-
103-input.create, input.attach {
104- margin-right: -11px !important;
105-}
106-.dash_block .errorlist {
107- width: 282px !important;
108- padding-left: 20px !important;
109-}
110-
111-#lnk_board, #lnk_wiki {
112- padding-top: 20px !important;
113-}
114-
115-h1 a{position:relative !important;}
116-
117-#preview {
118- margin-top: -13px !important;
119-}
120-
121-/*#projects .project.active {
122- height: 180px;
123- display: block;
124- filter: alpha(opacity=100);
125-}
126-
127-#projects .project.inactive {
128- height: 0;
129- filter: alpha(opacity=0);
130-}*/
131-
132-.ft_info {
133- margin-top: 0;
134- float: right;
135-}
136-
137-#home_login .error, #home_login .errorlist {
138- background: #ef767d !important;
139- border-top: 1px solid #f63e42 !important;
140- border-bottom: 1px solid #f63e42 !important;
141-
142-}
143-
144-#radar_service {margin-bottom: 50px !important; float: left;}
145-
146-#header h1 a sup {
147- margin-right: 0px;
148-}
149-
150-#user_info ul li {
151- list-style: disc inside;
152- margin-bottom: 2px;
153-}
154-
155+h1, h1 a, h1 span { position: relative !important; }
156+#content_wrap {margin-top: 15px;}
157 .image_detail, .instance_detail { position: relative; }
158-
159-a.launch {
160- margin-left: 10px !important;
161- margin-top: 0px;
162-}
163-
164-.image_detail a.launch {
165- margin-left: 31px !important;
166-}
167-
168-a#edit_image_link, a#edit_instance_link {
169- margin-left: -40px;
170-}
171-
172-.image_detail .image_privacy input, .image_detail .delete input {
173- margin-left: -15px;
174- margin-top: -10px;
175-}
176-
177-.post_status {
178- width: 20px !important;
179+td#actions { padding-bottom: 10px !important; }
180+td#actions input { width: 80px; }
181+#edit_image_link:hover { color: #1d77ff; }
182+input.private { margin-right: -30px !important; margin-left: -17px !important;}
183+#user_info li { list-style: disc !important; }
184+input.create, input.attach, input#launch_image { margin-right: 4px !important; }
185+
186+#edit_image_link {
187+ margin-left: -180px !important;
188+ margin-top: 20px !important;
189 }
190
191
192=== modified file 'media/dashboard/css/openstack.css'
193--- media/dashboard/css/openstack.css 2011-01-17 09:59:30 +0000
194+++ media/dashboard/css/openstack.css 2011-02-01 09:37:00 +0000
195@@ -121,6 +121,7 @@
196 float: left;
197 width: 309px;
198 }
199+
200 /* Home Page */
201
202
203@@ -129,12 +130,14 @@
204 float: left;
205 }
206
207+#content.home {
208+ width: 910px;
209+}
210 .block {
211 background-color: #dff2ff;
212 border: 1px solid #b1e7ff;
213 width: 445px;
214 float: left;
215-
216 }
217
218 .block h3 {
219@@ -148,9 +151,8 @@
220
221 #content.home #projects {
222 float: left;
223- margin: 0 20px 0 0;
224 width: 445px;
225-
226+ margin: 0 0 10px;
227 }
228 #content.home #projects li {
229 border-bottom: 1px solid #bce3ff;
230@@ -208,7 +210,7 @@
231 width: 396px;
232 }
233
234-#home_login input[type="submit"] {
235+#home_login input[type="submit"], #lnk_register {
236 float: right;
237 height: 31px;
238 background: url(/media/dashboard/img/login_btn.png) top left repeat-x;
239@@ -225,11 +227,19 @@
240 -border-radius: 3px;
241 }
242
243-#home_login input[type="submit"]:hover {
244+#lnk_register {
245+ float: none;
246+ padding: 8px 30px;
247+ font-size: 14px;
248+ text-decoration: none;
249+ margin-left: 39px;
250+}
251+
252+#home_login input[type="submit"]:hover, #lnk_register:hover {
253 background-position: center left;
254 }
255
256-#home_login input[type="submit"]:active {
257+#home_login input[type="submit"]:active, #lnk_register:active {
258 background-position: bottom left;
259 }
260
261@@ -254,6 +264,29 @@
262 font-size: 12px;
263 }
264
265+.home_block {
266+ width: 388px;
267+ float: left;
268+ margin-left: 25px;
269+ padding: 25px;
270+ background: #f1f1f1;
271+ margin-bottom: 25px;
272+ -webkit-border-radius: 5px;
273+ -moz-border-radius: 5px;
274+ border-radius: 5px;
275+
276+}
277+
278+.home_block ul {
279+ margin-left: 33px;
280+ list-style: disc;
281+ color: #999;
282+ margin-top: 13px;
283+}
284+
285+.home_block ul li {
286+ margin-bottom: 5px;
287+}
288
289 /* User Roles Manager */
290
291@@ -375,16 +408,6 @@
292 margin-bottom: 11px;
293 }
294
295-.dash_block form select, .dash_block form textarea, .dash_block form input[type="text"] {
296- width: 265px;
297-}
298-
299-.dash_block form input[type="submit"] {
300- float: right;
301- margin-right: 16px;
302-}
303-
304-
305 /* Tables */
306
307 #content table {
308@@ -537,7 +560,7 @@
309 font-size: 10px;
310 margin-left: -45px;
311 color: #579aff;
312- margin-top: -30px;
313+ margin-top: -25px;
314 }
315
316 #edit_image_link:hover {
317@@ -722,9 +745,15 @@
318 }
319
320 /* forms */
321-.dash_block input[type="text"] {
322+.dash_block form textarea, .dash_block form input[type="text"] {
323 padding: 5px;
324- width: 264px;
325+ width: 250px;
326+}
327+.dash_block form select { width: 264px;}
328+.dash_block form input[type="submit"] {
329+ float: right;
330+ margin-right: 23px;
331+ margin-top: 15px;
332 }
333
334 .dash_block input.create, .dash_block input.attach {
335@@ -748,3 +777,7 @@
336 padding: 5px;
337 margin-bottom: 5px;
338 }
339+
340+form.edit_instance input[type="submit"], form.edit_image input[type="submit"] {
341+ margin-right: 4px;
342+}
343\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: