Download as
Browse Code »

Commit 79e2a9dfe72fe0ac94c6b989abe469e45a01fd81

Authored by Marco
Committed by Sergio Oliveira
1 parent 30100e16
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

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
  Diff comments   View file @79e2a9d
... ... @@ -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
  Diff comments   View file @79e2a9d
... ... @@ -440,9 +440,8 @@ span.highlighted {
440 440  
441 441 .chart > p {
442 442 text-align: center;
443   - margin-top: 10px;
  443 + line-height: 1.5em;
444 444 }
445 445 .chart > p > label {
446   - margin: 0 3px;
447   - line-height: 2.5em;
  446 + margin: 0 2px;
448 447 }
... ...
src/templates/base.html
  Diff comments   View file @79e2a9d
... ... @@ -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
  Diff comments   View file @79e2a9d
... ... @@ -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 );
... ...