Subversion Repositories eFlore/Applications.eflore-consultation

Compare Revisions

Ignore whitespace Rev 990 → Rev 989

/trunk/index_mobile.php
File deleted
\ No newline at end of file
/trunk/modules/mobile/sources/Floraison.php
File deleted
\ No newline at end of file
/trunk/modules/mobile/sources/Illustrations.php
File deleted
\ No newline at end of file
/trunk/modules/mobile/sources/NomsCommuns.php
File deleted
\ No newline at end of file
/trunk/modules/mobile/sources/Repartition.php
File deleted
\ No newline at end of file
/trunk/modules/mobile/sources/Texte.php
File deleted
\ No newline at end of file
/trunk/modules/mobile/Mobile.php
File deleted
\ No newline at end of file
/trunk/modules/mobile/presentations/logos/tela_transparent.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
/trunk/modules/mobile/presentations/logos/tela.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
/trunk/modules/mobile/presentations/less/pyracantha_tela.less
File deleted
\ No newline at end of file
/trunk/modules/mobile/presentations/less/gentiana.less
File deleted
/trunk/modules/mobile/presentations/less/README
File deleted
\ No newline at end of file
/trunk/modules/mobile/presentations/less/functions.less
File deleted
/trunk/modules/mobile/presentations/less/pyracantha_blanc.less
File deleted
\ No newline at end of file
/trunk/modules/mobile/presentations/less/pyracantha.less
File deleted
\ No newline at end of file
/trunk/modules/mobile/presentations/less/pyracantha_vert.less
File deleted
\ No newline at end of file
/trunk/modules/mobile/presentations/css/pyracantha_tela.css
File deleted
/trunk/modules/mobile/presentations/css/gentiana.css
File deleted
/trunk/modules/mobile/presentations/css/pyracantha_blanc.css
File deleted
/trunk/modules/mobile/presentations/css/pyracantha_vert.css
File deleted
/trunk/modules/mobile/presentations/js/mobile.js
File deleted
\ No newline at end of file
/trunk/modules/mobile/presentations/icones/altitude.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
/trunk/modules/mobile/presentations/icones/zoom.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
/trunk/modules/mobile/squelettes/fiche.tpl.html
File deleted
\ No newline at end of file
/trunk/modules/mobile/squelettes/theme_gentiana_niveau1.tpl.html
File deleted
\ No newline at end of file
/trunk/modules/mobile/squelettes/theme_gentiana2_niveau1.tpl.html
File deleted
\ No newline at end of file
/trunk/modules/mobile/squelettes/theme_pyracantha_niveau1.tpl.html
File deleted
\ No newline at end of file
/trunk/modules/fiche/squelettes/fiche_pied_page.tpl.html
3,11 → 3,6
<h2>Téléchargements</h2>
<div class="conteneur_telechargements">
<?= $export_pdf; ?>
<br />
<span>QR Code Version Mobile</span>
<a href="<?= $mobile; ?>">
<img src="<?= $qr_code_png; ?>" alt="QR Code" />
</a>
</div>
</div>
<div class="droite infos_liens_permanents">
17,45 → 12,37
<h2>Liens permanents :</h2>
<div class="conteneur_permalien">
<span>Nom sélectionné :</span>
<span class="conteneur_permalien">
<a class="lien_externe" href="<?=htmlentities($permalien_num_nom)?>" title="Lien permanent vers <?=$nom_retenu;?>">
<?=htmlentities($permalien_num_nom)?>
</a>
</span>
<span>Nom séléctionné :</span>
<span class="conteneur_permalien">
<a class="lien_externe" href="<?=htmlentities($permalien_num_nom)?>" title="Lien permanent vers <?=$nom_retenu;?>">
<?=htmlentities($permalien_num_nom)?>
</a>
</span>
</div>
<!-- <div class="conteneur_permalien">
<span class="titre_lien_permanent">Taxon :</span>
<span>
<a class="lien_externe" href="<?=htmlentities($permalien_taxon)?>" title="Lien permanent vers ce taxon">
<?=htmlentities($permalien_taxon)?>
</a>
</span>
<span class="titre_lien_permanent">Taxon :</span>
<span>
<a class="lien_externe" href="<?=htmlentities($permalien_taxon)?>" title="Lien permanent vers ce taxon">
<?=htmlentities($permalien_taxon)?>
</a>
</span>
</div> -->
<div class="conteneur_permalien">
<span>Fiche wikipedia :</span>
<span class="description conteneur_permalien">
<a class="lien_externe" href="<?=htmlentities($wikipedia['lien'])?>" title="voir la page de ce taxon sur wikipedia (s'ouvre dans une nouvelle fenêtre)">
<?=htmlentities($wikipedia['lien'])?>
</a>
</span>
<span>Fiche wikipedia :</span>
<span class="description conteneur_permalien">
<a class="lien_externe" href="<?=htmlentities($wikipedia['lien'])?>" title="voir la page de ce taxon sur wikipedia (s'ouvre dans une nouvelle fenêtre)">
<?=htmlentities($wikipedia['lien'])?>
</a>
</span>
</div>
<div class="conteneur_permalien">
<span>Fiche wikini :</span>
<span class="description conteneur_permalien">
<a class="lien_externe" href="<?=htmlentities($wiki)?>" title="voir la page de ce taxon sur le wiki flora (s'ouvre dans une nouvelle fenêtre)">
<?=htmlentities($wiki)?>
</a>
</span>
<span>Fiche wikini :</span>
<span class="description conteneur_permalien">
<a class="lien_externe" href="<?=htmlentities($wiki)?>" title="voir la page de ce taxon sur le wiki flora (s'ouvre dans une nouvelle fenêtre)">
<?=htmlentities($wiki)?>
</a>
</span>
</div>
<div class="conteneur_permalien">
<span>Fiche mobile :</span>
<span class="description conteneur_permalien">
<a class="lien_externe" href="<?= $mobile; ?>" title="voir la version mobile de ce taxon (s'ouvre dans une nouvelle fenêtre)">
Version nomade
</a>
</span>
</div>
</div>
<hr class="nettoyage" />
</div>
/trunk/modules/fiche/Fiche.php
124,29 → 124,17
$description = new Description($this->conteneur);
$taxons = new Taxons($this->conteneur);
$referentiel = $this->conteneur->getParametre('referentiel');
$urlMobile = $this->url->obtenirUrlMobile($this->parametres['num_nom'], $this->parametres['type_nom'], $this->parametres['nom']);
$donnees = array('wikipedia' => $description->getUrlWikipedia(),
'export_pdf' => $this->ajouterLienModuleExport(),
'permalien_num_nom' => $taxons->getUrlPermalienNumNom($referentiel, 1, $this->conteneur->getNomCourant()->getNns()),
'permalien_taxon' => $taxons->getUrlPermalienTaxon($referentiel, 1, $this->conteneur->getNomCourant()->getNt()),
'nn' => $this->conteneur->getNomCourant()->getNns(),
'nt' => $this->conteneur->getNomCourant()->getNt(),
'wiki' => $description->getLienWikini(),
'nom_retenu' => $this->nom_retenu->get('nom_sci'),
'mobile' => $urlMobile,
'qr_code_png' => $this->obtenirUrlQrCode($urlMobile)
);
'export_pdf' => $this->ajouterLienModuleExport(),
'permalien_num_nom' => $taxons->getUrlPermalienNumNom($referentiel, 1, $this->conteneur->getNomCourant()->getNns()),
'permalien_taxon' => $taxons->getUrlPermalienTaxon($referentiel, 1, $this->conteneur->getNomCourant()->getNt()),
'nn' => $this->conteneur->getNomCourant()->getNns(),
'nt' => $this->conteneur->getNomCourant()->getNt(),
'wiki' => $description->getLienWikini(),
'nom_retenu' => $this->nom_retenu->get('nom_sci'));
$this->setSortie(self::RENDU_CORPS, $this->getVue('fiche_pied_page', $donnees), true);
}
private function obtenirUrlQrCode($urlMobile) {
$qr = $this->conteneur->getQrCode();
$qr->setUrl(htmlspecialchars_decode($urlMobile));
$idQrCode = $this->conteneur->getNomCourant()->getNns();
$urlQrCode = $qr->dessiner($idQrCode);
return $urlQrCode;
}
public function executerOnglet(){
$this->viderSorties();
$donnees = $this->obtenirDonnees();
/trunk/configurations/config.defaut.ini
137,8 → 137,6
 
; +------------------------------------------------------------------------------------------------------+
; Autres urls
urlApiChart = "http://chart.apis.google.com/chart"
urlQrCodeTpl = "http://www.tela-botanica.org/tmp/eflore_v5_cache/qrcode/%s"
baseUrlServicesAnnuaireTpl = "http://www.tela-botanica.org/service:annuaire:%s"
baseUrlServicesCelTpl = "http://www.tela-botanica.org/service:cel:%s"
 
223,9 → 221,12
statutsZoneGeoTpl = "{ref:baseUrlApiEflore}/statuts/?masque.nn={id}&retour.format=zone_geo"
 
; +------------------------------------------------------------------------------------------------------+
; Chemin vers outil de conversion pdf
WKHTMLTOPDF = "wkhtmltopdf"
; chemin vers outil de conversion pdf
WKHTMLTOPDF = "/usr/local/bin/wkhtmltopdf"
 
; chemin de stockage temporaire pour les Html & les PDF
dossier_pdf = "/home/mathilde/web/serveur/cache/eflore/pdf/"
 
; +------------------------------------------------------------------------------------------------------+
;permaliens
permalienNumNomTpl = "http://{ref:domaine}/{ref_tax}-nn-{id}";
232,15 → 233,8
permalienTaxonTpl = "http://{ref:domaine}/{ref_tax}/{ref_version}-nt-{id}";
 
; +------------------------------------------------------------------------------------------------------+
; Gestion du cache et des dossiers de stockage
; Active (true) ou désactive (false) le cache
cache = false
; chemin du cache
chemincache = "/home/telabotap/www/tmp/eflore_v5_cache/"
chemincache = "/home/aurelien/web/tmp/eflore/"
; durée du cache
dureecache = "php:60*60*24*365"
 
; chemin de stockage temporaire pour les Html & les PDF
dossier_pdf = "{ref:chemincache}pdf/"
; chemin de stockage temporaire pour les QrCode
dossierQrCode = "{ref:chemincache}qrcode/"
dureecache = "php:0"
/trunk/bibliotheque/QrCode.php
File deleted
\ No newline at end of file
/trunk/bibliotheque/Conteneur.php
129,18 → 129,6
}
return $this->partages['Bdd'];
}
public function getCache($dossierStockage = null) {
if (!isset($this->partages['Cache'])){
$params = array(
'mise_en_cache' => $this->getParametre('cache'),
'stockage_chemin' => is_null($dossierStockage) ? $this->getParametre('chemincache') : $dossierStockage,
'duree_de_vie' => $this->getParametre('dureecache')
);
$this->partages['Cache'] = new CacheSimple($params);
}
return $this->partages['Cache'];
}
 
