Commit eb6ead30 authored by Laurent's avatar Laurent
Browse files

hotline #56107 clean code

parent 2cbe86fc
- ticket #56107 : [EXPLO] 16/55 Retro Sprint 73 ! PB : plugin pour afficher des données métier dans un articles (intégrer une notice, une sitothèque...) avec des boutons ckEditor - ticket #56107 : ajout d'un plugin à l'éditeur des articles pour insérer un kiosque de notices
...@@ -30,16 +30,9 @@ class CmsController extends ZendAfi_Controller_Action { ...@@ -30,16 +30,9 @@ class CmsController extends ZendAfi_Controller_Action {
public function init() { public function init() {
parent::init(); parent::init();
$this->_helper->getHelper('AjaxContext') $this->_helper->getHelper('AjaxContext')
->addActionContext('reseau', 'html') ->addActionContext('reseau', 'html')
->initContext(); ->initContext();
$url = Class_Url::assemble(['module' => 'opac',
'controller' => 'java',
'action' => 'widget',
'code' => 'KIOSQUE',
'render' => 'popup']);
} }
......
...@@ -168,7 +168,18 @@ class Class_Feature_List { ...@@ -168,7 +168,18 @@ class Class_Feature_List {
'Right' => function($feature_description, $user) {return true;}, 'Right' => function($feature_description, $user) {return true;},
'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=Modifier_une_bande_annonce', 'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=Modifier_une_bande_annonce',
'Test' => '', 'Test' => '',
'Date' => '2017-11-27'] 'Date' => '2017-11-27'],
'56107' =>
['Label' => $this->_('Insérer un kiosque dans un article'),
'Desc' => $this->_('Permet d\'afficher un ou plusieurs kiosques de notices dans un article'),
'Image' => '',
'Video' => 'https://www.youtube.com/watch?v=EF7Ud4n_NQU',
'Category' => $this->_('Administration'),
'Right' => function($feature_description, $user) {return true;},
'Wiki' => 'https://www.youtube.com/redirect?v=EF7Ud4n_NQU&event=video_description&q=http%3A%2F%2Fwiki.bokeh-library-portal.org%2Findex.php%3Ftitle%3DArticles_-_Cr%25C3%25A9er%2C_r%25C3%25A9diger_et_ordonner%23Ins.C3.A9rer_un_kiosque',
'Test' => '',
'Date' => '2017-12-25']
]; ];
} }
......
...@@ -112,13 +112,10 @@ class ZendAfi_View_Helper_Accueil_Base extends ZendAfi_View_Helper_ModuleAbstrac ...@@ -112,13 +112,10 @@ class ZendAfi_View_Helper_Accueil_Base extends ZendAfi_View_Helper_ModuleAbstrac
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// Rend le html_array à mettre dans une boite // Rend le html_array à mettre dans une boite
//--------------------------------------------------------------------- //---------------------------------------------------------------------
protected function getHtmlArray($show_admin = true) protected function getHtmlArray()
{ {
$content = $show_admin ?
$this->getFonctionAdmin().$this->contenu
: $this->contenu;
return ["TITRE" => $this->titre, return ["TITRE" => $this->titre,
"CONTENU" => $content, "CONTENU" => $this->getFonctionAdmin().$this->contenu,
"MESSAGE" => $this->message, "MESSAGE" => $this->message,
"RSS" => $this->rss_interne, "RSS" => $this->rss_interne,
"TYPE_MODULE" => strtolower($this->type_module)]; "TYPE_MODULE" => strtolower($this->type_module)];
......
...@@ -37,9 +37,11 @@ class ZendAfi_View_Helper_Admin_ImgObjectPropertiesReader ...@@ -37,9 +37,11 @@ class ZendAfi_View_Helper_Admin_ImgObjectPropertiesReader
$this->view->addScriptPath(PATH_JAVA); $this->view->addScriptPath(PATH_JAVA);
$html = $this->_tag('div', $this->_('Propriétés de l\'objet')) $html = $this->_tag('div', $this->_('Propriétés de l\'objet'))
. $this->view->render($this->_properties_path); . $this->view->render($this->_properties_path);
if ($without_div)
if ($without_div)
return $html; return $html;
$html = $this->_tag('div',
$html = $this->_tag('div',
$html, $html,
['id' => 'objet_props', ['id' => 'objet_props',
'style' => 'display: none;']); 'style' => 'display: none;']);
......
...@@ -66,7 +66,7 @@ class ZendAfi_View_Helper_CkEditor extends ZendAfi_View_Helper_BaseHelper ...@@ -66,7 +66,7 @@ class ZendAfi_View_Helper_CkEditor extends ZendAfi_View_Helper_BaseHelper
'/', '/',
['HorizontalRule'], ['HorizontalRule'],
['Link','Unlink','Anchor'], ['Link','Unlink','Anchor'],
['Image','Flash','Table','Iframe','oembed','Slideshow', 'SpecialChar','Kiosk'], ['Image','Flash','Table','Iframe','oembed','Slideshow', 'SpecialChar','Kiosk'],
]; ];
$config['extraAllowedContent'] = [ $config['extraAllowedContent'] = [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment