Download as
Browse Code »

Commit e497a4705667e1754994000bed4868a27a19d531

Authored by Erik Zambom
Committed by GitHub
2 parents 8d9d0354 e2879923
Exists in amadeus_univasf

Merge pull request #589 from amadeusproject/refactoring 

Daily Update - 17_10_2017
Showing 29 changed files with 496 additions and 340 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -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-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -95,28 +95,23 @@ msgstr &quot;Temas&quot;
95 95 msgid "Web Conference"
96 96 msgstr "Web conferência"
97 97  
98   -#: amadeus/templates/base.html:340 amadeus/templates/base.html:396
99   -#: amadeus/templates/base.html:433
  98 +#: amadeus/templates/base.html:340 amadeus/templates/base.html:398
100 99 msgid "Subjects"
101 100 msgstr "Assuntos"
102 101  
103   -#: amadeus/templates/base.html:345 amadeus/templates/base.html:402
104   -#: amadeus/templates/base.html:438
  102 +#: amadeus/templates/base.html:345 amadeus/templates/base.html:404
105 103 msgid "Mural"
106 104 msgstr "Mural"
107 105  
108   -#: amadeus/templates/base.html:351 amadeus/templates/base.html:409
109   -#: amadeus/templates/base.html:444
  106 +#: amadeus/templates/base.html:351 amadeus/templates/base.html:411
110 107 msgid "Messages"
111 108 msgstr "Mensagens"
112 109  
113   -#: amadeus/templates/base.html:357 amadeus/templates/base.html:417
114   -#: amadeus/templates/base.html:450
  110 +#: amadeus/templates/base.html:357 amadeus/templates/base.html:419
115 111 msgid "Pendencies"
116 112 msgstr "Pendências"
117 113  
118   -#: amadeus/templates/base.html:365 amadeus/templates/base.html:426
119   -#: amadeus/templates/base.html:458
  114 +#: amadeus/templates/base.html:365 amadeus/templates/base.html:428
120 115 msgid "Analytics"
121 116 msgstr "Analytics"
122 117  
... ...
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @e497a47
... ... @@ -107,6 +107,10 @@
107 107 }
108 108 /* End Buttons */
109 109  
  110 + .goals_details_table > thead > tr > th, .goals_details_table > tbody > tr > td {
  111 + font-size: 9px;
  112 + }
  113 +
110 114 .subject-period {
111 115 font-size: 12px;
112 116 }
... ...
analytics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
api/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -26,23 +26,23 @@ msgstr &quot;&quot;
26 26 msgid "[Photo]"
27 27 msgstr ""
28 28  
29   -#: api/views.py:374
  29 +#: api/views.py:444
30 30 #, python-format
31 31 msgid "Last message in %s"
32 32 msgstr ""
33 33  
34   -#: api/views.py:391
  34 +#: api/views.py:461
35 35 msgid "Message sent successfully!"
36 36 msgstr ""
37 37  
38   -#: api/views.py:397
  38 +#: api/views.py:469
39 39 msgid "Error while sending message!"
40 40 msgstr ""
41 41  
42   -#: api/views.py:404
  42 +#: api/views.py:476
43 43 msgid "No information received!"
44 44 msgstr ""
45 45  
46   -#: api/views.py:410
  46 +#: api/views.py:482
47 47 msgid "Amadeus"
48 48 msgstr ""
... ...
bulletin/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -105,7 +105,7 @@ msgstr &quot;O arquivo não pode exceder 1MB.&quot;
105 105 #: bulletin/templates/bulletin/_form.html:99
106 106 #: bulletin/templates/bulletin/_form.html:152
107 107 msgid "File not supported."
108   -msgstr ""
  108 +msgstr "Arquivo não suportado."
109 109  
110 110 #: bulletin/templates/bulletin/_form.html:123
111 111 msgid "Click or drop the .xls file with the indicators data"
... ... @@ -131,6 +131,10 @@ msgstr &quot;Período desejado&quot;
131 131 msgid "Save"
132 132 msgstr "Salvar"
133 133  
  134 +#: bulletin/templates/bulletin/_form.html:363
  135 +msgid "Cancel"
  136 +msgstr "Cancelar"
  137 +
134 138 #: bulletin/templates/bulletin/create.html:20 bulletin/views.py:503
135 139 msgid "Create Bulletin"
136 140 msgstr "Criar boletim"
... ... @@ -196,13 +200,13 @@ msgid &quot;The picture could not exceed 5MB.&quot;
196 200 msgstr "A imagem não pode exceder 5MB."
197 201  
198 202 #: bulletin/templates/bulletin/send_message.html:62
199   -#: bulletin/templates/bulletin/view.html:235
  203 +#: bulletin/templates/bulletin/view.html:221
200 204 #: bulletin/templates/bulletin/window_view.html:258
201 205 msgid "Close"
202 206 msgstr "Fechar"
203 207  
204 208 #: bulletin/templates/bulletin/send_message.html:63
205   -#: bulletin/templates/bulletin/view.html:236
  209 +#: bulletin/templates/bulletin/view.html:222
206 210 #: bulletin/templates/bulletin/window_view.html:259
207 211 msgid "Send"
208 212 msgstr "Enviar"
... ... @@ -211,26 +215,167 @@ msgstr &quot;Enviar&quot;
211 215 msgid "Edit: "
212 216 msgstr "Editar: "
213 217  
214   -#: bulletin/templates/bulletin/view.html:215
  218 +#: bulletin/templates/bulletin/view.html:76
  219 +msgid "Check your goals"
  220 +msgstr "Confira suas metas"
  221 +
  222 +#: bulletin/templates/bulletin/view.html:81
  223 +msgid "Goals Reached"
  224 +msgstr "Metas Atingidas"
  225 +
  226 +#: bulletin/templates/bulletin/view.html:86
  227 +msgid "Goals Details"
  228 +msgstr "Detalhamento das metas"
  229 +
  230 +#: bulletin/templates/bulletin/view.html:92
  231 +msgid "Description"
  232 +msgstr "Descrição"
  233 +
  234 +#: bulletin/templates/bulletin/view.html:93
  235 +msgid "Professor's recomendation"
  236 +msgstr "Recomendação do(a) professor(a)"
  237 +
  238 +#: bulletin/templates/bulletin/view.html:94
  239 +msgid "Class average"
  240 +msgstr "Média da turma"
  241 +
  242 +#: bulletin/templates/bulletin/view.html:95
  243 +msgid "Your goal"
  244 +msgstr "Sua meta"
  245 +
  246 +#: bulletin/templates/bulletin/view.html:96
  247 +#: bulletin/templates/bulletin/view.html:145
  248 +#: bulletin/templates/bulletin/view.html:514
  249 +#: bulletin/templates/bulletin/view.html:542
  250 +#: bulletin/templates/bulletin/view.html:574
  251 +#: bulletin/templates/bulletin/view.html:629
  252 +#: bulletin/templates/bulletin/view.html:657
  253 +#: bulletin/templates/bulletin/view.html:688
  254 +#: bulletin/templates/bulletin/view.html:742
  255 +#: bulletin/templates/bulletin/view.html:769
  256 +#: bulletin/templates/bulletin/view.html:800
  257 +#: bulletin/templates/bulletin/view.html:855
  258 +#: bulletin/templates/bulletin/view.html:882
  259 +#: bulletin/templates/bulletin/view.html:914
  260 +#: bulletin/templates/bulletin/view.html:971
  261 +#: bulletin/templates/bulletin/view.html:998
  262 +#: bulletin/templates/bulletin/view.html:1030
  263 +#: bulletin/templates/bulletin/view.html:1086
  264 +#: bulletin/templates/bulletin/view.html:1113
  265 +#: bulletin/templates/bulletin/view.html:1144
  266 +msgid "Your result"
  267 +msgstr "Seu resultado"
  268 +
  269 +#: bulletin/templates/bulletin/view.html:112
  270 +msgid ""
  271 +"<b>Goal reached!</b><br /><br /> Atention! Your result were lower than the "
  272 +"professor's recommendation."
  273 +msgstr "<b>Meta atingida!</b><br /><br /> Atenção! Seu resultado foi inferior ao recomendado pelo professor."
  274 +
  275 +#: bulletin/templates/bulletin/view.html:117
  276 +msgid ""
  277 +"<b>Goal reached!</b><br /><br /> Atention! Your result were lower than your "
  278 +"initial goal."
  279 +msgstr "<b>Meta atingida!</b><br /><br /> Atenção! Seu resultado foi inferior à sua meta inicial."
  280 +
  281 +#: bulletin/templates/bulletin/view.html:122
  282 +msgid "<b>Goal reached!</b>"
  283 +msgstr "<b>Meta atingida!</b>"
  284 +
  285 +#: bulletin/templates/bulletin/view.html:127
  286 +msgid ""
  287 +"<b>Goal not reached!</b><br /><br /> Result lower than your goal and the "
  288 +"professor's recommendation."
  289 +msgstr "<b>Meta não atingida!</b><br /><br /> Resultado inferior à sua meta e ao recomendado pelo professor."
  290 +
  291 +#: bulletin/templates/bulletin/view.html:139
  292 +msgid "Relevant indicators to your performance"
  293 +msgstr "Indicadores relevantes para seu desempenho"
  294 +
  295 +#: bulletin/templates/bulletin/view.html:148
  296 +msgid "Level above the approved median"
  297 +msgstr "Nível acima da mediana dos aprovados"
  298 +
  299 +#: bulletin/templates/bulletin/view.html:151
  300 +msgid "Level below the approved median"
  301 +msgstr "Nível abaixo da mediana dos aprovados"
  302 +
  303 +#: bulletin/templates/bulletin/view.html:169
  304 +msgid "Indicators description"
  305 +msgstr "Descrição dos indicadores"
  306 +
  307 +#: bulletin/templates/bulletin/view.html:177
  308 +#: bulletin/templates/bulletin/view.html:436
  309 +#: bulletin/templates/bulletin/view.html:437
  310 +#: bulletin/templates/bulletin/view.html:438
  311 +#: bulletin/templates/bulletin/view.html:439
  312 +#: bulletin/templates/bulletin/view.html:440
  313 +#: bulletin/templates/bulletin/view.html:441
  314 +msgid "Indicator"
  315 +msgstr "Indicador"
  316 +
  317 +#: bulletin/templates/bulletin/view.html:199
