diff --git a/src/accounts/templates/accounts/user_detail.html b/src/accounts/templates/accounts/user_detail.html index cf28653..218e09b 100644 --- a/src/accounts/templates/accounts/user_detail.html +++ b/src/accounts/templates/accounts/user_detail.html @@ -8,8 +8,8 @@ {% trans "Messages" as group_collabs %} {% trans "Contributions" as type_collabs %} - {% include "doughnut-chart.html" with chart_data=type_count chart_div="collabs" name=type_collabs %} - {% include "doughnut-chart.html" with chart_data=list_activity chart_div="collabs2" name=group_collabs %} + {% include "doughnut-chart.html" with chart_data=type_count chart_canvas="collabs" name=type_collabs %} + {% include "doughnut-chart.html" with chart_data=list_activity chart_canvas="collabs2" name=group_collabs %} {% endblock %} {% block main-content %} @@ -102,7 +102,7 @@
- +

@@ -117,7 +117,7 @@
- +

diff --git a/src/static/css/screen.css b/src/static/css/screen.css index 0153db0..627433f 100644 --- a/src/static/css/screen.css +++ b/src/static/css/screen.css @@ -440,9 +440,8 @@ span.highlighted { .chart > p { text-align: center; - margin-top: 10px; + line-height: 1.5em; } .chart > p > label { - margin: 0 3px; - line-height: 2.5em; + margin: 0 2px; } diff --git a/src/templates/base.html b/src/templates/base.html index 9815098..536d0a1 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -22,10 +22,6 @@ href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css" type="text/css" media="screen" /> - {% if not is_mobile %} - {% conversejs_static %} - {% endif %} - @@ -38,6 +34,10 @@ {% block head_js %}{% endblock %} {% block head_css %}{% endblock %} + {% if not is_mobile %} + {% conversejs_static %} + {% endif %} + {% endblock %} diff --git a/src/templates/doughnut-chart.html b/src/templates/doughnut-chart.html index 5607c4b..32e3bdb 100644 --- a/src/templates/doughnut-chart.html +++ b/src/templates/doughnut-chart.html @@ -12,7 +12,7 @@ $(function () { var description = $('.{{ chart_canvas }} > p'); var data = []; - {% for option, value in type_count.items %} + {% for option, value in chart_data.items %} color = colors.shift(); data.push( { @@ -23,7 +23,7 @@ $(function () { } ); description.append($('