Merge pull request #865 from ICalofir/cancel/reset-buttons

Added cancel/reset buttons #845
rosedu · Mar 5, 2016 · 41b8015 · 41b8015
2 parents d3e72d9 + c136f56
commit 41b8015
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 9 deletions.
diff --git a/wouso/resources/templates/cpanel/add_player.html b/wouso/resources/templates/cpanel/add_player.html
@@ -24,6 +24,8 @@
 
         <form class="form-horizontal" action="" role="form" method="post">
             {{ form|bootstrap_horizontal }}
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
             <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
             {% csrf_token %}
         </form>

diff --git a/wouso/resources/templates/cpanel/add_spell.html b/wouso/resources/templates/cpanel/add_spell.html
@@ -24,8 +24,10 @@
 
         <form class="form-horizontal" role="form" action="" method="post" enctype="multipart/form-data">
             {{ form|bootstrap_horizontal }}
-          <input class="btn btn-primary" type="submit" value="Submit">
-          <button type="submit" class="btn btn-primary" onclick="history.back(); return false;">{% trans 'Cancel' %}</button> {% csrf_token %}
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
+            {% csrf_token %}
         </form>
     </div>
 

diff --git a/wouso/resources/templates/cpanel/edit_spell.html b/wouso/resources/templates/cpanel/edit_spell.html
@@ -1,6 +1,7 @@
 {% extends 'cpanel/index.html' %}
 
 {% load user %}
+{% load i18n %}
 {% load bootstrap %}
 {% load django_bootstrap_breadcrumbs %}
 
@@ -23,7 +24,9 @@
 
         <form class="form-horizontal" role="form" action="" method="post" enctype="multipart/form-data">
             {{ form|bootstrap_horizontal }}
-            <input class="btn btn-primary" type="submit" value="Submit">
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
             {% csrf_token %}
         </form>
     </div>

diff --git a/wouso/resources/templates/cpanel/qpool_add_tag.html b/wouso/resources/templates/cpanel/qpool_add_tag.html
@@ -22,7 +22,9 @@
 
         <form class="form-horizontal" role="form" action="" method="post">
             {{ form|bootstrap_horizontal }}
-            <input class="btn btn-primary" type="submit" value="Submit">
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
             {% csrf_token %}
         </form>
     </div>

diff --git a/wouso/resources/templates/cpanel/qpool_edit_tag.html b/wouso/resources/templates/cpanel/qpool_edit_tag.html
@@ -22,7 +22,9 @@
 
         <form class="form-horizontal" role="form" action="" method="post">
             {{ form|bootstrap_horizontal }}
-            <input class="btn btn-primary" type="submit" value="Submit">
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
             {% csrf_token %}
         </form>
     </div>

diff --git a/wouso/resources/templates/cpanel/races/create.html b/wouso/resources/templates/cpanel/races/create.html
@@ -1,6 +1,7 @@
 {% extends 'cpanel/index.html' %}
 
 {% load user %}
+{% load i18n %}
 {% load bootstrap %}
 {% load django_bootstrap_breadcrumbs %}
 
@@ -23,7 +24,9 @@
 
         <form class="form-horizontal" role="form" action="" method="post" enctype="multipart/form-data">
             {{ form|bootstrap_horizontal }}
-            <input type="submit" class="btn btn-primary" value="Submit">
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
             {% csrf_token %}
         </form>
     </div>

diff --git a/wouso/resources/templates/cpanel/races/edit_race.html b/wouso/resources/templates/cpanel/races/edit_race.html
@@ -1,6 +1,7 @@
 {% extends 'cpanel/index.html' %}
 
 {% load user %}
+{% load i18n %}
 {% load bootstrap %}
 {% load django_bootstrap_breadcrumbs %}
 
@@ -23,7 +24,9 @@
 
         <form class="form-horizontal" role="form" action="" method="post" enctype="multipart/form-data">
             {{ form|bootstrap_horizontal }}
-            <input type="submit" class="btn btn-primary" value="Submit">
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
             {% csrf_token %}
         </form>
     </div>

diff --git a/wouso/resources/templates/cpanel/races/group_create.html b/wouso/resources/templates/cpanel/races/group_create.html
@@ -1,6 +1,7 @@
 {% extends 'cpanel/index.html' %}
 
 {% load user %}
+{% load i18n %}
 {% load bootstrap %}
 {% load django_bootstrap_breadcrumbs %}
 
@@ -23,7 +24,9 @@
 
         <form class="form-horizontal" role="form" action="" method="post" enctype="multipart/form-data">
             {{ form|bootstrap_horizontal }}
-            <input type="submit" class="btn btn-primary" value="Submit">
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
             {% csrf_token %}
         </form>
     </div>

diff --git a/wouso/resources/templates/cpanel/races/group_edit.html b/wouso/resources/templates/cpanel/races/group_edit.html
@@ -1,6 +1,7 @@
 {% extends 'cpanel/index.html' %}
 
 {% load user %}
+{% load i18n %}
 {% load bootstrap %}
 {% load django_bootstrap_breadcrumbs %}
 
@@ -22,7 +23,9 @@
 
         <form class="form-horizontal" role="form" action="" method="post" enctype="multipart/form-data">
             {{ form|bootstrap_horizontal }}
-            <input type="submit" class="btn btn-primary" value="Submit">
+            <button onclick="history.back(); return false;" class="btn btn-warning">{% trans 'Cancel' %}</button>
+            <button type="reset" class="btn btn-danger">{% trans 'Reset' %}</button>
+            <button type="submit" class="btn btn-primary">{% trans 'Submit' %}</button>
             {% csrf_token %}
         </form>
     </div>