Download as
Browse Code »

Commit b7ef4d11283a1ed2b6ae154849d3fdd07a59dd4b

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

updated UI from reports form

Showing 2 changed files with 38 additions and 34 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @b7ef4d1
... ... @@ -1296,6 +1296,18 @@ div.dataTables_wrapper div.dataTables_paginate {
1296 1296 z-index: 5;
1297 1297 }
1298 1298  
  1299 + .general-parameters-field{
  1300 + width: 25%;
  1301 + float: left;
  1302 + margin-left: 1%;
  1303 + }
  1304 +
  1305 + #general-parameters-div{
  1306 + width: 100%;
  1307 + display: block;
  1308 + height: 100px;
  1309 + }
  1310 +
1299 1311 /* End Reports */
1300 1312  
1301 1313 /* Chat */
... ...
reports/templates/reports/_form.html
  Diff comments   View file @b7ef4d1
... ... @@ -17,44 +17,36 @@
17 17 {% endif %}
18 18  
19 19 <h5 class="one"> <span>{% trans "General Parameters" %}</span></h5>
20   - {% for field in form %}
  20 + <div id="general-parameters-div">
  21 + <div class="general-parameters-field">
  22 + {{form.topic.errors}}
  23 + <label> {{form.topic.label}} </label>
  24 + {% render_field form.topic class="form-control" %}
  25 + </div>
  26 + <div class="general-parameters-field">
  27 + <label> {{form.init_date.label}} </label>
  28 + {% render_field form.init_date class='form-control date-picker' %}
  29 + </div>
21 30  
  31 + <div class="general-parameters-field">
  32 + <label> {{form.end_date.label}} </label>
  33 + {% render_field form.end_date class='form-control date-picker' %}
  34 + </div>
  35 + </div>
22 36  
23   - {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date' %}
24   - <label class="form-field-report"> {{field.label}} </label>
25   - {% render_field field class='form-control date-picker' %}
26   -
27   -
28   -
29   - {% elif field.auto_id == 'id_from_mural' %}
30   - <h5 class="one"> <span>{% trans "Choose the Data Source (is possible to pick more than one)" %}</span></h5>
  37 + <h5 class="one"> <span>{% trans "Choose the Data Source (is possible to pick more than one)" %}</span></h5>
  38 + <div id="data-source-parameters-div">
31 39 <div class="report-check-fields">
32   -
33   - <label class="form-field-report"> {{field.label}}
34   - {% render_field field class='form-control ' %}
35   - </label>
  40 + <label class="form-field-report"> {% render_field form.from_mural %} {{form.from_mural.label}} </label>
  41 +
36 42 </div>
37   - {% else %}
38   - <label class="form-field-report"> {{field.label}} </label>
39   - {% render_field field class='form-control ' %}
40   - {% endif %}
41   -
42   - {% if field.errors %}
43   - <div class="row">
44   - </br>
45   - <div class="alert alert-danger alert-dismissible" role="alert">
46   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
47   - <span aria-hidden="true">&times;</span>
48   - </button>
49   - <ul>
50   - {% for error in field.errors %}
51   - <li>{{ error }}</li>
52   - {% endfor %}
53   - </ul>
54   - </div>
55   - </div>
56   - {% endif %}
57   - {% endfor %}
  43 + <div class="report-check-fields">
  44 + <label class="form-field-report"> {% render_field form.from_messages %} {{form.from_messages.label}} </label>
  45 +
  46 + </div>
  47 + </div>
  48 +
  49 +
58 50  
59 51 <!---Adding the selector -->
60 52 <div class="panel-group" id="resources_accordion" role="tablist" aria-multiselectable="true">
... ...