diff --git a/core/core.php b/core/core.php index 542cbf46..7b79b511 100644 --- a/core/core.php +++ b/core/core.php @@ -1972,16 +1972,25 @@ class layout extends common { * Affiche le contenu */ public function showContent() { - if( - $this->core->output['title'] - AND ( - $this->getData(['page', $this->getUrl(0)]) === null - OR $this->getData(['page', $this->getUrl(0), 'hideTitle']) === false - ) - ) { - echo '

' . $this->core->output['title'] . '

'; + // Exception pour le module code + if ($this->getData(['page', $this->getUrl(0), 'moduleId']) == 'code'&& + $this->getUrl(1) !== 'config') { + $this->core->output['title']; + //$this->core->output[include('site/file/source/' . $this->getdata(['module',$this->getUrl(0),'file']))]; + echo include('site/file/source/' . $this->getdata(['module',$this->getUrl(0),'file'])); + } else { + // Fin de l'exception + if( + $this->core->output['title'] + AND ( + $this->getData(['page', $this->getUrl(0)]) === null + OR $this->getData(['page', $this->getUrl(0), 'hideTitle']) === false + ) + ) { + echo '

' . $this->core->output['title'] . '

'; + } + echo $this->core->output['content']; } - echo $this->core->output['content']; } /** diff --git a/core/module/theme/resource/custom.css b/core/module/theme/resource/custom.css index dad33c28..708caca0 100755 --- a/core/module/theme/resource/custom.css +++ b/core/module/theme/resource/custom.css @@ -143,14 +143,4 @@ input[type='password']:hover, .inputFile:hover, select:hover, textarea:hover { -} - -/* iframe du module core */ - -iframe { - height: 100%; - border: none; - margin-top: 10px; - margin-bottom: 10px; - - } \ No newline at end of file +} \ No newline at end of file diff --git a/module/code/code.php b/module/code/code.php index dfc5ed19..24ed5fbe 100644 --- a/module/code/code.php +++ b/module/code/code.php @@ -63,11 +63,7 @@ class code extends common { $this->setData(['module', $this->getUrl(0), 'count', helper::filter($this->getData(['module', $this->getUrl(0), 'count']) + 1, helper::FILTER_INT)]); // Valeurs en sortie $this->addOutput([ - 'content' => '' , + 'content' => $this->getData(['module', $this->getUrl(0), 'file']), 'state' => true ]); }