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

Verbesserungen

Browse Source
This commit is contained in:
cgfhtw
2023-07-27 10:57:53 +02:00
parent cfe7c5b0da
commit ace3bd6736
12 changed files with 221 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/lehre/Antrag/Create.php
+3 -3
View File
@@ -18,13 +18,13 @@ $sitesettings = array(
);
$this->load->view(
'templates/FHC-Header',
'templates/CISHTML-Header',
$sitesettings
);
?>
<div id="wrapper">
<div class="fhc-header">
<div class="fhc-header hide-in-frame">
<h1 class="h2"><?= $this->p->t('studierendenantrag', 'antrag_header'); ?></h1>
</div>
@@ -49,6 +49,6 @@ $this->load->view(
<?php
$this->load->view(
'templates/FHC-Footer',
'templates/CISHTML-Footer',
$sitesettings
);
application/views/lehre/Antrag/Student/List.php
+2 -2
View File
@@ -17,7 +17,7 @@ $sitesettings = array(
);
$this->load->view(
'templates/FHC-Header',
'templates/CISHTML-Header',
$sitesettings
);
?>
@@ -131,6 +131,6 @@ $this->load->view(
<?php
$this->load->view(
'templates/FHC-Footer',
'templates/CISHTML-Footer',
$sitesettings
);
application/views/lehre/Antrag/Wiederholung/Student.php
+1 -1
View File
@@ -26,7 +26,7 @@ $this->load->view(
?>
<div id="wrapper" class="overflow-hidden">
<div class="fhc-header" v-if="notinframe">
<div class="fhc-header hide-in-frame" v-if="notinframe">
<h1 class="h2"><?= $this->p->t('studierendenantrag', 'title_lvzuweisen', ['name' => $antrag->name]);?></h1>
</div>
<div class="fhc-container row mt-3">
application/views/templates/CISHMVC-Header.php
+9 -2
View File
@@ -6,11 +6,17 @@
}
}
?>
<script type="text/javascript">
if (window.self !== window.top)
document.body.classList.add("in-frame");
</script>
<header id="cis-header" class="navbar-dark">
<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a id="nav-logo" href="<?= site_url('CisHmvc'); ?>">
<a id="nav-logo" href="<?= site_url(''); ?>">
<img src="<?= base_url('/public/images/logo-300x160.png'); ?>" alt="Logo">
</a>
<nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
@@ -24,7 +30,7 @@
<div class="offcanvas-body p-0">
<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></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="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
</button>
<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
@@ -46,4 +52,5 @@
</div>
</nav>
</header>
<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
application/views/templates/CISHTML-Header.php
+6 -1
View File
@@ -23,6 +23,10 @@ if (!isset($menu)) {
}
?>
<script type="text/javascript">
if (window.self !== window.top)
document.body.classList.add("in-frame");
</script>
<header id="cis-header" class="navbar-dark">
<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
@@ -39,7 +43,7 @@ if (!isset($menu)) {
<div class="offcanvas-body p-0">
<fhc-searchbar id="nav-search" class="fhc-searchbar w-100" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></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="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
<img src="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" class="avatar rounded-circle"/>
</button>
<ul id="nav-user-menu" class="collapse list-unstyled" aria-labelledby="nav-user-btn">
<li><a class="btn btn-level-2 rounded-0 d-block" href="#" id="menu-profil">Profil</a></li>
@@ -57,4 +61,5 @@ if (!isset($menu)) {
</div>
</nav>
</header>
<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
application/views/templates/CISVUE-Header.php
+8 -2
View File
@@ -17,13 +17,19 @@ $this->load->view('templates/FHC-Header', $includesArray);
?>
<script type="text/javascript">
if (window.self !== window.top)
document.body.classList.add("in-frame");
</script>
<header id="cis-header" class="navbar-dark">
<cis-menu
root-url="<?= site_url('CisVue'); ?>"
root-url="<?= site_url(''); ?>"
logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>"
avatar-url="<?= base_url('/cis/public/bild.php?src=person&person_id=' . getAuthPersonId()); ?>"
avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>"
logout-url="<?= site_url('Cis/Auth/logout'); ?>"
:searchbaroptions="searchbaroptions"
:searchfunction="searchfunction" />
</header>
<main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
application/views/templates/FHC-Header.php
+1 -1
View File
@@ -119,7 +119,7 @@
if ($widgets === true) generateCSSsInclude('public/css/Widgets.css');
// CIS
if ($cis === true) generateCSSsInclude('public/css/cis_bs5.css');
if ($cis === true) generateCSSsInclude(defined('CIS4') ? 'public/css/cis4.css' : 'public/css/cis_bs5.css');
// Eventually required CSS
generateCSSsInclude($customCSSs); // Eventually required CSS