215 318 #: bulletin/templates/bulletin/window_view.html:238
216 319 msgid "There are obstructions to your activities?"
217 320 msgstr "Existem impedimentos para as suas atividades?"
218 321  
219   -#: bulletin/templates/bulletin/view.html:216
  322 +#: bulletin/templates/bulletin/view.html:201
220 323 #: bulletin/templates/bulletin/window_view.html:239
221 324 msgid "Click here"
222 325 msgstr "Clique aqui"
223 326  
224   -#: bulletin/templates/bulletin/view.html:216
  327 +#: bulletin/templates/bulletin/view.html:201
225 328 #: bulletin/templates/bulletin/window_view.html:239
226 329 msgid "to communicate the difficulties that may decrease your performance."
227 330 msgstr "para informar as dificuldades que podem prejudicar seu desempenho."
228 331  
229   -#: bulletin/templates/bulletin/view.html:231
  332 +#: bulletin/templates/bulletin/view.html:217
230 333 #: bulletin/templates/bulletin/window_view.html:254
231 334 msgid "Type here the dificulties that may harm your performance"
232 335 msgstr "Escreva aqui as dificuldades que podem diminuir sua performance"
233 336  
  337 +#: bulletin/templates/bulletin/view.html:515
  338 +#: bulletin/templates/bulletin/view.html:543
  339 +#: bulletin/templates/bulletin/view.html:575
  340 +#: bulletin/templates/bulletin/view.html:630
  341 +#: bulletin/templates/bulletin/view.html:658
  342 +#: bulletin/templates/bulletin/view.html:689
  343 +#: bulletin/templates/bulletin/view.html:743
  344 +#: bulletin/templates/bulletin/view.html:770
  345 +#: bulletin/templates/bulletin/view.html:801
  346 +#: bulletin/templates/bulletin/view.html:856
  347 +#: bulletin/templates/bulletin/view.html:883
  348 +#: bulletin/templates/bulletin/view.html:915
  349 +#: bulletin/templates/bulletin/view.html:972
  350 +#: bulletin/templates/bulletin/view.html:999
  351 +#: bulletin/templates/bulletin/view.html:1031
  352 +#: bulletin/templates/bulletin/view.html:1087
  353 +#: bulletin/templates/bulletin/view.html:1114
  354 +#: bulletin/templates/bulletin/view.html:1145
  355 +msgid "Max"
  356 +msgstr "Máximo"
  357 +
  358 +#: bulletin/templates/bulletin/view.html:516
  359 +#: bulletin/templates/bulletin/view.html:544
  360 +#: bulletin/templates/bulletin/view.html:576
  361 +#: bulletin/templates/bulletin/view.html:631
  362 +#: bulletin/templates/bulletin/view.html:659
  363 +#: bulletin/templates/bulletin/view.html:690
  364 +#: bulletin/templates/bulletin/view.html:744
  365 +#: bulletin/templates/bulletin/view.html:771
  366 +#: bulletin/templates/bulletin/view.html:802
  367 +#: bulletin/templates/bulletin/view.html:857
  368 +#: bulletin/templates/bulletin/view.html:884
  369 +#: bulletin/templates/bulletin/view.html:916
  370 +#: bulletin/templates/bulletin/view.html:973
  371 +#: bulletin/templates/bulletin/view.html:1000
  372 +#: bulletin/templates/bulletin/view.html:1032
  373 +#: bulletin/templates/bulletin/view.html:1088
  374 +#: bulletin/templates/bulletin/view.html:1115
  375 +#: bulletin/templates/bulletin/view.html:1146
  376 +msgid "Median"
  377 +msgstr "Mediana"
  378 +
234 379 #: bulletin/utils.py:47 bulletin/views.py:1022
235 380 #, python-format
236 381 msgid "Last message in %s"
... ... @@ -341,12 +486,3 @@ msgstr &quot;A mensagem foi enviada com sucesso!&quot;
341 486 #: bulletin/views.py:1033
342 487 msgid "No user selected!"
343 488 msgstr "Nenhum usuário selecionado!"
344   -
345   -#~ msgid "Check your goals"
346   -#~ msgstr "Veja suas metas"
347   -
348   -#~ msgid "Inform difficulties"
349   -#~ msgstr "Informe as dificuldades"
350   -
351   -#~ msgid "Bulletin Data (Goals)"
352   -#~ msgstr "Dados do boletim (Metas)"
... ...
bulletin/templates/bulletin/view.html
  Diff comments   View file @e497a47
... ... @@ -69,195 +69,166 @@
69 69 {% endif %}
70 70  
71 71 {% autoescape off %}
72   - {{ bulletin.content }}
  72 + {{ bulletin.content }}
73 73 {% endautoescape %}
74 74  
75 75 <div style="padding-left: 0px;padding-right: 0px;">
76   - <div align="left" style="font-size:22px; color: #878787; padding-top: 0px;">Confira as suas metas</div>
  76 + <div align="left" style="font-size:22px; color: #878787; padding-top: 0px;">{% trans 'Check your goals' %}</div>
77 77 <hr style="height:2px; background-color:#878787; margin-top: 5px;">
  78 +
78 79 <div class="row">
79   - <div class="col-md-4">
80   - <div align="center" style="font-size:16px; color: #000; padding-botom: 10px;"><b>Metas Atingidas</b></div>
81   - <div id="donut_chart" align="center"></div>
82   - </div>
  80 + <div class="col-md-4">
  81 + <div align="center" style="font-size:16px; color: #000; padding-botom: 10px;"><b> {% trans 'Goals Reached' %}</b></div>
  82 + <div id="donut_chart" align="center"></div>
  83 + </div>
83 84  
84   - <div class="col-md-8">
85   - <div style="font-size:16px; text-align:left; color: #000; padding-left: 10px; "><b>Detalhamento das metas</b></div>
86   - <hr style="height:2px; background-color:#878787;margin-top: 5px;margin-bottom: 5px;">
87   - <table class="table table-hover">
88   - <thead>
89   - <tr>
90   - <th style="text-align:center">Descrição</th>
91   - <th style="width:150px; text-align:center">Recomendação </br> do(a) professor(a)</th>
92   - <th style="text-align:center">Média da turma</th>
93   - <th style="text-align:center">Sua meta</th>
94   - <th style="text-align:center">Seu resultado</th>
95   - </tr>
96   - </thead>
97   - <tbody>
98   - {% for meta in metas%}
  85 + <div class="col-md-8">
  86 + <div style="font-size:16px; text-align:left; color: #000; padding-left: 10px; "><b>{% trans 'Goals Details' %}</b></div>
  87 + <hr style="height:2px; background-color:#878787;margin-top: 5px;margin-bottom: 5px;">
  88 +
  89 + <table class="table table-hover goals_details_table">
  90 + <thead>
  91 + <tr>
  92 + <th style="text-align:center">{% trans 'Description' %}</th>
  93 + <th style="width:150px; text-align:center">{% trans "Professor's recomendation" %}</th>
  94 + <th style="text-align:center">{% trans 'Class average' %}</th>
  95 + <th style="text-align:center">{% trans 'Your goal' %}</th>
  96 + <th style="text-align:center">{% trans 'Your result' %}</th>
  97 + </tr>
  98 + </thead>
  99 + <tbody>
  100 + {% for meta in metas%}
