From 5df6cc5f4c36373631309383f09467984ae7f317 Mon Sep 17 00:00:00 2001
From: nicod_ <nicod@lerebooteux.fr>
Date: Sun, 16 Apr 2023 20:32:44 +0200
Subject: [PATCH] Ouvrir le formulaire d'ajout de bloc en popin Styles de blocs
et de boutons
---
prive/squelettes/contenu/bloc_edit.html | 12 ++++++++++--
prive/squelettes/inclure/blocs_objet.html | 8 ++++++--
prive/style_prive_plugin_blocks.html | 20 ++++++++++++++++++++
3 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/prive/squelettes/contenu/bloc_edit.html b/prive/squelettes/contenu/bloc_edit.html
index bf0c16d..390934d 100644
--- a/prive/squelettes/contenu/bloc_edit.html
+++ b/prive/squelettes/contenu/bloc_edit.html
@@ -9,7 +9,7 @@
]
#SET{redirect,#ENV{redirect}|sinon{#ID_BLOC|?{#ID_BLOC|generer_url_entite{bloc},#GET{id_parent}|?{#GET{id_parent}|generer_url_entite{blocs_type},#URL_ECRIRE{blocs_types}}}}}
-<div class="cadre-formulaire-editer">
+<div class="cadre-formulaire-editer cadre-formulaire-editer--bloc">
<div class="entete-formulaire">
[(#ID_BLOC|oui)
[(#GET{redirect}|icone_verticale{<:icone_retour:/>,bloc,'',left retour[(#ENV{retourajax,''}|oui)ajax preload]})]
@@ -26,8 +26,16 @@
<div class="ajax">
]
-[(#FORMULAIRE_EDITER_BLOC{#ENV{id_bloc,new}, '', '', #GET{redirect}})]
+[(#ENV{popin,''}|oui)
+ #SET{redirect,#URL_ECRIRE{#OBJET|objet_info{url_voir},#OBJET|id_table_objet|concat{'=',#ID_OBJET}}}
+ <div class="ajax">
+]
+[(#GET{redirect}|dd)]
+[(#FORMULAIRE_EDITER_BLOC{#ENV{id_bloc,new}, #OBJET, #ID_OBJET, #GET{redirect}})]
+[(#ENV{popin,''}|oui)
+ </div>
+]
[(#ENV{retourajax,''}|oui)
</div>
<script type="text/javascript">/*<!\[CDATA\[*/reloadExecPage('#ENV{exec}');/*\]\]>*/</script>
diff --git a/prive/squelettes/inclure/blocs_objet.html b/prive/squelettes/inclure/blocs_objet.html
index 97225ab..b0d4b46 100644
--- a/prive/squelettes/inclure/blocs_objet.html
+++ b/prive/squelettes/inclure/blocs_objet.html
@@ -31,9 +31,13 @@
</B>
-<div class="ajax">
-#FORMULAIRE_EDITER_BLOC{new,#OBJET,#ID_OBJET,#GET{redirect}}
+<div class="groupe-btns float-end">
+ <a class="btn popin" href="[(#URL_ECRIRE{bloc_edit,id_bloc=#ID_BLOC}|parametre_url{popin,1}|parametre_url{var_zajax,contenu}|parametre_url{id_objet,#ID_OBJET}|parametre_url{objet,#OBJET})]">
+ <span class="sp-icone sp-icone-bloc" aria-hidden="true">[(#CHEMIN_IMAGE{bloc-16.png}|balise_img)]</span>
+ <:bloc:texte_ajouter_bloc:/>
+ </a>
</div>
+<div class="nettoyeur"></div>
<script type="text/javascript">
/* Gestion du tri des blocs */
diff --git a/prive/style_prive_plugin_blocks.html b/prive/style_prive_plugin_blocks.html
index 8d42976..2ae459e 100644
--- a/prive/style_prive_plugin_blocks.html
+++ b/prive/style_prive_plugin_blocks.html
@@ -17,6 +17,26 @@
#SET{left,#ENV{ltr}|choixsiegal{left,left,right}}
#SET{right,#ENV{ltr}|choixsiegal{left,right,left}}
+.lity-content .cadre-formulaire-editer--bloc .entete-formulaire {
+ display: none;
+}
+
+.sp-icone-bloc {
+ background-color: white;
+ border-radius: 50%;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ width: 1.5rem;
+ height: 1.5rem;
+}
+
+.boutons-flex {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
.liste_items.blocs {
}
--
GitLab