From 120720ebc5f18fad7db6c16d907b6a852259ae97 Mon Sep 17 00:00:00 2001
From: "real3t@gmail.com" <>
Date: Tue, 9 Jun 2015 16:54:40 +0000
Subject: [PATCH] =?UTF-8?q?aoustrong=20est=20devenu=20lien=5Fou=5Fexpose?=
=?UTF-8?q?=20(int=C3=A9gr=C3=A9=20=C3=A0=20SPIP)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 -
json/gis.html | 19 -------------------
json/gis_articles.html | 7 ++++---
json/gis_auteurs.html | 7 ++++---
json/gis_documents.html | 5 +++--
json/gis_evenements.html | 3 ++-
json/gis_mots.html | 5 +++--
json/gis_rubriques.html | 5 +++--
json/gis_sites.html | 5 +++--
noisettes/telecharger_tableau.html | 2 +-
10 files changed, 23 insertions(+), 36 deletions(-)
delete mode 100644 json/gis.html
diff --git a/.gitattributes b/.gitattributes
index 7c6696c1..eb0c42ee 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -349,7 +349,6 @@ javascript/main.js -text
javascript/modernizr.js -text
javascript/tooltip.js -text
/javascripts.js.html -text
-json/gis.html -text
json/gis_articles.html -text
json/gis_auteurs.html -text
json/gis_documents.html -text
diff --git a/json/gis.html b/json/gis.html
deleted file mode 100644
index e3222a5d..00000000
--- a/json/gis.html
+++ /dev/null
@@ -1,19 +0,0 @@
- <BOUCLE_gis(GIS){id_gis ?}{id_rubrique ?}{id_article ?}{id_breve ?}{id_document ?}{id_mot ?}{id_auteur ?}{id_syndic ?}{recherche ?}{0, #ENV{limit}}{","}>
- {"type": "Feature",
- "geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
- "id":"#ID_GIS",
- "title":[(#TITRE*|supprimer_numero|json_encode)],
- "description":[(#DESCRIPTIF|json_encode)][(#SET{logo_doc,''})]
- [(#LOGO_GIS|oui)
- [(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
- [(#LOGO_GIS|non)
- [(#CHEMIN{images/marker_defaut.png}|oui)[
- (#SET{logo_doc,#CHEMIN{images/marker_defaut.png}|image_passe_partout{32,32}|image_recadre{32,32}})]
- ]]
- [(#GET{logo_doc}|oui)
- #SET{icon_w,#GET{logo_doc}|extraire_attribut{src}|largeur}
- #SET{icon_h,#GET{logo_doc}|extraire_attribut{src}|hauteur}
- [,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
- "icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
- "icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
- ]}</BOUCLE_gis>
\ No newline at end of file
diff --git a/json/gis_articles.html b/json/gis_articles.html
index a6ea0382..fc34afe1 100644
--- a/json/gis_articles.html
+++ b/json/gis_articles.html
@@ -1,8 +1,9 @@
- <BOUCLE_art(ARTICLES){gis}{id_article ?}{id_rubrique ?}{id_secteur ?}{id_mot ?}{id_auteur ?}{recherche ?}{0, #ENV{limit}}{","}>
+ <BOUCLE_art(ARTICLES){gis}{id_article ?}{id_rubrique ?}{id_secteur ?}{id_mot ?}{id_groupe ?}{id_auteur ?}{recherche ?}{0, #ENV{limit}}{","}>
{"type": "Feature",
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
- "title":[(#URL_ARTICLE|aoustrong{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
+ "properties": {
+ "title":[(#URL_ARTICLE|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
[(#LOGO_GIS|oui)
[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
@@ -17,4 +18,4 @@
[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
- ]}</BOUCLE_art>
\ No newline at end of file
+ ]}}</BOUCLE_art>
\ No newline at end of file
diff --git a/json/gis_auteurs.html b/json/gis_auteurs.html
index e31410ce..e8efb497 100644
--- a/json/gis_auteurs.html
+++ b/json/gis_auteurs.html
@@ -1,8 +1,9 @@
- <BOUCLE_auteurs(AUTEURS){gis}{id_article ?}{id_auteur ?}{recherche ?}{0, #ENV{limit}}{","}>
+ <BOUCLE_auteurs(AUTEURS){gis}{id_article ?}{id_auteur ?}{id_mot ?}{recherche ?}{0, #ENV{limit}}{","}>
{"type": "Feature",
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
- "title":[(#URL_AUTEUR|aoustrong{[(#TITRE_GIS*|sinon{#NOM*}|supprimer_numero)]}|json_encode)],
+ "properties": {
+ "title":[(#URL_AUTEUR|lien_ou_expose{[(#TITRE_GIS*|sinon{#NOM*}|supprimer_numero)]}|json_encode)],
"description":[(#DESCRIPTIF_GIS|sinon{#BIO}|json_encode)][(#SET{logo_doc,''})]
[(#LOGO_GIS|oui)
[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
@@ -21,4 +22,4 @@
[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
- ]}</BOUCLE_auteurs>
\ No newline at end of file
+ ]}}</BOUCLE_auteurs>
\ No newline at end of file
diff --git a/json/gis_documents.html b/json/gis_documents.html
index 78ac5171..c968ca00 100644
--- a/json/gis_documents.html
+++ b/json/gis_documents.html
@@ -2,7 +2,8 @@
{"type": "Feature",
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
- "title":[(#URL_DOCUMENT|aoustrong{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
+ "properties": {
+ "title":[(#URL_DOCUMENT|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
[(#LOGO_GIS|oui)
[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
@@ -21,4 +22,4 @@
[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
- ]}</BOUCLE_doc>
\ No newline at end of file
+ ]}}</BOUCLE_doc>
\ No newline at end of file
diff --git a/json/gis_evenements.html b/json/gis_evenements.html
index d35f9a04..8408c765 100644
--- a/json/gis_evenements.html
+++ b/json/gis_evenements.html
@@ -2,6 +2,7 @@
{"type": "Feature",
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
+ "properties": {
"title":[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero|json_encode)],
"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
[(#LOGO_GIS|oui)
@@ -17,4 +18,4 @@
[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
- ]}</BOUCLE_events>
+ ]}}</BOUCLE_events>
diff --git a/json/gis_mots.html b/json/gis_mots.html
index e5e073fd..3b5b5334 100644
--- a/json/gis_mots.html
+++ b/json/gis_mots.html
@@ -2,7 +2,8 @@
{"type": "Feature",
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
- "title":[(#URL_MOT|aoustrong{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
+ "properties": {
+ "title":[(#URL_MOT|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
[(#LOGO_GIS|oui)
[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
@@ -17,4 +18,4 @@
[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
- ]}</BOUCLE_mots>
\ No newline at end of file
+ ]}}</BOUCLE_mots>
\ No newline at end of file
diff --git a/json/gis_rubriques.html b/json/gis_rubriques.html
index 98e1c7fb..a19fa588 100644
--- a/json/gis_rubriques.html
+++ b/json/gis_rubriques.html
@@ -2,7 +2,8 @@
{"type": "Feature",
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
- "title":[(#URL_RUBRIQUE|aoustrong{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
+ "properties": {
+ "title":[(#URL_RUBRIQUE|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
[(#LOGO_GIS|oui)
[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
@@ -17,4 +18,4 @@
[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
- ]}</BOUCLE_rub>
\ No newline at end of file
+ ]}}</BOUCLE_rub>
\ No newline at end of file
diff --git a/json/gis_sites.html b/json/gis_sites.html
index 016861c1..ad71acd2 100644
--- a/json/gis_sites.html
+++ b/json/gis_sites.html
@@ -2,7 +2,8 @@
{"type": "Feature",
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
- "title":[(#ID_SYNDIC|generer_url_entite{site}|aoustrong{[(#TITRE_GIS*|sinon{#NOM_SITE*}|supprimer_numero)]}|json_encode)],
+ "properties": {
+ "title":[(#ID_SYNDIC|generer_url_entite{site}|lien_ou_expose{[(#TITRE_GIS*|sinon{#NOM_SITE*}|supprimer_numero)]}|json_encode)],
"description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][(#SET{logo_doc,''})]
[(#LOGO_GIS|oui)
[(#SET{logo_doc,#LOGO_GIS|image_passe_partout{32,32}|image_recadre{32,32}})]]
@@ -17,4 +18,4 @@
[,"icon": (#GET{logo_doc}|extraire_attribut{src}|url_absolue|json_encode)],
"icon_size": [(#VAL{91}|chr)]#GET{icon_w},#GET{icon_h}[(#VAL{93}|chr)],
"icon_anchor": [(#VAL{91}|chr)][(#GET{icon_w}|div{2})],[(#GET{icon_h})][(#VAL{93}|chr)]
- ]}</BOUCLE_sit>
\ No newline at end of file
+ ]}}</BOUCLE_sit>
\ No newline at end of file
diff --git a/noisettes/telecharger_tableau.html b/noisettes/telecharger_tableau.html
index bdaa6f5e..f627d6aa 100644
--- a/noisettes/telecharger_tableau.html
+++ b/noisettes/telecharger_tableau.html
@@ -1,6 +1,6 @@
<div class="onglets" id="listedocuments">
<ul>
- [<li>(#URL_PAGE{telecharger}|parametre_url{media,''}|ancre_url{'#listedocuments'}|aoustrong{<:medias:tous_les_medias:>,#ENV{media,''}|=={''}})</li>]
+ [<li>(#URL_PAGE{telecharger}|parametre_url{media,''}|ancre_url{'#listedocuments'}|lien_ou_expose{<:medias:tous_les_medias:>,#ENV{media,''}|=={''}})</li>]
<BOUCLE_Medias(DOCUMENTS){vu ?}{compteur types_documents, media}{media IN image,audio,video,file}>
<li>[(#ENV{media}|=={#MEDIA}|?{<strong>,<a href="[(#URL_PAGE{telecharger}|parametre_url{media,#MEDIA}|ancre_url{'#listedocuments'})]">})][(#VAL{medias:media_}|concat{#MEDIA}|_T|concat{' (',#COMPTEUR{types_documents},')'})][(#ENV{media}|=={#MEDIA}|?{</strong>,</a>})]</li>
</BOUCLE_Medias>
--
GitLab