Download as
Browse Code »

Commit 66497f20535678f11cc7c76b2a48c1cd93d32170

Authored by Erik Zambom
Committed by GitHub
2 parents 6332be9e a76575ca
Exists in amadeus_univasf

Merge pull request #585 from amadeusproject/refactoring 

Daily Update - 12_10_2017
Showing 18 changed files with 141 additions and 92 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @66497f2
... ... @@ -399,7 +399,16 @@
399 399 box-shadow: none;
400 400 }
401 401  
  402 + .notifies, .goalitems {
  403 + padding: 5px 0px;
  404 + text-align: right;
  405 + margin-bottom: 10px;
  406 + }
402 407  
  408 + .card .card-body {
  409 + height: 30%;
  410 + padding: 10px;
  411 + }
403 412 }
404 413  
405 414 @media(min-width: 769px) {
... ...
amadeus/static/js/category.js
  Diff comments   View file @66497f2
... ... @@ -172,6 +172,7 @@ $('.category-panel-content').on('shown.bs.collapse', function(e) {
172 172 $.ajax({
173 173 url: load_sub_url,
174 174 success: function (data) {
  175 + $("#" + panel_id + "_loading").hide();
175 176 $('#' + panel_id + '-accordion').html(data);
176 177  
177 178 var items = $('#' + panel_id + '-accordion').children(":visible").length;
... ...
api/views.py
  Diff comments   View file @66497f2
... ... @@ -480,44 +480,42 @@ class ChatViewset(viewsets.ModelViewSet, LogMixin):
480 480 def favorite_messages(self, request):
481 481 username = request.data['email']
482 482 favor = request.data['favor']
483   - message_id = int(request.data['id'])
  483 + list_size = int(request.data['list_size'])
484 484  
485 485 user = User.objects.get(email = username)
486 486  
487   - message = get_object_or_404(TalkMessages, id = message_id)
  487 + entries = []
  488 + array_ids = []
488 489  
489   - response = ""
  490 + for i in range(0, list_size):
490 491  
491   - if favor == "true":
492   - if not ChatFavorites.objects.filter(Q(user = user) & Q(message__id = message_id)).exists():
493   - #Insert on table
494   - ChatFavorites.objects.create(message = message, user = user)
  492 + message_id = int(request.data[str(i)])
495 493  
496   - info = {}
  494 + message = get_object_or_404(TalkMessages, id = message_id)
497 495  
498   - info["message"] = ""
499   - info["type"] = ""
500   - info["title"] = ""
501   - info["success"] = True
502   - info["number"] = 1
503   - info['extra'] = 0
504   -
505   - response = json.dumps(info)
  496 + if favor == "true":
  497 + if not ChatFavorites.objects.filter(Q(user = user) & Q(message__id = message_id)).exists():
  498 + entries.append(ChatFavorites(message = message, user = user))
  499 + elif favor == "false":
  500 + if ChatFavorites.objects.filter(Q(user = user) & Q(message__id = message_id)).exists():
  501 + array_ids.append(message_id)
506 502  
  503 + if favor == "true":
  504 + ChatFavorites.objects.bulk_create(entries)
507 505 elif favor == "false":
508   - if ChatFavorites.objects.filter(Q(user = user) & Q(message__id = message_id)).exists():
509   - #Delete row
510   - ChatFavorites.objects.filter(message = message, user = user).delete()
  506 + ChatFavorites.objects.filter(message__id__in = (array_ids)).delete()
  507 +
  508 + response = ""
511 509  
512   - info = {}
  510 + info = {}
513 511  
514   - info["message"] = ""
515   - info["type"] = ""
516   - info["title"] = ""
517   - info["success"] = True
518   - info["number"] = 1
519   - info['extra'] = 0
  512 + info["message"] = ""
  513 + info["type"] = ""
  514 + info["title"] = ""
  515 + info["success"] = True
  516 + info["number"] = 1
  517 + info['extra'] = 0
520 518  
521   - response = json.dumps(info)
  519 + response = json.dumps(info)
522 520  
523 521 return HttpResponse(response)
524 522 \ No newline at end of file
... ...
bulletin/sheets/xls/objetivos.xls 0 → 100644
View file @66497f2
No preview for this file type
bulletin/templates/bulletin/_form.html
  Diff comments   View file @66497f2
... ... @@ -249,12 +249,12 @@
249 249 </div>
250 250 </div>
251 251 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
252   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  252 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
253 253 <label>
254 254 {% render_field pendencies_form.begin_date_check class="begin_date" %} {{ pendencies_form.begin_date.label }}
255 255 </label>
256 256 </div>
257   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  257 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
258 258 {% render_field pendencies_form.begin_date class='form-control datetime-picker begin_date_input' %}
259 259 </div>
260 260 </div>
... ... @@ -275,12 +275,12 @@
275 275 {% endif %}
276 276 </div>
277 277 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
278   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  278 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
279 279 <label>
280 280 {% render_field pendencies_form.end_date_check class="end_date" %} {{ pendencies_form.end_date.label }}
281 281 </label>
282 282 </div>
283   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  283 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
284 284 {% render_field pendencies_form.end_date class='form-control datetime-picker end_date_input' %}
285 285 </div>
286 286 </div>
... ... @@ -354,9 +354,13 @@
354 354 {% endif %}
355 355 </div>
356 356  
357   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
358   - <div class="text-center">
359   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  357 + <div class="row">
  358 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  359 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  360 + </div>
  361 +
  362 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  363 + <a href="{% url 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
360 364 </div>
361 365 </div>
362 366 </form>
... ...
categories/templates/categories/_form.html
  Diff comments   View file @66497f2
... ... @@ -69,7 +69,7 @@
69 69 </div>
70 70  
71 71 <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
72   - <a href="{% url 'home' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
  72 + <a href="{% url 'categories:index' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
73 73 </div>
74 74 </div>
75 75 </form>
... ...
file_link/templates/file_links/_form.html
  Diff comments   View file @66497f2
... ... @@ -172,12 +172,12 @@
172 172 </div>
173 173 </div>
174 174 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
175   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  175 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
176 176 <label>
177 177 {% render_field pendencies_form.begin_date_check class="begin_date" %} {{ pendencies_form.begin_date.label }}
178 178 </label>
179 179 </div>
180   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  180 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
181 181 {% render_field pendencies_form.begin_date class='form-control datetime-picker begin_date_input' %}
182 182 </div>
183 183 </div>
... ... @@ -198,12 +198,12 @@
198 198 {% endif %}
199 199 </div>
200 200 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
201   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  201 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
202 202 <label>
203 203 {% render_field pendencies_form.end_date_check class="end_date" %} {{ pendencies_form.end_date.label }}
204 204 </label>
205 205 </div>
206   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  206 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
207 207 {% render_field pendencies_form.end_date class='form-control datetime-picker end_date_input' %}
208 208 </div>
209 209 </div>
... ... @@ -328,9 +328,13 @@
328 328 {% endif %}
329 329 </div>
330 330  
331   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
332   - <div class="text-center">
333   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  331 + <div class="row">
  332 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  333 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  334 + </div>
  335 +
  336 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  337 + <a href="{% url 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
334 338 </div>
335 339 </div>
336 340 </form>
... ...
goals/templates/goals/_form.html
  Diff comments   View file @66497f2
... ... @@ -267,12 +267,12 @@
267 267 </div>
268 268 </div>
269 269 <div class="form-group{% if notify.has_error %} has-error {% endif %} row">
270   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  270 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
271 271 <label>
272 272 {% render_field notify.begin_date_check class="begin_date" %} {{ notify.begin_date.label }}
273 273 </label>
274 274 </div>
275   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  275 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
276 276 {% render_field notify.begin_date class='form-control datetime-picker begin_date_input' %}
277 277 </div>
278 278 </div>
... ... @@ -293,12 +293,12 @@
293 293 {% endif %}
294 294 </div>
295 295 <div class="form-group{% if notify.has_error %} has-error {% endif %} row">
296   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  296 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
297 297 <label>
298 298 {% render_field notify.end_date_check class="end_date" %} {{ notify.end_date.label }}
299 299 </label>
300 300 </div>
301   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  301 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
302 302 {% render_field notify.end_date class='form-control datetime-picker end_date_input' %}
303 303 </div>
304 304 </div>
... ... @@ -397,9 +397,13 @@
397 397 {% endif %}
398 398 </div>
399 399  
400   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
401   - <div class="text-center">
402   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  400 + <div class="row">
  401 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  402 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  403 + </div>
  404 +
  405 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  406 + <a href="{% url 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
403 407 </div>
404 408 </div>
405 409 </form>
... ...
links/templates/links/_form.html
  Diff comments   View file @66497f2
... ... @@ -144,12 +144,12 @@
144 144 </div>
145 145 </div>
146 146 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
147   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  147 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
148 148 <label>
149 149 {% render_field pendencies_form.begin_date_check class="begin_date" %} {{ pendencies_form.begin_date.label }}
150 150 </label>
151 151 </div>
152   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  152 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
153 153 {% render_field pendencies_form.begin_date class='form-control datetime-picker begin_date_input' %}
154 154 </div>
155 155 </div>
... ... @@ -170,12 +170,12 @@
170 170 {% endif %}
171 171 </div>
172 172 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
173   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  173 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
174 174 <label>
175 175 {% render_field pendencies_form.end_date_check class="end_date" %} {{ pendencies_form.end_date.label }}
176 176 </label>
177 177 </div>
178   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  178 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
179 179 {% render_field pendencies_form.end_date class='form-control datetime-picker end_date_input' %}
180 180 </div>
181 181 </div>
... ... @@ -302,9 +302,13 @@
302 302  
303 303  
304 304  
305   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
306   - <div class="text-center">
307   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  305 + <div class="row">
  306 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  307 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  308 + </div>
  309 +
  310 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  311 + <a href="{% url 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
308 312 </div>
309 313 </div>
310 314 </form>
... ...
pdf_file/templates/pdf_file/_form.html
  Diff comments   View file @66497f2
... ... @@ -174,12 +174,12 @@
174 174 </div>
175 175 </div>
176 176 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
177   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  177 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
178 178 <label>
179 179 {% render_field pendencies_form.begin_date_check class="begin_date" %} {{ pendencies_form.begin_date.label }}
180 180 </label>
181 181 </div>
182   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  182 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
183 183 {% render_field pendencies_form.begin_date class='form-control datetime-picker begin_date_input' %}
184 184 </div>
185 185 </div>
... ... @@ -200,12 +200,12 @@
200 200 {% endif %}
201 201 </div>
202 202 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
203   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  203 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
204 204 <label>
205 205 {% render_field pendencies_form.end_date_check class="end_date" %} {{ pendencies_form.end_date.label }}
206 206 </label>
207 207 </div>
208   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  208 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
209 209 {% render_field pendencies_form.end_date class='form-control datetime-picker end_date_input' %}
210 210 </div>
211 211 </div>
... ... @@ -353,9 +353,13 @@
353 353 {% endif %}
354 354 </div>
355 355  
356   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
357   - <div class="text-center">
358   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  356 + <div class="row">
  357 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  358 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  359 + </div>
  360 +
  361 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  362 + <a href="{% url 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
359 363 </div>
360 364 </div>
361 365 </form>
... ...
subjects/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @66497f2
... ... @@ -51,7 +51,7 @@ msgid &quot;Slug&quot;
51 51 msgstr "Slug"
52 52  
53 53 #: subjects/models.py:26
54   -msgid "simpler_description"
  54 +msgid "Simpler description"
55 55 msgstr "Descrição simples"
56 56  
57 57 #: subjects/models.py:27
... ...
subjects/models.py
  Diff comments   View file @66497f2
... ... @@ -23,7 +23,7 @@ class Subject(models.Model):
23 23 name = models.CharField( _("Name"), unique = False, max_length= 200)
24 24 slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)
25 25  
26   - description_brief = models.TextField(_("simpler_description"), blank=True)
  26 + description_brief = models.TextField(_("simpler description"), blank=True)
27 27 description = models.TextField(_("description"), blank= True)
28 28 visible = models.BooleanField(_("visible"))
29 29  
... ...
subjects/templates/subjects/_form.html
  Diff comments   View file @66497f2
... ... @@ -93,7 +93,7 @@
93 93 </div>
94 94  
95 95 <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
96   - <a href="{% url 'home' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
  96 + <a href="{% url 'subjects:index' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
97 97 </div>
98 98 </div>
99 99 </form>
... ...
subjects/templates/subjects/list.html
  Diff comments   View file @66497f2
... ... @@ -104,6 +104,11 @@
104 104 <a href="{% url 'subjects:create' category.slug %}" class="btn btn-raised btn-success btn-block btn-sm">{% trans "Create new subject" %}</a>
105 105 {% endif %}
106 106  
  107 + <div id="{{ category.slug }}_category_loading" class="alert alert-success" role="alert" style="display:block" >
  108 + <center>
  109 + <span class="fa fa-spin fa-circle-o-notch"></span>
  110 + </center>
  111 + </div>
107 112 <div class="panel-group subject-group" id="{{ category.slug }}_category-accordion" role="tablist" aria-multiselectable="true">
108 113  
109 114 </div>
... ...
topics/templates/topics/_form.html
  Diff comments   View file @66497f2
... ... @@ -47,9 +47,13 @@
47 47 {% endif %}
48 48 </div>
49 49 {% endfor %}
50   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
51   - <div class="text-center">
52   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  50 + <div class="row">
  51 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  52 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  53 + </div>
  54 +
  55 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  56 + <a href="{% url 'subjects:view' subject.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
53 57 </div>
54 58 </div>
55 59 </form>
... ...
webconference/templates/webconference/_form.html
  Diff comments   View file @66497f2
... ... @@ -187,12 +187,12 @@
187 187 </div>
188 188 </div>
189 189 <div class="form-group{% if notify.has_error %} has-error {% endif %} row">
190   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  190 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
191 191 <label>
192 192 {% render_field notify.begin_date_check class="begin_date" %} {{ notify.begin_date.label }}
193 193 </label>
194 194 </div>
195   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  195 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
196 196 {% render_field notify.begin_date class='form-control datetime-picker begin_date_input' %}
197 197 </div>
198 198 </div>
... ... @@ -213,12 +213,12 @@
213 213 {% endif %}
214 214 </div>
215 215 <div class="form-group{% if notify.has_error %} has-error {% endif %} row">
216   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  216 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
217 217 <label>
218 218 {% render_field notify.end_date_check class="end_date" %} {{ notify.end_date.label }}
219 219 </label>
220 220 </div>
221   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  221 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
222 222 {% render_field notify.end_date class='form-control datetime-picker end_date_input' %}
223 223 </div>
224 224 </div>
... ... @@ -239,12 +239,12 @@
239 239 {% endif %}
240 240 </div>
241 241 <div class="form-group{% if notify.has_error %} has-error {% endif %} row">
242   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  242 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
243 243 <label>
244 244 {% render_field notify.limit_date_check class="limit_date" %} {{ notify.limit_date.label }}
245 245 </label>
246 246 </div>
247   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  247 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
248 248 {% render_field notify.limit_date class='form-control datetime-picker limit_date_input' %}
249 249 </div>
250 250 </div>
... ... @@ -393,9 +393,13 @@
393 393 {% endif %}
394 394 </div>
395 395  
396   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
397   - <div class="text-center">
398   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  396 + <div class="row">
  397 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  398 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  399 + </div>
  400 +
  401 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  402 + <a href="{% url 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
399 403 </div>
400 404 </div>
401 405 </form>
... ...
webpage/templates/webpages/_form.html
  Diff comments   View file @66497f2
... ... @@ -141,12 +141,12 @@
141 141 </div>
142 142 </div>
143 143 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
144   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  144 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
145 145 <label>
146 146 {% render_field pendencies_form.begin_date_check class="begin_date" %} {{ pendencies_form.begin_date.label }}
147 147 </label>
148 148 </div>
149   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  149 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
150 150 {% render_field pendencies_form.begin_date class='form-control datetime-picker begin_date_input' %}
151 151 </div>
152 152 </div>
... ... @@ -167,12 +167,12 @@
167 167 {% endif %}
168 168 </div>
169 169 <div class="form-group{% if pendencies_form.has_error %} has-error {% endif %} row">
170   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  170 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
171 171 <label>
172 172 {% render_field pendencies_form.end_date_check class="end_date" %} {{ pendencies_form.end_date.label }}
173 173 </label>
174 174 </div>
175   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  175 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
176 176 {% render_field pendencies_form.end_date class='form-control datetime-picker end_date_input' %}
177 177 </div>
178 178 </div>
... ... @@ -320,9 +320,13 @@
320 320 {% endif %}
321 321 </div>
322 322  
323   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
324   - <div class="text-center">
325   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  323 + <div class="row">
  324 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  325 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  326 + </div>
  327 +
  328 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  329 + <a href="{% url 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
326 330 </div>
327 331 </div>
328 332 </form>
... ...
youtube_video/templates/youtube/_form.html
  Diff comments   View file @66497f2
... ... @@ -146,12 +146,12 @@
146 146 </div>
147 147 </div>
148 148 <div class="form-group{% if notify.has_error %} has-error {% endif %} row">
149   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  149 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
150 150 <label>
151 151 {% render_field notify.begin_date_check class="begin_date" %} {{ notify.begin_date.label }}
152 152 </label>
153 153 </div>
154   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  154 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
155 155 {% render_field notify.begin_date class='form-control datetime-picker begin_date_input' %}
156 156 </div>
157 157 </div>
... ... @@ -172,12 +172,12 @@
172 172 {% endif %}
173 173 </div>
174 174 <div class="form-group{% if notify.has_error %} has-error {% endif %} row">
175   - <div class="col-lg-2 col-md-2 col-sm-2 col-xs-3 checkbox">
  175 + <div class="col-lg-2 col-md-2 col-sm-12 col-xs-12 checkbox">
176 176 <label>
177 177 {% render_field notify.end_date_check class="end_date" %} {{ notify.end_date.label }}
178 178 </label>
179 179 </div>
180   - <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
  180 + <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
181 181 {% render_field notify.end_date class='form-control datetime-picker end_date_input' %}
182 182 </div>
183 183 </div>
... ... @@ -326,9 +326,13 @@
326 326 {% endif %}
327 327 </div>
328 328  
329   - <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
330   - <div class="text-center">
331   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
  329 + <div class="row">
  330 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  331 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  332 + </div>
  333 +
  334 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  335 + <a href="{% url 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
332 336 </div>
333 337 </div>
334 338 </form>
... ...