public function getRestClient() {
if (!isset($this->partages['RestClient'])){
148,12 → 136,5
}
return $this->partages['RestClient'];
}
public function getQrCode() {
if (!isset($this->partages['QrCode'])){
$this->partages['QrCode'] = new QrCode($this);
}
return $this->partages['QrCode'];
}
}
?>
/trunk/bibliotheque/AppUrls.php
1,17 → 1,15
<?php
class AppUrls {
private $urlBase = null;
private $urlMobile = null;
private $urlBaseDossier = null;
private $urlCourante = null;
private $urlRedirection = null;
private $urlPopUp = null;
 
public function __construct(Url $urlBase = null, Url $urlBaseDossier = null, Url $urlPopUp = null, Url $urlMobile = null) {
public function __construct(Url $urlBase = null, Url $urlBaseDossier = null, Url $urlPopUp = null) {
$this->urlBase = (is_null($urlBase)) ? Registre::get('eFlore.urlBase') : $urlBase;
$this->urlBaseDossier = (is_null($urlBaseDossier)) ? Registre::get('eFlore.urlBaseDossier') : $urlBaseDossier;
$this->urlPopUp = (is_null($urlPopUp)) ? Registre::get('eFlore.urlPopUp') : $urlPopUp;
$this->urlMobile = (is_null($urlMobile)) ? Registre::get('eFlore.urlMobile') : $urlMobile;
}
 
public function obtenirUrlBase() {
169,26 → 167,6
$url = $this->urlBase->getURL();
return $url;
}
public function getParametresUrlMobile() {
$parametres = array(
'referentiel' => Registre::get('parametres.referentiel'),
'niveau' => 1,
'module' => 'mobile',
'action' => 'fiche'
);
return $parametres;
}
public function obtenirUrlMobile($numNom, $type_nom = 'nom_vernaculaire', $nom = '') {
$parametres = $this->getParametresUrlMobile();
$parametres['num_nom'] = $numNom;
$parametres['type_nom'] = $type_nom;
$parametres['nom'] = $nom;
$this->urlMobile->setRequete($parametres);
$url = $this->urlMobile->getURL();
return $url;
}
 
public function getParametresUrlMetaDonnees() {
$parametres = array(
/trunk/controleurs/AppControleur.php
107,7 → 107,6
Registre::set('eFlore.urlCourante', self::getUrlCourante());
Registre::set('eFlore.urlRedirection', self::getUrlRedirection());
Registre::set('eFlore.urlPopUp', new Url(Config::get('base_url_application_popup')));
Registre::set('eFlore.urlMobile', new Url(Config::get('base_url_mobile')));
 
Registre::set('parametres.referentiel', self::$parametres['referentiel']);
Registre::set('parametres.module', self::$parametres['module']);