99 101 <tr>
100   - <th style="font-weight: normal;">{{ meta.description }}</th>
101   - <th style="text-align:center;font-weight: normal;">{{ meta.desejada }} %</th>
  102 + <td style="font-weight: normal;">{{ meta.description }}</td>
  103 + <td style="text-align:center;font-weight: normal;">{{ meta.desejada }} %</td>
102 104 <td style="text-align:center;font-weight: normal;">{{ meta.media }}%</td>
103   - <th style="text-align:center; font-weight: normal;">{{ meta.estabelecida }}%</th>
  105 + <td style="text-align:center; font-weight: normal;">{{ meta.estabelecida }}%</td>
104 106  
105 107  
106 108 <!-- Cor amarela -->
107 109 {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada < meta.desejada and meta.alcancada == meta.estabelecida %}
108   - <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
  110 + <td style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
109 111 data-toggle="tooltip" data-html="true" data-placement="bottom"
110   - title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior ao recomendado pelo professor." class="grey-tooltip">
111   - {{ meta.alcancada }}%</th>
112   - {% endif %}
113   -
114   - {% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada < meta.estabelecida %}
115   - <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
  112 + title="{% trans "<b>Goal reached!</b><br /><br /> Atention! Your result were lower than the professor's recommendation." %}" class="grey-tooltip">
  113 + {{ meta.alcancada }}%</td>
  114 + {% elif meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada < meta.estabelecida %}
  115 + <td style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
116 116 data-toggle="tooltip" data-html="true" data-placement="bottom"
117   - title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior a sua meta inicial." class="grey-tooltip">
118   - {{ meta.alcancada }}%</th>
119   - {% endif %}
120   -
121   - <!-- Cor amarela -->
122   -
123   - <!-- Cor verde -->
124   - {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada > meta.desejada and meta.alcancada == meta.estabelecida or meta.alcancada == 100 or meta.alcancada == meta.desejada and meta.alcancada == meta.estabelecida %}
125   - <th style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
  117 + title="{% trans "<b>Goal reached!</b><br /><br /> Atention! Your result were lower than your initial goal." %}" class="grey-tooltip">
  118 + {{ meta.alcancada }}%</td>
  119 + {% elif meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada > meta.desejada and meta.alcancada == meta.estabelecida or meta.alcancada == 100 or meta.alcancada == meta.desejada and meta.alcancada == meta.estabelecida %}
  120 + <td style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
126 121 data-toggle="tooltip" data-html="true" data-placement="bottom"
127   - title="<b>Meta atingida!</b>" class="grey-tooltip">
128   - {{ meta.alcancada }}%</th>
129   - {% endif %}
130   -
131   - <!-- Cor verde -->
132   -
133   - <!-- Cor vermelha -->
134   - {% if meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %}
135   - <th style="text-align:center;background-color:#ff0000; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
  122 + title="{% trans "<b>Goal reached!</b>" %}" class="grey-tooltip">
  123 + {{ meta.alcancada }}%</td>
  124 + {% elif meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %}
  125 + <td style="text-align:center;background-color:#ff0000; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
136 126 data-toggle="tooltip" data-html="true" data-placement="bottom"
137   - title="<b>Meta não atingida!</b><br><br>Resultado inferior </br>a sua meta e ao recomendado pelo professor." class="grey-tooltip">
138   - {{ meta.alcancada }}%</th>
139   -
  127 + title="{% trans "<b>Goal not reached!</b><br /><br /> Result lower than your goal and the professor's recommendation." %}" class="grey-tooltip">
  128 + {{ meta.alcancada }}%</td>
140 129 {% endif %}
141   - <!-- Cor vermelha -->
142   -
143   -
144 130 </tr>
145   - {% endfor %}
146   -
147   -
148   - </tbody>
149   - </table>
150   - <hr style="height:1px; background-color:#878787;margin-top: -20px;">
151   - </div>
  131 + {% endfor %}
  132 + </tbody>
  133 + </table>
  134 + <hr style="height:1px; background-color:#878787;margin-top: -20px;" />
  135 + </div>
152 136 </div>
153 137 </div>
154 138 <div style="padding-left: 0px;padding-right: 0px;">
155   - <div align="left" style="font-size:22px; color: #878787; padding-top: 25px; ">Indicadores relevantes para o seu desempenho</div>
  139 + <div align="left" style="font-size:22px; color: #878787; padding-top: 25px; ">{% trans 'Relevant indicators to your performance' %}</div>
156 140 <hr style="height:2px; background-color:#878787; margin-top: 5px;">
157   - <div class="row" style="padding-left: 15px;" >
158   - <table >
159   - <tr >
  141 + <div class="row" style="padding-left: 15px;">
  142 + <table>
  143 + <tr>
160 144 <td style="background-color:#002F4B; width: 20px;"></td>
161   - <td style="padding-left: 5px;">Seu resultado</td>
  145 + <td style="padding-left: 5px;">{% trans 'Your result' %}</td>
162 146 <td style="width: 20px"></td>
163 147 <td style="background-color:#009688; width: 20px;"></td>
164   - <td style="padding-left: 5px;">Nível acima da mediana dos aprovados</td>
  148 + <td style="padding-left: 5px;">{% trans 'Level above the approved median' %}</td>
165 149 <td style="width: 20px"></td>
166 150 <td style="background-color:#d0cebb; width: 20px;"></td>
167   - <td style="padding-left: 5px;">Nível abaixo da mediana dos aprovados</td>
  151 + <td style="padding-left: 5px;">{% trans 'Level below the approved median' %}</td>
168 152 <td style="width: 30px"></td>
169 153 </tr>
170 154 </table>
171 155 </div>
172 156  
173 157 <div class="row" style="padding-left: 10px;">
174   - <div class="col-md-2" >
175   - <div class="row">
176   - <div id="bullet_chart1" > </div>
177   - </div>
178   - </div>
179   - <div class="col-md-2">
180   - <div class="row">
181   - <div id="bullet_chart2"> </div>
182   - </div>
183   - </div>
184   - <div class="col-md-3">
185   - <div class="row">
186   - <div id="bullet_chart3"> </div>
187   - </div>
  158 + <div class="graph-area col-md-2 col-xs-12">
  159 + <div id="bullet_chart1"></div>
  160 + </div>
  161 + <div class="graph-area col-md-2 col-xs-12">
  162 + <div id="bullet_chart2"></div>
  163 + </div>
  164 + <div class="graph-area col-md-2 col-xs-12">
  165 + <div id="bullet_chart3"></div>
  166 + </div>
  167 + <div class="col-md-offset-1 col-md-5 col-xs-12">
  168 + <div style="font-size:16px; text-align:left; color: #000; padding-left: 20px;padding-top: 30px; ">
  169 + <b>{% trans 'Indicators description' %}</b>
188 170 </div>
189   - <div class="col-md-5">
190   -
191   - <div style="font-size:16px; text-align:left; color: #000; padding-left: 20px;padding-top: 30px; ">
192   - <b>Descrição dos indicadores</b>
193   - </div>
194   -
195   - <hr style="height:2px; background-color:#878787;margin-top: 5px;margin-bottom: -1px;">
196   -
197   - <table class="table table-hover">
198   - <tbody>
199   - {% for titulo in titulos %}
200   - <tr>
201   - <th style="width:110px;">
202   - Indicador 0{{forloop.counter }}:
203   - </th>
204   - <th style="text-align:left; font-weight: normal; padding-left:0px;">
205   - {{titulo}}
206   - </th>
207   - </tr>
208   - {% endfor %}
209   -
210   - </tbody>
211   - </table>
212   - <hr style="height:1px; background-color:#878787;margin-top: -20px;">
213   - </div>
  171 + <hr style="height:2px; background-color:#878787;margin-top: 5px;margin-bottom: -1px;">
  172 + <table class="table table-hover">
  173 + <tbody>
  174 + {% for titulo in titulos %}
  175 + <tr>
  176 + <td style="width:110px;">
  177 + {% trans 'Indicator' %} {{ forloop.counter|stringformat:"02d" }}:
  178 + </td>
  179 + <td style="text-align:left; font-weight: normal; padding-left:0px;">
  180 + {{titulo}}
  181 + </td>
  182 + </tr>
  183 + {% endfor %}
  184 + </tbody>
  185 + </table>
  186 + <hr style="height:1px; background-color:#878787;margin-top: -20px;">
  187 + </div>
