diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php index 6c3e401c5..64d6d3a60 100644 --- a/config/global.config-default.inc.php +++ b/config/global.config-default.inc.php @@ -29,6 +29,9 @@ define('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN', true); define('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN', true); define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN', true); +// Wenn gesetzt, werden die Digitale Anwesenheit-Icons nur fuer diese Studiengaenge angezeigt, sonst für alle +// define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG', serialize(array('257'))); + // Im CIS Menue Links bei Modulen anzeigen wenn Lehrauftrag define('CIS_LEHRVERANSTALTUNG_MODULE_LINK',true); diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php index 1d66fa1a6..a18af4bde 100644 --- a/include/tw/cis_menu_lv.inc.php +++ b/include/tw/cis_menu_lv.inc.php @@ -242,12 +242,12 @@ function checkZeilenUmbruch() // Digitale Anwesenheiten if(defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet + && (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG))) && ($rechte->isBerechtigt('extension/anw_ent_admin') || $rechte->isBerechtigt('extension/anwesenheit_lektor') || $rechte->isBerechtigt('extension/anwesenheit_student') || $rechte->isBerechtigt('extension/anwesenheit_admin'))) { - $link=''; $text=''; diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css index c2f29452b..78d9215f1 100644 --- a/public/css/Cis4/Cis.css +++ b/public/css/Cis4/Cis.css @@ -182,6 +182,10 @@ html { transform: rotate(-90deg); } +#nav-sprachen{ + transition: none; +} + /* searchbar */ #nav-search { z-index: 1; @@ -540,4 +544,25 @@ html { padding-left: 2.5rem; overflow-wrap: anywhere; } +} + +/* classes used for the Vue component*/ +.v-enter-active, +.v-leave-active { + transition: opacity 0.2s ease-out; +} + +.v-enter-from, +.v-leave-to { + opacity: 0; +} + +.height-enter-active, +.height-leave-active { + transition: height 0.3s ease-out; +} + +.height-enter-from, +.height-leave-to { + height: 0px; } \ No newline at end of file diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js index 52b1c9bfb..f4a7315c9 100644 --- a/public/js/components/Calendar/Day/Page.js +++ b/public/js/components/Calendar/Day/Page.js @@ -288,11 +288,13 @@ export default { {{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}} -
+
-
- {{hourPositionTime}} -
+ +
+ {{hourPositionTime}} +
+

Keine Lehrveranstaltungen

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js index 222e4b4e7..5d09556f7 100644 --- a/public/js/components/Calendar/Week/Page.js +++ b/public/js/components/Calendar/Week/Page.js @@ -212,11 +212,13 @@ export default { {{day.toLocaleString(undefined, [{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{day:'numeric',month:'numeric'},{dateStyle:'short'}][this.size])}}
-
+
-
- {{hourPositionTime}} -
+ +
+ {{hourPositionTime}} +
+
{{hour}}:00
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js index 85ccfb290..8e8c080f7 100644 --- a/public/js/components/Cis/Cms/News.js +++ b/public/js/components/Cis/Cms/News.js @@ -37,7 +37,8 @@ export default { template: /*html*/ `

News

- + +
- `, + `, }; diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js index a8569762c..51bb6b4e1 100644 --- a/public/js/components/Cis/Menu.js +++ b/public/js/components/Cis/Menu.js @@ -51,16 +51,18 @@ export default { } }, methods: { - toggleCollapsibles(target){ - switch(target){ - case 'settings': - this.navUserDropdown?.hide(); - break; - case 'navUserDropdown': - this.$refs.searchbar?.settingsDropdown?.hide(); - break; + checkSettingsVisibility: function (event) { + // hides the settings collapsible if the user clicks somewhere else + if (!this.$refs.navUserDropdown.contains(event.target)) { + this.navUserDropdown.hide(); } }, + handleShowNavUser(){ + document.addEventListener("click", this.checkSettingsVisibility); + }, + handleHideNavUser(){ + document.removeEventListener("click", this.checkSettingsVisibility); + }, makeParentContentActive(content_id, collection=this.entries, parent=null){ for(let entry of collection){ if(entry.content_id == content_id){ @@ -86,14 +88,10 @@ export default { }); }, template: /*html*/` - - - + @@ -101,7 +99,10 @@ export default { -