diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php index 544e3d6bb..e01313521 100755 --- a/application/controllers/CisHmvc/Cms.php +++ b/application/controllers/CisHmvc/Cms.php @@ -72,8 +72,18 @@ class Cms extends Auth_Controller // return early if the content_id for the content is missing if(!isset($content_id)) $this->terminateWithError("content_id is missing"); - - $this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]); + + $content = $this->ContentModel->load($content_id); + if (isError($content)) + $this->terminateWithError(getError($content)); + + $content = getData($content); + if(NULL === $content) + $this->terminateWithError("Content not found"); + + $content = current($content); + + $this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]); } /** diff --git a/application/controllers/CisHtml/Cms.php b/application/controllers/CisHtml/Cms.php index 5223fd4e5..6cb43c8bc 100755 --- a/application/controllers/CisHtml/Cms.php +++ b/application/controllers/CisHtml/Cms.php @@ -48,8 +48,18 @@ class Cms extends FHC_Controller // return early if the content_id for the content is missing if(!isset($content_id)) $this->terminateWithError("content_id is missing"); - - $this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]); + + $content = $this->ContentModel->load($content_id); + if (isError($content)) + $this->terminateWithError(getError($content)); + + $content = getData($content); + if(NULL === $content) + $this->terminateWithError("Content not found"); + + $content = current($content); + + $this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]); } /** diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php index 74b8d19ee..cf9519e28 100755 --- a/application/controllers/CisVue/Cms.php +++ b/application/controllers/CisVue/Cms.php @@ -24,6 +24,9 @@ class Cms extends FHC_Controller $this->loadPhrases([ 'global' ]); + + $this->load->model('content/Content_model', 'ContentModel'); + } // ----------------------------------------------------------------------------------------------------------------- @@ -42,8 +45,18 @@ class Cms extends FHC_Controller // return early if the content_id for the content is missing if(!isset($content_id)) $this->terminateWithError("content_id is missing"); - - $this->load->view('CisHtml/Cms/Content', ['content_id' => $content_id, 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]); + + $content = $this->ContentModel->load($content_id); + if (isError($content)) + $this->terminateWithError(getError($content)); + + $content = getData($content); + if(NULL === $content) + $this->terminateWithError("Content not found"); + + $content = current($content); + + $this->load->view('CisVue/Cms/Content', ['content_id' => $content_id, 'template_kurzbz'=>$content->template_kurzbz , 'version' => $version, 'sprache' => $sprache, 'sichtbar' => $sichtbar]); } /** diff --git a/application/libraries/CmsLib.php b/application/libraries/CmsLib.php index 9a898df85..aee6f5c61 100755 --- a/application/libraries/CmsLib.php +++ b/application/libraries/CmsLib.php @@ -110,10 +110,14 @@ class CmsLib $processor = new XSLTProcessor(); $processor->importStylesheet($xsltemplate); - $content = $processor->transformToXML($XML); - $content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $content); + + $transformed_content = $processor->transformToXML($XML); + $transformed_content = str_replace('dms.php', APP_ROOT . 'cms/dms.php', $transformed_content); - return success($content); + return success([ + "type"=>$content->template_kurzbz, + "content"=>$transformed_content + ]); } /** diff --git a/application/views/CisHmvc/Cms/Content.php b/application/views/CisHmvc/Cms/Content.php index f56c45eb6..bf54d9d5f 100755 --- a/application/views/CisHmvc/Cms/Content.php +++ b/application/views/CisHmvc/Cms/Content.php @@ -1,19 +1,29 @@ 'FH-Complete', 'customJSModules' => ['public/js/apps/Cis/Cms.js'], + 'primevue3'=>true, 'customCSSs' => [ 'public/css/Cis4/Cms.css', #'skin/style.css.php' ] ); -$this->load->view('templates/FHC-Header', $includesArray); +switch($template_kurzbz){ + case 'raum_contentmittitel': + $includesArray['tabulator5'] = true; + break; +} + +$this->load->view('templates/CISVUE-Header', $includesArray); ?> + + +
' : ''); ?>
-load->view('templates/FHC-Footer', $includesArray); ?> + +load->view('templates/CISVUE-Footer', $includesArray); ?> diff --git a/application/views/CisHtml/Cms/Content.php b/application/views/CisHtml/Cms/Content.php index d3e03ea04..bf54d9d5f 100755 --- a/application/views/CisHtml/Cms/Content.php +++ b/application/views/CisHtml/Cms/Content.php @@ -1,20 +1,29 @@ true, 'customJSModules' => ['public/js/apps/Cis/Cms.js'], + 'primevue3'=>true, 'customCSSs' => [ 'public/css/Cis4/Cms.css', #'skin/style.css.php' ] ); -$this->load->view('templates/CISHTML-Header', $includesArray); +switch($template_kurzbz){ + case 'raum_contentmittitel': + $includesArray['tabulator5'] = true; + break; +} + +$this->load->view('templates/CISVUE-Header', $includesArray); ?> + +
' : ''); ?>
-load->view('templates/CISHTML-Footer', $includesArray); ?> \ No newline at end of file +load->view('templates/CISVUE-Footer', $includesArray); ?> + diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php index ed9d90ef2..bf54d9d5f 100755 --- a/application/views/CisVue/Cms/Content.php +++ b/application/views/CisVue/Cms/Content.php @@ -1,15 +1,24 @@ ['public/js/apps/Cis/Cms.js'], + 'primevue3'=>true, 'customCSSs' => [ 'public/css/Cis4/Cms.css', #'skin/style.css.php' ] ); +switch($template_kurzbz){ + case 'raum_contentmittitel': + $includesArray['tabulator5'] = true; + break; +} + $this->load->view('templates/CISVUE-Header', $includesArray); ?> + +
' : ''); ?> diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js index aa67ded2c..efd1de7e8 100644 --- a/public/js/components/Cis/Cms/Content.js +++ b/public/js/components/Cis/Cms/Content.js @@ -1,3 +1,5 @@ +import raum_contentmittitel from './Content_types/Raum_contentmittitel.js' + export default { props:{ @@ -19,6 +21,9 @@ export default { } + }, + components:{ + raum_contentmittitel, }, data() { return { @@ -29,12 +34,14 @@ export default { created() { console.log("this is the api", this.$fhcApi); this.$fhcApi.factory.cms.content(this.content_id,this.version, this.sprache, this.sichtbar).then(res =>{ - this.content = res.data; + this.content = res.data.content; + this.content_type = res.data.type; }); }, template: /*html*/ ` -
+

No content is available to display

+ `, }; diff --git a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js new file mode 100644 index 000000000..9c0b2105f --- /dev/null +++ b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js @@ -0,0 +1,33 @@ + +export default { + props:{ + content:{ + type:String, + required:true, + }, + }, + mounted(){ + let tables = document.getElementsByClassName("tablesorter"); + + for(let table of tables){ + new Tabulator(table, { + layout:"fitDataStretch", + + columnDefaults:{ + formatter:"html", + resizable:false, + minWidth: "100px", + } + }) + + table.classList.add("mx-auto"); + table.style.width="30em"; + } + }, + template: /*html*/ ` + +
+

Content was not found

+ `, + }; + \ No newline at end of file