diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index 68ab1c60d..d05b9e5fc 100755
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -27,6 +27,6 @@ class Cis4 extends FHC_Controller
*/
public function index()
{
- $this->load->view('CisHtml/Dashboard.php');
+ $this->load->view('CisVue/Dashboard.php');
}
}
diff --git a/application/controllers/CisHmvc/Cms.php b/application/controllers/CisHmvc/Cms.php
index fad3366d4..06cdb53bc 100755
--- a/application/controllers/CisHmvc/Cms.php
+++ b/application/controllers/CisHmvc/Cms.php
@@ -110,6 +110,6 @@ class Cms extends Auth_Controller
*/
public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
{
- $this->load->view('CisHtml/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
+ $this->load->view('CisHmvc/Cms/Content', ['infoscreen' => $infoscreen, 'studiengang_kz' => $studiengang_kz, 'semester' => $semester, 'mischen' => $mischen, 'titel' => $titel, 'edit' => $edit, 'sichtbar' => $sichtbar, "template_kurzbz"=>"news"]);
}
}
diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 97cdcc294..182168873 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -571,7 +571,7 @@ private function fhc_menu_pinboard(&$menu, $angemeldet, $is_lector, $studiengan
'position'=>'110',
'name'=>$p->t('lehre/pinboard'),
'c4_icon'=>base_url('skin/images/button_pinboard.png'),
- 'c4_link'=>base_url('CisHtml/Cms/news'),
+ 'c4_link'=>base_url('CisVue/Cms/news'),
'text'=>$text
);
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 93259a57c..9f0a3634e 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -118,7 +118,7 @@ class Content_model extends DB_Model
"content_id": 1000003,
"template_kurzbz": "redirect",
"titel": "COVID-19",
- "content": "",
+ "content": "",
"menu_open": false,
"aktiv": true,
"childs": []
@@ -138,7 +138,7 @@ class Content_model extends DB_Model
"content_id": 1000001,
"template_kurzbz": "redirect",
"titel": "News",
- "content": "",
+ "content": "",
"menu_open": false,
"aktiv": true,
"childs": []
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index 74d7b1349..2d61a849d 100755
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -5,7 +5,7 @@ $includesArray = array(
'customJSModules' => ['public/js/apps/Cis/Documents.js']
);
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
?>
@@ -210,4 +210,4 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
-load->view('templates/CISHTML-Footer', $includesArray); ?>
+load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/Cis/MyLv.php b/application/views/Cis/MyLv.php
index ff03f3b51..b4159402d 100755
--- a/application/views/Cis/MyLv.php
+++ b/application/views/Cis/MyLv.php
@@ -4,7 +4,7 @@ $includesArray = array(
'customJSModules' => ['public/js/apps/Cis/MyLv/Student.js']
);
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
?>
@@ -13,4 +13,4 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
-load->view('templates/CISHTML-Footer', $includesArray); ?>
+load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
index 2983f9ae3..bfab73109 100755
--- a/application/views/Cis/Stundenplan.php
+++ b/application/views/Cis/Stundenplan.php
@@ -5,11 +5,11 @@ $includesArray = array(
'customCSSs' => ['public/css/components/calendar.css']
);
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
?>
-load->view('templates/CISHTML-Footer', $includesArray); ?>
+load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/CisHtml/Dashboard.php b/application/views/CisHtml/Dashboard.php
index ec08a8ffa..1eddba454 100755
--- a/application/views/CisHtml/Dashboard.php
+++ b/application/views/CisHtml/Dashboard.php
@@ -8,7 +8,7 @@ $includesArray = array(
],
);
-$this->load->view('templates/CISVUE-Header', $includesArray);
+$this->load->view('templates/CISHTML-Header', $includesArray);
?>
@@ -17,5 +17,5 @@ $this->load->view('templates/CISVUE-Header', $includesArray);
-load->view('templates/CISVUE-Footer', $includesArray); ?>
+load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/application/views/CisVue/Cms/RoomInformation.php b/application/views/CisVue/Cms/RoomInformation.php
index 5111a56bd..e7b197504 100644
--- a/application/views/CisVue/Cms/RoomInformation.php
+++ b/application/views/CisVue/Cms/RoomInformation.php
@@ -5,7 +5,7 @@ $includesArray = array(
'customCSSs' => ['public/css/components/calendar.css']
);
-$this->load->view('templates/CISHTML-Header', $includesArray);
+$this->load->view('templates/CISVUE-Header', $includesArray);
?>
@@ -17,4 +17,4 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
-load->view('templates/CISHTML-Footer', $includesArray); ?>
+load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/CisVue/Dashboard.php b/application/views/CisVue/Dashboard.php
index 10721630e..ec08a8ffa 100755
--- a/application/views/CisVue/Dashboard.php
+++ b/application/views/CisVue/Dashboard.php
@@ -1,5 +1,6 @@
'Dashboard',
'tabulator5'=>true,
'customJSModules' => ['public/js/apps/Dashboard/Fhc.js'],
'customCSSs' => [
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 8a891cc59..0afdc3845 100755
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -81,15 +81,6 @@ export default {
this.currentDay = day;
this.minimized = true;
},
- showRoomInfo: function($ort_kurzbz){
-
- this.$fhcApi.factory.ort.getContentID($ort_kurzbz).then(res =>{
-
- window.location.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
- FHC_JS_DATA_STORAGE_OBJECT.ci_router +
- "/CisHtml/Cms/content/" + res.data;
- })
- },
updateRange: function (data) {