Download as
Browse Code »

Commit 796d57deb9458e4bebbfd4312b88fae8bff42b30

Authored by juliotoscano
1 parent d6358852
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

bug radio button #235

Showing 6 changed files with 18 additions and 26 deletions   Show diff stats
app/templates/admin_settings.html
  Diff comments   View file @796d57d
... ... @@ -110,7 +110,7 @@
110 110 </div>
111 111 </div>
112 112 </div>
113   -
  113 +
114 114 <!--/.Panel 2-->
115 115  
116 116 <!--Panel 3-->
... ... @@ -122,11 +122,6 @@
122 122 <input type="checkbox" checked> <b>Allow users self-enroll.</b>
123 123 </label>
124 124 </div>
125   - <div class="togglebutton">
126   - <label>
127   - <input type="checkbox"> <b>Put the system in maintenance mode.</b>
128   - </label>
129   - </div>
130 125 <button type="button" class="btn btn-primary">Save changes</button>
131 126 </div>
132 127 </div>
... ...
app/templates/home.html
  Diff comments   View file @796d57d
... ... @@ -7,12 +7,12 @@
7 7 <script type="text/javascript">
8 8 {% if page_obj and paginator %}
9 9 var pageNum = {{ page_obj.number }}; // The latest page loaded
10   - var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
  10 + var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
11 11 {% else %}
12 12 var pageNum = 0 ; // The latest page loaded
13 13 var numberPages = 0 ; // Indicates the number of pages
14 14 {% endif %}
15   -
  15 +
16 16 var baseUrl = '{% url "app:index" %}';
17 17  
18 18 // loadOnScroll handler
... ... @@ -55,6 +55,7 @@
55 55  
56 56 $(document).ready(function(){
57 57 $(window).bind('scroll', loadOnScroll);
  58 + $.material.init();
58 59 });
59 60 </script>
60 61 {% endif %}
... ...
core/templates/base.html
  Diff comments   View file @796d57d
... ... @@ -8,16 +8,16 @@
8 8 <head>
9 9 <title>{{ title }}</title>
10 10  
  11 + <!-- jQuery & jQuery UI -->
  12 + <script type="text/javascript" src="{% static 'js/vendor/jquery-3.1.0.min.js' %}"></script>
  13 + <script type="text/javascript" src="{% static 'js/vendor/jquery-ui.js' %}"></script>
  14 +
11 15 <meta http-equiv="Cache-Control" content="no-cache, no-store" />
12 16 <link href="{% static 'img/topo-amadeus.png' %}" rel="shortcut icon" />
13 17 <!-- Roboto font -->
14 18 <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
15 19 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
16 20  
17   - <!-- jQuery & jQuery UI -->
18   - <script type="text/javascript" src="{% static 'js/vendor/jquery-3.1.0.min.js' %}"></script>
19   - <script type="text/javascript" src="{% static 'js/vendor/jquery-ui.js' %}"></script>
20   -
21 21 <!-- Bootstrap and themes (material) -->
22 22 <link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
23 23  
... ... @@ -25,7 +25,6 @@
25 25 <link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.css' %}">
26 26 <link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
27 27  
28   -
29 28 <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/bootstrap-datepicker.standalone.css' %}">
30 29 <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/alertify.min.css' %}">
31 30 <link rel="stylesheet" type="text/css" href="{% static 'css/vendor/alertifyjs/themes/bootstrap.css' %}">
... ... @@ -36,11 +35,9 @@
36 35 <script type="text/javascript" src="{% static 'material/js/ripples.js' %}"></script>
37 36 <script type="text/javascript" src="{% static 'material/js/ripples.min.js' %}"></script>
38 37 <script type="text/javascript" src="{% static 'js/vendor/bootstrap-datepicker.js' %}"></script>
39   -
40 38 {% with "js/vendor/locales/bootstrap-datepicker."|add:LANGUAGE_CODE|add:".js" as locale_datepicker %}
41   - <script type="text/javascript" src="{% static locale_datepicker %}"></script>
  39 + <script type="text/javascript" src="{% static locale_datepicker %}"></script>
42 40 {% endwith %}
43   -
44 41 <script type="text/javascript" src="{% static 'js/vendor/alertify.min.js' %}"></script>
45 42 <script type="text/javascript" src="{% static 'js/vendor/jscookie.js' %}"></script>
46 43  
... ... @@ -50,11 +47,9 @@
50 47 <!-- Custom styles -->
51 48 <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
52 49  
53   - <!-- Init material Bootstrap -->
54   - <script type="text/javascript">$.material.init()</script>
55   -
56 50 <!--Javascript block for specific-app ones -->
57 51 <script src="{% static 'js/base/amadeus.js' %}"></script>
  52 + <script src="{% static 'js/main.js' %}"></script>
58 53 {% block style %}
59 54 {% endblock %}
60 55 {% block javascript %}
... ... @@ -172,8 +167,7 @@
172 167 </div>
173 168 </div>
174 169 </div>
175   - <script src="{% static 'js/main.js' %}"></script>
176   - <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
  170 +
177 171 {% block script_file %}
178 172  
179 173 {% endblock script_file %}
... ... @@ -181,6 +175,8 @@
181 175 {% block script_link %}
182 176  
183 177 {% endblock script_link %}
  178 + <!-- Init material Bootstrap -->
  179 + <script type="text/javascript">$.material.init()</script>
184 180 </body>
185 181  
186 182 </html>
... ...
core/templates/index.html
  Diff comments   View file @796d57d
... ... @@ -49,7 +49,7 @@
49 49 <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10 col-lg-offset-1">
50 50 <div class="checkbox">
51 51 <label>
52   - <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
  52 + <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"></span> {% trans 'Remember Email' %}
53 53 </label>
54 54 </div>
55 55 </div>
... ...
courses/templates/course/view.html
  Diff comments   View file @796d57d
... ... @@ -10,6 +10,7 @@
10 10 {% block javascript %}
11 11 <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
12 12 <script type="text/javascript" src="{% static 'js/modal_subject.js' %}"></script>
  13 + <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
13 14 {% endblock %}
14 15  
15 16 {% block breadcrumbs %}
... ...
users/templates/users/edit_profile.html
  Diff comments   View file @796d57d
... ... @@ -8,11 +8,11 @@
8 8 {% block breadcrumbs %}
9 9 {% if user|has_role:'system_admin' %}
10 10 {{ block.super }}
11   - {% breadcrumb 'Update User' 'users:update' %}
  11 + {% breadcrumb 'Update User' 'users:update' %}
12 12 {% else %}
13 13 {{ block.super }}
14 14 {% breadcrumb 'Update Profile' 'users:update' %}
15   - {% endif %}
  15 + {% endif %}
16 16  
17 17 {% endblock %}
18 18  
... ... @@ -28,7 +28,6 @@
28 28 </div>
29 29 {% endfor %}
30 30 {% endif %}
31   -
32 31 <div class="card mg-b-5m">
33 32 <div class="card-content">
34 33 <div class="card-body">
... ... @@ -57,7 +56,7 @@
57 56  
58 57 {% elif field.auto_id == 'id_phone' %}
59 58 {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
60   -
  59 +
61 60 {% elif field.auto_id == 'id_year_titration' %}
62 61 {% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
63 62  
... ...