214 188 </div>
215 189 </div>
216 190  
217 191 {% if not has_subject_permissions %}
218   - <div class="form-group" style="background-color:#fff; box-shadow: 1px 1px 25px #c0beaf; margin-top: 15px;">
  192 + <div class="form-group" style="background-color:#fff; box-shadow: 1px 1px 25px #c0beaf; margin-top: 15px;">
219 193 <div class="row">
220   - <div class="col-md-1" align="left" style="padding-left: 25px; padding-top: 10px;">
221   - <img src="{% static 'img/warning.png' %}" height="80" width="95"/>
222   - </div>
223   - <div class="col-md-11">
224   - <div class="row">
  194 + <div class="col-md-1" align="left" style="padding-left: 25px; padding-top: 10px;">
  195 + <img src="{% static 'img/warning.png' %}" height="80" width="95"/>
  196 + </div>
  197 + <div class="col-md-11">
  198 + <div class="row">
225 199 <div align="left" style="padding-left: 25px; font-size:22px; color: #878787; padding-top: 15px;padding-bottom: 20px;">{% trans 'There are obstructions to your activities?' %}</div>
226   - <div align="left" style="padding-left: 25px; padding-right:35px; font-size:16px;"><p><a data-toggle="modal" data-target="#bulletin-difficulties-modal" href=""><b>{% trans 'Click here' %}</b></a> {% trans 'to communicate the difficulties that may decrease your performance.' %}</p></div>
  200 + <div align="left" style="padding-left: 25px; padding-right:35px; font-size:16px;">
  201 + <p><a data-toggle="modal" data-target="#bulletin-difficulties-modal" href=""><b>{% trans 'Click here' %}</b></a> {% trans 'to communicate the difficulties that may decrease your performance.' %}</p>
  202 + </div>
  203 + </div>
227 204 </div>
228 205 </div>
229 206 </div>
230   - </div>
231   - </br>
232   - <div class="modal fade" tabindex="-1" role="dialog" id="bulletin-difficulties-modal">
233   - <div class="modal-dialog" role="document">
234   - <div class="modal-content">
  207 + </br>
  208 + <div class="modal fade" tabindex="-1" role="dialog" id="bulletin-difficulties-modal">
  209 + <div class="modal-dialog" role="document">
  210 + <div class="modal-content">
235 211 <div class="modal-header">
236   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  212 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
237 213 </div>
238 214 <div class="modal-body">
239   - <form id="bulletin-difficulties" action="" method="POST" enctype="multipart/form-data">
240   - {% csrf_token %}
241   - <textarea class="form-control" id="dificulties" name="difficulties" placeholder="{% trans 'Type here the dificulties that may harm your performance' %}"></textarea>
242   - </form>
  215 + <form id="bulletin-difficulties" action="" method="POST" enctype="multipart/form-data">
  216 + {% csrf_token %}
  217 + <textarea class="form-control" id="dificulties" name="difficulties" placeholder="{% trans 'Type here the dificulties that may harm your performance' %}"></textarea>
  218 + </form>
243 219 </div>
244 220 <div class="modal-footer">
245   - <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
246   - <button type="submit" class="btn btn-success btn-raised erase-button" form="bulletin-difficulties">{% trans "Send" %}</button>
  221 + <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
  222 + <button type="submit" class="btn btn-success btn-raised erase-button" form="bulletin-difficulties">{% trans "Send" %}</button>
247 223 </div>
  224 + </div>
248 225 </div>
249   - </div>
  226 + </div>
  227 + {% endif %}
  228 + </div>
250 229 </div>
251   - {% endif %}
252   -
253   - {% block addtional_scripts %}
254   - <script type="text/javascript">
255   - sessionSecurity.confirmFormDiscard = undefined;
256   - </script>
257   - {% endblock %}
258 230  
259   -
260   - <script type="text/javascript">
  231 + <script type="text/javascript">
