/branches/v2.20-pistolet-arroseur/doc/bdd/cel.sql |
---|
369,6 → 369,73 |
SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; |
SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; |
-- |
-- Structure de la table `cel_groupes_zones` |
-- |
CREATE TABLE IF NOT EXISTS `cel_groupes_zones` ( |
`id_groupe` varchar(50) NOT NULL, |
`valeur` varchar(50) NOT NULL, |
KEY `id_groupe` (`id_groupe`), |
KEY `valeur` (`valeur`) |
) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
-- |
-- Contenu de la table `cel_groupes_zones` |
-- |
INSERT INTO `cel_groupes_zones` (`id_groupe`, `valeur`) VALUES |
('metropole_grenoble', 'INSEE-C:38057'), |
('metropole_grenoble', 'INSEE-C:38059'), |
('metropole_grenoble', 'INSEE-C:38068'), |
('metropole_grenoble', 'INSEE-C:38071'), |
('metropole_grenoble', 'INSEE-C:38111'), |
('metropole_grenoble', 'INSEE-C:38126'), |
('metropole_grenoble', 'INSEE-C:38150'), |
('metropole_grenoble', 'INSEE-C:38151'), |
('metropole_grenoble', 'INSEE-C:38158'), |
('metropole_grenoble', 'INSEE-C:38169'), |
('metropole_grenoble', 'INSEE-C:38170'), |
('metropole_grenoble', 'INSEE-C:38179'), |
('metropole_grenoble', 'INSEE-C:38185'), |
('metropole_grenoble', 'INSEE-C:38187'), |
('metropole_grenoble', 'INSEE-C:38188'), |
('metropole_grenoble', 'INSEE-C:38200'), |
('metropole_grenoble', 'INSEE-C:38229'), |
('metropole_grenoble', 'INSEE-C:38235'), |
('metropole_grenoble', 'INSEE-C:38252'), |
('metropole_grenoble', 'INSEE-C:38258'), |
('metropole_grenoble', 'INSEE-C:38271'), |
('metropole_grenoble', 'INSEE-C:38277'), |
('metropole_grenoble', 'INSEE-C:38279'), |
('metropole_grenoble', 'INSEE-C:38281'), |
('metropole_grenoble', 'INSEE-C:38309'), |
('metropole_grenoble', 'INSEE-C:38317'), |
('metropole_grenoble', 'INSEE-C:38325'), |
('metropole_grenoble', 'INSEE-C:38328'), |
('metropole_grenoble', 'INSEE-C:38364'), |
('metropole_grenoble', 'INSEE-C:38382'), |
('metropole_grenoble', 'INSEE-C:38388'), |
('metropole_grenoble', 'INSEE-C:38421'), |
('metropole_grenoble', 'INSEE-C:38423'), |
('metropole_grenoble', 'INSEE-C:38436'), |
('metropole_grenoble', 'INSEE-C:38445'), |
('metropole_grenoble', 'INSEE-C:38471'), |
('metropole_grenoble', 'INSEE-C:38472'), |
('metropole_grenoble', 'INSEE-C:38474'), |
('metropole_grenoble', 'INSEE-C:38478'), |
('metropole_grenoble', 'INSEE-C:38485'), |
('metropole_grenoble', 'INSEE-C:38486'), |
('metropole_grenoble', 'INSEE-C:38516'), |
('metropole_grenoble', 'INSEE-C:38524'), |
('metropole_grenoble', 'INSEE-C:38528'), |
('metropole_grenoble', 'INSEE-C:38529'), |
('metropole_grenoble', 'INSEE-C:38533'), |
('metropole_grenoble', 'INSEE-C:38540'), |
('metropole_grenoble', 'INSEE-C:38545'), |
('metropole_grenoble', 'INSEE-C:38562'); |
-- ----------------------------------------------------- |
-- Data for table `cel_catalogue_champs_etendus` |
-- ----------------------------------------------------- |
/branches/v2.20-pistolet-arroseur/doc/bdd/schema_bdd.mwb |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/branches/v2.20-pistolet-arroseur/doc |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v2.10-motoculteur/doc:r2598,2655-2661 |
Merged /branches/v2.2-faucille/doc:r2185-2186,2188,2197-2198 |
Merged /branches/v2.3-faux/doc:r2228,2285 |
Merged /branches/v2.8-houe/doc:r2479,2489,2495,2499,2502-2503,2542 |
Merged /branches/v2.6-greffoir/doc:r2355-2384 |
Merged /branches/v2.7-grelinette/doc:r2437,2444 |
Merged /branches/v1.7-croissant/doc:r1855,1879-1880,1885-1886,1917,1923,1983 |
Merged /trunk/doc:r2173,2183,2191-2192,2194,2671-2682 |
Merged /branches/v2.4-fourche/doc:r2295,2310-2311,2313,2316 |
Merged /branches/v2.5-gouge-a-asperges/doc:r2344,2348 |
Merged /branches/topic-dbsingleton/doc:r1720-1764 |
Merged /branches/v1.8-debroussailleuse/doc:r1981,1987,1992 |
Merged /branches/v2.9-motobineuse/doc:r2562 |
/branches/v2.20-pistolet-arroseur/widget/modules/telechargement/squelettes/telechargement.tpl.html |
---|
36,6 → 36,18 |
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/1.7.1/jquery-1.7.1.js"></script> |
<script type="text/javascript" src="<?= $url_base; ?>modules/telechargement/squelettes/js/telechargement.js" ></script> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body> |
69,19 → 81,5 |
<?php } ?> |
</ul> |
</div> |
<!-- Stats : Google Analytics--> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/carto/squelettes/carte_defaut.tpl.html |
---|
86,6 → 86,18 |
<link rel="stylesheet" href="http://www.tela-botanica.org/commun/jquery/fancybox/1.3.4/jquery.fancybox-1.3.4.css" type="text/css" media="screen" /> |
<link rel="stylesheet" href="http://www.tela-botanica.org/commun/jquery/jquery-ui/1.8.15/css/smoothness/jquery-ui-1.8.15.custom.css" type="text/css" media="screen" /> |
<link href="<?=$url_base?>modules/carto/squelettes/css/carto.css" rel="stylesheet" type="text/css" media="screen" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body> |
331,20 → 343,5 |
</p> |
</form> |
</div> |
<!-- Stats : Google Analytics --> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/photo/squelettes/photo.tpl.html |
---|
67,6 → 67,18 |
<!-- Javascript : bibliothèques --> |
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/1.6/jquery-1.6.min.js"></script> |
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/fancybox/1.3.4/jquery.fancybox-1.3.4.js"></script> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body> |
<!-- WIDGET:CEL:PHOTO - DEBUT --> |
/branches/v2.20-pistolet-arroseur/widget/modules/photo/Photo.php |
---|
215,7 → 215,7 |
private function traiterParametres() { |
$parametres_flux = '?'; |
$criteres = array('utilisateur', 'commune', 'dept', 'taxon', 'commentaire', 'date', 'tag', 'motcle', 'projet', 'num_taxon', 'num_nom'); |
$criteres = array('utilisateur', 'commune', 'dept', 'taxon', 'commentaire', 'date', 'tag', 'motcle', 'projet', 'num_taxon', 'num_nom', 'groupe_zones_geo'); |
foreach($this->parametres as $nom_critere => $valeur_critere) { |
if (in_array($nom_critere, $criteres)) { |
$valeur_critere = str_replace(' ', '%20', $valeur_critere); |
/branches/v2.20-pistolet-arroseur/widget/modules/observation/squelettes/observation.tpl.html |
---|
28,6 → 28,18 |
<!-- Javascript : bibliothèques --> |
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/1.4.4/jquery-1.4.4.min.js"></script> |
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/fancybox/1.3.4/jquery.fancybox-1.3.4.js"></script> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body> |
<!-- WIDGET:CEL:OBSERVATION - DEBUT --> |
/branches/v2.20-pistolet-arroseur/widget/modules/observation/Observation.php |
---|
138,7 → 138,7 |
private function traiterParametres() { |
$parametres_flux = '?'; |
$criteres = array('utilisateur', 'commune', 'dept', 'taxon', 'commentaire', 'date', 'projet', 'motcle', 'num_taxon'); |
$criteres = array('utilisateur', 'commune', 'dept', 'taxon', 'commentaire', 'date', 'projet', 'motcle', 'num_taxon', 'groupe_zones_geo'); |
foreach($this->parametres as $nom_critere => $valeur_critere) { |
if (in_array($nom_critere, $criteres)) { |
$valeur_critere = str_replace(' ', '%20', $valeur_critere); |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/biodiversite34/biodiversite34.tpl.html |
---|
49,6 → 49,18 |
<link href="<?=$url_base?>modules/saisie/squelettes/biodiversite34/css/biodiversite34.css" rel="stylesheet" type="text/css" media="screen" /> |
<link rel="stylesheet" href="http://www.tela-botanica.org/commun/jquery/jquery-ui/1.8.13/css/ui-darkness/jquery-ui-1.8.13.custom.css" type="text/css" media="screen" /> |
<link rel="stylesheet" href="http://www.tela-botanica.org/commun/jquery/fancybox/1.3.4/jquery.fancybox-1.3.4.css" type="text/css" media="screen" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body> |
193,20 → 205,5 |
<div id="dialogue-erreur" style="display: none;" title="Erreur"> |
</div> |
<!-- Stats : Google Analytics --> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/arbres-tetards/arbres-tetards.tpl.html |
---|
114,6 → 114,18 |
<link rel="stylesheet" href="http://resources.tela-botanica.org/bootstrap/3.2.0/css/bootstrap.min.css" /> |
<link rel="stylesheet" href="http://resources.tela-botanica.org/bootstrap/3.2.0/css/bootstrap-theme.min.css" /> |
<link rel="stylesheet" href="<?=$url_base?>modules/saisie/squelettes/arbres-tetards/css/<?=isset($_GET['style']) ? $_GET['style'] : 'arbres-tetards'?>.css" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body data-spy="scroll"> |
1009,21 → 1021,6 |
</div> |
</div> |
</div> |
<!-- Stats : Google Analytics--> |
<script> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</div> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/mobile/mobile.tpl.html |
---|
37,6 → 37,19 |
<!-- Javascript : Jquery Mobile --> |
<script src="http://www.tela-botanica.org/commun/jquery/mobile/1.3.1/jquery.mobile-1.3.1.min.js"></script> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/defaut/defaut.tpl.html |
---|
129,6 → 129,18 |
<link href="http://www.tela-botanica.org/commun/bootstrap/2.0.2/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" /> |
<link href="http://www.tela-botanica.org/commun/bootstrap/2.0.2/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css" media="screen" /> |
<link href="<?=$url_base?>modules/saisie/squelettes/defaut/css/<?=isset($_GET['style']) ? $_GET['style'] : 'defaut'?>.css" rel="stylesheet" type="text/css" media="screen" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body data-spy="scroll"> |
572,21 → 584,6 |
le formulaire de signalement d'erreurs</a>. |
</p> |
</div> |
<!-- Stats : Google Analytics--> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</div> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/missions-flore/missions-flore.tpl.html |
---|
131,6 → 131,18 |
<link rel="stylesheet" href="http://resources.tela-botanica.org/bootstrap/3.2.0/css/bootstrap.min.css" /> |
<link rel="stylesheet" href="http://resources.tela-botanica.org/bootstrap/3.2.0/css/bootstrap-theme.min.css" /> |
<link rel="stylesheet" href="<?=$url_base?>modules/saisie/squelettes/missions-flore/css/<?=isset($_GET['style']) ? $_GET['style'] : 'missions-flore'?>.css" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body data-spy="scroll"> |
791,21 → 803,6 |
</p> |
</div> |
</div> |
<!-- Stats : Google Analytics--> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</div> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/missions-flore/js/missions-flore.js |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/widget/modules/saisie/squelettes/missions-flore/js/missions-flore.js:r2671-2682 |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/florileges/florileges.tpl.html |
---|
117,6 → 117,19 |
<link href="http://www.tela-botanica.org/commun/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" /> |
<link href="http://www.tela-botanica.org/commun/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css" media="screen" /> |
<link href="<?=$url_base?>modules/saisie/squelettes/florileges/css/<?=isset($_GET['style']) ? $_GET['style'] : 'florileges'?>.css" rel="stylesheet" type="text/css" media="screen" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body data-spy="scroll"> |
1053,20 → 1066,5 |
le formulaire de signalement d'erreurs</a>. |
</p> |
</div> |
<!-- Stats : Google Analytics--> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/ambrosia/ambrosia.tpl.html |
---|
114,6 → 114,17 |
<link rel="stylesheet" media="screen" href="http://resources.tela-botanica.org/bootstrap/modal/2.2.5/css/bootstrap-modal.css" /> |
<link rel="stylesheet" media="screen" href="<?=$url_base?>modules/saisie/squelettes/ambrosia/css/<?=isset($_GET['style']) ? $_GET['style'] : 'ambrosia'?>.css"/> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body data-spy="scroll"> |
686,21 → 697,6 |
<button class="btn" data-dismiss="modal" aria-hidden="true">Fermer</button> |
</div> |
</div> |
<!-- Stats : Google Analytics--> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</div> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/sauvages/sauvages.tpl.html |
---|
128,6 → 128,18 |
<link href="http://www.tela-botanica.org/commun/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" /> |
<link href="http://www.tela-botanica.org/commun/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css" media="screen" /> |
<link href="<?=$url_base?>modules/saisie/squelettes/sauvages/css/<?=isset($_GET['style']) ? $_GET['style'] : 'sauvages'?>.css" rel="stylesheet" type="text/css" media="screen" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body data-spy="scroll"> |
720,20 → 732,5 |
le formulaire de signalement d'erreurs</a>. |
</p> |
</div> |
<!-- Stats : Google Analytics--> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie/squelettes/sauvages |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/widget/modules/saisie/squelettes/sauvages:r2671-2682 |
/branches/v2.20-pistolet-arroseur/widget/modules/saisie |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/widget/modules/saisie:r2671-2682 |
/branches/v2.20-pistolet-arroseur/widget/modules/stats/squelettes/stats_tout.tpl.html |
---|
37,18 → 37,16 |
<title>Statistiques du Carnet En Ligne</title> |
<!-- Stats : Google Analytics --> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
/branches/v2.20-pistolet-arroseur/widget/modules/export/squelettes/export.tpl.html |
---|
67,6 → 67,18 |
<!-- <link href="http://www.tela-botanica.org/commun/bootstrap/2.0.2/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" /> --> |
<link rel="stylesheet" type="text/css" href="http://resources.tela-botanica.org/bootstrap/3.1.0/css/bootstrap.min.css" /> |
<link href="<?= $url_base; ?>modules/export/squelettes/css/export.css" rel="stylesheet" type="text/css" media="screen" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body> |
163,19 → 175,5 |
</div> |
</form> |
</div> |
<!-- Stats : Google Analytics--> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget/modules/cartopoint/CartoPoint.php |
---|
48,7 → 48,8 |
private $image = null; // url d'une image à ajouter dans l'interface |
private $nbjours = null; // nombre de jour à partir de la date courate pour lesquels on affiche les points |
private $annee = null; // filtre par année |
private $referentiel = null; // nombre de jour à partir de la date courate pour lesquels on affiche les points |
private $referentiel = null; |
private $groupe_zones_geo = null; // Groupe de zones géographiques personnalisé |
/** |
* Méthode appelée par défaut pour charger ce widget. |
96,6 → 97,7 |
$this->nbjours = (isset($nbjours) ? urldecode($nbjours) : null); |
$this->annee = (isset($annee) ? urldecode($annee) : null); |
$this->referentiel = (isset($referentiel) ? urldecode($referentiel) : null); |
$this->groupe_zones_geo = (isset($groupe_zones_geo) ? urldecode($groupe_zones_geo) : null); |
$this->start = (isset($start) ? $start : null); |
$this->limit = (isset($limit) ? $limit : null); |
} |
130,6 → 132,7 |
$widget['donnees']['nbjours'] = $this->nbjours; |
$widget['donnees']['annee'] = $this->annee; |
$widget['donnees']['referentiel'] = $this->referentiel; |
$widget['donnees']['groupe_zones_geo'] = $this->groupe_zones_geo; |
$widget['donnees']['url_limites_communales'] = $this->obtenirUrlsLimitesCommunales(); |
$widget['donnees']['communeImageUrl'] = $this->config['carto']['communeImageUrl']; |
$widget['donnees']['pointImageUrl'] = $this->config['carto']['pointImageUrl']; |
149,7 → 152,7 |
$parametres_retenus = array(); |
$parametres_a_tester = array('station', 'utilisateur', 'projet', 'tag', 'dept', 'commune', |
'num_taxon', 'taxon', 'date', 'commentaire', 'nbjours', 'referentiel','pays', |
'num_taxon', 'taxon', 'date', 'commentaire', 'nbjours', 'referentiel','pays', 'groupe_zones_geo', |
'start', 'limit'); |
foreach ($parametres_a_tester as $param) { |
if (isset($this->$param) && $this->$param != '*') { |
/branches/v2.20-pistolet-arroseur/widget/modules/cartopoint/squelettes/carte_defaut.tpl.html |
---|
61,9 → 61,11 |
'&dept=<?=$dept?>'+ |
'&commune=<?=rawurlencode($commune)?>'+ |
'&pays=<?=rawurlencode($pays)?>'+ |
'&commentaire=<?=rawurlencode($commentaire)?>', |
'&commentaire=<?=rawurlencode($commentaire)?>'+ |
'&groupe_zones_geo=<?=rawurlencode($groupe_zones_geo)?>', |
utilisateur = '<?=$utilisateur?>', |
photos = '<?= ($photos != null) ? $photos : "null"; ?>'; |
groupe_zones_geo = '<?= ($groupe_zones_geo != null) ? $groupe_zones_geo : "null"; ?>'; |
if (photos != null) { |
filtreCommun += '&photos=<?=rawurlencode($photos)?>'; |
} |
100,6 → 102,18 |
<link rel="stylesheet" href="http://www.tela-botanica.org/commun/jquery/fancybox/1.3.4/jquery.fancybox-1.3.4.css" type="text/css" media="screen" /> |
<link rel="stylesheet" href="http://www.tela-botanica.org/commun/jquery/jquery-ui/1.8.15/css/smoothness/jquery-ui-1.8.15.custom.css" type="text/css" media="screen" /> |
<link href="<?=$url_base?>modules/cartopoint/squelettes/css/<?=isset($_GET['style']) ? $_GET['style'] : 'carto'?>.css" rel="stylesheet" type="text/css" media="screen" /> |
<script> |
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
ga('create', 'UA-20092557-1', 'auto'); |
ga('require', 'displayfeatures'); |
ga('send', 'pageview'); |
</script> |
</head> |
<body> |
402,20 → 416,5 |
</p> |
</form> |
</div> |
<!-- Stats : Google Analytics --> |
<script type="text/javascript"> |
//<![CDATA[ |
var _gaq = _gaq || []; |
_gaq.push(['_setAccount', 'UA-20092557-1']); |
_gaq.push(['_trackPageview']); |
(function() { |
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; |
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; |
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); |
})(); |
//]]> |
</script> |
</body> |
</html> |
/branches/v2.20-pistolet-arroseur/widget |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/widget:r2671-2682 |
/branches/v2.20-pistolet-arroseur/jrest/bibliotheque/GestionMotsClesChemin.php |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/jrest/bibliotheque/GestionMotsClesChemin.php:r2671-2682 |
/branches/v2.20-pistolet-arroseur/jrest/bibliotheque/Bdd.php |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/jrest/bibliotheque/Bdd.php:r2671-2682 |
/branches/v2.20-pistolet-arroseur/jrest/services/CelSyndicationImage.php |
---|
39,7 → 39,8 |
'date' => 'c.date_prise_de_vue', |
'tag' => 'tag', |
'motcle' => 'tag', |
'projet' => 'projet'); |
'projet' => 'projet', |
'groupe_zones_geo' => 'groupe_zones_geo'); |
/** |
* Méthode appelée avec une requête de type GET. |
504,6 → 505,7 |
$nom_valeur[1].'%") AND '; break; |
case "tag" : $requete .= $this->creerSousRequeteMotsCles($nom_valeur[1]).' AND '; break; |
case "projet" : $requete .= $this->creerSousRequeteProjet($nom_valeur[1]).' AND '; break; |
case "groupe_zones_geo" : $requete .= $this->creerSousRequeteGroupeZonesGeo($nom_valeur[1])." AND "; break; |
default : $requete .= $nom_valeur[0].' = "'.$nom_valeur[1].'" AND '; break; |
} |
} |
511,6 → 513,18 |
$requete = rtrim($requete,' AND '); |
return $requete; |
} |
private function creerSousRequeteGroupeZonesGeo($groupe_zones_geo) { |
$req = "SELECT valeur FROM cel_groupes_zones WHERE id_groupe = ".Cel::db()->proteger($groupe_zones_geo); |
$res = Cel::db()->requeter($req); |
$zones = array(); |
foreach($res as &$r) { |
$zones[] = Cel::db()->proteger($r['valeur']); |
} |
$sql = '(b.ce_zone_geo IN ('.implode(',', $zones).')) '; |
return $sql; |
} |
private function creerSousRequeteMotsCles($mot_cle) { |
$requete = ''; |
/branches/v2.20-pistolet-arroseur/jrest/services/ImportXLS.php |
---|
328,16 → 328,15 |
// le cast en string des nombres permet d'unifier le parsing du retour |
// car il n'est destiné qu'à être affiché |
$retour = array( |
'import_obs_ajoutees' => (string)$obs_ajouts, |
'import_images_ajoutees' => (string)$nb_images_ajoutees, |
'import_mots_cles_ajoutes' => (string)$nb_mots_cle_ajoutes, |
'import_obs_ajoutees' => (string)$obs_ajouts, |
'import_images_ajoutees' => (string)$nb_images_ajoutees, |
'import_mots_cles_ajoutes' => (string)$nb_mots_cle_ajoutes, |
'import_colonnes_non_traitees' => implode(', ', $filtre->exclues) |
); |
// Ajout d'éventuelles erreurs |
if ($this->bilan) { |
$retour += array('import_erreurs' => implode("\n", $this->bilan) . "\n"); |
if ($this->bilan) { |
$retour += array('import_erreurs' => implode("\n", $this->bilan) . "\n"); |
} |
// Dans le cas où le client ne sait pas lire le retour d'upload |
// on stocke les stats en session pour les appeler plus tard |
// car ceci peut poser notamment problème pour les requêtes CORS |
/branches/v2.20-pistolet-arroseur/jrest/services/CelWidgetMapPoint.php |
---|
131,6 → 131,7 |
$this->construireWhereTag(). |
$this->construireWhereNombreDeJours(). |
$this->construireWhereAnnee(). |
$this->construireWhereGroupeZoneGeo(). |
' GROUP BY id_coord'; |
$resultats_emplacements = Cel::db()->requeter($requete); |
169,7 → 170,8 |
$this->construireWhereProjet(). |
$this->construireWhereTag(). |
$this->construireWhereNombreDeJours(). |
$this->construireWhereAnnee(); |
$this->construireWhereAnnee(). |
$this->construireWhereGroupeZoneGeo(); |
$resultats_nb_obs = Cel::db()->requeter($requete); |
return $resultats_nb_obs[0]['nb']; |
355,7 → 357,8 |
$this->construireWhereProjet(). |
$this->construireWhereTag(). |
$this->construireWhereNombreDeJours(). |
$this->construireWhereAnnee(). |
$this->construireWhereAnnee(). |
$this->construireWhereGroupeZoneGeo(). |
'ORDER BY nom_sel ASC '. |
"LIMIT {$this->start},{$this->limit} "; |
//echo $requete;exit; |
504,6 → 507,7 |
$this->construireWhereTag(). |
$this->construireWhereNombreDeJours(). |
$this->construireWhereAnnee(). |
$this->construireWhereGroupeZoneGeo(). |
'ORDER BY nom_ret ASC '. |
"LIMIT {$this->start},{$this->limit} "; |
//$this->debug[] = $requete; |
767,6 → 771,7 |
$this->construireWhereReferentiel(). |
$this->construireWhereProjet(). |
$this->construireWhereTag(). |
$this->construireWhereGroupeZoneGeo(). |
'ORDER BY utilisateur ASC, ordre ASC'; |
//$this->debug[] = $requete; |
//die($requete); |
1104,7 → 1109,24 |
} |
return $sql; |
} |
private function construireWhereGroupeZoneGeo() { |
$sql = null; |
extract($this->parametres); |
if (isset($groupe_zones_geo) && !$this->etreNull($groupe_zones_geo)) { |
$req = "SELECT valeur FROM cel_groupes_zones WHERE id_groupe = ".Cel::db()->proteger($groupe_zones_geo); |
$res = Cel::db()->requeter($req); |
$zones = array(); |
foreach($res as &$r) { |
$zones[] = Cel::db()->proteger($r['valeur']); |
} |
$sql = 'AND ce_zone_geo IN ('.implode(',', $zones).') '; |
} |
return $sql; |
} |
/** |
* Traitement de $tag pour construction du filtre dans la requête |
*/ |
/branches/v2.20-pistolet-arroseur/jrest/services/CelSyndicationObservation.php |
---|
46,7 → 46,8 |
'commentaire' => 'commentaire', |
'date' => 'date_observation', |
'motcle' => 'tags', |
'projet' => 'mots-cles'); |
'projet' => 'mots-cles', |
'groupe_zones_geo' => 'groupe_zones_geo'); |
private $catalogue_cles_labels_champs_etendus = array(); |
/** |
179,10 → 180,6 |
private function chargerListeDesFlux() { |
$this->setFlux('par-defaut', 'Flux de syndication des observations publiques du CEL', |
'Ce flux fournit des informations sur les observations du CEL.'); |
$this->setFlux('par-mots-cles', 'Flux de syndication obsolète', |
"Ce flux est désormais accessible via le flux multicriteres/atom/M?tag='mot-cle'."); |
$this->setFlux('par-commune','Flux de syndication obsolète', |
"Ce flux est désormais accessible via le flux multicriteres/atom/M?commune='commune'."); |
$this->setFlux('multicriteres','Flux de syndication des nouvelles observations publiques du CEL '. |
'filtrées par un ou plusieurs critères', |
"Ce flux fournit des informations sur les nouvelles observations du CEL filtrées par ". |
228,42 → 225,6 |
return $contenu; |
} |
private function getServiceParMotsCles() { |
$infos=array(); |
$infos[0]['nom_sel_nn'] = ''; |
$infos[0]['date_modification'] = '2011-06-28'; |
$donnees = $this->construireDonneesCommunesAuFlux($infos); |
$donnees['items'][0]['guid'] = 0; |
$donnees['items'][0]['description'] = 'Ce flux est devenu obsolète. Veuillez utiliser le flux '. |
'<b>http://www.tela-botanica.org/eflore/cel2/jrest/CelSyndicationObservation/multicriteres/atom?projet='; |
if (isset($this->parametres[0])) { |
$donnees['items'][0]['description'] .= $this->parametres[0].'</b>'; |
} else { |
$donnees['items'][0]['description'] .= '</b>'; |
} |
$donnees['items'][0]['titre'] = ''; |
$contenu = Cel::traiterSquelettePhp($this->squelette, $donnees); |
return $contenu; |
} |
private function getServiceParCommune() { |
$infos=array(); |
$infos[0]['nom_sel_nn'] = ''; |
$infos[0]['date_modification'] = '2011-06-28'; |
$donnees = $this->construireDonneesCommunesAuFlux($infos); |
$donnees['items'][0]['guid'] = 0; |
$donnees['items'][0]['description'] = 'Ce flux est devenu obsolète. Veuillez utiliser le flux '. |
'<b>http://www.tela-botanica.org/eflore/cel2/jrest/CelSyndicationObservation/multicriteres/atom?commune='; |
if (isset($this->parametres[0])) { |
$donnees['items'][0]['description'] .= $this->parametres[0].'</b>'; |
} else { |
$donnees['items'][0]['description'] .= '</b>'; |
} |
$donnees['items'][0]['titre'] = ''; |
$contenu = Cel::traiterSquelettePhp($this->squelette, $donnees); |
return $contenu; |
} |
private function getServiceMultiCriteres() { |
$contenu = ''; |
if (isset($_GET['debut'])) $this->start = $_GET['debut']; |
329,6 → 290,7 |
$nom_valeur[1].'%") AND '; break; |
case "mots-cles" : $requete .= $this->creerSousRequeteMotsCles($nom_valeur[1]).' AND '; break; |
case "tags" : $requete .= $this->creerSousRequeteTags($nom_valeur[1]).' AND '; break; |
case "groupe_zones_geo" : $requete .= $this->creerSousRequeteGroupeZonesGeo($nom_valeur[1])." AND "; break; |
default : $requete .= $nom_valeur[0].' = "'.$nom_valeur[1].'" AND '; break; |
} |
} |
336,6 → 298,18 |
$requete = rtrim($requete,' AND '); |
return $requete; |
} |
private function creerSousRequeteGroupeZonesGeo($groupe_zones_geo) { |
$req = "SELECT valeur FROM cel_groupes_zones WHERE id_groupe = ".Cel::db()->proteger($groupe_zones_geo); |
$res = Cel::db()->requeter($req); |
$zones = array(); |
foreach($res as &$r) { |
$zones[] = Cel::db()->proteger($r['valeur']); |
} |
$sql = '(ce_zone_geo IN ('.implode(',', $zones).')) '; |
return $sql; |
} |
private function creerSousRequeteMotsCles($mot_cle) { |
$requete = ''; |
/branches/v2.20-pistolet-arroseur/jrest/services |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/jrest/services:r2671-2682 |
/branches/v2.20-pistolet-arroseur/jrest |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/jrest:r2671-2682 |