diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 6dc9243..17c95a3 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -1173,7 +1173,7 @@ article { } } -#menu-rechercher, #menu-ajouter { +#menu-rechercher, #menu-ajouter, #menu-configurer { display: none; } @@ -1206,7 +1206,7 @@ article { #boutons-fixes { display: none; } - #menu-rechercher, #menu-ajouter { + #menu-rechercher, #menu-ajouter, #menu-configurer { display: inline-block; } diff --git a/src/agenda_culturel/templates/agenda_culturel/batchimportation_form.html b/src/agenda_culturel/templates/agenda_culturel/batchimportation_form.html index 4db2a29..d2cdf67 100644 --- a/src/agenda_culturel/templates/agenda_culturel/batchimportation_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/batchimportation_form.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load static %} {% block title %}{% block og_title %}Importation manuelle{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/cancel_import_confirm.html b/src/agenda_culturel/templates/agenda_culturel/cancel_import_confirm.html index a26aad3..7a991ee 100644 --- a/src/agenda_culturel/templates/agenda_culturel/cancel_import_confirm.html +++ b/src/agenda_culturel/templates/agenda_culturel/cancel_import_confirm.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Supprimer {{ object.title }}{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/categorisation_rules.html b/src/agenda_culturel/templates/agenda_culturel/categorisation_rules.html index e0d564f..5c989f7 100644 --- a/src/agenda_culturel/templates/agenda_culturel/categorisation_rules.html +++ b/src/agenda_culturel/templates/agenda_culturel/categorisation_rules.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Règles de catégorisation{% endblock %}{% endblock %} @@ -84,6 +84,10 @@ +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="catrules" %} diff --git a/src/agenda_culturel/templates/agenda_culturel/categorisationrule_confirm_delete.html b/src/agenda_culturel/templates/agenda_culturel/categorisationrule_confirm_delete.html index 36e7ceb..49561cc 100644 --- a/src/agenda_culturel/templates/agenda_culturel/categorisationrule_confirm_delete.html +++ b/src/agenda_culturel/templates/agenda_culturel/categorisationrule_confirm_delete.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Supprimer la règle de catégorisation {{ object.pk }}{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/categorisationrule_form.html b/src/agenda_culturel/templates/agenda_culturel/categorisationrule_form.html index 3fa14b8..24d7dfd 100644 --- a/src/agenda_culturel/templates/agenda_culturel/categorisationrule_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/categorisationrule_form.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load static %} {% block title %}{% block og_title %}Règle de catéorisation{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/categorise_events_form.html b/src/agenda_culturel/templates/agenda_culturel/categorise_events_form.html index c0787ce..dd864cd 100644 --- a/src/agenda_culturel/templates/agenda_culturel/categorise_events_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/categorise_events_form.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load static %} {% load utils_extra %} {% load cat_extra %} diff --git a/src/agenda_culturel/templates/agenda_culturel/contactmessage_confirm_delete.html b/src/agenda_culturel/templates/agenda_culturel/contactmessage_confirm_delete.html index 39ad54c..4a7b087 100644 --- a/src/agenda_culturel/templates/agenda_culturel/contactmessage_confirm_delete.html +++ b/src/agenda_culturel/templates/agenda_culturel/contactmessage_confirm_delete.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Supprimer {{ object.subject }}{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/contactmessage_create_form.html b/src/agenda_culturel/templates/agenda_culturel/contactmessage_create_form.html index d784860..114a170 100644 --- a/src/agenda_culturel/templates/agenda_culturel/contactmessage_create_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/contactmessage_create_form.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load static %} {% block title %}{% block og_title %}Contact{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/contactmessage_moderation_form.html b/src/agenda_culturel/templates/agenda_culturel/contactmessage_moderation_form.html index 280a554..06ef099 100644 --- a/src/agenda_culturel/templates/agenda_culturel/contactmessage_moderation_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/contactmessage_moderation_form.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load static %} {% load utils_extra %} @@ -42,6 +42,10 @@ +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="contactmessages" %} diff --git a/src/agenda_culturel/templates/agenda_culturel/contactmessages.html b/src/agenda_culturel/templates/agenda_culturel/contactmessages.html index 945e7c1..48accf0 100644 --- a/src/agenda_culturel/templates/agenda_culturel/contactmessages.html +++ b/src/agenda_culturel/templates/agenda_culturel/contactmessages.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Derniers messages de contact reçus{% endblock %}{% endblock %} @@ -51,6 +51,10 @@ +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="contactmessages" %} diff --git a/src/agenda_culturel/templates/agenda_culturel/delete_spams_confirm.html b/src/agenda_culturel/templates/agenda_culturel/delete_spams_confirm.html index 1ba9090..b6d70b7 100644 --- a/src/agenda_culturel/templates/agenda_culturel/delete_spams_confirm.html +++ b/src/agenda_culturel/templates/agenda_culturel/delete_spams_confirm.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block fluid %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/duplicates.html b/src/agenda_culturel/templates/agenda_culturel/duplicates.html index e6bb87d..a60c414 100644 --- a/src/agenda_culturel/templates/agenda_culturel/duplicates.html +++ b/src/agenda_culturel/templates/agenda_culturel/duplicates.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load utils_extra %} {% load event_extra %} @@ -59,6 +59,10 @@ +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="duplicates" %} diff --git a/src/agenda_culturel/templates/agenda_culturel/fix_duplicate.html b/src/agenda_culturel/templates/agenda_culturel/fix_duplicate.html index 72b6126..7adb993 100644 --- a/src/agenda_culturel/templates/agenda_culturel/fix_duplicate.html +++ b/src/agenda_culturel/templates/agenda_culturel/fix_duplicate.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load utils_extra %} {% load event_extra %} diff --git a/src/agenda_culturel/templates/agenda_culturel/imports.html b/src/agenda_culturel/templates/agenda_culturel/imports.html index f33e8c6..c9bc0e0 100644 --- a/src/agenda_culturel/templates/agenda_culturel/imports.html +++ b/src/agenda_culturel/templates/agenda_culturel/imports.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Importations par lot{% endblock %}{% endblock %} @@ -22,6 +22,10 @@ {% include "agenda_culturel/batch-imports-inc.html" with paginator_filter=paginator_filter %} +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="imports" %} diff --git a/src/agenda_culturel/templates/agenda_culturel/moderation.html b/src/agenda_culturel/templates/agenda_culturel/moderation.html index a1bd7a8..fa12d82 100644 --- a/src/agenda_culturel/templates/agenda_culturel/moderation.html +++ b/src/agenda_culturel/templates/agenda_culturel/moderation.html @@ -1,5 +1,6 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} +{% load utils_extra %} {% block title %}{% block og_title %}Derniers événements soumis{% endblock %}{% endblock %} {% load cat_extra %} @@ -7,9 +8,10 @@ {% css_categories %} {% endblock %} + {% block content %}
    -
    +

    Derniers événements soumis

    @@ -29,6 +31,10 @@
    +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="moderation" %}
    diff --git a/src/agenda_culturel/templates/agenda_culturel/moderationanswer_confirm_delete.html b/src/agenda_culturel/templates/agenda_culturel/moderationanswer_confirm_delete.html index 338e2e5..86f533f 100644 --- a/src/agenda_culturel/templates/agenda_culturel/moderationanswer_confirm_delete.html +++ b/src/agenda_culturel/templates/agenda_culturel/moderationanswer_confirm_delete.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Supprimer la réponse #{{ object.pk }}{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/moderationanswer_form.html b/src/agenda_culturel/templates/agenda_culturel/moderationanswer_form.html index be67bfd..7d7bd58 100644 --- a/src/agenda_culturel/templates/agenda_culturel/moderationanswer_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/moderationanswer_form.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load static %} {% block title %}{% block og_title %}{% if form.instance.pk %}Modification{% else %}Création{% endif %} d'une réponse de modération{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/moderationquestion_confirm_delete.html b/src/agenda_culturel/templates/agenda_culturel/moderationquestion_confirm_delete.html index 76d9fe5..2839b97 100644 --- a/src/agenda_culturel/templates/agenda_culturel/moderationquestion_confirm_delete.html +++ b/src/agenda_culturel/templates/agenda_culturel/moderationquestion_confirm_delete.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Supprimer la question #{{ object.pk }}{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/moderationquestion_detail.html b/src/agenda_culturel/templates/agenda_culturel/moderationquestion_detail.html index ce4baf7..e92321e 100644 --- a/src/agenda_culturel/templates/agenda_culturel/moderationquestion_detail.html +++ b/src/agenda_culturel/templates/agenda_culturel/moderationquestion_detail.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Question de modération #{{ object.pk }}{% endblock %}{% endblock %} @@ -61,6 +61,10 @@ {% endif %} +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="moderationquestions" %} diff --git a/src/agenda_culturel/templates/agenda_culturel/moderationquestion_form.html b/src/agenda_culturel/templates/agenda_culturel/moderationquestion_form.html index 185db48..04543af 100644 --- a/src/agenda_culturel/templates/agenda_culturel/moderationquestion_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/moderationquestion_form.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% load static %} diff --git a/src/agenda_culturel/templates/agenda_culturel/moderationquestion_list.html b/src/agenda_culturel/templates/agenda_culturel/moderationquestion_list.html index 939ef79..006dac9 100644 --- a/src/agenda_culturel/templates/agenda_culturel/moderationquestion_list.html +++ b/src/agenda_culturel/templates/agenda_culturel/moderationquestion_list.html @@ -1,4 +1,4 @@ -{% extends "agenda_culturel/page.html" %} +{% extends "agenda_culturel/page-admin.html" %} {% block title %}{% block og_title %}Questions de modération{% endblock %}{% endblock %} @@ -59,6 +59,10 @@ +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="moderationquestions" %} diff --git a/src/agenda_culturel/templates/agenda_culturel/page-admin.html b/src/agenda_culturel/templates/agenda_culturel/page-admin.html new file mode 100644 index 0000000..38a4487 --- /dev/null +++ b/src/agenda_culturel/templates/agenda_culturel/page-admin.html @@ -0,0 +1,3 @@ +{% extends "agenda_culturel/page.html" %} + +{% block configurer-menu %}{% block configurer-bouton %}{% endblock %}{% endblock %} diff --git a/src/agenda_culturel/templates/agenda_culturel/page-rimport.html b/src/agenda_culturel/templates/agenda_culturel/page-rimport.html index 7e0c2b5..d96a2cf 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-rimport.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-rimport.html @@ -50,6 +50,10 @@ + {% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • + {% endblock %} {% include "agenda_culturel/side-nav.html" with current="rimports" %} {% endblock %} \ No newline at end of file diff --git a/src/agenda_culturel/templates/agenda_culturel/page.html b/src/agenda_culturel/templates/agenda_culturel/page.html index 3274527..9a5722b 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page.html +++ b/src/agenda_culturel/templates/agenda_culturel/page.html @@ -36,6 +36,8 @@
    @@ -45,6 +47,7 @@
    diff --git a/src/agenda_culturel/templates/agenda_culturel/place_unknown_list.html b/src/agenda_culturel/templates/agenda_culturel/place_unknown_list.html index 328e355..333c43e 100644 --- a/src/agenda_culturel/templates/agenda_culturel/place_unknown_list.html +++ b/src/agenda_culturel/templates/agenda_culturel/place_unknown_list.html @@ -43,6 +43,10 @@ +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="unknown_places" %} diff --git a/src/agenda_culturel/templates/agenda_culturel/recurrentimport_confirm_delete.html b/src/agenda_culturel/templates/agenda_culturel/recurrentimport_confirm_delete.html index 539feab..6c6696b 100644 --- a/src/agenda_culturel/templates/agenda_culturel/recurrentimport_confirm_delete.html +++ b/src/agenda_culturel/templates/agenda_culturel/recurrentimport_confirm_delete.html @@ -4,6 +4,8 @@ {% block fluid %}{% endblock %} +{% block configurer-bouton %}{% endblock %} + {% block content %}

    Suppression de l'import récurrent {{ object.pk }}

    diff --git a/src/agenda_culturel/templates/agenda_culturel/recurrentimport_form.html b/src/agenda_culturel/templates/agenda_culturel/recurrentimport_form.html index cdf6037..6b3831b 100644 --- a/src/agenda_culturel/templates/agenda_culturel/recurrentimport_form.html +++ b/src/agenda_culturel/templates/agenda_culturel/recurrentimport_form.html @@ -3,6 +3,8 @@ {% block title %}{% block og_title %}Importation récurrente{% endblock %}{% endblock %} +{% block configurer-bouton %}{% endblock %} + {% block entete_header %} diff --git a/src/agenda_culturel/templates/agenda_culturel/rimports.html b/src/agenda_culturel/templates/agenda_culturel/rimports.html index df4e32a..b63644e 100644 --- a/src/agenda_culturel/templates/agenda_culturel/rimports.html +++ b/src/agenda_culturel/templates/agenda_culturel/rimports.html @@ -9,6 +9,7 @@ {% block entete_header %} {% css_categories %} {% endblock %} +{% block configurer-bouton %}{% endblock %} {% block content %}
    @@ -115,6 +116,10 @@ +{% block sidemenu-bouton %} +
  • {% picto_from_name "chevron-up" %}
  • +
  • {% picto_from_name "chevron-down" %}
  • +{% endblock %} {% include "agenda_culturel/side-nav.html" with current="rimports" %}
    diff --git a/src/agenda_culturel/templates/agenda_culturel/run_all_rimports_confirm.html b/src/agenda_culturel/templates/agenda_culturel/run_all_rimports_confirm.html index c3306ce..5de6e9f 100644 --- a/src/agenda_culturel/templates/agenda_culturel/run_all_rimports_confirm.html +++ b/src/agenda_culturel/templates/agenda_culturel/run_all_rimports_confirm.html @@ -4,6 +4,8 @@ {% block fluid %}{% endblock %} +{% block configurer-bouton %}{% endblock %} + {% block content %}
    diff --git a/src/agenda_culturel/templates/agenda_culturel/run_canceled_rimports_confirm.html b/src/agenda_culturel/templates/agenda_culturel/run_canceled_rimports_confirm.html index 20373ab..d6e30b0 100644 --- a/src/agenda_culturel/templates/agenda_culturel/run_canceled_rimports_confirm.html +++ b/src/agenda_culturel/templates/agenda_culturel/run_canceled_rimports_confirm.html @@ -4,6 +4,7 @@ {% block fluid %}{% endblock %} +{% block configurer-bouton %}{% endblock %} {% block content %} diff --git a/src/agenda_culturel/templates/agenda_culturel/run_failed_rimports_confirm.html b/src/agenda_culturel/templates/agenda_culturel/run_failed_rimports_confirm.html index 421a1d5..1a192bd 100644 --- a/src/agenda_culturel/templates/agenda_culturel/run_failed_rimports_confirm.html +++ b/src/agenda_culturel/templates/agenda_culturel/run_failed_rimports_confirm.html @@ -3,6 +3,7 @@ {% block title %}{% block og_title %}Lancer tous les imports échoués{% endblock %}{% endblock %} {% block fluid %}{% endblock %} +{% block configurer-bouton %}{% endblock %} {% block content %} diff --git a/src/agenda_culturel/templates/agenda_culturel/run_rimport_confirm.html b/src/agenda_culturel/templates/agenda_culturel/run_rimport_confirm.html index c7a335c..3c0993a 100644 --- a/src/agenda_culturel/templates/agenda_culturel/run_rimport_confirm.html +++ b/src/agenda_culturel/templates/agenda_culturel/run_rimport_confirm.html @@ -4,6 +4,8 @@ {% block fluid %}{% endblock %} +{% block configurer-bouton %}{% endblock %} + {% block content %}
    diff --git a/src/agenda_culturel/templates/agenda_culturel/side-nav.html b/src/agenda_culturel/templates/agenda_culturel/side-nav.html index e7390ad..0551910 100644 --- a/src/agenda_culturel/templates/agenda_culturel/side-nav.html +++ b/src/agenda_culturel/templates/agenda_culturel/side-nav.html @@ -1,7 +1,7 @@ {% load event_extra %} {% load contactmessages_extra %} {% load duplicated_extra %} -