diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css index bb3bd0d62..366542969 100644 --- a/public/css/components/dashboard/news.css +++ b/public/css/components/dashboard/news.css @@ -17,6 +17,11 @@ height: 100%; } +.widgets-news img +{ + max-width: 100%; +} + .widgets-news .card-body{ overflow: hidden; } \ No newline at end of file diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js index d0645c95a..58d6f7193 100644 --- a/public/js/components/DashboardWidget/News.js +++ b/public/js/components/DashboardWidget/News.js @@ -87,12 +87,10 @@ export default { -
+
- -
- -
+
+
`, diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js index 50e15572a..cedbbbf4c 100644 --- a/public/js/components/DashboardWidget/Stundenplan.js +++ b/public/js/components/DashboardWidget/Stundenplan.js @@ -34,6 +34,7 @@ export default { const currentCalendarDate = new CalendarDate(this.currentDay) const mapArr = currentCalendarDate.nextSevenDays.map((d) => [new CalendarDate(d), []]) + // return map of key => calendar date of next 7 days & values the respective events on that date return new Map((this.events || []).filter(evt => evt.start >= this.currentDay).reduce((acc, cur) => { const date = new CalendarDate(new Date(cur.datum)) const arr = acc.find(el => el[0].compare(date)) @@ -188,6 +189,7 @@ export default {
+
{{ $p.t('lehre/stundenplan') }}
{{ p.t('lehre/noLvFound') }} diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 5d08f0e96..8e66bd17e 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -37116,6 +37116,26 @@ array( 'insertvon' => 'system' ) ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'stundenplan', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Stundenplan', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Timetable', + 'description' => '', + 'insertvon' => 'system' + ) + ) ) // CIS4 phrases from legacy code end );