mirror of
git://git.yoctoproject.org/layerindex-web.git
synced 2025-07-19 20:59:01 +02:00
Fix OE-Classic stats page for update to latest django-nvd3 (0.6.0)
Update d3/nvd3 js files in the process, but hold off on nv.d3.css for now because the latest version breaks the formatting/fading on tooltips. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
parent
5ee1bb255b
commit
5aa533b678
2
README
2
README
|
@ -150,7 +150,7 @@ Bundled uitablefilter.js is redistributed under the MIT license.
|
|||
|
||||
Bundled nv.d3.js is redistributed under the Apache License 2.0.
|
||||
|
||||
Bundled d3.v2.js is redistributed under the BSD License.
|
||||
Bundled d3.js is redistributed under the BSD License.
|
||||
|
||||
All other content is copyright (C) 2013 Intel Corporation and licensed
|
||||
under the MIT license (unless otherwise noted) - see COPYING.MIT for
|
||||
|
|
9275
layerindex/static/js/d3.js
vendored
Normal file
9275
layerindex/static/js/d3.js
vendored
Normal file
File diff suppressed because it is too large
Load Diff
7033
layerindex/static/js/d3.v2.js
vendored
7033
layerindex/static/js/d3.v2.js
vendored
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -742,6 +742,12 @@ class ClassicRecipeStatsView(TemplateView):
|
|||
chartdata = {'x': statuses, 'y': [status_counts[k] for k in statuses]}
|
||||
context['charttype_status'] = 'pieChart'
|
||||
context['chartdata_status'] = chartdata
|
||||
context['extra_status'] = {
|
||||
'x_is_date': False,
|
||||
'x_axis_format': '',
|
||||
'tag_script_js': True,
|
||||
'jquery_on_ready': False,
|
||||
}
|
||||
# *** Categories chart ***
|
||||
categories = ['obsoletedir', 'nonworkingdir']
|
||||
uniquevals = ClassicRecipe.objects.exclude(classic_category='').values_list('classic_category', flat=True).distinct()
|
||||
|
@ -771,4 +777,10 @@ class ClassicRecipeStatsView(TemplateView):
|
|||
chartdata_category = {'x': categories, 'y': [catcounts[k] for k in categories]}
|
||||
context['charttype_category'] = 'pieChart'
|
||||
context['chartdata_category'] = chartdata_category
|
||||
context['extra_category'] = {
|
||||
'x_is_date': False,
|
||||
'x_axis_format': '',
|
||||
'tag_script_js': True,
|
||||
'jquery_on_ready': False,
|
||||
}
|
||||
return context
|
||||
|
|
|
@ -48,9 +48,9 @@
|
|||
{% block scripts %}
|
||||
|
||||
<link media="all" href="{% static "css/nv.d3.css" %}" type="text/css" rel="stylesheet" />
|
||||
<script src="{% static "js/d3.v2.js" %}" type="text/javascript"></script>
|
||||
<script src="{% static "js/d3.js" %}" type="text/javascript"></script>
|
||||
<script src="{% static "js/nv.d3.js" %}" type="text/javascript"></script>
|
||||
|
||||
{% load_chart charttype_status chartdata_status "chart_status" %}
|
||||
{% load_chart charttype_category chartdata_category "chart_category" %}
|
||||
{% load_chart charttype_status chartdata_status "chart_status" extra_status %}
|
||||
{% load_chart charttype_category chartdata_category "chart_category" extra_category %}
|
||||
{% endblock %}
|
||||
|
|
Loading…
Reference in New Issue
Block a user