261 232 $('#bulletin-difficulties-modal').on('shown.bs.modal', function (e) {
262 233 $.ajax({
263 234 url: "{% url 'bulletin:difficulties_log' bulletin.slug %}",
... ... @@ -405,9 +376,9 @@
405 376 };
406 377 setTimeout(animate,0);
407 378  
408   - </script>
  379 + </script>
409 380  
410   - <script type="text/javascript">
  381 + <script type="text/javascript">
411 382 // Script para a geração do gráfico de indicadores relevantes
412 383 var mediana1 = parseFloat("{{medianas.0}}".replace(",","."))
413 384 var mediana2 = parseFloat("{{medianas.1}}".replace(",","."))
... ... @@ -462,12 +433,12 @@
462 433 var height = h - margin.top - margin.bottom;
463 434  
464 435 // Definindo x1 com escala ordinal
465   - var x = d3.scale.ordinal().domain(ind01.map(function(entry){return "Indicador 01";})).rangeBands([0, width]);
466   - var x2 = d3.scale.ordinal().domain(ind02.map(function(entry){return "Indicador 02";})).rangeBands([0, width]);
467   - var x3 = d3.scale.ordinal().domain(ind03.map(function(entry){return "Indicador 03";})).rangeBands([0, width]);
468   - var x4 = d3.scale.ordinal().domain(ind04.map(function(entry){return "Indicador 04";})).rangeBands([0, width]);
469   - var x5 = d3.scale.ordinal().domain(ind05.map(function(entry){return "Indicador 05";})).rangeBands([0, width]);
470   - var x6 = d3.scale.ordinal().domain(ind06.map(function(entry){return "Indicador 06";})).rangeBands([0, width]);
  436 + var x = d3.scale.ordinal().domain(ind01.map(function(entry){return "{% trans 'Indicator' %} 01";})).rangeBands([0, width]);
  437 + var x2 = d3.scale.ordinal().domain(ind02.map(function(entry){return "{% trans 'Indicator' %} 02";})).rangeBands([0, width]);
  438 + var x3 = d3.scale.ordinal().domain(ind03.map(function(entry){return "{% trans 'Indicator' %} 03";})).rangeBands([0, width]);
  439 + var x4 = d3.scale.ordinal().domain(ind04.map(function(entry){return "{% trans 'Indicator' %} 04";})).rangeBands([0, width]);
  440 + var x5 = d3.scale.ordinal().domain(ind05.map(function(entry){return "{% trans 'Indicator' %} 05";})).rangeBands([0, width]);
  441 + var x6 = d3.scale.ordinal().domain(ind06.map(function(entry){return "{% trans 'Indicator' %} 06";})).rangeBands([0, width]);
471 442  
472 443 // Definindo y com escala linear
473 444 var y = d3.scale.linear().domain([0, d3.max(ind01, function(d){return d.maximo;})]).range([height, 0]);
... ... @@ -502,9 +473,9 @@
502 473  
503 474  
504 475 // Definindo o objeto SVG
505   - var svg = d3.select("#bullet_chart1").append("svg").attr("id", "bullet_chart").attr("width", 6*w).attr("height", h);
506   - var svg2 = d3.select("#bullet_chart2").append("svg").attr("id", "bullet_chart").attr("width", 6*w).attr("height", h);
507   - var svg3 = d3.select("#bullet_chart3").append("svg").attr("id", "bullet_chart").attr("width", 6*w).attr("height", h);
  476 + var svg = d3.select("#bullet_chart1").append("svg").attr("id", "bullet_chart").attr("width", $('.graph-area').width() + 90).attr("height", h);
  477 + var svg2 = d3.select("#bullet_chart2").append("svg").attr("id", "bullet_chart").attr("width", $('.graph-area').width() + 90).attr("height", h);
  478 + var svg3 = d3.select("#bullet_chart3").append("svg").attr("id", "bullet_chart").attr("width", $('.graph-area').width() + 90).attr("height", h);
508 479  
509 480 // Definindo um objeto SVG agrupado
510 481 var bullet_chart = svg.append("g").classed("display", true).attr("transform", "translate(" + margin.left + "," + margin.top + ")");
... ... @@ -540,9 +511,9 @@
540 511 .style("left", d3.event.pageX - 80 + "px")
541 512 .style("top", d3.event.pageY - 110 + "px")
542 513 .style("display", "inline-block")
543   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
544   - + "Máximo: " + (d.maximo)
545   - + "<br>" + "Mediana: " + (d.mediana));
  514 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  515 + + "{% trans 'Max' %}: " + (d.maximo)
  516 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
546 517 })
547 518 .attr("y", function(d,i){
548 519 return y(d.maximo);
... ... @@ -568,9 +539,9 @@
568 539 .style("left", d3.event.pageX - 80 + "px")
569 540 .style("top", d3.event.pageY - 110 + "px")
570 541 .style("display", "inline-block")
571   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
572   - + "Máximo: " + (d.maximo)
573   - + "<br>" + "Mediana: " + (d.mediana));
  542 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  543 + + "{% trans 'Max' %}: " + (d.maximo)
  544 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
574 545 })
575 546 .attr("y", function(d,i){
576 547 return y(d.mediana);
... ... @@ -600,9 +571,9 @@
600 571 .style("left", d3.event.pageX - 80 + "px")
601 572 .style("top", d3.event.pageY - 110 + "px")
602 573 .style("display", "inline-block")
603   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
604   - + "Máximo: " + (d.maximo)
605   - + "<br>" + "Mediana: " + (d.mediana));
  574 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  575 + + "{% trans 'Max' %}: " + (d.maximo)
  576 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
606 577 })
607 578 .attr("x", 20)
608 579 .attr("width", function(d){
... ... @@ -655,9 +626,9 @@
655 626 .style("left", d3.event.pageX - 80 + "px")
656 627 .style("top", d3.event.pageY - 110 + "px")
657 628 .style("display", "inline-block")
658   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
659   - + "Máximo: " + (d.maximo)
660   - + "<br>" + "Mediana: " + (d.mediana));
  629 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  630 + + "{% trans 'Max' %}: " + (d.maximo)
  631 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
661 632 })
662 633 .attr("y2", function(d,i){
663 634 return y2(d.maximo);
... ... @@ -683,9 +654,9 @@
683 654 .style("left", d3.event.pageX - 80 + "px")
684 655 .style("top", d3.event.pageY - 110 + "px")
685 656 .style("display", "inline-block")
686   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
687   - + "Máximo: " + (d.maximo)
688   - + "<br>" + "Mediana: " + (d.mediana));
  657 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  658 + + "{% trans 'Max' %}: " + (d.maximo)
  659 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
689 660 })
690 661 .attr("y", function(d,i){
691 662 return y2(d.mediana);
... ... @@ -714,9 +685,9 @@
714 685 .style("left", d3.event.pageX - 80 + "px")
715 686 .style("top", d3.event.pageY - 110 + "px")
716 687 .style("display", "inline-block")
717   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
718   - + "Máximo: " + (d.maximo)
719   - + "<br>" + "Mediana: " + (d.mediana));
  688 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  689 + + "{% trans 'Max' %}: " + (d.maximo)
  690 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
720 691 })
721 692 .attr("x", 20)
722 693 .attr("width", function(d){
... ... @@ -768,9 +739,9 @@
768 739 .style("left", d3.event.pageX - 80 + "px")
769 740 .style("top", d3.event.pageY - 110 + "px")
770 741 .style("display", "inline-block")
771   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
772   - + "Máximo: " + (d.maximo)
773   - + "<br>" + "Mediana: " + (d.mediana));
  742 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  743 + + "{% trans 'Max' %}: " + (d.maximo)
  744 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
774 745 })
775 746 .attr("y", function(d,i){
776 747 return y3(d.maximo);
... ... @@ -795,9 +766,9 @@
795 766 .style("left", d3.event.pageX - 80 + "px")
796 767 .style("top", d3.event.pageY - 110 + "px")
797 768 .style("display", "inline-block")
798   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
799   - + "Máximo: " + (d.maximo)
800   - + "<br>" + "Mediana: " + (d.mediana));
  769 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  770 + + "{% trans 'Max' %}: " + (d.maximo)
  771 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
801 772 })
802 773 .attr("y", function(d,i){
803 774 return y3(d.mediana);
... ... @@ -826,9 +797,9 @@
826 797 .style("left", d3.event.pageX - 80 + "px")
827 798 .style("top", d3.event.pageY - 110 + "px")
828 799 .style("display", "inline-block")
829   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
830   - + "Máximo: " + (d.maximo)
831   - + "<br>" + "Mediana: " + (d.mediana));
  800 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  801 + + "{% trans 'Max' %}: " + (d.maximo)
  802 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
832 803 })
833 804  
834 805 .attr("x", 20)
... ... @@ -881,9 +852,9 @@
881 852 .style("left", d3.event.pageX - 80 + "px")
882 853 .style("top", d3.event.pageY - 110 + "px")
883 854 .style("display", "inline-block")
884   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
885   - + "Máximo: " + (d.maximo)
886   - + "<br>" + "Mediana: " + (d.mediana));
  855 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  856 + + "{% trans 'Max' %}: " + (d.maximo)
  857 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
887 858 })
888 859 .attr("y", function(d,i){
889 860 return y4(d.maximo);
... ... @@ -908,9 +879,9 @@
908 879 .style("left", d3.event.pageX - 80 + "px")
909 880 .style("top", d3.event.pageY - 110 + "px")
910 881 .style("display", "inline-block")
911   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
912   - + "Máximo: " + (d.maximo)
913   - + "<br>" + "Mediana: " + (d.mediana));
  882 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  883 + + "{% trans 'Max' %}: " + (d.maximo)
  884 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
914 885 })
915 886 .attr("y", function(d,i){
916 887 return y4(d.mediana);
... ... @@ -940,9 +911,9 @@
940 911 .style("left", d3.event.pageX - 80 + "px")
941 912 .style("top", d3.event.pageY - 110 + "px")
942 913 .style("display", "inline-block")
943   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
944   - + "Máximo: " + (d.maximo)
945   - + "<br>" + "Mediana: " + (d.mediana));
  914 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  915 + + "{% trans 'Max' %}: " + (d.maximo)
  916 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
946 917 })
947 918  
948 919 .attr("x", 20)
... ... @@ -997,9 +968,9 @@
997 968 .style("left", d3.event.pageX - 80 + "px")
998 969 .style("top", d3.event.pageY - 110 + "px")
999 970 .style("display", "inline-block")
1000   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
1001   - + "Máximo: " + (d.maximo)
1002   - + "<br>" + "Mediana: " + (d.mediana));
  971 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  972 + + "{% trans 'Max' %}: " + (d.maximo)
  973 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1003 974 })
1004 975 .attr("y5", function(d,i){
1005 976 return y5(d.maximo);
... ... @@ -1024,9 +995,9 @@
1024 995 .style("left", d3.event.pageX - 80 + "px")
1025 996 .style("top", d3.event.pageY - 110 + "px")
1026 997 .style("display", "inline-block")
1027   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
1028   - + "Máximo: " + (d.maximo)
1029   - + "<br>" + "Mediana: " + (d.mediana));
  998 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  999 + + "{% trans 'Max' %}: " + (d.maximo)
  1000 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1030 1001 })
1031 1002  
1032 1003 .attr("y", function(d,i){
... ... @@ -1056,9 +1027,9 @@
1056 1027 .style("left", d3.event.pageX - 80 + "px")
1057 1028 .style("top", d3.event.pageY - 110 + "px")
1058 1029 .style("display", "inline-block")
1059   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
1060   - + "Máximo: " + (d.maximo)
1061   - + "<br>" + "Mediana: " + (d.mediana));
  1030 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1031 + + "{% trans 'Max' %}: " + (d.maximo)
  1032 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1062 1033 })
1063 1034  
1064 1035 .attr("x", 20)
... ... @@ -1112,9 +1083,9 @@
1112 1083 .style("left", d3.event.pageX - 80 + "px")
1113 1084 .style("top", d3.event.pageY - 110 + "px")
1114 1085 .style("display", "inline-block")
1115   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
1116   - + "Máximo: " + (d.maximo)
1117   - + "<br>" + "Mediana: " + (d.mediana));
  1086 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1087 + + "{% trans 'Max' %}: " + (d.maximo)
  1088 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1118 1089 })
1119 1090 .attr("y", function(d,i){
1120 1091 return y6(d.maximo);
... ... @@ -1139,9 +1110,9 @@
1139 1110 .style("left", d3.event.pageX - 80 + "px")
1140 1111 .style("top", d3.event.pageY - 110 + "px")
1141 1112 .style("display", "inline-block")
1142   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
1143   - + "Máximo: " + (d.maximo)
1144   - + "<br>" + "Mediana: " + (d.mediana));
  1113 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1114 + + "{% trans 'Max' %}: " + (d.maximo)
  1115 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1145 1116 })
