Changeset 107719 in spip-zone

Timestamp:

Nov 23, 2017, 2:43:42 PM (3 years ago)

Author:

jeanmarie.listes@…

Message:

Mise en forme du code pour éviter au max de générer des lignes vides dans le source.

Location:

_plugins_/metaplus/trunk/inclure

Files:

• metasplus-article.html (modified) (2 diffs)
• metasplus.html (modified) (3 diffs)

_plugins_/metaplus/trunk/inclure/metasplus-article.html

@@ -10 +10 @@
         1. D'abord rassembler les informations et les formater
 
-]
-[(#SET{titre, #TITRE|supprimer_tags|textebrut})]
-[(#SET{lang, #LANG})]
-[(#SET{desc,[(#CHAPO|sinon{#INTRODUCTION}|sinon{#TITRE}|supprimer_tags|textebrut)]})]
-[(#SET{author,#LESAUTEURS|supprimer_tags|textebrut})]
-[(#SET{date,#DATE})]
-[(#SET{url,#URL_ARTICLE})]
-[(#SET{logo,''})]
-[(#LOGO_ARTICLE|oui)
+][
+(#SET{titre, #TITRE|supprimer_tags|textebrut})][
+(#SET{lang, #LANG})][
+(#SET{desc,[(#CHAPO|sinon{#INTRODUCTION}|sinon{#TITRE}|supprimer_tags|textebrut)]})][
+(#SET{author,#LESAUTEURS|supprimer_tags|textebrut})][
+(#SET{date,#DATE})][
+(#SET{url,#URL_ARTICLE})][
+(#SET{logo,''})][
+(#LOGO_ARTICLE|oui)
         [(#SET{logo, #LOGO_ARTICLE})]
 ]
@@ -26 +26 @@
         [(#SET{logo,[(#FICHIER)]})]
 </BOUCLE_illus>
-
-
 [(#REM)
 
         2. Passer les données au modèle général
 
-]
-<INCLURE{fond=inclure/metasplus,
+]<INCLURE{fond=inclure/metasplus,
         titre=#GET{titre},
         lang=#GET{lang},

_plugins_/metaplus/trunk/inclure/metasplus.html

@@ -45 +45 @@
 <meta name="DC.Format" content="text/html" />
 <meta name="dc.Type" content="text" />
-[<meta name="dc.Title" lang="#LANG" content="(#ENV{titre}|attribut_html)" />]
-[<meta name="dc.Language" scheme="rfc1766" content="(#LANG)" />]
-[<meta name="dc.Description" lang="#LANG" content="(#ENV{desc}|couper{200,'…'}|attribut_html)" />
-][<meta name="dc.Creator" content="(#ENV{author, #ENV{auteur}}|attribut_html)" />
-][<meta name="dc.Date" scheme="DCTERMS.W3CDTF" content="(#ENV{date}|affdate{Y-m-d})" />]
-[<meta name="DC.Identifier" scheme="URI" content="(#ENV{url}|url_absolue)" />]
-[<meta name="dc.Publisher" content="(#NOM_SITE_SPIP|attribut_html)" />]
+[<meta name="dc.Title" lang="#LANG" content="(#ENV{titre}|attribut_html)" />][
+<meta name="dc.Language" scheme="rfc1766" content="(#LANG)" />][
+<meta name="dc.Description" lang="#LANG" content="(#ENV{desc}|couper{200,'…'}|attribut_html)" />][
+<meta name="dc.Creator" content="(#ENV{author, #ENV{auteur}}|attribut_html)" />][
+<meta name="dc.Date" scheme="DCTERMS.W3CDTF" content="(#ENV{date}|affdate{Y-m-d})" />][
+<meta name="DC.Identifier" scheme="URI" content="(#ENV{url}|url_absolue)" />][
+<meta name="dc.Publisher" content="(#NOM_SITE_SPIP|attribut_html)" />]
 ][(#REM)
 
@@ -60 +60 @@
 [(#ENV{territoire}|oui) [(#SET{lang_territoire,[(#ENV{lang})]_[(#ENV{territoire}|strtoupper)]})]
 ][(#ENV{territoire}|non)
-        [(#LANG|=={en}|oui) [(#SET{lang_territoire,en_UK})]]
-        [(#LANG|=={en}|non) [(#SET{lang_territoire,#LANG[_(#LANG|strtoupper)]})]]
+        [(#LANG|=={en}|oui) [(#SET{lang_territoire,en_UK})]][
+        (#LANG|=={en}|non) [(#SET{lang_territoire,#LANG[_(#LANG|strtoupper)]})]]
 ]<!-- Open Graph -->
-[<meta property="og:type" content="(#ENV{og-type}|sinon{article}|attribut_html)" />]
-[<meta property="og:title" content="(#ENV{titre}|attribut_html)" />]
+[<meta property="og:type" content="(#ENV{og-type}|sinon{article}|attribut_html)" />][
+<meta property="og:title" content="(#ENV{titre}|attribut_html)" />]
 <meta property="og:locale" content="#GET{lang_territoire}" />
-[<meta property="og:url" content="(#ENV{url}|url_absolue)" />]
-[<meta property="og:description" content="(#ENV{desc}|couper{200,'…'}|attribut_html)" />
-][(#ENV{og-type}|sinon{article}|=={article}|oui)[<meta property="article:published_time" content="(#ENV{date}|affdate{Y-m-d})" />]
-[<meta property="article:author" content="(#ENV{author, #ENV{auteur}}|attribut_html)" />
-]][<meta property="og:image" content="(#GET{logo}|url_absolue)" />
-[<meta property="og:image:width" content="(#GET{logo}|largeur)" />]
-[<meta property="og:image:height" content="(#GET{logo}|hauteur)" />]
-][<meta property="og:site_name" content="(#NOM_SITE_SPIP|attribut_html)" />][(#REM)
+[<meta property="og:url" content="(#ENV{url}|url_absolue)" />][
+<meta property="og:description" content="(#ENV{desc}|couper{200,'…'}|attribut_html)" />][
+(#ENV{og-type}|sinon{article}|=={article}|oui)[<meta property="article:published_time" content="(#ENV{date}|affdate{Y-m-d})" />][
+<meta property="article:author" content="(#ENV{author, #ENV{auteur}}|attribut_html)" />]][
+<meta property="og:image" content="(#GET{logo}|url_absolue)" />
+[<meta property="og:image:width" content="(#GET{logo}|largeur)" />][
+<meta property="og:image:height" content="(#GET{logo}|hauteur)" />]][
+<meta property="og:site_name" content="(#NOM_SITE_SPIP|attribut_html)" />][(#REM)
 
         Prise en charge du plugin facebook : s'il est présent, on envoie la méta fb:app_id
@@ -85 +85 @@
 <!-- Twitter Card -->
 <meta name="twitter:card" content="[(#ENV{logo}|?{summary_large_image,summary})]" />
-[<meta name="twitter:title" content="(#ENV{titre}|attribut_html)" />]
-[<meta name="twitter:description" content="(#ENV{desc}|couper{200,'…'}|attribut_html)" />]
-[<meta name="twitter:image" content="(#GET{logo}|url_absolue)" />]
+[<meta name="twitter:title" content="(#ENV{titre}|attribut_html)" />][
+<meta name="twitter:description" content="(#ENV{desc}|couper{200,'…'}|attribut_html)" />][
+<meta name="twitter:image" content="(#GET{logo}|url_absolue)" />]
 <meta name="twitter:dnt" content="on" />
 [<meta name="twitter:url" content="(#ENV{url}|url_absolue)" />]