From 404743062a8bdb9a354c09b2b36a4f2b2b90cf10 Mon Sep 17 00:00:00 2001
From: tcharlss <tcharlss@bravecassine.com>
Date: Tue, 6 Oct 2020 09:15:11 +0200
Subject: [PATCH] =?UTF-8?q?Suite=20ajustements=20des=20boutons=20:=20prend?=
=?UTF-8?q?re=20en=20compte=20le=20formulaire=20d'=C3=A9dition=20de=20docu?=
=?UTF-8?q?ment=20=C3=A9galement=20+=20ajustements=20ailleurs=20(groupes?=
=?UTF-8?q?=20de=20boutond,=20etc.).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
formulaires/editer_document.html | 14 +++++------
formulaires/illustrer_document.html | 4 ++--
modeles/document_case.html | 6 ++---
modeles/document_desc.html | 21 +++++++++-------
.../inclure/portfolio-documents.html | 4 ++--
.../inclure/portfolio-images-legacy.html | 4 ++--
prive/style_prive_plugin_medias.html | 24 ++++++++++++-------
7 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/formulaires/editer_document.html b/formulaires/editer_document.html
index f2911699..39e6db6b 100644
--- a/formulaires/editer_document.html
+++ b/formulaires/editer_document.html
@@ -27,10 +27,10 @@
<span class='erreur_message'>(#ENV**{erreurs}|table_valeur{fichier})</span>
]
(#ENV{fichier})
- <p class='actions'>
- [(#ENV{distant}|=={oui}|et{#TAILLE|<{#CONST{_COPIE_LOCALE_MAX_SIZE}}}|oui)<input type='submit' class='btn submit' name='copier_local' value='<:medias:bouton_copier_local|attribut_html:>' />]
+ <p class='actions right'>
+ [(#ENV{distant}|=={oui}|et{#TAILLE|<{#CONST{_COPIE_LOCALE_MAX_SIZE}}}|oui)<input type='submit' class='btn submit mini' name='copier_local' value='<:medias:bouton_copier_local|attribut_html:>' />]
[(#PIPELINE{editer_document_actions,#ARRAY{args,#ARRAY{id_document,#ENV{id_document,nouveau}},data,''}})]
- [<a href='#' onclick='jQuery("#changer_fichier_document").toggle("fast");return false;'><:bouton_changer:></a>]
+ <a class="bouton mini" href='#' onclick='jQuery("#changer_fichier_document").toggle("fast");return false;'><:bouton_changer:></a>
</p>
#SET{upload,#INCLURE{fond=formulaires/inc-upload_document, env, joindre_upload=oui, multi=non}}
<div id='changer_fichier_document' class="[(#GET{upload}|match{erreur}|non)none-js]">
@@ -40,10 +40,10 @@
<div class="editer editer_apercu">
<label><:medias:label_apercu:></label>
[(#ENV{apercu}|oui)
- <div class="tourner">
- <button class="image" type="submit" name="tournerL90" value="x">[(#CHEMIN_IMAGE{tourner-gauche-12.png}|balise_img{'',<:medias:image_tourner_gauche:>})]</button>
- <button class="image" type="submit" name="tournerR90" value="x">[(#CHEMIN_IMAGE{tourner-droite-12.png}|balise_img{'',<:medias:image_tourner_droite:>})]</button>
- <button class="image" type="submit" name="tourner180" value="x">[(#CHEMIN_IMAGE{tourner-180-12.png}|balise_img{'',<:medias:image_tourner_180:>})]</button>
+ <div class="tourner groupe-boutons">
+ <button class="bouton image" type="submit" name="tournerL90" value="x">[(#CHEMIN_IMAGE{tourner-gauche-12.png}|balise_img{'',<:medias:image_tourner_gauche:>})]</button>
+ <button class="bouton image" type="submit" name="tournerR90" value="x">[(#CHEMIN_IMAGE{tourner-droite-12.png}|balise_img{'',<:medias:image_tourner_droite:>})]</button>
+ <button class="bouton image" type="submit" name="tourner180" value="x">[(#CHEMIN_IMAGE{tourner-180-12.png}|balise_img{'',<:medias:image_tourner_180:>})]</button>
</div>
[<a href='#ENV{apercu}'>(#ENV{apercu}|image_reduire{320,200})</a>]
]
diff --git a/formulaires/illustrer_document.html b/formulaires/illustrer_document.html
index ad1b5a92..dd5677b4 100644
--- a/formulaires/illustrer_document.html
+++ b/formulaires/illustrer_document.html
@@ -13,9 +13,9 @@
][(#ENV*{vignette}|non)<:medias:aucune_vignette:>
[(#CONFIG{creer_preview}|=={oui}|et{#ENV{media}|=={image}})<br /><:medias:miniature_automatique_active:>]
]
- <p class='actions'>
+ <p class='actions right groupe-boutons mini'>
[(#ENV{id_vignette}|oui|et{#AUTORISER{supprimer,document,#ENV{id_vignette}}}) <input type='submit' class='btn submit' name='supprimer' value='<:medias:bouton_supprimer|attribut_html:>' />]
- [(#ENV{id_vignette}|non|ou{#AUTORISER{modifier,document,#ENV{id_vignette}}}) [<a href='#' onclick='jQuery("#illustrer_document").toggle("fast");return false;'><:bouton_changer:></a>]]
+ [(#ENV{id_vignette}|non|ou{#AUTORISER{modifier,document,#ENV{id_vignette}}}) <a class="bouton" href='#' onclick='jQuery("#illustrer_document").toggle("fast");return false;'><:bouton_changer:></a>]
<span class='image_loading'> </span>
</p>
<div id='illustrer_document' style='display:none;'>
diff --git a/modeles/document_case.html b/modeles/document_case.html
index 62945c47..a2dbf033 100644
--- a/modeles/document_case.html
+++ b/modeles/document_case.html
@@ -15,7 +15,7 @@
</h3>
<div class="infos">
[(#EXTENSION|match{gif|png|jpg|svg}|oui) #SET{id,#ID_VIGNETTE|?{#ID_VIGNETTE,#ID_DOCUMENT}}
- <div class="tourner">
+ <div class="tourner groupe-boutons vertical">
[(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-gauche-12.png}|balise_img{<:medias:image_tourner_gauche:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',-90'},#SELF},ajax})]
[(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-droite-12.png}|balise_img{<:medias:image_tourner_droite:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',90'},#SELF},ajax})]
[(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-180-12.png}|balise_img{<:medias:image_tourner_180:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',180'},#SELF},ajax})]
@@ -38,9 +38,9 @@
</div>]
<div class="actions groupe-boutons bloc">
<BOUCLE_compte(documents_liens){id_document}{0,2} />
- [(#TOTAL_BOUCLE|=={1}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr,#SELF},ajax secondaire,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
+ [(#TOTAL_BOUCLE|=={1}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr,#SELF},ajax,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
<//B_compte>
- [(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT,#SELF},ajax secondaire,'','',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
+ [(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT,#SELF},ajax,'','',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
[(#AUTORISER{modifier,document,#ID_DOCUMENT}|oui)
<a href="#URL_ECRIRE{document_edit,id_document=#ID_DOCUMENT}" target="_blank" class="editbox bouton principal" tabindex="0" role="button"><:medias:bouton_modifier_document:></a>
]
diff --git a/modeles/document_desc.html b/modeles/document_desc.html
index 799de039..62bb7180 100644
--- a/modeles/document_desc.html
+++ b/modeles/document_desc.html
@@ -78,15 +78,18 @@ Distribue sous licence GPL
</div>
<div class="actions">
- [(#INCLUS|affiche_bouton_mode_image_portfolio)
- <div class="mode">
- [(#MODE|=={image}|oui)[(#BOUTON_ACTION{<:medias:upload_info_mode_document:>,#URL_ACTION_AUTEUR{changer_mode_document,#ID_DOCUMENT-document,#SELF},ajax})]
- ][(#MODE|=={image}|non)[(#BOUTON_ACTION{<:medias:upload_info_mode_image:>,#URL_ACTION_AUTEUR{changer_mode_document,#ID_DOCUMENT-image,#SELF},ajax})]]
- </div>]
- <BOUCLE_compte(documents_liens){id_document}{0,2} />
- [(#TOTAL_BOUCLE|=={1}|et{#VU|=={non}}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr-safe,#SELF},ajax noscroll,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
- <//B_compte>
- [(#VU|=={non}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT--safe,#SELF},ajax noscroll,'','',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
+ <div class="groupe-boutons">
+ [(#INCLUS|affiche_bouton_mode_image_portfolio)
+ <div class="mode">
+ [(#MODE|=={image}|oui)[(#BOUTON_ACTION{<:medias:upload_info_mode_document:>,#URL_ACTION_AUTEUR{changer_mode_document,#ID_DOCUMENT-document,#SELF},ajax})]
+ ][(#MODE|=={image}|non)[(#BOUTON_ACTION{<:medias:upload_info_mode_image:>,#URL_ACTION_AUTEUR{changer_mode_document,#ID_DOCUMENT-image,#SELF},ajax})]]
+ </div>
+ ]
+ <BOUCLE_compte(documents_liens){id_document}{0,2} />
+ [(#TOTAL_BOUCLE|=={1}|et{#VU|=={non}}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr-safe,#SELF},ajax noscroll,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
+ <//B_compte>
+ [(#VU|=={non}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT--safe,#SELF},ajax noscroll,'','',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
+ </div>
[(#AUTORISER{modifier,document,#ID_DOCUMENT}|oui)
<div class="deplacer-modifier">
<span class="deplacer-document" data-rang="#RANG_LIEN"><img src='#CHEMIN_IMAGE{deplacer-16.png}' width='16' height='16' alt='<:medias:ordonner_ce_document|attribut_html:>' title='<:medias:ordonner_ce_document|attribut_html:>' /></span>
diff --git a/prive/squelettes/inclure/portfolio-documents.html b/prive/squelettes/inclure/portfolio-documents.html
index 8efc7c4f..5d14988d 100644
--- a/prive/squelettes/inclure/portfolio-documents.html
+++ b/prive/squelettes/inclure/portfolio-documents.html
@@ -21,7 +21,7 @@
</div>
[<p class="pagination">(#PAGINATION{prive})</p>]
[(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})
- <div class="actions-liste">
+ <div class="actions-liste groupe-boutons">
[(#BOUTON_ACTION{<:medias:lien_tout_enlever:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-I/image,#SELF|ancre_url{illustrations}},'ajax noscroll tout_dissocier',<:medias:lien_tout_enlever_verif:>})]
[(#BOUTON_ACTION{<:medias:lien_tout_desordonner:>,#URL_ACTION_AUTEUR{desordonner_liens_documents,#ID_OBJET-#OBJET-I/image,#SELF|ancre_url{illustrations}},'ajax tout_desordonner',<:medias:lien_tout_desordonner_verif:>})]
</div>
@@ -44,7 +44,7 @@
</div>
[<p class="pagination">(#PAGINATION{prive})</p>]
[(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})
- <div class="actions-liste">
+ <div class="actions-liste groupe-boutons">
[(#BOUTON_ACTION{<:medias:lien_tout_enlever:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-D/document,#SELF|ancre_url{documents}},'ajax noscroll tout_dissocier',<:medias:lien_tout_enlever_verif:>})]
[(#BOUTON_ACTION{<:medias:lien_tout_desordonner:>,#URL_ACTION_AUTEUR{desordonner_liens_documents,#ID_OBJET-#OBJET-D/document,#SELF|ancre_url{documents}},'ajax tout_desordonner',<:medias:lien_tout_desordonner_verif:>})]
</div>
diff --git a/prive/squelettes/inclure/portfolio-images-legacy.html b/prive/squelettes/inclure/portfolio-images-legacy.html
index 284f72c4..c80f7c5c 100644
--- a/prive/squelettes/inclure/portfolio-images-legacy.html
+++ b/prive/squelettes/inclure/portfolio-images-legacy.html
@@ -10,7 +10,7 @@
</div>
[<p class="pagination">(#PAGINATION{prive})</p>]
[(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})
- <div class="actions-liste">
+ <div class="actions-liste groupe-boutons">
[(#BOUTON_ACTION{<:medias:lien_tout_enlever:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-I/image,#SELF|ancre_url{illustrations}},'ajax noscroll tout_dissocier',<:medias:lien_tout_enlever_verif:>})]
[(#BOUTON_ACTION{<:medias:lien_tout_desordonner:>,#URL_ACTION_AUTEUR{desordonner_liens_documents,#ID_OBJET-#OBJET-I/image,#SELF|ancre_url{illustrations}},'ajax tout_desordonner',<:medias:lien_tout_desordonner_verif:>})]
</div>
@@ -31,7 +31,7 @@
</div>
[<p class="pagination">(#PAGINATION{prive})</p>]
[(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})
- <div class="actions-liste">
+ <div class="actions-liste groupe-boutons">
[(#BOUTON_ACTION{<:medias:lien_tout_enlever:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-I/document,#SELF|ancre_url{portfolio}},'ajax noscroll tout_dissocier',<:medias:lien_tout_enlever_verif:>})]
[(#BOUTON_ACTION{<:medias:lien_tout_desordonner:>,#URL_ACTION_AUTEUR{desordonner_liens_documents,#ID_OBJET-#OBJET-I/document,#SELF|ancre_url{illustrations}},'ajax tout_desordonner',<:medias:lien_tout_desordonner_verif:>})]
</div>
diff --git a/prive/style_prive_plugin_medias.html b/prive/style_prive_plugin_medias.html
index 92dda7a4..d08291ba 100644
--- a/prive/style_prive_plugin_medias.html
+++ b/prive/style_prive_plugin_medias.html
@@ -24,9 +24,9 @@
.formulaire_editer_document .taille_modifiee {display:block;color: red;}
-.formulaire_editer_document .editer_apercu .tourner {display:block;float:#GET{right};}
-.formulaire_editer_document .editer_apercu .tourner input.image {padding:5px;border:1px solid #eee;}
-.formulaire_editer_document .editer_apercu .tourner button.image {padding:5px;border:1px solid #eee;background: none;}
+.formulaire_editer_document .editer_apercu .tourner {float:#GET{right};}
+.formulaire_editer_document .editer_apercu .tourner input.image {}
+.formulaire_editer_document .editer_apercu .tourner button.image {}
.box_mediabox .formulaire_editer_document .invisible-first-save-button {#GET{right}:0.5em !important;#GET{left}:auto !important;top:-3em !important;}
.box_mediabox .formulaire_editer_document .boutons {position: sticky;bottom: -1rem;z-index: 100;}
@@ -136,9 +136,9 @@ p.actions {clear:both;}
display: inline-flex;
margin: 0;
}
-.lte7 #documents_joints .item div.mode button,.lte7 #documents_joints .item .actions button {font-size: 11px;}
-#documents_joints .item .tourner {display:block;float:#GET{right};}
-#documents_joints .item .tourner button {padding:1px;border:1px solid #eee;display:block;}
+#documents_joints .item .tourner {
+ float: #GET{right};
+}
#documents_joints .item .tourner button img {margin:0px;}
#documents_joints .item .actions > *,
@@ -180,7 +180,7 @@ p.actions {clear:both;}
.portfolios .item .titrem .fichier {font-weight:normal;font-size:0.9em; font-style:italic; display:block; }
.portfolios .item .titrem .titre {display:block;}
.portfolios .item .descriptif { color:#444; margin-bottom:.6925em; -webkit-box-flex: 1; -ms-flex-positive: 1; flex-grow: 1; }
-.portfolios .item .infos { margin-top: auto; }
+.portfolios .item .infos { }
.portfolios .item .infos .permanentes {
display: -webkit-box;
display: -ms-flexbox;
@@ -206,7 +206,13 @@ p.actions {clear:both;}
.portfolios .item table.compact tr:nth-child(2n) th { background:none; }
.portfolios .item .infos .credits .vide { font-style:italic; opacity:.5; }
.portfolios .item div.mode {display:inline-block; clear:#GET{right};}
-.portfolios .item .actions { clear:both; overflow:visible; margin-top:.6925em; padding-#GET{right}: .6925em; margin-bottom:-3px; }
+.portfolios .item .actions {
+ clear:both;
+ overflow:visible;
+ margin-top: auto;
+ padding-top: 0.6925em;
+ margin-bottom: -3px;
+}
.portfolios .item div.mode,
.portfolios .item .actions,
.portfolios .item div.mode button,
@@ -235,7 +241,7 @@ p.actions {clear:both;}
.portfolios .item .titre > .sanstitre,
.portfolios .item .titre > .sanstitre + .fichier {opacity:0.4;}
-.portfolios .actions-liste { clear:both; margin-top:.6925em; display:block; }
+.portfolios .actions-liste { clear:both; margin-top:.6925em; }
.portfolios .actions-liste > * {display:inline; }
.portfolios .tout_dissocier span {display:block; text-align:#GET{right};}
--
GitLab