From 128314bcb337708c8b6eba46b337177cacfe4f22 Mon Sep 17 00:00:00 2001 From: Arthur Gerbaud Date: Sat, 13 Aug 2016 20:59:48 +0200 Subject: [PATCH] cleaning up, improved scripts and menus --- maraudes/admin.py | 1 + .../compte_rendu/compterendu_create.html | 92 ++++--------------- .../compte_rendu/compterendu_form.html | 36 +------- .../templates/compte_rendu/menu_creation.html | 55 +++++++++++ maraudes/templates/maraudes/list.html | 4 +- maraudes/views.py | 28 +++++- suivi/templates/suivi/details.html | 23 ++++- suivi/templates/suivi/sujet_suivi.html | 18 ++-- sujets/templates/sujets/sujet_create.html | 7 +- .../templates/sujets/sujet_create_inner.html | 6 +- .../templates/sujets/sujet_details_inner.html | 45 +++++---- website/mixins.py | 37 +++----- website/static/base.css | 20 +++- website/static/bootstrap/config.json | 8 +- .../static/bootstrap/css/bootstrap-theme.css | 14 +-- .../bootstrap/css/bootstrap-theme.min.css | 6 +- website/static/bootstrap/css/bootstrap.css | 20 ++-- .../static/bootstrap/css/bootstrap.min.css | 6 +- website/static/bootstrap/js/bootstrap.js | 4 +- website/static/bootstrap/js/bootstrap.min.js | 4 +- website/static/scripts/formsets.js | 0 website/static/scripts/update_time.js | 41 +++++++++ website/templates/base.html | 4 +- website/templates/navbar.html | 2 +- website/views.py | 2 +- 25 files changed, 274 insertions(+), 209 deletions(-) create mode 100644 maraudes/templates/compte_rendu/menu_creation.html create mode 100644 website/static/scripts/formsets.js create mode 100644 website/static/scripts/update_time.js diff --git a/maraudes/admin.py b/maraudes/admin.py index 31e2016..ee5d207 100644 --- a/maraudes/admin.py +++ b/maraudes/admin.py @@ -15,6 +15,7 @@ admin.site.register(Lieu) # Inlines class ObservationInline(admin.StackedInline): model = Observation + extra = 0 @admin.register(Rencontre) diff --git a/maraudes/templates/compte_rendu/compterendu_create.html b/maraudes/templates/compte_rendu/compterendu_create.html index 0d43c72..e98e09f 100644 --- a/maraudes/templates/compte_rendu/compterendu_create.html +++ b/maraudes/templates/compte_rendu/compterendu_create.html @@ -1,14 +1,10 @@ -{% load bootstrap3 %} -{% load staticfiles %} - +{% load bootstrap3 %}{% load staticfiles %} {{ form.media.js }}{{ form.media.css }} -
@@ -114,18 +49,9 @@
{% include "compte_rendu/compterendu_form.html" %}
-
-

Enregistrées @@ -142,3 +68,17 @@

+ + diff --git a/maraudes/templates/compte_rendu/compterendu_form.html b/maraudes/templates/compte_rendu/compterendu_form.html index e0b3da8..de5f6ca 100644 --- a/maraudes/templates/compte_rendu/compterendu_form.html +++ b/maraudes/templates/compte_rendu/compterendu_form.html @@ -1,4 +1,4 @@ -{% load bootstrap3 %} +{% load bootstrap3 %}{% load staticfiles %}
{% if form.id %}{% bootstrap_field form.id %}{% endif %} {% bootstrap_field form.lieu layout="inline" size="small" %} @@ -27,36 +27,4 @@ {% endfor %}
- + diff --git a/maraudes/templates/compte_rendu/menu_creation.html b/maraudes/templates/compte_rendu/menu_creation.html new file mode 100644 index 0000000..865e742 --- /dev/null +++ b/maraudes/templates/compte_rendu/menu_creation.html @@ -0,0 +1,55 @@ +{% if user.is_superuser %}{% load bootstrap3 %} +