Merge lp:~allanlesage/qa-coverage-dashboard/deployment-necessary-changes into lp:qa-coverage-dashboard

Proposed by Allan LeSage on 2014-06-02
Status: Needs review
Proposed branch: lp:~allanlesage/qa-coverage-dashboard/deployment-necessary-changes
Merge into: lp:qa-coverage-dashboard
Prerequisite: lp:~allanlesage/qa-coverage-dashboard/aggregate-by-product
Diff against target: 83 lines (+5/-19)
5 files modified
gaps/static/gaps/js/gaps_chart.js (+1/-2)
gaps/templates/gaps/gaps_layout.html (+0/-1)
gaps/templates/gaps/product_list.html (+2/-13)
gaps/views.py (+0/-1)
qa_dashboard/settings.py (+2/-2)
To merge this branch: bzr merge lp:~allanlesage/qa-coverage-dashboard/deployment-necessary-changes
Reviewer Review Type Date Requested Status
gaps 2014-06-02 Pending
Review via email: mp+221790@code.launchpad.net

Commit message

Add some minor deployment-necessary changes.

Description of the change

A few minor changes necessary for deployment:

* eliminate gviz_api
* stuff a d3 graph back into html until Django's static settings can be sorted
* a STATIC_URL settings reversion

To post a comment you must log in.

Unmerged revisions

782. By Allan LeSage on 2014-06-02

Compile some deployment-necessary changes for merge.

781. By Allan LeSage on 2014-05-27

Move product_list js back into html, broken in production.

780. By Allan LeSage on 2014-05-26

Merge chris.gagnon's axis indenting fix.

779. By Allan LeSage on 2014-05-23

Move templates around for product.

778. By Allan LeSage on 2014-05-23

Some pull fixes, fill in dict of products and projects with health check info.

777. By Allan LeSage on 2014-05-22

Merge trunk, resolving conflicts.

776. By Allan LeSage on 2014-05-22

Remove an obviated cu2d module.

775. By Allan LeSage on 2014-05-22

Skip a test until further notice.

774. By Allan LeSage on 2014-05-22

Add some logging for clarity.

773. By Allan LeSage on 2014-05-22

Fix url_artifact last_build_only, another fix for actual pull.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gaps/static/gaps/js/gaps_chart.js'
2--- gaps/static/gaps/js/gaps_chart.js 2014-06-02 21:10:05 +0000
3+++ gaps/static/gaps/js/gaps_chart.js 2014-06-02 21:10:05 +0000
4@@ -2,8 +2,7 @@
5 d3.json(data_url, function(data) {
6 nv.addGraph(function() {
7 var chart = nv.models.lineChart()
8- .width(900).height(400);
9-
10+ .width(1100).height(400);
11 chart.forceY([0, 1]);
12
13 chart.xAxis
14
15=== modified file 'gaps/templates/gaps/gaps_layout.html'
16--- gaps/templates/gaps/gaps_layout.html 2014-04-04 23:18:27 +0000
17+++ gaps/templates/gaps/gaps_layout.html 2014-06-02 21:10:05 +0000
18@@ -6,5 +6,4 @@
19 <!-- need to switch back to cdnjs when bugs are fixed
20 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/nvd3/0.9/nv.d3.js"></script>-->
21 <script type="text/javascript" src="//6df403e3d98e2ac67ac2-180150c581869d2c4c18db9c9e3179c4.r40.cf1.rackcdn.com/nv.d3.js"></script>
22- <script type='text/javascript' src='{% static "gaps/js/gaps_chart.js" %}'></script>
23 {% endblock%}
24
25=== modified file 'gaps/templates/gaps/product_list.html'
26--- gaps/templates/gaps/product_list.html 2014-06-02 21:10:05 +0000
27+++ gaps/templates/gaps/product_list.html 2014-06-02 21:10:05 +0000
28@@ -27,26 +27,15 @@
29 nv.addGraph(function() {
30 var chart = nv.models.lineChart()
31 .width(900).height(400);
32-
33 chart.forceY([0, 1]);
34-
35 chart.xAxis
36 .axisLabel('Date')
37 .tickFormat(function(d){return d3.time.format('%Y%m%d')(new Date(d * 1000));})
38- .staggerLabels(true);
39-
40 chart.yAxis
41 .axisLabel('%')
42- .tickFormat(d3.format('%'));
43-
44- d3.select('#line-chart svg')
45- .datum(data)
46- .transition()
47- .duration(500)
48- .call(chart);
49-
50+ .tickFormat(d3.format('%'))
51+ d3.select('#line-chart svg').datum(data).transition().duration(500).call(chart);
52 nv.utils.windowResize(chart.update);
53-
54 return chart;
55 }); //d3.json
56 }); //addGraph
57
58=== modified file 'gaps/views.py'
59--- gaps/views.py 2014-06-02 21:10:05 +0000
60+++ gaps/views.py 2014-06-02 21:10:05 +0000
61@@ -3,7 +3,6 @@
62 from django.http import HttpResponse
63 from django.template import (Context, loader)
64 from django.shortcuts import get_object_or_404
65-import gviz_api
66
67 from common.bread_crumbs import (BreadCrumb,
68 BreadCrumbTrail)
69
70=== modified file 'qa_dashboard/settings.py'
71--- qa_dashboard/settings.py 2014-06-02 21:10:05 +0000
72+++ qa_dashboard/settings.py 2014-06-02 21:10:05 +0000
73@@ -116,8 +116,8 @@
74 # Example: "http://media.lawrence.com/static/"
75
76 #TODO CHANGE THIS BACK!!! WHEN WE MERGE BACK IN
77-#STATIC_URL = STATIC_URL_BASE + assets_revision + '/'
78-STATIC_URL = '/static/'
79+STATIC_URL = STATIC_URL_BASE + assets_revision + '/'
80+#STATIC_URL = '/static/'
81
82 # URL prefix for admin static files -- CSS, JavaScript and images.
83 # Make sure to use a trailing slash.

Subscribers

People subscribed via source and target branches

to all changes: