From c33198a1e6c2e89e9f06e6684a9e70b0a2d08d51 Mon Sep 17 00:00:00 2001
From: "real3t@gmail.com" <>
Date: Tue, 9 Jun 2015 19:53:49 +0000
Subject: [PATCH] =?UTF-8?q?Synchronisation=20des=20json=20avec=20ceux=20de?=
=?UTF-8?q?=20GIS4.=20Ce=20qui=20change=20=3F=20-=20Liens=20vers=20article?=
=?UTF-8?q?s,=20rubrique,=20auteur,=20mot=20quand=20=C3=A7a=20n'est=20pas?=
=?UTF-8?q?=20celui=20de=20l'URL=20(utile=20pour=20faire=20un=20lien=20ver?=
=?UTF-8?q?s=20les=20articles=20depuis=20une=20rubrique=20listant=20tous?=
=?UTF-8?q?=20les=20GIS=20des=20articles=20contenus=20dedans).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Pour les auteurs et les documents, on utilise leur logo si disponible.
b_b backport possible ?
---
.gitattributes | 1 -
json/gis_articles.html | 20 ++++----------------
json/gis_auteurs.html | 24 ++++--------------------
json/gis_documents.html | 24 ++++--------------------
json/gis_evenements.html | 21 ---------------------
json/gis_mots.html | 20 ++++----------------
json/gis_rubriques.html | 20 ++++----------------
json/gis_sites.html | 20 ++++----------------
8 files changed, 24 insertions(+), 126 deletions(-)
delete mode 100644 json/gis_evenements.html
diff --git a/.gitattributes b/.gitattributes
index eb0c42ee..1fbc40e3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -352,7 +352,6 @@ javascript/tooltip.js -text
json/gis_articles.html -text
json/gis_auteurs.html -text
json/gis_documents.html -text
-json/gis_evenements.html -text
json/gis_mots.html -text
json/gis_rubriques.html -text
json/gis_sites.html -text
diff --git a/json/gis_articles.html b/json/gis_articles.html
index fc34afe1..50268681 100644
--- a/json/gis_articles.html
+++ b/json/gis_articles.html
@@ -3,19 +3,7 @@
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
"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}})]]
- [(#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}
- #SET{icon_anchorPoint,''}
- [,"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
+ "title":[(#URL_ARTICLE|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|extraire_multi|supprimer_numero)]}|json_encode)],
+ "description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+ (#LOGO_GIS|gis_icon_properties)]
+ }}</BOUCLE_art>
\ No newline at end of file
diff --git a/json/gis_auteurs.html b/json/gis_auteurs.html
index e8efb497..8c0d591d 100644
--- a/json/gis_auteurs.html
+++ b/json/gis_auteurs.html
@@ -3,23 +3,7 @@
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
"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}})]]
- [(#LOGO_GIS|non)
- [(#LOGO_AUTEUR|oui)
- [(#SET{logo_doc,#LOGO_AUTEUR|image_passe_partout{32,32}|image_recadre{32,32}})]]
- ]
- [(#LOGO_GIS|non)[(#LOGO_AUTEUR|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}
- #SET{icon_anchorPoint,''}
- [,"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
+ "title":[(#URL_AUTEUR|lien_ou_expose{[(#TITRE_GIS*|sinon{#NOM*}|extraire_multi|supprimer_numero)]}|json_encode)],
+ "description":[(#DESCRIPTIF_GIS|sinon{#BIO}|json_encode)][
+ (#LOGO_GIS|sinon{#LOGO_AUTEUR_NORMAL}|gis_icon_properties)]
+ }}</BOUCLE_auteurs>
\ No newline at end of file
diff --git a/json/gis_documents.html b/json/gis_documents.html
index c968ca00..6019e13f 100644
--- a/json/gis_documents.html
+++ b/json/gis_documents.html
@@ -3,23 +3,7 @@
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
"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}})]]
- [(#LOGO_GIS|non)
- [(#LOGO_DOCUMENT|oui)
- [(#SET{logo_doc,#LOGO_DOCUMENT|image_passe_partout{32,32}|image_recadre{32,32}})]]
- ]
- [(#LOGO_GIS|non)[(#LOGO_DOCUMENT|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}
- #SET{icon_anchorPoint,''}
- [,"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
+ "title":[(#URL_DOCUMENT|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|extraire_multi|supprimer_numero)]}|json_encode)],
+ "description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+ (#LOGO_GIS|sinon{#LOGO_DOCUMENT}|gis_icon_properties)]
+ }}</BOUCLE_doc>
\ No newline at end of file
diff --git a/json/gis_evenements.html b/json/gis_evenements.html
deleted file mode 100644
index 8408c765..00000000
--- a/json/gis_evenements.html
+++ /dev/null
@@ -1,21 +0,0 @@
- <BOUCLE_events(EVENEMENTS){gis}{id_evenement ?}{id_article ?}{id_rubrique ?}{id_secteur ?}{id_mot ?}{id_auteur ?}{recherche ?}{0, #ENV{limit}}{","}>
- {"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)
- [(#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}
- #SET{icon_anchorPoint,''}
- [,"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>
diff --git a/json/gis_mots.html b/json/gis_mots.html
index 3b5b5334..8530452e 100644
--- a/json/gis_mots.html
+++ b/json/gis_mots.html
@@ -3,19 +3,7 @@
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
"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}})]]
- [(#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}
- #SET{icon_anchorPoint,''}
- [,"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
+ "title":[(#URL_MOT|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|extraire_multi|supprimer_numero)]}|json_encode)],
+ "description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+ (#LOGO_GIS|gis_icon_properties)]
+ }}</BOUCLE_mots>
\ No newline at end of file
diff --git a/json/gis_rubriques.html b/json/gis_rubriques.html
index a19fa588..192b4d53 100644
--- a/json/gis_rubriques.html
+++ b/json/gis_rubriques.html
@@ -3,19 +3,7 @@
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
"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}})]]
- [(#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}
- #SET{icon_anchorPoint,''}
- [,"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
+ "title":[(#URL_RUBRIQUE|extraire_multi|lien_ou_expose{[(#TITRE_GIS*|sinon{#TITRE*}|supprimer_numero)]}|json_encode)],
+ "description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+ (#LOGO_GIS|gis_icon_properties)]
+ }}</BOUCLE_rub>
\ No newline at end of file
diff --git a/json/gis_sites.html b/json/gis_sites.html
index ad71acd2..9b6de8ff 100644
--- a/json/gis_sites.html
+++ b/json/gis_sites.html
@@ -3,19 +3,7 @@
"geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
"id":"#ID_GIS",
"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}})]]
- [(#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}
- #SET{icon_anchorPoint,''}
- [,"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
+ "title":[(#ID_SYNDIC|generer_url_entite{site}|lien_ou_expose{[(#TITRE_GIS*|sinon{#NOM_SITE*}|extraire_multi|supprimer_numero)]}|json_encode)],
+ "description":[(#DESCRIPTIF_GIS|sinon{#DESCRIPTIF}|json_encode)][
+ (#LOGO_GIS|gis_icon_properties)]
+ }}</BOUCLE_sit>
\ No newline at end of file
--
GitLab