blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 17:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes the header for the Dashboard to the CISVUE-Header and passes the selectedTypes props to fix the CISVUE Header search

Browse Source
This commit is contained in:
SimonGschnell
2024-09-30 09:43:26 +02:00
parent d1070656ac
commit c0596c08c5
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/CisHmvc/Dashboard.php
+2 -2
View File
@@ -8,7 +8,7 @@
],
);
$this->load->view('templates/FHC-Header', $includesArray);
$this->load->view('templates/CISVUE-Header', $includesArray);
?>
<div id="content">
@@ -17,5 +17,5 @@
<fhc-dashboard dashboard="CIS"/>
</div>
<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
application/views/CisHtml/Dashboard.php
+2 -2
View File
@@ -8,7 +8,7 @@ $includesArray = array(
],
);
$this->load->view('templates/CISHTML-Header', $includesArray);
$this->load->view('templates/CISVUE-Header', $includesArray);
?>
<div id="content">
@@ -17,5 +17,5 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
<fhc-dashboard dashboard="CIS"/>
</div>
<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>
application/views/templates/CISVUE-Header.php
+2 -1
View File
@@ -27,7 +27,8 @@ $this->load->view('templates/FHC-Header', $includesArray);
root-url="<?= site_url(''); ?>"
logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>"
avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
logout-url="<?= site_url('Cis/Auth/logout'); ?>"
logout-url="<?= site_url('Cis/Auth/logout'); ?>"
:selectedtypes="selectedtypes"
:searchbaroptions="searchbaroptions"
:searchfunction="searchfunction" />
</header>
public/js/components/Cis/Menu.js
+2 -1
View File
@@ -11,6 +11,7 @@ export default {
logoUrl: String,
avatarUrl: String,
logoutUrl: String,
selectedtypes: Array,
searchbaroptions: Object,
searchfunction: Function
},
@@ -48,7 +49,7 @@ export default {
</button>
</div>
<div class="offcanvas-body p-0">
<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction" :selectedtypes="selectedtypes"></fhc-searchbar>
<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
<img :src="avatarUrl" class="avatar rounded-circle"/>
</button>