Download as
Browse Code »

Commit 786f57472e59eab62d8502f2acb3e383d2523f15

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

improved translation and UI, fixed colors

Showing 4 changed files with 11 additions and 6 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @786f574
... ... @@ -1245,6 +1245,10 @@ div.dataTables_wrapper div.dataTables_paginate {
1245 1245 float: left;
1246 1246 }
1247 1247  
  1248 +#resources_accordion .panel-heading{
  1249 + background-color: #c4c4c4 !important;
  1250 +
  1251 +}
1248 1252  
1249 1253 .delete-row{
1250 1254 float: right;
... ...
reports/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @786f574
... ... @@ -92,7 +92,7 @@ msgstr "Dados de Interação"
92 92  
93 93 #: templates/reports/create.html:40 templates/reports/view.html:46
94 94 msgid "Report Card"
95   -msgstr "Boletim do Topico"
  95 +msgstr "Boletim do Tópico"
96 96  
97 97 #: templates/reports/create.html:43 templates/reports/view.html:49
98 98 msgid "Participation"
... ...
reports/templates/reports/_form.html
  Diff comments   View file @786f574
... ... @@ -25,11 +25,12 @@
25 25  
26 26  
27 27 {% elif field.auto_id == 'id_from_mural' %}
28   - <h5 class="one"> <span>{% trans "Choose the Data Source (is possible to pick more than one)" %}</span></h5>
  28 + <h5 class="one"> <span>{% trans "Choose the Data Source (is possible to pick more than one)" %}</span></h5>
29 29 <div class="report-check-fields">
30 30  
31   - <label class="form-field-report"> {{field.label}} </label>
  31 + <label class="form-field-report"> {{field.label}}
32 32 {% render_field field class='form-control ' %}
  33 + </label>
33 34 </div>
34 35 {% else %}
35 36 <label class="form-field-report"> {{field.label}} </label>
... ... @@ -61,7 +62,7 @@
61 62 <div class="col-md-12">
62 63 <a data-parent="#resources_accordion" data-toggle="collapse" href="#resources">
63 64 <h4 class="panel-title">
64   - <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 for="resources">{% trans "Interaction with resources" %}</label>
  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>
65 66 </h4>
66 67 </a>
67 68 </div>
... ...
reports/views.py
  Diff comments   View file @786f574
... ... @@ -272,7 +272,7 @@ def get_resources(request):
272 272 subject = Subject.objects.get(id=request.GET['subject_id'])
273 273  
274 274 topic_choice = request.GET["topic_choice"]
275   - if topic_choice.lower() == "all":
  275 + if topic_choice.lower() == "all" or topic_choice.lower() == "todos":
276 276 topics = subject.topic_subject.all()
277 277 else:
278 278 topics = [Topic.objects.get(id=int(topic_choice))]
... ... @@ -299,7 +299,7 @@ def get_tags(request):
299 299 resource_type = request.GET['resource_class_name']
300 300 subject = Subject.objects.get(id=request.GET['subject_id'])
301 301 topic_choice = request.GET["topic_choice"]
302   - if topic_choice.lower() == "all":
  302 + if topic_choice.lower() == "all" or topic_choice.lower() == "todos":
303 303 topics = subject.topic_subject.all()
304 304 else:
305 305 topics = [Topic.objects.get(id=int(topic_choice))]
... ...