[PLUGINS] ~zpip 1.7.21 --> 1.7.26

diff --git a/www/plugins/zpip_v1/backend.html b/www/plugins/zpip_v1/backend.html
index 803ef9c..4045b0d 100644 (file)
--- a/www/plugins/zpip_v1/backend.html
+++ b/www/plugins/zpip_v1/backend.html
@@ -23,10 +23,10 @@ version="1.0"[ encoding="(#CHARSET)"]?>
 
 [      <image>
                <title>[(#NOM_SITE_SPIP|texte_backend)]</title>
-               <url>(#LOGO_SITE_SPIP||image_reduire{144,400}|extraire_attribut{src}|url_absolue|texte_backend)</url>
+               <url>(#LOGO_SITE_SPIP|image_reduire{144,400}|extraire_attribut{src}|url_absolue|texte_backend)</url>
                <link>#URL_SITE_SPIP/</link>
-               [<height>(#LOGO_SITE_SPIP||image_reduire{144,400}|extraire_attribut{height})</height>]
-               [<width>(#LOGO_SITE_SPIP||image_reduire{144,400}|extraire_attribut{width})</width>]
+               [<height>(#LOGO_SITE_SPIP|image_reduire{144,400}|extraire_attribut{height})</height>]
+               [<width>(#LOGO_SITE_SPIP|image_reduire{144,400}|extraire_attribut{width})</width>]
        </image>
 ]
 

diff --git a/www/plugins/zpip_v1/contenu/article.html b/www/plugins/zpip_v1/contenu/article.html
index 049eb05..6a6a0fc 100644 (file)
--- a/www/plugins/zpip_v1/contenu/article.html
+++ b/www/plugins/zpip_v1/contenu/article.html
@@ -4,7 +4,7 @@
 
 <div class="contenu-principal">
        <div class="cartouche">
-               [(#LOGO_ARTICLE||image_reduire{200,200})]
+               [(#LOGO_ARTICLE|image_reduire{200,200})]
                [<p class="#EDIT{surtitre} surtitre">(#SURTITRE)</p>]
                <h1 class="h1 #EDIT{titre}">#TITRE</h1>
                [<p class="#EDIT{soustitre} soustitre">(#SOUSTITRE)</p>]

diff --git a/www/plugins/zpip_v1/contenu/auteur.html b/www/plugins/zpip_v1/contenu/auteur.html
index da0f11e..244e884 100644 (file)
--- a/www/plugins/zpip_v1/contenu/auteur.html
+++ b/www/plugins/zpip_v1/contenu/auteur.html
@@ -6,7 +6,7 @@
 <div class="contenu-principal">
        <div class="vcard">[(#REM) microformat vcard]
        <div class="cartouche">
-               [(#LOGO_AUTEUR||image_reduire{200,200})]
+               [(#LOGO_AUTEUR|image_reduire{200,200})]
                <h1 class="h1 #EDIT{qui} fn">#NOM</h1>
        </div>
 

diff --git a/www/plugins/zpip_v1/contenu/breve.html b/www/plugins/zpip_v1/contenu/breve.html
index a7f38cd..ff0a5b8 100644 (file)
--- a/www/plugins/zpip_v1/contenu/breve.html
+++ b/www/plugins/zpip_v1/contenu/breve.html
@@ -5,7 +5,7 @@
 <div class="contenu-principal">
 
   <div class="cartouche">
-      [(#LOGO_BREVE||image_reduire{200,200})]
+      [(#LOGO_BREVE|image_reduire{200,200})]
       <h1 class="h1 #EDIT{titre}">#TITRE</h1>
       <p class="info-publi"><abbr class="published" title="[(#DATE|date_iso)]">[(#DATE|nom_jour) ][(#DATE|affdate)]</abbr></p>
   </div>

diff --git a/www/plugins/zpip_v1/contenu/mot.html b/www/plugins/zpip_v1/contenu/mot.html
index fb48887..fe6bf35 100644 (file)
--- a/www/plugins/zpip_v1/contenu/mot.html
+++ b/www/plugins/zpip_v1/contenu/mot.html
@@ -5,7 +5,7 @@
 <div class="contenu-principal">
 
   <div class="cartouche">
-      [(#LOGO_MOT||image_reduire{200,200})]
+      [(#LOGO_MOT|image_reduire{200,200})]
       <h1 class="h1 #EDIT{titre}">#TITRE</h1>
   </div>
 

diff --git a/www/plugins/zpip_v1/contenu/page-forum.html b/www/plugins/zpip_v1/contenu/page-forum.html
index 38792d8..b393256 100644 (file)
--- a/www/plugins/zpip_v1/contenu/page-forum.html
+++ b/www/plugins/zpip_v1/contenu/page-forum.html
@@ -65,7 +65,7 @@
     </BOUCLE_article>
     
     <BOUCLE_breve(BREVES) {id_breve}>
-    [(#LOGO_BREVE||image_reduire{150,100})]
+    [(#LOGO_BREVE|image_reduire{150,100})]
     <h3 class="h3"><a href="#URL_BREVE">#TITRE</a></h3>
                <div class="info-publi">[<abbr class="published" title="[(#DATE|date_iso)]">(#DATE|affdate_jourcourt)</abbr>]</div>
     [<div class="introduction">(#INTRODUCTION)</div>]

diff --git a/www/plugins/zpip_v1/contenu/rubrique.html b/www/plugins/zpip_v1/contenu/rubrique.html
index 5f82e2b..c80d73f 100644 (file)
--- a/www/plugins/zpip_v1/contenu/rubrique.html
+++ b/www/plugins/zpip_v1/contenu/rubrique.html
@@ -5,7 +5,7 @@
 <div class="contenu-principal">
 
        <div class="cartouche">
-               [(#LOGO_RUBRIQUE||image_reduire{200,200})]
+               [(#LOGO_RUBRIQUE|image_reduire{200,200})]
                <h1 class="h1 #EDIT{titre}">#TITRE</h1>
                [<p class="info-publi"><span class="published"><:dernier_ajout:> : (#DATE|affdate_jourcourt).</span></p>]
        </div>

diff --git a/www/plugins/zpip_v1/contenu/site.html b/www/plugins/zpip_v1/contenu/site.html
index 97650b3..ab733e4 100644 (file)
--- a/www/plugins/zpip_v1/contenu/site.html
+++ b/www/plugins/zpip_v1/contenu/site.html
@@ -5,7 +5,7 @@
 <div class="contenu-principal">
 
   <div class="cartouche">
-      <a href="#URL_SITE">[(#LOGO_SITE||image_reduire{150,100})]</a>
+      <a href="#URL_SITE">[(#LOGO_SITE|image_reduire{150,100})]</a>
       <h1 class="h1 #EDIT{nom_site}">#NOM_SITE</h1>
   </div>
 

diff --git a/www/plugins/zpip_v1/head/article.html b/www/plugins/zpip_v1/head/article.html
index 2d5bb4a..5bc04fd 100644 (file)
--- a/www/plugins/zpip_v1/head/article.html
+++ b/www/plugins/zpip_v1/head/article.html
@@ -3,3 +3,5 @@
 [<meta name="description" content="(#INTRODUCTION{150}|attribut_html)" />]
 [<link rel="canonical" href="(#URL_ARTICLE|url_absolue)" />]
 </BOUCLE_article_head>
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/breve.html b/www/plugins/zpip_v1/head/breve.html
index 999c3ad..f0183bf 100644 (file)
--- a/www/plugins/zpip_v1/head/breve.html
+++ b/www/plugins/zpip_v1/head/breve.html
@@ -2,4 +2,6 @@
 <title>[(#TITRE|textebrut) - ][(#NOM_SITE_SPIP|textebrut)]</title>
 [<meta name="description" content="(#INTRODUCTION{150}|attribut_html)" />]
 [<link rel="canonical" href="(#URL_BREVE|url_absolue)" />]
-</BOUCLE_breve_principal>
\ No newline at end of file
+</BOUCLE_breve_principal>
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/dist.html b/www/plugins/zpip_v1/head/dist.html
index 039affe..5558765 100644 (file)
--- a/www/plugins/zpip_v1/head/dist.html
+++ b/www/plugins/zpip_v1/head/dist.html
@@ -23,4 +23,6 @@
        (utile aux moteurs de recherche)
 ]
 <title>[(#NOM_SITE_SPIP|textebrut)]</title>
-[<meta name="description" content="(#DESCRIPTIF_SITE_SPIP|couper{150}|textebrut)" />]
\ No newline at end of file
+[<meta name="description" content="(#DESCRIPTIF_SITE_SPIP|couper{150}|textebrut)" />]
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/mot.html b/www/plugins/zpip_v1/head/mot.html
index 216cdc6..7eb24e0 100644 (file)
--- a/www/plugins/zpip_v1/head/mot.html
+++ b/www/plugins/zpip_v1/head/mot.html
@@ -4,3 +4,5 @@
 [(#REM) Lien vers le flux RSS des articles du mot cle ]
 <link rel="alternate" type="application/rss+xml"[ title="(#TITRE|attribut_html)"] href="[(#URL_PAGE{backend}|parametre_url{id_mot,#ID_MOT})]" />
 </BOUCLE_principale>
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/page-404.html b/www/plugins/zpip_v1/head/page-404.html
index 2536830..efda125 100644 (file)
--- a/www/plugins/zpip_v1/head/page-404.html
+++ b/www/plugins/zpip_v1/head/page-404.html
@@ -1,2 +1,4 @@
 <title><:pass_erreur:> 404 - [(#NOM_SITE_SPIP|textebrut)]</title>
 <meta name="robots" content="none" />
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/page-plan.html b/www/plugins/zpip_v1/head/page-plan.html
index 0cfa210..f7a6e73 100644 (file)
--- a/www/plugins/zpip_v1/head/page-plan.html
+++ b/www/plugins/zpip_v1/head/page-plan.html
@@ -1,3 +1,5 @@
 <title><:plan_site:> - [(#NOM_SITE_SPIP|textebrut)]</title>
 [<meta name="description" content="(#DESCRIPTIF_SITE_SPIP|couper{150}|attribut_html)" />]
 <meta name="robots" content="none" />
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/page-recherche.html b/www/plugins/zpip_v1/head/page-recherche.html
index ae92aac..f41716b 100644 (file)
--- a/www/plugins/zpip_v1/head/page-recherche.html
+++ b/www/plugins/zpip_v1/head/page-recherche.html
@@ -1,2 +1,4 @@
 <title><:resultats_recherche:> - [(#NOM_SITE_SPIP|textebrut)]</title>
 <meta name="robots" content="none" />
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/page-sommaire.html b/www/plugins/zpip_v1/head/page-sommaire.html
index d97b5af..34247d2 100644 (file)
--- a/www/plugins/zpip_v1/head/page-sommaire.html
+++ b/www/plugins/zpip_v1/head/page-sommaire.html
@@ -21,3 +21,5 @@
 ]
 <title>[(#NOM_SITE_SPIP|typo|textebrut)][ - (#SLOGAN_SITE_SPIP|typo|textebrut)]</title>
 [<meta name="description" content="(#DESCRIPTIF_SITE_SPIP|couper{150}|textebrut)" />]
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/rubrique.html b/www/plugins/zpip_v1/head/rubrique.html
index 683e1cf..ae95d4c 100644 (file)
--- a/www/plugins/zpip_v1/head/rubrique.html
+++ b/www/plugins/zpip_v1/head/rubrique.html
@@ -5,3 +5,5 @@
 [(#REM) Lien vers le flux RSS de la rubrique ]
 <link rel="alternate" type="application/rss+xml" title="<:syndiquer_rubrique:>" href="[(#URL_PAGE{backend}|parametre_url{id_rubrique,#ID_RUBRIQUE})]" />
 </BOUCLE_rubrique_head>
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/head/site.html b/www/plugins/zpip_v1/head/site.html
index 6619884..52bbdc7 100644 (file)
--- a/www/plugins/zpip_v1/head/site.html
+++ b/www/plugins/zpip_v1/head/site.html
@@ -2,4 +2,6 @@
 <title>[(#NOM_SITE|textebrut) - ][(#NOM_SITE_SPIP|textebrut)]</title>
 [<meta name="description" content="(#DESCRIPTIF|couper{150}|textebrut)" />]
 <meta name="robots" content="none" />
-</BOUCLE_site>
\ No newline at end of file
+</BOUCLE_site>
+[<link rel="icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />
+[<link rel="shortcut icon" type="image/x-icon" href="(#CHEMIN{favicon.ico})" />]]

diff --git a/www/plugins/zpip_v1/inclure/article-resume.html b/www/plugins/zpip_v1/inclure/article-resume.html
index db010c8..8249740 100644 (file)
--- a/www/plugins/zpip_v1/inclure/article-resume.html
+++ b/www/plugins/zpip_v1/inclure/article-resume.html
@@ -7,7 +7,7 @@
 ]\r
 <BOUCLE_articles(ARTICLES) {id_article} {statut?}>\r
 <li class="item hentry">\r
-       <h3 class="h3 entry-title"><a href="#URL_ARTICLE" rel="bookmark">[(#LOGO_ARTICLE_RUBRIQUE||image_reduire{150,100})]#TITRE</a></h3>\r
+       <h3 class="h3 entry-title"><a href="#URL_ARTICLE" rel="bookmark">[(#LOGO_ARTICLE_RUBRIQUE|image_reduire{150,100})]#TITRE</a></h3>\r
        <div class="info-publi">[<abbr class="published" title="[(#DATE|date_iso)]">(#DATE|affdate_jourcourt)</abbr>][<span class="sep">, </span><span class="auteurs"><:par_auteur:> (#LESAUTEURS)</span>]</div>\r
        [<div class="#EDIT{intro} introduction entry-content">(#INTRODUCTION)</div>]\r
        <div class="meta-publi">\r

diff --git a/www/plugins/zpip_v1/inclure/documents.html b/www/plugins/zpip_v1/inclure/documents.html
index 1a37f92..ac77b30 100644 (file)
--- a/www/plugins/zpip_v1/inclure/documents.html
+++ b/www/plugins/zpip_v1/inclure/documents.html
@@ -1,7 +1,7 @@
 [(#REM) Portfolio : album d'images ]
 <B_documents_portfolio>
 <div class="documents documents_portfolio">
-       <h2 class="h2"><:info_portfolio:></h2>
+       <h2 class="h2">[(#SPIP_VERSION|>{3}|?{<:medias:info_portfolio:>,<:infos_portfolio:>})]</h2>
        <BOUCLE_documents_portfolio(DOCUMENTS) {id_article?}{id_rubrique?} {mode=document}{extension IN png,jpg,gif} {par num titre, date}{vu=non}>[
        <a href="(#URL_DOCUMENT)"
                 type="#MIME_TYPE"
@@ -20,7 +20,7 @@
 ]
 <B_documents_joints>
        <div class="liste documents documents_joints">
-       <h2 class="h2"><:titre_documents_joints:></h2>
+       <h2 class="h2">[(#SPIP_VERSION|>{3}|?{<:medias:titre_documents_joints:>,<:titre_documents_joints:>})]</h2>
        <ul class="liste-items">
                <BOUCLE_documents_joints(DOCUMENTS) {id_article?}{id_rubrique?} {extension !IN gif,jpg,png} {vu=non}{par num titre, date}>[
                <li class="item">

diff --git a/www/plugins/zpip_v1/inclure/entete.html b/www/plugins/zpip_v1/inclure/entete.html
index 6d9125b..f5a881e 100644 (file)
--- a/www/plugins/zpip_v1/inclure/entete.html
+++ b/www/plugins/zpip_v1/inclure/entete.html
@@ -1,5 +1,5 @@
 <div class="accueil">
-       [<a rel="start home" href="#URL_SITE_SPIP/" title="<:accueil_site:>">(#LOGO_SITE_SPIP||image_reduire{300,100})</a>]
+       [<a rel="start home" href="#URL_SITE_SPIP/" title="<:accueil_site:>">(#LOGO_SITE_SPIP|image_reduire{300,100})</a>]
        <strong id="nom_site_spip"><a rel="start home" href="#URL_SITE_SPIP/" title="<:accueil_site:>">#NOM_SITE_SPIP</a></strong>
        [<div id='slogan_site_spip'>(#SLOGAN_SITE_SPIP|PtoBR)</div>]
 </div>

diff --git a/www/plugins/zpip_v1/inclure/pied.html b/www/plugins/zpip_v1/inclure/pied.html
index e35f0d1..db6ff67 100644 (file)
--- a/www/plugins/zpip_v1/inclure/pied.html
+++ b/www/plugins/zpip_v1/inclure/pied.html
@@ -1,5 +1,5 @@
 
-<a href="http://www.spip.net/" title="<:site_realise_avec_spip:>"><img src="#CHEMIN{spip.png}" alt="SPIP" width="48" height="16" /></a>
+<a href="http://www.spip.net/" title="<:site_realise_avec_spip:>"><img src="[(#CHEMIN{prive/themes/spip/images/spip.png}|sinon{spip.png})]" alt="SPIP" width="48" height="16" /></a>
 <?php if (isset($GLOBALS['visiteur_session']['id_auteur']) AND $GLOBALS['visiteur_session']['id_auteur']) { ?>
 | <a href="#URL_LOGOUT" rel="nofollow"><:icone_deconnecter:></a>
        <?php if (include_spip('inc/autoriser') AND autoriser('ecrire')){ ?>| <a href="#EVAL{_DIR_RESTREINT_ABS}"><:espace_prive:></a><?php } ?>

diff --git a/www/plugins/zpip_v1/inclure/rss-item.html b/www/plugins/zpip_v1/inclure/rss-item.html
index c6e1020..09ac0fa 100644 (file)
--- a/www/plugins/zpip_v1/inclure/rss-item.html
+++ b/www/plugins/zpip_v1/inclure/rss-item.html
@@ -37,7 +37,7 @@
        ce qui permet une syndication plus riche (mais plus "lourde").
        Fonction desactivable depuis les reglages du site.
 ][
-(#CONFIG{syndication_integrale}|=={oui}|?{' ',''})<content:encoded>[(#LOGO_ARTICLE{right}||image_reduire{150,150}|texte_backend)
+(#CONFIG{syndication_integrale}|=={oui}|?{' ',''})<content:encoded>[(#LOGO_ARTICLE{right}|image_reduire{150,150}|texte_backend)
                ][&lt;div class='rss_chapo'&gt;(#CHAPO|texte_backend)&lt;/div&gt;
                ][&lt;div class='rss_texte'&gt;(#TEXTE|
                        image_reduire{500,0}|texte_backend)&lt;/div&gt;

diff --git a/www/plugins/zpip_v1/plugin.xml b/www/plugins/zpip_v1/plugin.xml
index 3ff6562..dc90c20 100644 (file)
--- a/www/plugins/zpip_v1/plugin.xml
+++ b/www/plugins/zpip_v1/plugin.xml
@@ -4,7 +4,7 @@
        <auteur>Matthieu Marcillaud, C&#233;dric Morin, Romy T&#234;tue, Collectif SPIP</auteur>
        <icon>img/zpip-128.png</icon>
        <licence>GNU/GPL</licence>
-       <version>1.7.21</version>
+       <version>1.7.26</version>
        <etat>stable</etat>
        <description>
 Zpip est issu d'une fusion des projets Zesty et SPIP-Zen. Zpip-dist est la version de base de ce mod&#232;le de squelette, que vous pouvez utiliser telle quelle ou personnaliser et enrichir selon vos besoins.

diff --git a/www/plugins/zpip_v1/spip_style.css b/www/plugins/zpip_v1/spip_style.css
index db1bc63..9f62c89 100644 (file)
--- a/www/plugins/zpip_v1/spip_style.css
+++ b/www/plugins/zpip_v1/spip_style.css
@@ -37,7 +37,7 @@ table.spip td { vertical-align: top; }
 img, .spip_logos { margin: 0; padding: 0; border: 0; }
 .spip_documents { text-align: center; line-height: normal; }
 .spip_documents p { margin: 0.10em; padding: 0; }
-.spip_documents_center { display: block;display: table; clear: both; margin: 1em auto; }
+.spip_documents_center { display: table; clear: both; margin: 1em auto; }
 .spip_documents_left { float: left; margin-right: 15px; margin-bottom: 5px; }
 .spip_documents_right { float: right; margin-left: 15px; margin-bottom: 5px; }
 .spip_doc_titre { margin-right: auto; margin-left: auto; font-weight: bold; font-size: 0.90em; }

diff --git a/www/plugins/zpip_v1/svn.revision b/www/plugins/zpip_v1/svn.revision
index da586be..9fb1dfe 100644 (file)
--- a/www/plugins/zpip_v1/svn.revision
+++ b/www/plugins/zpip_v1/svn.revision
@@ -1,10 +1,10 @@
 <svn_revision>
 <text_version>
 Origine: file:///home/svn/repository/spip-zone/_squelettes_/zpip-dist/branches/zpip_v1
-Revision: 68933
-Dernier commit: 2013-01-10 19:00:04 +0100 
+Revision: 80430
+Dernier commit: 2014-02-03 19:00:50 +0100 
 </text_version>
 <origine>file:///home/svn/repository/spip-zone/_squelettes_/zpip-dist/branches/zpip_v1</origine>
-<revision>68933</revision>
-<commit>2013-01-10 19:00:04 +0100 </commit>
+<revision>80430</revision>
+<commit>2014-02-03 19:00:50 +0100 </commit>
 </svn_revision>
\ No newline at end of file