From 7c1c29c9c4c2395b0b146d4af799013f551ee9c3 Mon Sep 17 00:00:00 2001
From: Filipe Medeiros <fcma@cin.ufpe.br>
Date: Wed, 11 Oct 2017 13:41:57 -0300
Subject: [PATCH] Adding cancel button in resouces forms

---
 bulletin/sheets/xls/objetivos.xls                | Bin 0 -> 5632 bytes
 bulletin/templates/bulletin/_form.html           | 10 +++++++---
 categories/templates/categories/_form.html       |  2 +-
 file_link/templates/file_links/_form.html        | 10 +++++++---
 goals/templates/goals/_form.html                 | 10 +++++++---
 links/templates/links/_form.html                 | 10 +++++++---
 pdf_file/templates/pdf_file/_form.html           | 10 +++++++---
 subjects/templates/subjects/_form.html           |  2 +-
 topics/templates/topics/_form.html               |  2 +-
 webconference/templates/webconference/_form.html | 10 +++++++---
 webpage/templates/webpages/_form.html            | 10 +++++++---
 youtube_video/templates/youtube/_form.html       | 10 +++++++---
 12 files changed, 59 insertions(+), 27 deletions(-)
 create mode 100644 bulletin/sheets/xls/objetivos.xls

diff --git a/bulletin/sheets/xls/objetivos.xls b/bulletin/sheets/xls/objetivos.xls
new file mode 100644
index 0000000..1ba51e1
Binary files /dev/null and b/bulletin/sheets/xls/objetivos.xls differ
diff --git a/bulletin/templates/bulletin/_form.html b/bulletin/templates/bulletin/_form.html
index 0ff1abe..a2aa4cb 100644
--- a/bulletin/templates/bulletin/_form.html
+++ b/bulletin/templates/bulletin/_form.html
@@ -354,9 +354,13 @@
 		{% endif %}
 	</div>
 
-	<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 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/categories/templates/categories/_form.html b/categories/templates/categories/_form.html
index 7e818e2..a136e8d 100644
--- a/categories/templates/categories/_form.html
+++ b/categories/templates/categories/_form.html
@@ -69,7 +69,7 @@
 		</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>
+			<a href="{% url 'categories:index' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/file_link/templates/file_links/_form.html b/file_link/templates/file_links/_form.html
index 12c3bac..fdb10e8 100644
--- a/file_link/templates/file_links/_form.html
+++ b/file_link/templates/file_links/_form.html
@@ -328,9 +328,13 @@
 		{% endif %}
 	</div>
 
-	<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 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/goals/templates/goals/_form.html b/goals/templates/goals/_form.html
index 4a810e9..bd1576e 100644
--- a/goals/templates/goals/_form.html
+++ b/goals/templates/goals/_form.html
@@ -397,9 +397,13 @@
 		{% endif %}
 	</div>
 
-	<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 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/links/templates/links/_form.html b/links/templates/links/_form.html
index d22e21c..2d1b624 100644
--- a/links/templates/links/_form.html
+++ b/links/templates/links/_form.html
@@ -302,9 +302,13 @@
 	
 	
 
-	<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 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/pdf_file/templates/pdf_file/_form.html b/pdf_file/templates/pdf_file/_form.html
index 7ad79f7..7b219f8 100644
--- a/pdf_file/templates/pdf_file/_form.html
+++ b/pdf_file/templates/pdf_file/_form.html
@@ -353,9 +353,13 @@
 		{% endif %}
 	</div>
 
-	<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 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/subjects/templates/subjects/_form.html b/subjects/templates/subjects/_form.html
index b191c4e..0708dfb 100755
--- a/subjects/templates/subjects/_form.html
+++ b/subjects/templates/subjects/_form.html
@@ -93,7 +93,7 @@
 		</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>
+			<a href="{% url 'subjects:index' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/topics/templates/topics/_form.html b/topics/templates/topics/_form.html
index edef7ce..f0069d2 100644
--- a/topics/templates/topics/_form.html
+++ b/topics/templates/topics/_form.html
@@ -53,7 +53,7 @@
 		</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>
+			<a href="{% url 'subjects:view' subject.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/webconference/templates/webconference/_form.html b/webconference/templates/webconference/_form.html
index 8be3e10..d4d933e 100644
--- a/webconference/templates/webconference/_form.html
+++ b/webconference/templates/webconference/_form.html
@@ -393,9 +393,13 @@
 		{% endif %}
 	</div>
 
-	<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 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/webpage/templates/webpages/_form.html b/webpage/templates/webpages/_form.html
index ae2478a..2518db8 100644
--- a/webpage/templates/webpages/_form.html
+++ b/webpage/templates/webpages/_form.html
@@ -320,9 +320,13 @@
 		{% endif %}
 	</div>
 
-	<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 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
diff --git a/youtube_video/templates/youtube/_form.html b/youtube_video/templates/youtube/_form.html
index e0bbef5..a5ba491 100644
--- a/youtube_video/templates/youtube/_form.html
+++ b/youtube_video/templates/youtube/_form.html
@@ -326,9 +326,13 @@
 		{% endif %}
 	</div>
 
-	<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 'subjects:topic_view' slug=subject.slug topic_slug=topic.slug %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
 		</div>
 	</div>
 </form>
--
libgit2 0.21.2