LAVA Dispatcher

Merge lp:~mwhudson/lava-dispatcher/style into lp:lava-dispatcher

  1. style
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Rejected
Rejected by: Michael Hudson-Doyle
Proposed branch: lp:~mwhudson/lava-dispatcher/style
Merge into: lp:lava-dispatcher
Diff against target: 129 lines (+52/-17)
5 files modified
lava/scheduler/interface/static/css/style.css (+12/-0)
lava/scheduler/interface/static/js/scheduler_ajax.js (+3/-3)
lava/scheduler/interface/templates/base.html (+29/-11)
lava/scheduler/interface/templates/scheduler/index.html (+7/-1)
lava/scheduler/interface/urls.py (+1/-2)
To merge this branch: bzr merge lp:~mwhudson/lava-dispatcher/style
Reviewer Review Type Date Requested Status
Paul Larson Pending
Review via email: mp+57259@code.launchpad.net

Description of the change

This branch adds a style sheet, moves the only page to the front of the application, tidies up the base template a bit and adds a terrible, terrible logo. You can see what the page looks like with these changes at http://people.linaro.org/~mwh/index.png.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Wow, that really is a bad logo! :)
I had actually thought the launch-control red theme was kind of fitting for lava as well, and it would also be nice for consistency across the tools. But possibly with some simple logo, yes.

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Let's bash mirsad's branch into something usable instead.

Unmerged revisions

32. By Michael Hudson-Doyle

add hilariously terrible logo
add favicon
add stylesheet
fix template inheritance
make base template a bit nicer

31. By Michael Hudson-Doyle

fix lint in js

30. By Michael Hudson-Doyle

move job submission to site root

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'lava/scheduler/interface/static/css'
2=== added file 'lava/scheduler/interface/static/css/style.css'
3--- lava/scheduler/interface/static/css/style.css 1970-01-01 00:00:00 +0000
4+++ lava/scheduler/interface/static/css/style.css 2011-04-11 23:20:52 +0000
5@@ -0,0 +1,12 @@
6+body {
7+ font-family: sans;
8+}
9+a img { border: none; }
10+div.content {
11+ margin-left: auto;
12+ margin-right: auto;
13+ width: 75%;
14+}
15+img.logo {
16+ float: left;
17+}
18
19=== added directory 'lava/scheduler/interface/static/images'
20=== added file 'lava/scheduler/interface/static/images/linaro.ico'
21Binary files lava/scheduler/interface/static/images/linaro.ico 1970-01-01 00:00:00 +0000 and lava/scheduler/interface/static/images/linaro.ico 2011-04-11 23:20:52 +0000 differ
22=== added file 'lava/scheduler/interface/static/images/logo.png'
23Binary files lava/scheduler/interface/static/images/logo.png 1970-01-01 00:00:00 +0000 and lava/scheduler/interface/static/images/logo.png 2011-04-11 23:20:52 +0000 differ
24=== modified file 'lava/scheduler/interface/static/js/scheduler_ajax.js'
25--- lava/scheduler/interface/static/js/scheduler_ajax.js 2011-03-21 17:49:27 +0000
26+++ lava/scheduler/interface/static/js/scheduler_ajax.js 2011-04-11 23:20:52 +0000
27@@ -1,11 +1,11 @@
28 function get_test_cases(){
29- new Ajax.Request('/scheduler/', {
30+ new Ajax.Request('/', {
31 method: 'post',
32 parameters: $H({'test_suite':$('id_test_suite').getValue()}),
33 onSuccess: function(transport) {
34- var e = $('id_test_case')
35+ var e = $('id_test_case');
36 if(transport.responseText)
37- e.update(transport.responseText)
38+ e.update(transport.responseText);
39 }
40 }); // end new Ajax.Request
41 }
42
43=== modified file 'lava/scheduler/interface/templates/base.html'
44--- lava/scheduler/interface/templates/base.html 2011-04-07 04:01:20 +0000
45+++ lava/scheduler/interface/templates/base.html 2011-04-11 23:20:52 +0000
46@@ -1,16 +1,34 @@
47-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
48-<html lang="en">
49+<?xml version="1.0" encoding="utf-8"?>
50+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
51+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
52+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
53 <head>
54- <title>Lava: Submit test job</title>
55- <script type="text/javascript" src="/scheduler/static/js/prototype.js"></script>
56- <script type="text/javascript" src="/scheduler/static/js/scheduler_ajax.js"></script>
57+ <script type="text/javascript" src="{{MEDIA_URL}}js/prototype.js"></script>
58+ <script type="text/javascript" src="{{MEDIA_URL}}js/scheduler_ajax.js"></script>
59+ <link rel="shortcut icon" href="{{MEDIA_URL}}images/linaro.ico" />
60+ <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/style.css" />
61+ <title>{% block title %}LAVA{% endblock %}</title>
62 </head>
63 <body>
64- {% if user.is_authenticated %}
65- Logged in as {{ user.username }} - <a href="{{ logout_url }}">log out</a>
66- {% else %}
67- <a id="log-in" href="{{ login_url }}">Login</a>
68- {% endif %}
69- {% block content %}{% endblock %}
70+ <div class="content">
71+ <p id="login-p" style="text-align: right; margin: 0 0 0 0; padding: 0 0 0 0">
72+ {% if user.is_authenticated %}
73+ Logged in as {{ user.username }} - <a href="{{ logout_url }}">log out</a>
74+ {% else %}
75+ <a id="log-in" href="{{ login_url }}">Login</a>
76+ {% endif %}
77+ </p>
78+ <table>
79+ <tr>
80+ <td>
81+ <a href="{{ root }}"><img src="{{MEDIA_URL}}images/logo.png" class="logo" /></a>
82+ </td>
83+ <td>
84+ <h1>{% block heading %}LAVA{% endblock %}</h1>
85+ </td>
86+ </tr>
87+ </table>
88+ {% block content %}{% endblock %}
89+ </div>
90 </body>
91 </html>
92
93=== modified file 'lava/scheduler/interface/templates/scheduler/index.html'
94--- lava/scheduler/interface/templates/scheduler/index.html 2011-04-07 04:01:20 +0000
95+++ lava/scheduler/interface/templates/scheduler/index.html 2011-04-11 23:20:52 +0000
96@@ -1,4 +1,4 @@
97-{% include "base.html" %}
98+{% extends "base.html" %}
99 {% block content %}
100 <form action="." method="post">
101 {{ form.as_p }}
102@@ -30,3 +30,9 @@
103 {% endif %}
104 </p>
105 {% endblock %}
106+{% block heading %}
107+Submit test job
108+{% endblock %}
109+{% block title %}
110+LAVA: Submit test job
111+{% endblock %}
112
113=== modified file 'lava/scheduler/interface/urls.py'
114--- lava/scheduler/interface/urls.py 2011-04-08 05:22:01 +0000
115+++ lava/scheduler/interface/urls.py 2011-04-11 23:20:52 +0000
116@@ -5,12 +5,11 @@
117 admin.autodiscover()
118
119 urlpatterns = patterns('',
120- (r'^scheduler/', include('lava.scheduler.interface.scheduler_app.urls')),
121 (r'^openid/', include('django_openid_auth.urls')),
122 (r'^logout$', 'django.contrib.auth.views.logout'),
123 # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
124 # to INSTALLED_APPS to enable admin documentation:
125 # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
126-
127 (r'^admin/', include(admin.site.urls)),
128+ (r'^', include('lava.scheduler.interface.scheduler_app.urls')),
129 )

Subscribers

People subscribed via source and target branches