diff --git a/templates/base.html b/templates/base.html index aea0ea99..408abec1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -94,18 +94,18 @@ with this program; if not, write to the Free Software Foundation, Inc., Login {% endif %} - - + + {% if is_cableur %} - {% endif %} - + + + {% endif %} + @@ -122,9 +122,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{# Display django.contrib.messages as Bootstrap alerts #} {% bootstrap_messages %} -
- {% block content %}{% endblock %}
@@ -146,9 +144,9 @@ with this program; if not, write to the Free Software Foundation, Inc., Connexion {% if request_user.has_access %} - jusqu'au {{ request.user.end_access|date:"d b Y" }} + jusqu'au {{ request.user.end_access|date:"d b Y" }} {% else %} - Désactivée + Désactivée {% endif %} @@ -201,8 +199,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,

Re2o 2016 - Gabriel Détraz, Goulven Kermarec, Augustin Lemesle, Maël Kervella

- - {# Read the documentation for more information #} diff --git a/templates/buttons/add.html b/templates/buttons/add.html index b0cb5fe7..0cffb9f4 100644 --- a/templates/buttons/add.html +++ b/templates/buttons/add.html @@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} - diff --git a/templates/buttons/edit.html b/templates/buttons/edit.html index d5cfa277..aaa51261 100644 --- a/templates/buttons/edit.html +++ b/templates/buttons/edit.html @@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} - diff --git a/templates/buttons/history.html b/templates/buttons/history.html index 8dc5b32a..42f08614 100644 --- a/templates/buttons/history.html +++ b/templates/buttons/history.html @@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} - diff --git a/templates/buttons/multiple_checkbox_alt.html b/templates/buttons/multiple_checkbox_alt.html index 6346632c..e6fd7d58 100644 --- a/templates/buttons/multiple_checkbox_alt.html +++ b/templates/buttons/multiple_checkbox_alt.html @@ -21,20 +21,18 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} -
{% for val in field.field.choices %} - + {% endfor %}
{% for error in field.errors %} -
{{ error }}
+
{{ error }}
{% endfor %}
{{ field.help_text }}
diff --git a/templates/buttons/suppr.html b/templates/buttons/suppr.html index 383bca40..907345be 100644 --- a/templates/buttons/suppr.html +++ b/templates/buttons/suppr.html @@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. {% endcomment %} - diff --git a/templates/pagination.html b/templates/pagination.html index 7ebd26c1..a3a51602 100644 --- a/templates/pagination.html +++ b/templates/pagination.html @@ -31,13 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endif %} {% for page in list.paginator.page_range %} {% if list.number <= page|add:"3" and list.number >= page|add:"-3" %} -
  • {{ page }}
  • +
  • {{ page }}
  • {% endif %} {% endfor %} {% if list.has_next %}
  • >
  • -
  • >>
  • +
  • >>
  • {% endif %}