Merge pull request #514 from felixhahnweilheim/enh-listview

Replace listWeek with listMonth

docs/CHANGELOG.md

@@ -16,6 +16,7 @@ Changelog
 ------------------------
 - Fix #509: Fix event type visibility
 - Enh #512: Surround the widget wall entry links with a dedicated HTML class
+- Enh #514: Replace the view modes listWeek and listYear with listMonth
 - Enh #516: Improved calendar page URLs
 - Fix #519: Fix issue where `IntlDateFormatter::parse()` failed to parse Bulgarian dates.
 - Fix #520: Fix global calendar url when prettyUrl is disabled 

models/participation/FullCalendarSettings.php

@@ -10,11 +10,10 @@
 
 class FullCalendarSettings extends Model
 {
-    public const SETTING_LIST_WEEK = 'listWeek';
     public const SETTING_GRID_DAY = 'timeGridDay';
     public const SETTING_GRID_WEEK = 'timeGridWeek';
     public const SETTING_GRID_MONTH = 'dayGridMonth';
-    public const SETTING_LIST_YEAR = 'listYear';
+    public const SETTING_LIST_MONTH = 'listMonth';
     public const SETTING_VIEW_MODE_KEY = 'defaults.fullCalendarViewMode';
 
     /**
@@ -42,6 +41,11 @@ public function init()
     private function initSettings()
     {
         $this->viewMode = $this->getSetting(self::SETTING_VIEW_MODE_KEY, static::SETTING_GRID_MONTH);
+
+        // Handle removed view modes
+        if ($this->viewMode === 'listWeek' || $this->viewMode === 'listYear') {
+            $this->viewMode = 'listMonth';
+        }
     }
 
     /**
@@ -110,11 +114,10 @@ public function isGlobal()
     public function getViewModeItems()
     {
         return [
-            self::SETTING_LIST_YEAR => Yii::t('CalendarModule.base', 'Year'),
             self::SETTING_GRID_MONTH => Yii::t('CalendarModule.base', 'Month'),
             self::SETTING_GRID_WEEK => Yii::t('CalendarModule.base', 'Week'),
             self::SETTING_GRID_DAY => Yii::t('CalendarModule.base', 'Day'),
-            self::SETTING_LIST_WEEK => Yii::t('CalendarModule.base', 'List'),
+            self::SETTING_LIST_MONTH => Yii::t('CalendarModule.base', 'List'),
         ];
     }
 }

resources/js/humhub.calendar.Calendar.js

@@ -171,7 +171,7 @@ humhub.module('calendar.Calendar', function (module, require, $) {
             header: {
                 left: 'prev,next today',
                 center: 'title',
-                right: 'create dayGridMonth,timeGridWeek,timeGridDay,listWeek'
+                right: 'create dayGridMonth,timeGridWeek,timeGridDay,listMonth'
             },
             buttonText: buttonText,
             plugins: ['dayGrid', 'timeGrid', 'list', 'interaction', 'bootstrap', 'moment', 'momentTimezone'],
@@ -197,7 +197,7 @@ humhub.module('calendar.Calendar', function (module, require, $) {
                 right: 'today'
             };
             options.footer = {
-                center: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek',
+                center: 'dayGridMonth,timeGridWeek,timeGridDay,listMonth',
                 right: 'create'
             };
         }