From 84fc011740ab8f1076bf66a49cf8d7df5d364810 Mon Sep 17 00:00:00 2001
From: "real3t@gmail.com" <>
Date: Mon, 31 Aug 2015 14:10:27 +0000
Subject: [PATCH] Plus besoin de forker les json de GIS (merci b_b).
---
.gitattributes | 7 -------
json/gis_articles.html | 9 ---------
json/gis_articles_branche.html | 9 ---------
json/gis_auteurs.html | 9 ---------
json/gis_documents.html | 9 ---------
json/gis_mots.html | 9 ---------
json/gis_rubriques.html | 9 ---------
json/gis_sites.html | 9 ---------
paquet.xml | 2 +-
9 files changed, 1 insertion(+), 71 deletions(-)
delete mode 100644 json/gis_articles.html
delete mode 100644 json/gis_articles_branche.html
delete mode 100644 json/gis_auteurs.html
delete mode 100644 json/gis_documents.html
delete mode 100644 json/gis_mots.html
delete mode 100644 json/gis_rubriques.html
delete mode 100644 json/gis_sites.html
diff --git a/.gitattributes b/.gitattributes
index fdd6ed9a..9a13211f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -349,14 +349,7 @@ javascript/main.js -text
javascript/modernizr.js -text
javascript/tooltip.js -text
/javascripts.js.html -text
-json/gis_articles.html -text
-json/gis_articles_branche.html -text
json/gis_articles_plus_sites_branche.html -text
-json/gis_auteurs.html -text
-json/gis_documents.html -text
-json/gis_mots.html -text
-json/gis_rubriques.html -text
-json/gis_sites.html -text
json/gis_sites_branche.html -text
/la_meteo.html -text
lang/local_en.php -text
diff --git a/json/gis_articles.html b/json/gis_articles.html
deleted file mode 100644
index 50268681..00000000
--- a/json/gis_articles.html
+++ /dev/null
@@ -1,9 +0,0 @@
- <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",
- "properties": {
- "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_articles_branche.html b/json/gis_articles_branche.html
deleted file mode 100644
index 09bdbf42..00000000
--- a/json/gis_articles_branche.html
+++ /dev/null
@@ -1,9 +0,0 @@
- <BOUCLE_art(ARTICLES){gis}{id_article ?}{branche ?}{id_mot ?}{id_groupe ?}{id_auteur ?}{recherche ?}{0, #ENV{limit}}{","}>
- {"type": "Feature",
- "geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
- "id":"#ID_GIS",
- "properties": {
- "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
deleted file mode 100644
index 8c0d591d..00000000
--- a/json/gis_auteurs.html
+++ /dev/null
@@ -1,9 +0,0 @@
- <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",
- "properties": {
- "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
deleted file mode 100644
index 6019e13f..00000000
--- a/json/gis_documents.html
+++ /dev/null
@@ -1,9 +0,0 @@
- <BOUCLE_doc(DOCUMENTS){gis}{id_article ?}{id_rubrique ?}{id_secteur ?}{id_mot ?}{recherche ?}{media ?}{0, #ENV{limit}}{","}>
- {"type": "Feature",
- "geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
- "id":"#ID_GIS",
- "properties": {
- "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_mots.html b/json/gis_mots.html
deleted file mode 100644
index 8530452e..00000000
--- a/json/gis_mots.html
+++ /dev/null
@@ -1,9 +0,0 @@
- <BOUCLE_mots(MOTS){gis}{id_mot ?}{id_groupe ?}{id_article ?}{id_rubrique ?}{id_breve ?}{id_syndic ?}{id_forum ?}{recherche ?}{0, #ENV{limit}}{","}>
- {"type": "Feature",
- "geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
- "id":"#ID_GIS",
- "properties": {
- "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
deleted file mode 100644
index 192b4d53..00000000
--- a/json/gis_rubriques.html
+++ /dev/null
@@ -1,9 +0,0 @@
- <BOUCLE_rub(RUBRIQUES){gis}{id_rubrique ?}{id_secteur ?}{id_parent?=#ENV{id_parent}}{id_mot ?}{recherche ?}{0, #ENV{limit}}{","}>
- {"type": "Feature",
- "geometry": {"type": "Point", "coordinates": [#LON, #LAT]},
- "id":"#ID_GIS",
- "properties": {
- "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
deleted file mode 100644
index 9b6de8ff..00000000
--- a/json/gis_sites.html
+++ /dev/null
@@ -1,9 +0,0 @@
- <BOUCLE_sit(SITES){gis}{id_syndic ?}{id_rubrique ?}{id_secteur ?}{id_mot ?}{recherche ?}{0, #ENV{limit}}{","}>
- {"type": "Feature",
- "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*}|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
diff --git a/paquet.xml b/paquet.xml
index a54ca13c..142f96b3 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -55,7 +55,7 @@
<utilise nom="entravaux" compatibilite="[3.1.20;[" />
<utilise nom="eva_freemind" compatibilite="[1.2.2;[" />
<utilise nom="forms" compatibilite="[0.5.6;0.5.*]" />
- <utilise nom="gis" compatibilite="[4.26.11;[" />
+ <utilise nom="gis" compatibilite="[4.30.0;[" />
<utilise nom="gravatar" compatibilite="[1.6.3;[" />
<utilise nom="image_cliquable" compatibilite="[3.0.2;[" />
<utilise nom="mesfavoris" compatibilite="[2.4.1;[" />
--
GitLab