Download as
Browse Code »

Commit 4bb518ef6371714f623a71e8f27358ac3a210317

Authored by Filipe Medeiros
1 parent 396d4690
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adding loadign image on subject

Showing 4 changed files with 14 additions and 4 deletions   Show diff stats
amadeus/static/js/category.js
  Diff comments   View file @4bb518e
@@ -172,6 +172,7 @@ $('.category-panel-content').on('shown.bs.collapse', function(e) { @@ -172,6 +172,7 @@ $('.category-panel-content').on('shown.bs.collapse', function(e) {
172 $.ajax({ 172 $.ajax({
173 url: load_sub_url, 173 url: load_sub_url,
174 success: function (data) { 174 success: function (data) {
  175 + $("#" + panel_id + "_loading").hide();
175 $('#' + panel_id + '-accordion').html(data); 176 $('#' + panel_id + '-accordion').html(data);
176 177
177 var items = $('#' + panel_id + '-accordion').children(":visible").length; 178 var items = $('#' + panel_id + '-accordion').children(":visible").length;
subjects/models.py
  Diff comments   View file @4bb518e
@@ -23,7 +23,7 @@ class Subject(models.Model): @@ -23,7 +23,7 @@ class Subject(models.Model):
23 name = models.CharField( _("Name"), unique = False, max_length= 200) 23 name = models.CharField( _("Name"), unique = False, max_length= 200)
24 slug = AutoSlugField(_("Slug"),populate_from='name',unique=True) 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 description = models.TextField(_("description"), blank= True) 27 description = models.TextField(_("description"), blank= True)
28 visible = models.BooleanField(_("visible")) 28 visible = models.BooleanField(_("visible"))
29 29
subjects/templates/subjects/list.html
  Diff comments   View file @4bb518e
@@ -104,6 +104,11 @@ @@ -104,6 +104,11 @@
104 <a href="{% url 'subjects:create' category.slug %}" class="btn btn-raised btn-success btn-block btn-sm">{% trans "Create new subject" %}</a> 104 <a href="{% url 'subjects:create' category.slug %}" class="btn btn-raised btn-success btn-block btn-sm">{% trans "Create new subject" %}</a>
105 {% endif %} 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 <div class="panel-group subject-group" id="{{ category.slug }}_category-accordion" role="tablist" aria-multiselectable="true"> 112 <div class="panel-group subject-group" id="{{ category.slug }}_category-accordion" role="tablist" aria-multiselectable="true">
108 113
109 </div> 114 </div>
topics/templates/topics/_form.html
  Diff comments   View file @4bb518e
@@ -47,9 +47,13 @@ @@ -47,9 +47,13 @@
47 {% endif %} 47 {% endif %}
48 </div> 48 </div>
49 {% endfor %} 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 'home' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
53 </div> 57 </div>
54 </div> 58 </div>
55 </form> 59 </form>