Download as
Browse Code »

Commit d01cc219fa05ed8c1c71676faf46cb67eb3759d4

Authored by Zambom
1 parent 632a061b
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Answered goals report style adjustments and activate i18n

Showing 4 changed files with 36 additions and 13 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @d01cc21
... ... @@ -1196,6 +1196,10 @@ li.item .notify_badge {
1196 1196 font-weight: 700;
1197 1197 font-size: 20px;
1198 1198 }
  1199 +
  1200 +div.dataTables_wrapper div.dataTables_paginate {
  1201 + text-align: center !important;
  1202 +}
1199 1203 /* End Goals */
1200 1204  
1201 1205  
... ...
amadeus/static/js/goals_reports.js
  Diff comments   View file @d01cc21
... ... @@ -23,7 +23,8 @@ function getAnswered() {
23 23 // return false;
24 24 // });
25 25 $('#answered_table').DataTable({
26   - "dom": "frtip"
  26 + "dom": "frtip",
  27 + "language": dataTablei18n
27 28 });
28 29 // var items = $("#answered_table").children(":visible").length;
29 30  
... ...
goals/templates/goals/_answered.html
  Diff comments   View file @d01cc21
... ... @@ -8,27 +8,19 @@
8 8 <table id="answered_table" class="table table-striped table-bordered">
9 9 <thead>
10 10 <th>
11   - <a href="">
12   - {% trans 'Student' %} <i class="fa fa-fw pull-right"></i>
13   - </a>
  11 + {% trans 'Student' %}
14 12 </th>
15 13 <th>
16 14 {% trans 'Group' %}
17 15 </th>
18 16 <th>
19   - <a href="">
20   - {% trans 'Definition Date' %} <i class="fa fa-fw pull-right"></i>
21   - </a>
  17 + {% trans 'Definition Date' %}
22 18 </th>
23 19 <th>
24   - <a href="">
25   - {% trans 'Update Date' %} <i class="fa fa-fw pull-right"></i>
26   - </a>
  20 + {% trans 'Update Date' %}
27 21 </th>
28 22 <th>
29   - <a href="">
30   - {% trans 'Goals' %} <i class="fa fa-fw pull-right"></i>
31   - </a>
  23 + {% trans 'Goals' %}
32 24 </th>
33 25 </thead>
34 26 <tbody>
... ...
goals/templates/goals/reports.html
  Diff comments   View file @d01cc21
... ... @@ -66,5 +66,31 @@
66 66 </div>
67 67 </div>
68 68  
  69 + <script type="text/javascript">
  70 + var dataTablei18n = {
  71 + "decimal": "",
  72 + "emptyTable": "{% trans 'No data available in table' %}",
  73 + "info": "{% trans 'Showing _START_ to _END_ of _TOTAL_ entries' %}",
  74 + "infoEmpty": "{% trans 'Showing 0 to 0 of 0 entries' %}",
  75 + "infoFiltered": "{% trans '(filtered from _MAX_ total entries)' %}",
  76 + "infoPostFix": "",
  77 + "thousands": ",",
  78 + "lengthMenu": "{% trans 'Show _MENU_ entries' %}",
  79 + "loadingRecords": "{% trans 'Loading...' %}",
  80 + "processing": "{% trans 'Processing...' %}",
  81 + "search": "{% trans 'Search' %}:",
  82 + "zeroRecords": "{% trans 'No matching records found' %}",
  83 + "paginate": {
  84 + "first": "{% trans 'First' %}",
  85 + "last": "{% trans 'Last' %}",
  86 + "next": "»",
  87 + "previous": "«"
  88 + },
  89 + "aria": {
  90 + "sortAscending": "{% trans ': activate to sort column ascending' %}",
  91 + "sortDescending": "{% trans ': activate to sort column descending' %}"
  92 + }
  93 + }
  94 + </script>
69 95 <script type="text/javascript" src="{% static 'js/goals_reports.js' %}"></script>
70 96 {% endblock %}
71 97 \ No newline at end of file
... ...