Merge lp:~cjohnston/qa-dashboard/memevent-padding into lp:qa-dashboard

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 571
Merged at revision: 571
Proposed branch: lp:~cjohnston/qa-dashboard/memevent-padding
Merge into: lp:qa-dashboard
Diff against target: 48 lines (+4/-2)
3 files modified
memevent/templates/memevent/event_detail.html (+1/-1)
memevent/templates/memevent/image_detail.html (+1/-1)
memevent/templates/memevent/image_overview.html (+2/-0)
To merge this branch: bzr merge lp:~cjohnston/qa-dashboard/memevent-padding
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Joe Talbott Approve
Review via email: mp+180133@code.launchpad.net

Commit message

Fixes a couple of minor padding issues in memevent

Description of the change

There were a couple places where grid_15's were put in the wrong location, or not included at all. This fixes that

To post a comment you must log in.
Revision history for this message
Joe Talbott (joetalbott) wrote :

LGTM

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

PASSED: Continuous integration, rev:571
http://s-jenkins:8080/job/dashboard-ci/151/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dashboard-ci/151/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'memevent/templates/memevent/event_detail.html'
2--- memevent/templates/memevent/event_detail.html 2013-07-22 20:43:31 +0000
3+++ memevent/templates/memevent/event_detail.html 2013-08-14 13:27:24 +0000
4@@ -9,10 +9,10 @@
5 {% endblock extra_headers %}
6
7 {% block content %}
8+<div class="grid_15">
9 <h3>
10 Memory Event details for {{ event }}
11 </h3>
12-<div class="grid_15">
13 <div id="event_chart_line">
14 <svg></svg>
15 </div>
16
17=== modified file 'memevent/templates/memevent/image_detail.html'
18--- memevent/templates/memevent/image_detail.html 2013-07-18 15:45:30 +0000
19+++ memevent/templates/memevent/image_detail.html 2013-08-14 13:27:24 +0000
20@@ -8,10 +8,10 @@
21 {% endblock extra_headers %}
22
23 {% block content %}
24+<div class="grid_15">
25 <h3>
26 Memory Event details for {{ image }}
27 </h3>
28-<div class="grid_15">
29 <div id="image_chart">
30 <svg></svg>
31 </div>
32
33=== modified file 'memevent/templates/memevent/image_overview.html'
34--- memevent/templates/memevent/image_overview.html 2013-07-26 17:55:37 +0000
35+++ memevent/templates/memevent/image_overview.html 2013-08-14 13:27:24 +0000
36@@ -4,10 +4,12 @@
37 {% block page_name %}Memory Event details for {{ image }}{% endblock %}
38
39 {% block content %}
40+<div class="grid_15">
41 <h3>
42 Memory Event details for {{ image }}
43 </h3>
44 {% render_table table %}
45
46 <a href="{% url memevent_image_detail image.id machine %}">Detailed View</a>
47+</div>
48 {% endblock content %}

Subscribers

People subscribed via source and target branches