Skip to content
Snippets Groups Projects

Master

Merged Patrick Barroca requested to merge master into WIP
Compare and
+ 893
304
Preferences
Compare changes
Files
@@ -274,6 +274,8 @@ class Admin_AccueilController extends Zend_Controller_Action {
if (1 == $this->_getParam('styles_reload')) {
$this->view->preferences = $this->_request->getPost();
} else {
if ($this->isAFlashStyleSelected())
$_POST['profil_redirect'] = '';
$this->_updateConfig('KIOSQUE');
}
}
@@ -286,10 +288,9 @@ class Admin_AccueilController extends Zend_Controller_Action {
protected function isAFlashStyleSelected() {
if($this->_getParam('style_liste'))
return array_key_exists($this->_getParam('style_liste'), $this->_getStylesListes()['flash']);
return array_key_exists($this->view->preferences['style_liste'], $this->_getStylesListes()['flash']);
return Class_Systeme_ModulesAccueil::moduleByCode('KIOSQUE')
->isAFlashStyle($this->_getParam('style_liste',
$this->view->preferences['style_liste']));
}
@@ -455,30 +456,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
protected function _getStylesListes() {
// Styles HTML
$styles["html"]["vignettes"] = "Liste avec vignettes";
$styles["html"]["mur"] = "Mur";
$styles["html"]["chrono"] = "Frise chronologique";
// Styles java
$styles["java"]["slide_show"] = "Barre d'images horizontale";
$styles["java"]["protoflow"] = "Cover flow";
$styles["java"]["cube"] = "Cube";
$styles["java"]["diaporama"] = "Diaporama";
$styles["java"]["jcarousel"] = "Barre horizontale animée";
$styles["java"]["mycarousel_horizontal"] = "Barre horizontale pleine largeur";
$styles["java"]["mycarousel_vertical"] = "Barre verticale";
// Styles flash
// $styles["flash"]["coverflow"] = "Cover flow";
$styles["flash"]["carrousel_horizontal"] = "Carrousel horizontal";
$styles["flash"]["carrousel_vertical"] = "Carrousel vertical";
$styles["flash"]["dockmenu_horizontal"] = "Barre d'images horizontale";
$styles["flash"]["dockmenu_vertical"] = "Barre d'images verticale";
$styles["flash"]["pyramid_gallery"] = "Mur d'images";
return $styles;
}
}
?>
\ No newline at end of file
return Class_Systeme_ModulesAccueil::moduleByCode('KIOSQUE')
->getStylesListes();
}
}
\ No newline at end of file