Download as
Browse Code »

Commit 19a6508d8baf3b8e9feabaf4fb79e9876aa4709e

Authored by fbormann
1 parent 786f5747
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

saving checkpoint

Showing 2 changed files with 36 additions and 30 deletions   Show diff stats
reports/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @19a6508
... ... @@ -8,7 +8,7 @@ msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-03-16 19:05-0300\n"
  11 +"POT-Creation-Date: 2017-03-17 00:26-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -70,15 +70,15 @@ msgstr &quot;Esta data deve ser igual ou anterior à&quot;
70 70 msgid "General Parameters"
71 71 msgstr "Escolha o Tópico e o Período"
72 72  
73   -#: templates/reports/_form.html:27
  73 +#: templates/reports/_form.html:28
74 74 msgid "Choose the Data Source (is possible to pick more than one)"
75 75 msgstr "Escolha a fonte de dados (é possível escolher mais de uma)"
76 76  
77   -#: templates/reports/_form.html:60
  77 +#: templates/reports/_form.html:65
78 78 msgid "Interaction with resources"
79 79 msgstr "Interação com recursos"
80 80  
81   -#: templates/reports/_form.html:92
  81 +#: templates/reports/_form.html:100
82 82 msgid "Search"
83 83 msgstr "Buscar"
84 84  
... ... @@ -132,7 +132,7 @@ msgstr &quot;Dados de interação&quot;
132 132  
133 133 #: views.py:67
134 134 msgid "Report created successfully"
135   -msgstr "Report criado com sucesso!"
  135 +msgstr "Relatório criado com sucesso!"
136 136  
137 137 #: views.py:168
138 138 msgid "Number of help posts created by the user."
... ... @@ -192,9 +192,13 @@ msgid &quot;Number of access to mural between 0 a.m to 6a.m. .&quot;
192 192 msgstr ""
193 193 "Número de acessos ao ambiente virtual da disciplina no horário de 24h às 06h."
194 194  
  195 +#: views.py:233
  196 +msgid "sunday"
  197 +msgstr "domingo"
  198 +
195 199 #: views.py:236 views.py:239
196 200 msgid "Number of access to the subject on "
197   -msgstr "Número de acesso ao subject no "
  201 +msgstr "Número de acessos ao assunto na(o) "
198 202  
199 203 #: views.py:242
200 204 msgid "Number of distinct days the user access the subject. "
... ... @@ -213,24 +217,3 @@ msgstr &quot;Desempenho&quot;
213 217  
214 218 #~ msgid "Data Source"
215 219 #~ msgstr "Escolha a origem dos dados (É possível selecionar mais de uma)"
216   -
217   -#~ msgid "sunday"
218   -#~ msgstr "domingo"
219   -
220   -#~ msgid "monday"
221   -#~ msgstr "segunda-feira"
222   -
223   -#~ msgid "tuesday"
224   -#~ msgstr "terça-feira"
225   -
226   -#~ msgid "wednesday"
227   -#~ msgstr "quarta-feira"
228   -
229   -#~ msgid "thursday"
230   -#~ msgstr "quinta-feira"
231   -
232   -#~ msgid "friday"
233   -#~ msgstr "sexta-feira"
234   -
235   -#~ msgid "saturday"
236   -#~ msgstr "sábado"
... ...
reports/templates/reports/_form.html
  Diff comments   View file @19a6508
1 1 {% load widget_tweaks static i18n %}
2 2  
3 3 <form action="" method="post">{% csrf_token %}
4   - <h5 class="one"> <span>{% trans "General Parameters" %}</span></h5>
  4 +
5 5  
6 6 {% if form.errors %}
7 7 <div class="alert alert-danger alert-dismissible" role="alert">
... ... @@ -15,6 +15,8 @@
15 15 </ul>
16 16 </div>
17 17 {% endif %}
  18 +
  19 + <h5 class="one"> <span>{% trans "General Parameters" %}</span></h5>
18 20 {% for field in form %}
19 21  
20 22  
... ... @@ -62,7 +64,10 @@
62 64 <div class="col-md-12">
63 65 <a data-parent="#resources_accordion" data-toggle="collapse" href="#resources">
64 66 <h4 class="panel-title">
65   - <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label class="form-field-report" for="resources">{% trans "Interaction with resources" %}</label>
  67 + <button class="btn btn-default btn-xs text-center cat-selector">
  68 + <i class="fa fa-angle-right fa-2x" aria-hidden="true"></i>
  69 + </button>
  70 + <label class="form-field-report" for="resources">{% trans "Interaction with resources" %}</label>
66 71 </h4>
67 72 </a>
68 73 </div>
... ... @@ -97,8 +102,26 @@
97 102 </div>
98 103  
99 104 <div class="row text-center">
100   - <input type="submit" value="{% trans "Search" %}" class="btn btn-success btn-raised" />
  105 + <input type="submit" value="{% trans 'Search' %}" class="btn btn-success btn-raised" />
101 106 </div>
102 107 </form>
103 108  
  109 +<script>
  110 + $('.collapse').on('show.bs.collapse', function (e) {
  111 + if($(this).is(e.target)){
  112 + var btn = $(this).parent().find('.fa-angle-right');
  113 +
  114 + btn.switchClass("fa-angle-right", "fa-angle-down", 250, "easeInOutQuad");
  115 + }
  116 + });
  117 +
  118 + $('.collapse').on('hide.bs.collapse', function (e) {
  119 + if($(this).is(e.target)){
  120 + var btn = $(this).parent().find('.fa-angle-down');
  121 +
  122 + btn.switchClass("fa-angle-down", "fa-angle-right", 250, "easeInOutQuad");
  123 + }
  124 + });
  125 +</script>
  126 +
104 127  
... ...