From: Ludovic CHEVALIER Date: Mon, 10 Feb 2014 09:45:53 +0000 (+0100) Subject: Merge branch 'v1' X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fweb%2Fwww.git;a=commitdiff_plain;h=d8b7931e7a1ecffac4ce5cabaf9055d49df5a1f5;hp=ac3048660a3889c33f121bf5a567654e674e543a Merge branch 'v1' --- diff --git a/www/plugins/zpip_v1/backend.html b/www/plugins/zpip_v1/backend.html index 803ef9c3..4045b0d0 100644 --- a/www/plugins/zpip_v1/backend.html +++ b/www/plugins/zpip_v1/backend.html @@ -23,10 +23,10 @@ version="1.0"[ encoding="(#CHARSET)"]?> [ [(#NOM_SITE_SPIP|texte_backend)] - (#LOGO_SITE_SPIP||image_reduire{144,400}|extraire_attribut{src}|url_absolue|texte_backend) + (#LOGO_SITE_SPIP|image_reduire{144,400}|extraire_attribut{src}|url_absolue|texte_backend) #URL_SITE_SPIP/ - [(#LOGO_SITE_SPIP||image_reduire{144,400}|extraire_attribut{height})] - [(#LOGO_SITE_SPIP||image_reduire{144,400}|extraire_attribut{width})] + [(#LOGO_SITE_SPIP|image_reduire{144,400}|extraire_attribut{height})] + [(#LOGO_SITE_SPIP|image_reduire{144,400}|extraire_attribut{width})] ] diff --git a/www/plugins/zpip_v1/contenu/article.html b/www/plugins/zpip_v1/contenu/article.html index 049eb059..6a6a0fcc 100644 --- a/www/plugins/zpip_v1/contenu/article.html +++ b/www/plugins/zpip_v1/contenu/article.html @@ -4,7 +4,7 @@
- [(#LOGO_ARTICLE||image_reduire{200,200})] + [(#LOGO_ARTICLE|image_reduire{200,200})] [

(#SURTITRE)

]

#TITRE

[

(#SOUSTITRE)

] diff --git a/www/plugins/zpip_v1/contenu/auteur.html b/www/plugins/zpip_v1/contenu/auteur.html index da0f11e8..244e8840 100644 --- a/www/plugins/zpip_v1/contenu/auteur.html +++ b/www/plugins/zpip_v1/contenu/auteur.html @@ -6,7 +6,7 @@
[(#REM) microformat vcard]
- [(#LOGO_AUTEUR||image_reduire{200,200})] + [(#LOGO_AUTEUR|image_reduire{200,200})]

#NOM

diff --git a/www/plugins/zpip_v1/contenu/breve.html b/www/plugins/zpip_v1/contenu/breve.html index a7f38cd4..ff0a5b8a 100644 --- a/www/plugins/zpip_v1/contenu/breve.html +++ b/www/plugins/zpip_v1/contenu/breve.html @@ -5,7 +5,7 @@
- [(#LOGO_BREVE||image_reduire{200,200})] + [(#LOGO_BREVE|image_reduire{200,200})]

#TITRE

[(#DATE|nom_jour) ][(#DATE|affdate)]

diff --git a/www/plugins/zpip_v1/contenu/mot.html b/www/plugins/zpip_v1/contenu/mot.html index fb488870..fe6bf350 100644 --- a/www/plugins/zpip_v1/contenu/mot.html +++ b/www/plugins/zpip_v1/contenu/mot.html @@ -5,7 +5,7 @@
- [(#LOGO_MOT||image_reduire{200,200})] + [(#LOGO_MOT|image_reduire{200,200})]

#TITRE

diff --git a/www/plugins/zpip_v1/contenu/page-forum.html b/www/plugins/zpip_v1/contenu/page-forum.html index 38792d84..b3932565 100644 --- a/www/plugins/zpip_v1/contenu/page-forum.html +++ b/www/plugins/zpip_v1/contenu/page-forum.html @@ -65,7 +65,7 @@ - [(#LOGO_BREVE||image_reduire{150,100})] + [(#LOGO_BREVE|image_reduire{150,100})]

#TITRE

[(#DATE|affdate_jourcourt)]
[
(#INTRODUCTION)
] diff --git a/www/plugins/zpip_v1/contenu/rubrique.html b/www/plugins/zpip_v1/contenu/rubrique.html index 5f82e2b2..c80d73f3 100644 --- a/www/plugins/zpip_v1/contenu/rubrique.html +++ b/www/plugins/zpip_v1/contenu/rubrique.html @@ -5,7 +5,7 @@
- [(#LOGO_RUBRIQUE||image_reduire{200,200})] + [(#LOGO_RUBRIQUE|image_reduire{200,200})]

#TITRE

[

<:dernier_ajout:> : (#DATE|affdate_jourcourt).

]
diff --git a/www/plugins/zpip_v1/contenu/site.html b/www/plugins/zpip_v1/contenu/site.html index 97650b3b..ab733e4d 100644 --- a/www/plugins/zpip_v1/contenu/site.html +++ b/www/plugins/zpip_v1/contenu/site.html @@ -5,7 +5,7 @@
- [(#LOGO_SITE||image_reduire{150,100})] + [(#LOGO_SITE|image_reduire{150,100})]

#NOM_SITE

diff --git a/www/plugins/zpip_v1/head/article.html b/www/plugins/zpip_v1/head/article.html index 2d5bb4ae..5bc04fd2 100644 --- a/www/plugins/zpip_v1/head/article.html +++ b/www/plugins/zpip_v1/head/article.html @@ -3,3 +3,5 @@ [] [] +[ +[]] diff --git a/www/plugins/zpip_v1/head/breve.html b/www/plugins/zpip_v1/head/breve.html index 999c3add..f0183bf2 100644 --- a/www/plugins/zpip_v1/head/breve.html +++ b/www/plugins/zpip_v1/head/breve.html @@ -2,4 +2,6 @@ [(#TITRE|textebrut) - ][(#NOM_SITE_SPIP|textebrut)] [] [] - \ No newline at end of file + +[ +[]] diff --git a/www/plugins/zpip_v1/head/dist.html b/www/plugins/zpip_v1/head/dist.html index 039affef..5558765e 100644 --- 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) ] [(#NOM_SITE_SPIP|textebrut)] -[] \ No newline at end of file +[] +[ +[]] diff --git a/www/plugins/zpip_v1/head/mot.html b/www/plugins/zpip_v1/head/mot.html index 216cdc69..7eb24e09 100644 --- 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 ] +[ +[]] diff --git a/www/plugins/zpip_v1/head/page-404.html b/www/plugins/zpip_v1/head/page-404.html index 25368306..efda125e 100644 --- a/www/plugins/zpip_v1/head/page-404.html +++ b/www/plugins/zpip_v1/head/page-404.html @@ -1,2 +1,4 @@ <:pass_erreur:> 404 - [(#NOM_SITE_SPIP|textebrut)] +[ +[]] diff --git a/www/plugins/zpip_v1/head/page-plan.html b/www/plugins/zpip_v1/head/page-plan.html index 0cfa210c..f7a6e738 100644 --- a/www/plugins/zpip_v1/head/page-plan.html +++ b/www/plugins/zpip_v1/head/page-plan.html @@ -1,3 +1,5 @@ <:plan_site:> - [(#NOM_SITE_SPIP|textebrut)] [] +[ +[]] diff --git a/www/plugins/zpip_v1/head/page-recherche.html b/www/plugins/zpip_v1/head/page-recherche.html index ae92aac9..f41716bb 100644 --- a/www/plugins/zpip_v1/head/page-recherche.html +++ b/www/plugins/zpip_v1/head/page-recherche.html @@ -1,2 +1,4 @@ <:resultats_recherche:> - [(#NOM_SITE_SPIP|textebrut)] +[ +[]] diff --git a/www/plugins/zpip_v1/head/page-sommaire.html b/www/plugins/zpip_v1/head/page-sommaire.html index d97b5afa..34247d21 100644 --- a/www/plugins/zpip_v1/head/page-sommaire.html +++ b/www/plugins/zpip_v1/head/page-sommaire.html @@ -21,3 +21,5 @@ ] [(#NOM_SITE_SPIP|typo|textebrut)][ - (#SLOGAN_SITE_SPIP|typo|textebrut)] [] +[ +[]] diff --git a/www/plugins/zpip_v1/head/rubrique.html b/www/plugins/zpip_v1/head/rubrique.html index 683e1cfb..ae95d4c6 100644 --- 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 ] +[ +[]] diff --git a/www/plugins/zpip_v1/head/site.html b/www/plugins/zpip_v1/head/site.html index 66198849..52bbdc73 100644 --- a/www/plugins/zpip_v1/head/site.html +++ b/www/plugins/zpip_v1/head/site.html @@ -2,4 +2,6 @@ [(#NOM_SITE|textebrut) - ][(#NOM_SITE_SPIP|textebrut)] [] - \ No newline at end of file + +[ +[]] diff --git a/www/plugins/zpip_v1/inclure/article-resume.html b/www/plugins/zpip_v1/inclure/article-resume.html index db010c8d..82497400 100644 --- a/www/plugins/zpip_v1/inclure/article-resume.html +++ b/www/plugins/zpip_v1/inclure/article-resume.html @@ -7,7 +7,7 @@ ]
  • -

    [(#LOGO_ARTICLE_RUBRIQUE||image_reduire{150,100})]#TITRE

    +

    [(#LOGO_ARTICLE_RUBRIQUE|image_reduire{150,100})]#TITRE

    [(#DATE|affdate_jourcourt)][, <:par_auteur:> (#LESAUTEURS)]
    [
    (#INTRODUCTION)
    ]
    diff --git a/www/plugins/zpip_v1/inclure/documents.html b/www/plugins/zpip_v1/inclure/documents.html index 1a37f92d..ac77b306 100644 --- 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 ]
    -

    <:info_portfolio:>

    +

    [(#SPIP_VERSION|>{3}|?{<:medias:info_portfolio:>,<:infos_portfolio:>})]

    [
    -

    <:titre_documents_joints:>

    +

    [(#SPIP_VERSION|>{3}|?{<:medias:titre_documents_joints:>,<:titre_documents_joints:>})]

      [
    • diff --git a/www/plugins/zpip_v1/inclure/entete.html b/www/plugins/zpip_v1/inclure/entete.html index 6d9125bc..f5a881eb 100644 --- a/www/plugins/zpip_v1/inclure/entete.html +++ b/www/plugins/zpip_v1/inclure/entete.html @@ -1,5 +1,5 @@
      - [(#LOGO_SITE_SPIP||image_reduire{300,100})] + [(#LOGO_SITE_SPIP|image_reduire{300,100})] #NOM_SITE_SPIP [
      (#SLOGAN_SITE_SPIP|PtoBR)
      ]
      diff --git a/www/plugins/zpip_v1/inclure/pied.html b/www/plugins/zpip_v1/inclure/pied.html index e35f0d15..db6ff676 100644 --- a/www/plugins/zpip_v1/inclure/pied.html +++ b/www/plugins/zpip_v1/inclure/pied.html @@ -1,5 +1,5 @@ -SPIP +SPIP | <:icone_deconnecter:> | <:espace_prive:> diff --git a/www/plugins/zpip_v1/inclure/rss-item.html b/www/plugins/zpip_v1/inclure/rss-item.html index c6e1020d..09ac0fa7 100644 --- 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}|?{' ',''})[(#LOGO_ARTICLE{right}||image_reduire{150,150}|texte_backend) +(#CONFIG{syndication_integrale}|=={oui}|?{' ',''})[(#LOGO_ARTICLE{right}|image_reduire{150,150}|texte_backend) ][<div class='rss_chapo'>(#CHAPO|texte_backend)</div> ][<div class='rss_texte'>(#TEXTE| image_reduire{500,0}|texte_backend)</div> diff --git a/www/plugins/zpip_v1/plugin.xml b/www/plugins/zpip_v1/plugin.xml index 3ff6562e..dc90c20f 100644 --- a/www/plugins/zpip_v1/plugin.xml +++ b/www/plugins/zpip_v1/plugin.xml @@ -4,7 +4,7 @@ Matthieu Marcillaud, Cédric Morin, Romy Têtue, Collectif SPIP img/zpip-128.png GNU/GPL - 1.7.21 + 1.7.26 stable Zpip est issu d'une fusion des projets Zesty et SPIP-Zen. Zpip-dist est la version de base de ce modè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 db1bc63b..9f62c89e 100644 --- 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 da586be1..9fb1dfe5 100644 --- a/www/plugins/zpip_v1/svn.revision +++ b/www/plugins/zpip_v1/svn.revision @@ -1,10 +1,10 @@ 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 file:///home/svn/repository/spip-zone/_squelettes_/zpip-dist/branches/zpip_v1 -68933 -2013-01-10 19:00:04 +0100 +80430 +2014-02-03 19:00:50 +0100 \ No newline at end of file