1146 1117 .attr("y", function(d,i){
1147 1118 return y6(d.mediana);
... ... @@ -1170,9 +1141,9 @@
1170 1141 .style("left", d3.event.pageX - 80 + "px")
1171 1142 .style("top", d3.event.pageY - 110 + "px")
1172 1143 .style("display", "inline-block")
1173   - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
1174   - + "Máximo: " + (d.maximo)
1175   - + "<br>" + "Mediana: " + (d.mediana));
  1144 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1145 + + "{% trans 'Max' %}: " + (d.maximo)
  1146 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1176 1147 })
1177 1148  
1178 1149 .attr("x", 20 )
... ... @@ -1217,6 +1188,7 @@
1217 1188 gridlines: yGridlines});
1218 1189  
1219 1190 plot3.call(bullet_chart3, {
  1191 +
1220 1192 data: ind03,
1221 1193 axis:{x: xAxis3,y: yAxis3},
1222 1194 gridlines: yGridlines});
... ... @@ -1236,6 +1208,11 @@
1236 1208 axis:{x: xAxis6,y: yAxis6},
1237 1209 gridlines: yGridlines});
1238 1210  
1239   - </script>
1240   - </div>
  1211 + </script>
1241 1212 {% endblock %}
  1213 +
  1214 +{% block addtional_scripts %}
  1215 + <script type="text/javascript">
  1216 + sessionSecurity.confirmFormDiscard = undefined;
  1217 + </script>
  1218 +{% endblock %}
1242 1219 \ No newline at end of file
... ...
categories/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -62,12 +62,16 @@ msgstr &quot;Coordenadores&quot;
62 62 msgid "Atribute coordinator role to users"
63 63 msgstr "Atribua perfil de coordenador aos usuários"
64 64  
65   -#: categories/templates/categories/_form.html:67
  65 +#: categories/templates/categories/_form.html:68
66 66 msgid "Save"
67 67 msgstr "Salvar"
68 68  
69   -#: categories/templates/categories/_form.html:73
70   -#: categories/templates/categories/_form.html:74
  69 +#: categories/templates/categories/_form.html:72
  70 +msgid "Cancel"
  71 +msgstr ""
  72 +
  73 +#: categories/templates/categories/_form.html:79
  74 +#: categories/templates/categories/_form.html:80
71 75 msgid "search for an username"
72 76 msgstr "pesquise por um nome de usuário"
73 77  
... ...
chat/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
dashboards/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
file_link/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -112,6 +112,10 @@ msgstr &quot;Atribuir grupos de estudo ao Link para Arquivo&quot;
112 112 msgid "Save"
113 113 msgstr "Salvar"
114 114  
  115 +#: file_link/templates/file_links/_form.html:337
  116 +msgid "Cancel"
  117 +msgstr ""
  118 +
115 119 #: file_link/templates/file_links/create.html:20 file_link/views.py:194
116 120 msgid "Create File Link"
117 121 msgstr "Criar Link para Arquivo"
... ...
goals/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -173,19 +173,23 @@ msgstr &quot;Período desejado&quot;
173 173 msgid "Save"
174 174 msgstr "Salvar"
175 175  
176   -#: goals/templates/goals/_form.html:413
  176 +#: goals/templates/goals/_form.html:406
  177 +msgid "Cancel"
  178 +msgstr ""
  179 +
  180 +#: goals/templates/goals/_form.html:417
177 181 msgid "Add new goal"
178 182 msgstr "Adicionar nova meta"
179 183  
180   -#: goals/templates/goals/_form.html:414
  184 +#: goals/templates/goals/_form.html:418
181 185 msgid "Remove this goal"
182 186 msgstr "Remover essa meta"
183 187  
184   -#: goals/templates/goals/_form.html:435
  188 +#: goals/templates/goals/_form.html:439
185 189 msgid "Add new notification"
186 190 msgstr "Adicionar nova notificação"
187 191  
188   -#: goals/templates/goals/_form.html:436
  192 +#: goals/templates/goals/_form.html:440
189 193 msgid "Remove this"
190 194 msgstr "Remover essa notificação"
191 195  
... ...
links/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -82,6 +82,10 @@ msgstr &quot;Atribuir grupos para o link de arquivo&quot;
82 82 msgid "Save"
83 83 msgstr "Salvar"
84 84  
  85 +#: links/templates/links/_form.html:311
  86 +msgid "Cancel"
  87 +msgstr ""
  88 +
85 89 #: links/templates/links/create.html:20
86 90 msgid "Create Website Link"
87 91 msgstr "Criar Link do Website"
... ...
log/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
mailsender/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
mural/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -237,8 +237,10 @@ msgstr &quot;Por Assunto&quot;
237 237 #: mural/templates/mural/list_category.html:124
238 238 #: mural/templates/mural/list_subject.html:74
239 239 #: mural/templates/mural/list_subject.html:123
240   -#: mural/templates/mural/resource_view.html:66
241   -#: mural/templates/mural/subject_view.html:81
  240 +#: mural/templates/mural/resource_view.html:38
  241 +#: mural/templates/mural/resource_view.html:84
  242 +#: mural/templates/mural/subject_view.html:53
  243 +#: mural/templates/mural/subject_view.html:99
242 244 msgid "Filter"
243 245 msgstr "Filtrar"
244 246  
... ... @@ -247,8 +249,10 @@ msgstr &quot;Filtrar&quot;
247 249 #: mural/templates/mural/list_category.html:129
248 250 #: mural/templates/mural/list_subject.html:79
249 251 #: mural/templates/mural/list_subject.html:128
250   -#: mural/templates/mural/resource_view.html:71
251   -#: mural/templates/mural/subject_view.html:86
  252 +#: mural/templates/mural/resource_view.html:43
  253 +#: mural/templates/mural/resource_view.html:89
  254 +#: mural/templates/mural/subject_view.html:58
  255 +#: mural/templates/mural/subject_view.html:104
252 256 msgid "Favorite posts"
253 257 msgstr "Postagens favoritas"
254 258  
... ... @@ -257,24 +261,26 @@ msgstr &quot;Postagens favoritas&quot;
257 261 #: mural/templates/mural/list_category.html:134
258 262 #: mural/templates/mural/list_subject.html:84
259 263 #: mural/templates/mural/list_subject.html:133
260   -#: mural/templates/mural/resource_view.html:76
261   -#: mural/templates/mural/subject_view.html:91
  264 +#: mural/templates/mural/resource_view.html:48
  265 +#: mural/templates/mural/resource_view.html:94
  266 +#: mural/templates/mural/subject_view.html:63
  267 +#: mural/templates/mural/subject_view.html:109
262 268 msgid "Only my posts"
263 269 msgstr "Apenas minhas postagens"
264 270  
265 271 #: mural/templates/mural/list.html:50
266 272 #: mural/templates/mural/list_category.html:99
267 273 #: mural/templates/mural/list_subject.html:98
268   -#: mural/templates/mural/resource_view.html:44
269   -#: mural/templates/mural/subject_view.html:59
  274 +#: mural/templates/mural/resource_view.html:62
  275 +#: mural/templates/mural/subject_view.html:77
270 276 msgid "Wish to make a new post?"
271 277 msgstr "Deseja fazer uma nova postagem?"
272 278  
273 279 #: mural/templates/mural/list.html:68
274 280 #: mural/templates/mural/list_category.html:120
275 281 #: mural/templates/mural/list_subject.html:119
276   -#: mural/templates/mural/resource_view.html:62
277   -#: mural/templates/mural/subject_view.html:77
  282 +#: mural/templates/mural/resource_view.html:80
  283 +#: mural/templates/mural/subject_view.html:95
278 284 msgid "There are no posts in this mural yet."
279 285 msgstr "Ainda não existe nenhuma postagem nesse mural."
280 286  
... ...
news/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
notifications/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
pdf_file/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -100,6 +100,10 @@ msgstr &quot;&quot;
100 100 msgid "Save"
101 101 msgstr "Salvar"
102 102  
  103 +#: pdf_file/templates/pdf_file/_form.html:362
  104 +msgid "Cancel"
  105 +msgstr ""
  106 +
103 107 #: pdf_file/templates/pdf_file/create.html:20
104 108 msgid "Create PDF file"
105 109 msgstr "Criar arquivo PDF"
... ... @@ -176,20 +180,16 @@ msgstr &quot;Enviar&quot;
176 180 msgid "Edit: "
177 181 msgstr "Editar: "
178 182  
179   -#: pdf_file/templates/pdf_file/view.html:52
180   -msgid "PDF could not be displayed"
181   -msgstr "PDF não pode ser mostrado"
182   -
183   -#: pdf_file/views.py:127 pdf_file/views.py:140 pdf_file/views.py:252
184   -#: pdf_file/views.py:254 pdf_file/views.py:270 pdf_file/views.py:272
  183 +#: pdf_file/views.py:129 pdf_file/views.py:142 pdf_file/views.py:254
  184 +#: pdf_file/views.py:256 pdf_file/views.py:272 pdf_file/views.py:274
