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
=== modified file 'gaps/static/gaps/js/gaps_chart.js'
--- gaps/static/gaps/js/gaps_chart.js 2014-06-02 21:10:05 +0000
+++ gaps/static/gaps/js/gaps_chart.js 2014-06-02 21:10:05 +0000
@@ -2,8 +2,7 @@
2 d3.json(data_url, function(data) {2 d3.json(data_url, function(data) {
3 nv.addGraph(function() {3 nv.addGraph(function() {
4 var chart = nv.models.lineChart()4 var chart = nv.models.lineChart()
5 .width(900).height(400);5 .width(1100).height(400);
6
7 chart.forceY([0, 1]);6 chart.forceY([0, 1]);
87
9 chart.xAxis8 chart.xAxis
109
=== modified file 'gaps/templates/gaps/gaps_layout.html'
--- gaps/templates/gaps/gaps_layout.html 2014-04-04 23:18:27 +0000
+++ gaps/templates/gaps/gaps_layout.html 2014-06-02 21:10:05 +0000
@@ -6,5 +6,4 @@
6 <!-- need to switch back to cdnjs when bugs are fixed6 <!-- need to switch back to cdnjs when bugs are fixed
7<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/nvd3/0.9/nv.d3.js"></script>-->7<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/nvd3/0.9/nv.d3.js"></script>-->
8 <script type="text/javascript" src="//6df403e3d98e2ac67ac2-180150c581869d2c4c18db9c9e3179c4.r40.cf1.rackcdn.com/nv.d3.js"></script>8 <script type="text/javascript" src="//6df403e3d98e2ac67ac2-180150c581869d2c4c18db9c9e3179c4.r40.cf1.rackcdn.com/nv.d3.js"></script>
9 <script type='text/javascript' src='{% static "gaps/js/gaps_chart.js" %}'></script>
10{% endblock%}9{% endblock%}
1110
=== modified file 'gaps/templates/gaps/product_list.html'
--- gaps/templates/gaps/product_list.html 2014-06-02 21:10:05 +0000
+++ gaps/templates/gaps/product_list.html 2014-06-02 21:10:05 +0000
@@ -27,26 +27,15 @@
27 nv.addGraph(function() {27 nv.addGraph(function() {
28 var chart = nv.models.lineChart()28 var chart = nv.models.lineChart()
29 .width(900).height(400);29 .width(900).height(400);
30
31 chart.forceY([0, 1]);30 chart.forceY([0, 1]);
32
33 chart.xAxis31 chart.xAxis
34 .axisLabel('Date')32 .axisLabel('Date')
35 .tickFormat(function(d){return d3.time.format('%Y%m%d')(new Date(d * 1000));})33 .tickFormat(function(d){return d3.time.format('%Y%m%d')(new Date(d * 1000));})
36 .staggerLabels(true);
37
38 chart.yAxis34 chart.yAxis
39 .axisLabel('%')35 .axisLabel('%')
40 .tickFormat(d3.format('%'));36 .tickFormat(d3.format('%'))
41 37 d3.select('#line-chart svg').datum(data).transition().duration(500).call(chart);
42 d3.select('#line-chart svg')
43 .datum(data)
44 .transition()
45 .duration(500)
46 .call(chart);
47
48 nv.utils.windowResize(chart.update);38 nv.utils.windowResize(chart.update);
49
50 return chart;39 return chart;
51 }); //d3.json40 }); //d3.json
52 }); //addGraph41 }); //addGraph
5342
=== modified file 'gaps/views.py'
--- gaps/views.py 2014-06-02 21:10:05 +0000
+++ gaps/views.py 2014-06-02 21:10:05 +0000
@@ -3,7 +3,6 @@
3from django.http import HttpResponse3from django.http import HttpResponse
4from django.template import (Context, loader)4from django.template import (Context, loader)
5from django.shortcuts import get_object_or_4045from django.shortcuts import get_object_or_404
6import gviz_api
76
8from common.bread_crumbs import (BreadCrumb,7from common.bread_crumbs import (BreadCrumb,
9 BreadCrumbTrail)8 BreadCrumbTrail)
109
=== modified file 'qa_dashboard/settings.py'
--- qa_dashboard/settings.py 2014-06-02 21:10:05 +0000
+++ qa_dashboard/settings.py 2014-06-02 21:10:05 +0000
@@ -116,8 +116,8 @@
116# Example: "http://media.lawrence.com/static/"116# Example: "http://media.lawrence.com/static/"
117117
118#TODO CHANGE THIS BACK!!! WHEN WE MERGE BACK IN118#TODO CHANGE THIS BACK!!! WHEN WE MERGE BACK IN
119#STATIC_URL = STATIC_URL_BASE + assets_revision + '/'119STATIC_URL = STATIC_URL_BASE + assets_revision + '/'
120STATIC_URL = '/static/'120#STATIC_URL = '/static/'
121121
122# URL prefix for admin static files -- CSS, JavaScript and images.122# URL prefix for admin static files -- CSS, JavaScript and images.
123# Make sure to use a trailing slash.123# Make sure to use a trailing slash.

Subscribers

People subscribed via source and target branches

to all changes: