From 4bb518ef6371714f623a71e8f27358ac3a210317 Mon Sep 17 00:00:00 2001
From: Filipe Medeiros <fcma@cin.ufpe.br>
Date: Wed, 11 Oct 2017 12:21:23 -0300
Subject: [PATCH] Adding loadign image on subject

---
 amadeus/static/js/category.js         |  1 +
 subjects/models.py                    |  2 +-
 subjects/templates/subjects/list.html |  5 +++++
 topics/templates/topics/_form.html    | 10 +++++++---
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/amadeus/static/js/category.js b/amadeus/static/js/category.js
index a2c8a30..db4201a 100755
--- a/amadeus/static/js/category.js
+++ b/amadeus/static/js/category.js
@@ -172,6 +172,7 @@ $('.category-panel-content').on('shown.bs.collapse', function(e) {
             $.ajax({
                 url: load_sub_url,
                 success: function (data) {
+                    $("#" + panel_id + "_loading").hide();
                     $('#' + panel_id + '-accordion').html(data);
 
                     var items = $('#' + panel_id + '-accordion').children(":visible").length;
diff --git a/subjects/models.py b/subjects/models.py
index 5cda91f..44d108a 100644
--- a/subjects/models.py
+++ b/subjects/models.py
@@ -23,7 +23,7 @@ class Subject(models.Model):
     name = models.CharField( _("Name"), unique = False, max_length= 200)
     slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)
 
-    description_brief = models.TextField(_("simpler_description"), blank=True)
+    description_brief = models.TextField(_("simpler description"), blank=True)
     description = models.TextField(_("description"), blank= True)
     visible = models.BooleanField(_("visible"))
 
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index 7cec7de..1bce7b1 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -104,6 +104,11 @@
                                     <a href="{% url 'subjects:create' category.slug %}" class="btn btn-raised btn-success btn-block btn-sm">{% trans "Create new subject" %}</a>
                                 {% endif %}
 
+                                <div id="{{ category.slug }}_category_loading" class="alert alert-success" role="alert" style="display:block" >
+                                    <center>
+                                        <span class="fa fa-spin fa-circle-o-notch"></span>
+                                    </center>
+                                </div>
                                 <div class="panel-group subject-group" id="{{ category.slug }}_category-accordion" role="tablist" aria-multiselectable="true">
 
                                 </div>
diff --git a/topics/templates/topics/_form.html b/topics/templates/topics/_form.html
index a245c89..edef7ce 100644
--- a/topics/templates/topics/_form.html
+++ b/topics/templates/topics/_form.html
@@ -47,9 +47,13 @@
 			{% endif %}
 		</div>
 	{% endfor %}
-	<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
-		<div class="text-center">
-			<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
+	<div class="row">
+		<div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
+			<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
+		</div>
+
+		<div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
+			<a href="{% url 'home' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
--
libgit2 0.21.2