From bc6bc930fe16647c9833f51ed11df579de41bfc7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 26 Sep 2024 12:05:44 +0200
Subject: [PATCH] moves the news titel to the component and adds css classes
 for darker dropdown buttons for the different menu levels

---
 application/views/CisVue/Cms/Content.php | 19 ++++++++++++-------
 public/css/Cis4/Cis.css                  | 18 +++++++++++++++++-
 public/js/components/Cis/Cms/News.js     |  2 ++
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/application/views/CisVue/Cms/Content.php b/application/views/CisVue/Cms/Content.php
index 450d014e6..2a623568d 100755
--- a/application/views/CisVue/Cms/Content.php
+++ b/application/views/CisVue/Cms/Content.php
@@ -16,17 +16,22 @@ if(isset($template_kurzbz)){
 	}
 }
 
-
-$this->load->view('templates/CISVUE-Header', $includesArray);
+if(defined('CIS4')){
+	$this->load->view('templates/CISVUE-Header', $includesArray);
+}else{
+	$this->load->view('templates/FHC-Header', $includesArray);
+}
 ?>
 
-
-<h2 ><?php echo isset($content_id)? "Content" : "News" ?></h2>
-<hr/>
 <div id="cms">
 <?php echo (isset($content_id) ? '<cms-content :content_id="'.$content_id.'" :version="'.$version.'" :sprache="'.$sprache.'" :sichtbar="'.$sichtbar.'" />' : '<cms-news/>'); ?>
-	
 </div>
 
-<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
+<?php
+if (defined('CIS4')) {
+	$this->load->view('templates/CISVUE-Footer', $includesArray);
+} else {
+	$this->load->view('templates/FHC-Footer', $includesArray);
+}
+ ?>
 
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 0758522e1..87ab72d37 100755
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -68,10 +68,26 @@ html {
   background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
 }
 
-/* makes the dropdown button darker*/
+/* makes the dropdown button darker for level1*/
 #cis-header .btn-level-1+.btn:not(.btn-level-1){
 	background-color:var(--fhc-cis-menu-lvl-1-bg-hover) !important;
 }
+/* makes the dropdown button darker for level2*/
+#cis-header .btn-level-2+.btn:not(.btn-level-2){
+		background-color: var(--fhc-cis-menu-lvl-2-bg-hover) !important;
+}
+/* makes the dropdown button darker for level3*/
+#cis-header .btn-level-3+.btn:not(.btn-level-3){
+		background-color: var(--fhc-cis-menu-lvl-3-bg-hover) !important;
+}
+/* makes the dropdown button darker for level4*/
+#cis-header .btn-level-4+.btn:not(.btn-level-4){
+		background-color: var(--fhc-cis-menu-lvl-4-bg-hover) !important;
+}
+/* makes the dropdown button darker for level5*/
+#cis-header .btn-level-5+.btn:not(.btn-level-5){
+		background-color: var(--fhc-cis-menu-lvl-5-bg-hover) !important;
+}
 
 #cis-header .btn-level-2,
 #cis-header .btn-level-2 + .btn,
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index 819f617b4..85ccfb290 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -35,6 +35,8 @@ export default {
     });
   },
   template: /*html*/ `
+  	<h2 >News</h2>
+	<hr/>
     <pagination :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
     <div v-html="content"></div>
     </pagination>`,