Code Review
/
pharos-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add Nav Button Disabling Behavior"
[pharos-tools.git]
/
dashboard
/
src
/
templates
/
dashboard
/
resource_all.html
diff --git
a/dashboard/src/templates/dashboard/resource_all.html
b/dashboard/src/templates/dashboard/resource_all.html
index
a770d4e
..
0b0d0d4
100644
(file)
--- a/
dashboard/src/templates/dashboard/resource_all.html
+++ b/
dashboard/src/templates/dashboard/resource_all.html
@@
-2,6
+2,7
@@
{% load staticfiles %}
{% block extrahead %}
{% load staticfiles %}
{% block extrahead %}
+ {{ block.super }}
<!-- Morris Charts CSS -->
<link href="{% static "bower_components/morrisjs/morris.css" %}" rel="stylesheet">
<!-- Morris Charts CSS -->
<link href="{% static "bower_components/morrisjs/morris.css" %}" rel="stylesheet">
@@
-63,10
+64,6
@@
var chart_id = "{{ resource.id }}_booking_utilization";
var utilization_url = "{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=4 %}";
loadChartData(chart_id, utilization_url);
var chart_id = "{{ resource.id }}_booking_utilization";
var utilization_url = "{% url 'dashboard:booking_utilization' resource_id=resource.id weeks=4 %}";
loadChartData(chart_id, utilization_url);
-
- var chart_id = "{{ resource.id }}_jenkins_utilization";
- var utilization_url = "{% url 'dashboard:jenkins_utilization' resource_id=resource.id weeks=1 %}";
- loadChartData(chart_id, utilization_url);
{% endfor %}
});
</script>
{% endfor %}
});
</script>