185 185 msgid "Visualize"
186 186 msgstr "Visualizar"
187 187  
188   -#: pdf_file/views.py:200
  188 +#: pdf_file/views.py:202
189 189 msgid "Create PDF File"
190 190 msgstr "Criar o arquivo PDF"
191 191  
192   -#: pdf_file/views.py:212
  192 +#: pdf_file/views.py:214
193 193 #, python-format
194 194 msgid ""
195 195 "The PDF File \"%s\" was added to the Topic \"%s\" of the virtual environment "
... ... @@ -198,67 +198,70 @@ msgstr &quot;&quot;
198 198 "O arquivo PDF \"%s\" foi adicionado ao topico \"%s\" do ambiente virtual "
199 199 "\"%s\" com sucesso!"
200 200  
201   -#: pdf_file/views.py:316
  201 +#: pdf_file/views.py:318
202 202 msgid "Update PDF File"
203 203 msgstr "Atualize arquivo PDF"
204 204  
205   -#: pdf_file/views.py:329
  205 +#: pdf_file/views.py:331
206 206 #, python-format
207 207 msgid "The PDF File \"%s\" was updated successfully!"
208 208 msgstr "O arquivo PDF \"%s\" foi atualizado com sucesso!"
209 209  
210   -#: pdf_file/views.py:356
  210 +#: pdf_file/views.py:358
211 211 #, python-format
212 212 msgid ""
213 213 "The PDF File \"%s\" was removed successfully from virtual environment \"%s\"!"
214 214 msgstr ""
215 215 "O arquivo PDF \"%s\" foi removido com sucesso do ambiente virtual \"%s\" "
216 216  
217   -#: pdf_file/views.py:414
  217 +#: pdf_file/views.py:416
218 218 msgid "PDF File Reports"
219 219 msgstr "Relatórios do arquivo de PDF"
220 220  
221   -#: pdf_file/views.py:434
  221 +#: pdf_file/views.py:436
222 222 msgid "Realized"
223 223 msgstr "Realizada"
224 224  
225   -#: pdf_file/views.py:434
  225 +#: pdf_file/views.py:436
226 226 msgid "Unrealized"
227 227 msgstr "Não Realizada"
228 228  
229   -#: pdf_file/views.py:434
  229 +#: pdf_file/views.py:436
230 230 msgid "Historic"
231 231 msgstr "Histórico"
232 232  
233   -#: pdf_file/views.py:450 pdf_file/views.py:458
  233 +#: pdf_file/views.py:452 pdf_file/views.py:460
234 234 msgid "View"
235 235 msgstr "Visualizar"
236 236  
237   -#: pdf_file/views.py:459
  237 +#: pdf_file/views.py:461
238 238 msgid "PDF File"
239 239 msgstr "Criar o arquivo PDF"
240 240  
241   -#: pdf_file/views.py:464
  241 +#: pdf_file/views.py:466
242 242 msgid "Actions about resource"
243 243 msgstr "Ações sobre o recurso"
244 244  
245   -#: pdf_file/views.py:465
  245 +#: pdf_file/views.py:467
246 246 msgid "Quantity"
247 247 msgstr "Quantidade"
248 248  
249   -#: pdf_file/views.py:512
  249 +#: pdf_file/views.py:514
250 250 msgid "[Photo]"
251 251 msgstr "[Imagem]"
252 252  
253   -#: pdf_file/views.py:524
  253 +#: pdf_file/views.py:526
254 254 #, python-format
255 255 msgid "Last message in %s"
256 256 msgstr "Última mensagem em %s"
257 257  
258   -#: pdf_file/views.py:533
  258 +#: pdf_file/views.py:535
259 259 msgid "The message was successfull sent!"
260 260 msgstr "A mensagem foi enviada com sucesso!"
261 261  
262   -#: pdf_file/views.py:535
  262 +#: pdf_file/views.py:537
263 263 msgid "No user selected!"
264 264 msgstr "Nenhum usuário selecionado!"
  265 +
  266 +#~ msgid "PDF could not be displayed"
  267 +#~ msgstr "PDF não pode ser mostrado"
... ...
pendencies/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
reports/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
security/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
students_group/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
subjects/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -51,7 +51,9 @@ msgid &quot;Slug&quot;
51 51 msgstr "Slug"
52 52  
53 53 #: subjects/models.py:26
54   -msgid "Simpler description"
  54 +#, fuzzy
  55 +#| msgid "Simpler description"
  56 +msgid "simpler description"
55 57 msgstr "Descrição simples"
56 58  
57 59 #: subjects/models.py:27
... ... @@ -108,19 +110,24 @@ msgstr &quot;Professor(es) &quot;
108 110 msgid "Attribute professors to subject"
109 111 msgstr "Atribuir professores ao assunto"
110 112  
111   -#: subjects/templates/subjects/_form.html:91
  113 +#: subjects/templates/subjects/_form.html:92
112 114 msgid "Save"
113 115 msgstr "Salvar"
114 116  
115   -#: subjects/templates/subjects/_form.html:97
116   -#: subjects/templates/subjects/_form.html:98
  117 +#: subjects/templates/subjects/_form.html:96
  118 +#: subjects/templates/subjects/subscribe.html:18
  119 +msgid "Cancel"
  120 +msgstr "Cancelar"
  121 +
  122 +#: subjects/templates/subjects/_form.html:103
  123 +#: subjects/templates/subjects/_form.html:104
117 124 #, fuzzy
118 125 #| msgid "Search results"
119 126 msgid "Search for professors"
120 127 msgstr "Resultados da busca"
121 128  
122   -#: subjects/templates/subjects/_form.html:143
123   -#: subjects/templates/subjects/_form.html:144
  129 +#: subjects/templates/subjects/_form.html:149
  130 +#: subjects/templates/subjects/_form.html:150
124 131 #, fuzzy
125 132 #| msgid "Search results"
126 133 msgid "Search for students"
... ... @@ -132,33 +139,33 @@ msgstr &quot;Resultados da busca&quot;
132 139 #: subjects/templates/subjects/backup.html:104
133 140 #: subjects/templates/subjects/restore.html:58
134 141 #: subjects/templates/subjects/subject_card.html:33
135   -#: subjects/templates/subjects/view.html:55
  142 +#: subjects/templates/subjects/view.html:50
136 143 msgid "Backup"
137 144 msgstr "Backup"
138 145  
139 146 #: subjects/templates/subjects/backup.html:54
140 147 #: subjects/templates/subjects/list.html:75
141   -#: subjects/templates/subjects/list.html:137
  148 +#: subjects/templates/subjects/list.html:142
142 149 #: subjects/templates/subjects/restore.html:54
143 150 #: subjects/templates/subjects/subject_card.html:29
144   -#: subjects/templates/subjects/view.html:51
  151 +#: subjects/templates/subjects/view.html:46
145 152 msgid "Replicate"
146 153 msgstr "Replicar"
147 154  
148 155 #: subjects/templates/subjects/backup.html:56
149 156 #: subjects/templates/subjects/list.html:77
150   -#: subjects/templates/subjects/list.html:139
  157 +#: subjects/templates/subjects/list.html:144
151 158 #: subjects/templates/subjects/resource_card.html:25
152 159 #: subjects/templates/subjects/restore.html:56
153 160 #: subjects/templates/subjects/subject_card.html:31
154   -#: subjects/templates/subjects/view.html:53
  161 +#: subjects/templates/subjects/view.html:48
155 162 msgid "Edit"
156 163 msgstr "Editar"
157 164  
158 165 #: subjects/templates/subjects/backup.html:57
159 166 #: subjects/templates/subjects/restore.html:57
160 167 #: subjects/templates/subjects/subject_card.html:32
161   -#: subjects/templates/subjects/view.html:54
  168 +#: subjects/templates/subjects/view.html:49
162 169 msgid "Groups"
163 170 msgstr "Grupos"
164 171  
... ... @@ -168,17 +175,17 @@ msgstr &quot;Grupos&quot;
168 175 #: subjects/templates/subjects/restore.html:59
169 176 #: subjects/templates/subjects/restore.html:102
170 177 #: subjects/templates/subjects/subject_card.html:34
171   -#: subjects/templates/subjects/view.html:56
  178 +#: subjects/templates/subjects/view.html:51
