Ubuntu CI Services

Merge lp:~cjohnston/ubuntu-ci-services-itself/webui into lp:ubuntu-ci-services-itself

  1. webui
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Joe Talbott
Approved revision: 211
Merged at revision: 224
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/webui
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 195 lines (+42/-33)
4 files modified
webui/index.html (+6/-5)
webui/ticket.html (+7/-3)
webui/webui.css (+21/-18)
webui/webui.js (+8/-7)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/webui
Reviewer Review Type Date Requested Status
Joe Talbott (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Chris Johnston (community) Needs Resubmitting
Review via email: mp+204775@code.launchpad.net

Commit message

Make changes to the theme and ticket layout

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:207
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/79/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/79/rebuild

review: Approve (continuous-integration)
lp:~cjohnston/ubuntu-ci-services-itself/webui updated
208. By Chris Johnston

Updates pre review

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:208
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/81/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/81/rebuild

review: Approve (continuous-integration)
lp:~cjohnston/ubuntu-ci-services-itself/webui updated
209. By Chris Johnston

Fix refresh not showing up

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:209
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/84/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/84/rebuild

review: Approve (continuous-integration)
Revision history for this message
Joe Talbott (joetalbott) wrote :

57 and 140 are not needed. Y.one('body').append adds the refresh div as its last child. If your intent is to append it after div#container you can append it to that div's parent.

lp:~cjohnston/ubuntu-ci-services-itself/webui updated
210. By Chris Johnston

Merge trunk

211. By Chris Johnston

Change where refresh attaches to in the page

Revision history for this message
Chris Johnston (cjohnston) :
review: Needs Resubmitting
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:211
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/94/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/94/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:211
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/96/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/96/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:211
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/100/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/100/rebuild

review: Approve (continuous-integration)
Revision history for this message
Joe Talbott (joetalbott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'webui/index.html'
2--- webui/index.html 2014-01-31 19:07:11 +0000
3+++ webui/index.html 2014-02-05 23:48:18 +0000
4@@ -6,9 +6,9 @@
5 <script type="text/javascript" src="webui.js"></script>
6 <script type="text/javascript" src="webui_ticket_list.js"></script>
7 <link rel="stylesheet" href="webui.css">
8- <title>CI Engine Web UI</title>
9+ <title>Ubuntu CI Engine</title>
10 </head>
11- <body id="doc">
12+ <body>
13
14 <header class="banner global" role="banner">
15 <nav role="navigation" class="nav-primary nav-right">
16@@ -23,9 +23,10 @@
17 </ul>
18 </nav>
19 </header><!-- /#header -->
20-
21+ <div class='container_15 clearfix'>
22+ <div class="wrapper">
23+ <div id="main-content" class="inner-wrapper">
24 <div id="table" class="yui3-skin-sam"></div>
25- Click a row for details.
26- <div id="container"></div>
27+ </div></div></div>
28 </body>
29 </html>
30
31=== modified file 'webui/ticket.html'
32--- webui/ticket.html 2014-01-31 19:07:11 +0000
33+++ webui/ticket.html 2014-02-05 23:48:18 +0000
34@@ -6,9 +6,9 @@
35 <script type="text/javascript" src="webui_ticket_detail.js"></script>
36 <link rel="stylesheet" type="text/css" media="screen" href="ubuntu-styles.css" />
37 <link rel="stylesheet" href="webui.css">
38- <title>CI Engine Web UI Ticket Details</title>
39+ <title>Ubuntu CI Engine - Ticket Details</title>
40 </head>
41- <body id="doc">
42+ <body>
43 <header class="banner global" role="banner">
44 <nav role="navigation" class="nav-primary nav-right">
45 <div class="logo">
46@@ -22,7 +22,11 @@
47 </ul>
48 </nav>
49 </header><!-- /#header -->
50-
51+
52+ <div class='container_15 clearfix'>
53+ <div class="wrapper">
54+ <div id="main-content" class="inner-wrapper">
55 <div id="container"></div>
56+ </div></div></div>
57 </body>
58 </html>
59
60=== modified file 'webui/webui.css'
61--- webui/webui.css 2014-01-31 19:07:11 +0000
62+++ webui/webui.css 2014-02-05 23:48:18 +0000
63@@ -2,21 +2,19 @@
64 background-color: #EFEFEF;
65 }
66
67-#doc {
68- margin: auto;
69- width: 800px;
70- min-width: 600px;
71- text-align: center;
72-}
73-
74 div#container {
75 padding: 5px;
76 overflow: auto;
77 margin: 0 auto;
78 }
79
80+div#container,h4 {
81+ margin-bottom: 0px;
82+}
83+
84 div.subticket,div.ticket {
85 /* border: 2px solid black; */
86+ padding: 15px 0px 15px 0px;
87 display: block;
88 margin: 5px;
89 text-align: left;
90@@ -28,7 +26,20 @@
91 box-shadow: 0 2px 2px 0 #C2C2C2;
92 }
93
94-div.subticket,div.ticket,h3,h2 {
95+div.ticket {
96+ margin: 10px 10px 20px 10px;
97+}
98+
99+div.subticket {
100+ margin: 10px 25px 20px 25px;
101+}
102+
103+
104+div.subticket,div.ticket,h4,h3,h2 {
105+ text-align: center;
106+}
107+
108+div#status {
109 text-align: center;
110 }
111
112@@ -62,14 +73,6 @@
113 background-color: #EFEFEF;
114 }
115
116-header.banner .logo {
117- padding-left: 12px;
118-}
119-
120-header.banner .nav-primary {
121- width: 100%;
122-}
123-
124-header.banner .logo-ubuntu span {
125- top: 3px;
126+#refresh {
127+ padding: 5px;
128 }
129
130=== modified file 'webui/webui.js'
131--- webui/webui.js 2014-02-04 18:59:04 +0000
132+++ webui/webui.js 2014-02-05 23:48:18 +0000
133@@ -12,7 +12,7 @@
134 'id="refresh_rate" value="10" maxlength="3" size="2"/> seconds.</small>'
135 );
136
137- Y.one('body').append(refresh);
138+ Y.one('div#main-content').append(refresh);
139
140 var refresh_rate = Y.one("#refresh_rate");
141 Y.webui.refresh_timeout = null;
142@@ -144,7 +144,7 @@
143 var div = Y.Node.create("<div class='subticket'></div>");
144
145 var table = div.appendChild(Y.Node.create("<table>"));
146- var hidden_fields = Y.Array(['id', 'resource_uri']);
147+ var hidden_fields = Y.Array(['id', 'resource_uri', 'current_workflow_step', 'status', 'source_package_upload']);
148
149 for (var key in data) {
150 // Skip hidden fields
151@@ -200,14 +200,14 @@
152 return span;
153 },
154 ticket_detail_element: function(data) {
155- var hidden_fields = Y.Array(['id', 'title', 'subticket', 'resource_uri']);
156+ var hidden_fields = Y.Array(['id', 'title', 'subticket', 'resource_uri', 'current_workflow_step', 'status', 'owner', 'description']);
157
158 div = Y.Node.create("<div id='table_wrapper'/>");
159 ticket_div = div.appendChild(Y.Node.create("<div class='ticket'></div>"));
160 table = ticket_div.appendChild(Y.Node.create("<table></table>"));
161
162 if (data['title']) {
163- div.prepend(Y.Node.create('<h2>' + data['title'] + '</h2>'));
164+ div.prepend(Y.Node.create('<h2>#' + data['id'] + ' - ' + data['title'] + '</h2><h4><strong>Workflow Step:</strong> ' + data['current_workflow_step'] + ' <strong>Status:</strong> ' + data['status'] + '</h4><strong>Owner:</strong> ' + data['owner'] + '<br /><strong>Description:</strong> ' + data['description']));
165 }
166
167 for (var key in data) {
168@@ -228,15 +228,16 @@
169
170 tr = Y.Node.create('<tr></tr>');
171 table.appendChild(tr);
172- tr.appendChild(Y.Node.create('<th>' + key + '</th>'));
173+ tr.appendChild(Y.Node.create('<th>' + key + ': </th>'));
174 tr.appendChild(Y.Node.create('<td>' + value + '</td>'));
175 }
176
177 if (data['subticket']) {
178- div.appendChild("<h3>Subtickets</h3>");
179+ div.appendChild("<h3>Uploads</h3>");
180 var subticket_count = data['subticket'].length;
181 if (subticket_count > 0) {
182 for (var i = 0; i < subticket_count; i++) {
183+ div.appendChild("<h4>" + data['subticket'][i]['source_package_upload']['sourcepackage']['name'] + " " + data['subticket'][i]['source_package_upload']['version'] + "</h4><div id='status'><strong>Workflow step:</strong> " + data['subticket'][i]['current_workflow_step'] + " <strong>Status:</strong> " + data['subticket'][i]['status'] + "</div>");
184 var subticket = data['subticket'][i];
185
186 var subt = Y.webui.make_subticket(subticket);
187@@ -369,7 +370,7 @@
188 };
189 var columns = [
190 {key: 'title', label: 'Title', formatter: format_id},
191- {key: 'current_workflow_step', label: 'Workflow Step'},
192+ {key: 'current_workflow_step', label: 'Workflow step'},
193 {key: 'status', label: 'Status'}
194 ]
195 var data = [];

Subscribers

People subscribed via source and target branches