From e4bff4eae9c26d0a50f7b8e904f61b0c7c62cbf2 Mon Sep 17 00:00:00 2001 From: juliotoscano Date: Fri, 11 Nov 2016 19:08:20 -0300 Subject: [PATCH] modifying buttons cancel #205 --- core/templates/base.html | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------- poll/templates/poll/create.html | 2 +- users/templates/list_users.html | 4 ++-- users/templates/users/change_password.html | 2 +- users/templates/users/edit_profile.html | 2 +- users/templates/users/remove_account.html | 2 +- users/templates/users/update.html | 6 +++--- 7 files changed, 94 insertions(+), 100 deletions(-) diff --git a/core/templates/base.html b/core/templates/base.html index cfc44a9..645aaf0 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -8,9 +8,9 @@ {{ title }} - - - + + + @@ -30,9 +30,7 @@ - - {% with "js/vendor/locales/bootstrap-datepicker."|add:LANGUAGE_CODE|add:".js" as locale_datepicker %} @@ -62,92 +60,88 @@ - {% block nav %} -
-
- - -
-
-
-
-
-
- -
- - - - - -
-
-
- - -
-
- {% endblock %} -
-
-
- {% block sidebar %} - {% endblock %} -
-
- {% block breadcrumbs %}{% endblock %} - {% block render_breadcrumbs %}{% endblock %} -
-
- {% block content %}{% endblock %} -
-
-
- - {% block script_file %} - - {% endblock script_file %} - - {% block script_link %} - - {% endblock script_link %} - - + {% block nav %} +
+
+ + +
+
+
+
+
+
+ +
+ + + +
+
+
+ +
+
+ {% endblock %} +
+
+
+ {% block sidebar %} + {% endblock %} +
+
+ {% block breadcrumbs %}{% endblock %} + {% block render_breadcrumbs %}{% endblock %} +
+
+ {% block content %}{% endblock %} +
+
+
+ + {% block script_file %} + + {% endblock script_file %} + + {% block script_link %} + + {% endblock script_link %} + + diff --git a/poll/templates/poll/create.html b/poll/templates/poll/create.html index b0759a5..fd05942 100644 --- a/poll/templates/poll/create.html +++ b/poll/templates/poll/create.html @@ -144,7 +144,7 @@
- + {% block button_save %} diff --git a/users/templates/list_users.html b/users/templates/list_users.html index b069ce4..42319f3 100644 --- a/users/templates/list_users.html +++ b/users/templates/list_users.html @@ -61,7 +61,7 @@

{% trans 'Contact' %}: {{ acc.phone }}

{% trans 'Edit' %} - {% trans 'Delete' %} + {% trans 'Delete' %}
@@ -78,7 +78,7 @@ {% trans 'Are you sure you want to delete the user' %} {{acc.name}}?
- {% trans 'Cancel' %} + {% trans 'Cancel' %} {% trans 'Delete' %}
diff --git a/users/templates/users/change_password.html b/users/templates/users/change_password.html index affdd04..78b8c08 100644 --- a/users/templates/users/change_password.html +++ b/users/templates/users/change_password.html @@ -44,7 +44,7 @@
- {% trans 'Cancel' %} + {% trans 'Cancel' %}
diff --git a/users/templates/users/edit_profile.html b/users/templates/users/edit_profile.html index 9df02cd..2ed7235 100644 --- a/users/templates/users/edit_profile.html +++ b/users/templates/users/edit_profile.html @@ -99,7 +99,7 @@
- {% trans 'Cancel' %} + {% trans 'Cancel' %}
diff --git a/users/templates/users/remove_account.html b/users/templates/users/remove_account.html index 4983b0f..b44d1df 100644 --- a/users/templates/users/remove_account.html +++ b/users/templates/users/remove_account.html @@ -32,7 +32,7 @@ {% trans 'Remove' %}
- {% trans 'Cancel' %} + {% trans 'Cancel' %}
diff --git a/users/templates/users/update.html b/users/templates/users/update.html index 8f598a3..3f94bf5 100644 --- a/users/templates/users/update.html +++ b/users/templates/users/update.html @@ -6,10 +6,10 @@ {% load django_bootstrap_breadcrumbs %} {% block breadcrumbs %} - + {{ block.super }} {% breadcrumb 'Update User' 'users:update' %} - + {% endblock %} @@ -80,7 +80,7 @@
- {% trans 'Cancel' %} + {% trans 'Cancel' %}
-- libgit2 0.21.2