Commit 79e2a9dfe72fe0ac94c6b989abe469e45a01fd81
Committed by
Sergio Oliveira
1 parent
30100e16
Exists in
master
and in
39 other branches
Update charts and fix layout issues
Showing
4 changed files
with
12 additions
and
13 deletions
Show diff stats
src/accounts/templates/accounts/user_detail.html
... | ... | @@ -8,8 +8,8 @@ |
8 | 8 | {% trans "Messages" as group_collabs %} |
9 | 9 | {% trans "Contributions" as type_collabs %} |
10 | 10 | |
11 | - {% include "doughnut-chart.html" with chart_data=type_count chart_div="collabs" name=type_collabs %} | |
12 | - {% include "doughnut-chart.html" with chart_data=list_activity chart_div="collabs2" name=group_collabs %} | |
11 | + {% include "doughnut-chart.html" with chart_data=type_count chart_canvas="collabs" name=type_collabs %} | |
12 | + {% include "doughnut-chart.html" with chart_data=list_activity chart_canvas="collabs2" name=group_collabs %} | |
13 | 13 | {% endblock %} |
14 | 14 | |
15 | 15 | {% block main-content %} |
... | ... | @@ -102,7 +102,7 @@ |
102 | 102 | <div class="panel-body"> |
103 | 103 | <div id="collabs"></div> |
104 | 104 | <div class="chart collabs"> |
105 | - <canvas width="270" height="270"></canvas> | |
105 | + <canvas width="200" height="200"></canvas> | |
106 | 106 | <p></p> |
107 | 107 | </div> |
108 | 108 | </div> |
... | ... | @@ -117,7 +117,7 @@ |
117 | 117 | </div> |
118 | 118 | <div class="panel-body"> |
119 | 119 | <div class="chart collabs2"> |
120 | - <canvas width="270" height="270"></canvas> | |
120 | + <canvas width="200" height="200"></canvas> | |
121 | 121 | <p></p> |
122 | 122 | </div> |
123 | 123 | </div> | ... | ... |
src/static/css/screen.css
src/templates/base.html
... | ... | @@ -22,10 +22,6 @@ |
22 | 22 | href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css" |
23 | 23 | type="text/css" media="screen" /> |
24 | 24 | |
25 | - {% if not is_mobile %} | |
26 | - {% conversejs_static %} | |
27 | - {% endif %} | |
28 | - | |
29 | 25 | <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css" |
30 | 26 | type="text/css" media="screen" /> |
31 | 27 | |
... | ... | @@ -38,6 +34,10 @@ |
38 | 34 | {% block head_js %}{% endblock %} |
39 | 35 | {% block head_css %}{% endblock %} |
40 | 36 | |
37 | + {% if not is_mobile %} | |
38 | + {% conversejs_static %} | |
39 | + {% endif %} | |
40 | + | |
41 | 41 | {% endblock %} |
42 | 42 | </head> |
43 | 43 | ... | ... |
src/templates/doughnut-chart.html
... | ... | @@ -12,7 +12,7 @@ $(function () { |
12 | 12 | var description = $('.{{ chart_canvas }} > p'); |
13 | 13 | var data = []; |
14 | 14 | |
15 | - {% for option, value in type_count.items %} | |
15 | + {% for option, value in chart_data.items %} | |
16 | 16 | color = colors.shift(); |
17 | 17 | data.push( |
18 | 18 | { |
... | ... | @@ -23,7 +23,7 @@ $(function () { |
23 | 23 | } |
24 | 24 | ); |
25 | 25 | description.append($('<label>') |
26 | - .addClass('label label-defaultj') | |
26 | + .addClass('label label-default') | |
27 | 27 | .css('background', color) |
28 | 28 | .append('{{ option }}') |
29 | 29 | ); | ... | ... |