172 179 msgid "Restore"
173 180 msgstr "Restaurar"
174 181  
175 182 #: subjects/templates/subjects/backup.html:60
176 183 #: subjects/templates/subjects/list.html:79
177   -#: subjects/templates/subjects/list.html:140
  184 +#: subjects/templates/subjects/list.html:145
178 185 #: subjects/templates/subjects/resource_card.html:26
179 186 #: subjects/templates/subjects/restore.html:60
180 187 #: subjects/templates/subjects/subject_card.html:35
181   -#: subjects/templates/subjects/view.html:57
  188 +#: subjects/templates/subjects/view.html:52
182 189 msgid "Remove"
183 190 msgstr "Remover"
184 191  
... ... @@ -215,7 +222,7 @@ msgstr &quot;Meus assuntos&quot;
215 222  
216 223 #: subjects/templates/subjects/home.html:80
217 224 #: subjects/templates/subjects/initial.html:90
218   -#: subjects/templates/subjects/list.html:180
  225 +#: subjects/templates/subjects/list.html:185
219 226 msgid "You still do not posses any subject in our platform"
220 227 msgstr "Você ainda não possui assuntos em nossa plataforma"
221 228  
... ... @@ -234,17 +241,17 @@ msgid &quot;All subjects&quot;
234 241 msgstr "Todos os assuntos"
235 242  
236 243 #: subjects/templates/subjects/list.html:94
237   -#: subjects/templates/subjects/list.html:155
  244 +#: subjects/templates/subjects/list.html:160
238 245 msgid "Coordinator(s) "
239 246 msgstr "Coordenador(es) "
240 247  
241 248 #: subjects/templates/subjects/list.html:98
242   -#: subjects/templates/subjects/list.html:159
  249 +#: subjects/templates/subjects/list.html:164
243 250 msgid "It doesn't possess coordinators"
244 251 msgstr "Não possui coordenadores"
245 252  
246 253 #: subjects/templates/subjects/list.html:104
247   -#: subjects/templates/subjects/list.html:165
  254 +#: subjects/templates/subjects/list.html:170
248 255 msgid "Create new subject"
249 256 msgstr "Criar novo assunto"
250 257  
... ... @@ -311,22 +318,22 @@ msgid &quot;File not supported.&quot;
311 318 msgstr ""
312 319  
313 320 #: subjects/templates/subjects/subject_card.html:39
314   -#: subjects/templates/subjects/view.html:61
  321 +#: subjects/templates/subjects/view.html:56
315 322 msgid "Analytics"
316 323 msgstr "Analytics"
317 324  
318 325 #: subjects/templates/subjects/subject_card.html:40
319   -#: subjects/templates/subjects/view.html:62
  326 +#: subjects/templates/subjects/view.html:57
320 327 msgid "Pendencies"
321 328 msgstr "Pendências"
322 329  
323 330 #: subjects/templates/subjects/subject_card.html:44
324   -#: subjects/templates/subjects/view.html:66
  331 +#: subjects/templates/subjects/view.html:61
325 332 msgid "Messages"
326 333 msgstr "Mensagens"
327 334  
328 335 #: subjects/templates/subjects/subject_card.html:48
329   -#: subjects/templates/subjects/view.html:70
  336 +#: subjects/templates/subjects/view.html:65
330 337 msgid "Mural"
331 338 msgstr "Mural"
332 339  
... ... @@ -354,10 +361,6 @@ msgstr &quot;Esse assunto não permite novas inscrições&quot;
354 361 msgid "Are you sure you want to subscribe to the subject"
355 362 msgstr "Tem certeza que deseja se inscrever no assunto"
356 363  
357   -#: subjects/templates/subjects/subscribe.html:18
358   -msgid "Cancel"
359   -msgstr "Cancelar"
360   -
361 364 #: subjects/templates/subjects/subscribe.html:19
362 365 msgid "Ok"
363 366 msgstr "Ok"
... ... @@ -366,23 +369,23 @@ msgstr &quot;Ok&quot;
366 369 msgid "Update: "
367 370 msgstr "Editar: "
368 371  
369   -#: subjects/templates/subjects/view.html:82
  372 +#: subjects/templates/subjects/view.html:77
370 373 msgid "Create new topic"
371 374 msgstr "Criar novo tópico"
372 375  
373   -#: subjects/templates/subjects/view.html:87
  376 +#: subjects/templates/subjects/view.html:82
374 377 msgid "Participants"
375 378 msgstr "Participantes"
376 379  
377   -#: subjects/templates/subjects/view.html:103
  380 +#: subjects/templates/subjects/view.html:98
378 381 msgid "Close"
379 382 msgstr "Fechar"
380 383  
381   -#: subjects/templates/subjects/view.html:116
  384 +#: subjects/templates/subjects/view.html:111
382 385 msgid "See Profile"
383 386 msgstr "Ver Perfil"
384 387  
385   -#: subjects/templates/subjects/view.html:119
  388 +#: subjects/templates/subjects/view.html:114
386 389 msgid "Send Message"
387 390 msgstr "Enviar Mensagem"
388 391  
... ...
themes/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -102,7 +102,7 @@ msgid &quot;It is recommended to be a white image&quot;
102 102 msgstr "É recomendável ser uma imagem branca"
103 103  
104 104 #: themes/templates/themes/basic_update.html:103
105   -#: themes/templates/themes/css_update.html:75
  105 +#: themes/templates/themes/css_update.html:73
106 106 msgid "Save"
107 107 msgstr "Salvar"
108 108  
... ... @@ -112,7 +112,7 @@ msgstr &quot;Salvar&quot;
112 112 msgid "CSS Selector"
113 113 msgstr "Seletor CSS"
114 114  
115   -#: themes/templates/themes/css_update.html:49
  115 +#: themes/templates/themes/css_update.html:48
116 116 msgid "Documentation"
117 117 msgstr "Documentação"
118 118  
... ...
topics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -140,6 +140,10 @@ msgstr &quot;Apenas um tópico por asssunto pode ser um repositório&quot;
140 140 msgid "Save"
141 141 msgstr "Salvar"
142 142  
  143 +#: topics/templates/topics/_form.html:56
  144 +msgid "Cancel"
  145 +msgstr ""
  146 +
143 147 #: topics/templates/topics/create.html:8 topics/views.py:86
144 148 msgid "Create Topic"
145 149 msgstr "Criar Tópico"
... ...
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ...
webconference/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -133,11 +133,15 @@ msgstr &quot;Atribuir grupos à web conferência&quot;
133 133 msgid "Save"
134 134 msgstr "Salvar"
135 135  
136   -#: webconference/templates/webconference/_form.html:405
  136 +#: webconference/templates/webconference/_form.html:402
  137 +msgid "Cancel"
  138 +msgstr ""
  139 +
  140 +#: webconference/templates/webconference/_form.html:409
137 141 msgid "Add new notification"
138 142 msgstr "Notificações Pendentes"
139 143  
140   -#: webconference/templates/webconference/_form.html:406
  144 +#: webconference/templates/webconference/_form.html:410
141 145 msgid "Remove this"
142 146 msgstr "Remover isto"
143 147  
... ...
webpage/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -94,6 +94,10 @@ msgstr &quot;Atribuir grupos de estudo à Página Web&quot;
94 94 msgid "Save"
95 95 msgstr "Salvar"
96 96  
  97 +#: webpage/templates/webpages/_form.html:329
  98 +msgid "Cancel"
  99 +msgstr ""
  100 +
97 101 #: webpage/templates/webpages/create.html:20 webpage/views.py:234
98 102 msgid "Create Webpage"
99 103 msgstr "Criar Página Web"
... ...
youtube_video/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @e497a47
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-10-07 00:08-0300\n"
  11 +"POT-Creation-Date: 2017-10-16 23:05-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"
... ... @@ -82,11 +82,15 @@ msgstr &quot;Atribuir grupos de estudo ao Vídeo do YouTube&quot;
82 82 msgid "Save"
83 83 msgstr "Salvar"
84 84  
85   -#: youtube_video/templates/youtube/_form.html:338
  85 +#: youtube_video/templates/youtube/_form.html:335
  86 +msgid "Cancel"
  87 +msgstr ""
  88 +
  89 +#: youtube_video/templates/youtube/_form.html:342
86 90 msgid "Add new notification"
87 91 msgstr "Adicionar nova notificação"
88 92  
89   -#: youtube_video/templates/youtube/_form.html:339
  93 +#: youtube_video/templates/youtube/_form.html:343
90 94 msgid "Remove this"
91 95 msgstr "Remover essa notificação"
92 96  
... ...