Changeset 95834 in spip-zone

Timestamp:

Mar 7, 2016, 9:28:56 PM (5 years ago)

Author:

rastapopoulos@…

Message:

Ne pas afficher les logos même hachurés si pas activés dans tout le site. + broutilles et petit bug

Location:

_plugins_/selections_editoriales/trunk

Files:

• paquet.xml (modified) (1 diff)
• prive/objets/liste/selections.html (modified) (2 diffs)
• prive/objets/liste/selections_contenus.html (modified) (2 diffs)
• prive/objets/liste/selections_objets.html (modified) (2 diffs)
• prive/squelettes/inclure/editer_selections_contenus.html (modified) (2 diffs)
• selections_editoriales_pipelines.php (modified) (1 diff)

_plugins_/selections_editoriales/trunk/paquet.xml

@@ -2 +2 @@
         prefix="selections_editoriales"
         categorie="navigation"
-        version="1.3.1"
+        version="1.3.2"
         etat="stable"
         compatibilite="[3.0.0;3.1.*]"

_plugins_/selections_editoriales/trunk/prive/objets/liste/selections.html

@@ -11 +11 @@
         <thead>
                 <tr class='first_row'>
-                        <th class='picto' scope='col'></th>
                         <th class='titre' scope='col'>[(#TRI{titre,<:selection:champ_titre_label:>,ajax})]</th>
                         <th class='identifiant' scope='col'>[(#TRI{identifiant,<:selection:champ_identifiant_label:>,ajax})]</th>
@@ -20 +19 @@
         <BOUCLE_liste_selections(SELECTIONS){orphelins}{auteurs_liens.id_auteur?}{where?}{recherche?}{tri #ENV{par,num titre},#GET{defaut_tri}}{par titre}{pagination #ENV{nb,10}}>
                 <tr class='[(#COMPTEUR_BOUCLE|alterner{row_odd,row_even})]'>
-                        <td class='picto'>[(#CHEMIN_IMAGE{selection-16.png}|balise_img)]</td>
                         <td class='titre principale'>[(#LOGO_SELECTION|image_reduire{20,26})]<a href="[(#ID_SELECTION|generer_url_entite{selection})]" title="<:info_numero_abbreviation|attribut_html:> #ID_SELECTION">[(#RANG). ]#TITRE</a></td>
                         <td class='identifiant principale'>#IDENTIFIANT</td>

_plugins_/selections_editoriales/trunk/prive/objets/liste/selections_contenus.html

@@ -11 +11 @@
         <thead>
                 <tr class='first_row'>
-                        <th class='picto' scope='col'></th>
                         <th class='titre' scope='col'>[(#TRI{titre,<:selections_contenu:champ_titre_label:>,ajax})]</th>
                         <th class='id_selection' scope='col'>[(#TRI{id_selection,<:selections_contenu:champ_titre_label:>,ajax})]</th>
@@ -20 +19 @@
         <BOUCLE_liste_selections_contenus(SELECTIONS_CONTENUS){id_selection?}{where?}{recherche?}{tri #ENV{par,num titre},#GET{defaut_tri}}{par titre}{pagination #ENV{nb,10}}>
                 <tr class='[(#COMPTEUR_BOUCLE|alterner{row_odd,row_even})]'>
-                        <td class='picto'>[(#CHEMIN_IMAGE{selections_contenu-16.png}|balise_img)]</td>
                         <td class='titre principale'>[(#LOGO_SELECTIONS_CONTENU|image_reduire{20,26})]<a href="[(#ID_SELECTIONS_CONTENU|generer_url_entite{selections_contenu})]" title="<:info_numero_abbreviation|attribut_html:> #ID_SELECTIONS_CONTENU">[(#RANG). ]#TITRE</a></td>
                         <td class='id_selection principale'><a href="[(#ID_SELECTION|generer_url_entite{selection})]" title="<:info_numero_abbreviation|attribut_html:> #ID_SELECTION">[(#INFO_TITRE{selection,#ID_SELECTION})]</a></td>

_plugins_/selections_editoriales/trunk/prive/objets/liste/selections_objets.html

@@ -12 +12 @@
         <thead>
                 <tr class='first_row'>
-                        <th class='picto' scope='col'></th>
                         <th class='titre' scope='col'>[(#TRI{L2.objet,<:onglet_contenu:>,ajax})]</th>
                         <th class='titre' scope='col'>[(#TRI{titre,<:selection:champ_titre_label:>,ajax})]</th>
@@ -21 +20 @@
         <BOUCLE_liste_selections(SELECTIONS selections_liens){!orphelins}{where?}{recherche?}{tri #ENV{par,num titre},#GET{defaut_tri}}{par id_objet}{pagination #ENV{nb,10}}>
                 <tr class='[(#COMPTEUR_BOUCLE|alterner{row_odd,row_even})]'>
-                        <td class='picto'>[(#CHEMIN_IMAGE{selection-16.png}|balise_img)]</td>
                         <td class='titre principale'><a href="[(#ID_OBJET|generer_url_entite{#OBJET})]">[(#INFO_TITRE{#OBJET,#ID_OBJET})] ([(#OBJET|objet_info{texte_objet}|_T)])</a></td>
                         <td class='titre principale'><a href="[(#ID_SELECTION|generer_url_entite{selection})]" title="<:info_numero_abbreviation|attribut_html:> #ID_SELECTION">[(#RANG). ]#TITRE</a></td>

_plugins_/selections_editoriales/trunk/prive/squelettes/inclure/editer_selections_contenus.html

@@ -7 +7 @@
                 <BOUCLE_contenus(SELECTIONS_CONTENUS){id_selection}{par num titre,titre}>
                 <div class="item" id="selection#ID_SELECTION-contenu#ID_SELECTIONS_CONTENU">
-                        [<a class="ajax" title="<:info_telecharger_nouveau_logo|trim{:}:>" href="[(#SELF|parametre_url{editer_contenu_logo,#ENV{editer_contenu_logo}|=={#ID_SELECTIONS_CONTENU}|?{non,#ID_SELECTIONS_CONTENU}})]">(#LOGO_SELECTIONS_CONTENU|sinon{#CHEMIN{prive/images/rayures-gris.gif}}|image_reduire{60,60}|inserer_attribut{alt,<:info_telecharger_nouveau_logo|trim{:}:>}|inserer_attribut{class,spip_documents_left})</a>]
+                        [(#CONFIG{activer_logos}|=={oui}|oui)
+                                [<a class="ajax" title="<:info_telecharger_nouveau_logo|trim{:}:>" href="[(#SELF|parametre_url{editer_contenu,''}|parametre_url{editer_contenu_logo,#ENV{editer_contenu_logo}|=={#ID_SELECTIONS_CONTENU}|?{non,#ID_SELECTIONS_CONTENU}})]">(#LOGO_SELECTIONS_CONTENU|sinon{#CHEMIN{prive/images/rayures-gris.gif}}|image_reduire{60,60}|inserer_attribut{alt,<:info_telecharger_nouveau_logo|trim{:}:>}|inserer_attribut{class,spip_documents_left})</a>]
+                        ]
                         <h4 class="titrem"><span class="#EDIT{titre}"><a href="#URL">#TITRE</a></span></h4>
                         <div class="descriptif #EDIT{descriptif}">#DESCRIPTIF</div>
@@ -16 +18 @@
                                 ]
                                 [(#AUTORISER{modifier,selections_contenu,#ID_SELECTIONS_CONTENU}|oui)
-                                <a class="ajax" href="[(#SELF|parametre_url{editer_contenu,#ID_SELECTIONS_CONTENU})]"><:bouton_modifier:></a>
+                                <a class="ajax" href="[(#SELF|parametre_url{editer_contenu_logo,''}|parametre_url{editer_contenu,#ID_SELECTIONS_CONTENU})]"><:bouton_modifier:></a>
                                 ]
                         </div>

_plugins_/selections_editoriales/trunk/selections_editoriales_pipelines.php

@@ -138 +138 @@
                 and autoriser('creer', 'selection')
          ) {
-                $flux['data'] .= recuperer_fond('prive/squelettes/inclure/selections_objet', array(
-                        'objet' => $type,
-                        'id_objet' => $id,
+                $flux['data'] .= recuperer_fond(
+                        'prive/squelettes/inclure/selections_objet',
+                        array(
+                                'objet' => $type,
+                                'id_objet' => $id,
+                                'editer_contenu' => _request('editer_contenu'),
+                                'editer_contenu_logo' => _request('editer_contenu_logo'),
                         ),
                         array('ajax'=>'selections')