From 5642e68ebbf9e14ad938ce380ff8a7ed4df3684a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Farr=C3=A9?= Date: Wed, 24 Jul 2024 18:11:41 +0200 Subject: [PATCH] Fix: Add autofocus on event edit and event type edit --- docs/CHANGELOG.md | 1 + views/common/editTypeModal.php | 34 +++++++++++++++++----------------- views/entry/edit-basic.php | 30 +++++++++++++++--------------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 0ab9c5eb..84b0dd4b 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -5,6 +5,7 @@ Changelog --------------------- - Fix #477: Hide the settings button when module is not available for a container - Enh #466: Fix period selector on default reminder settings +- Fix: Add autofocus on event edit and event type edit (for HumHub 1.17 - see https://github.com/humhub/humhub/issues/7136) 1.6.2 (July 16, 2024) --------------------- diff --git a/views/common/editTypeModal.php b/views/common/editTypeModal.php index 137ab866..17aa6524 100644 --- a/views/common/editTypeModal.php +++ b/views/common/editTypeModal.php @@ -15,7 +15,7 @@ /* @var $model CalendarEntryType|CalendarTypeSetting */ -if($model instanceof CalendarTypeSetting) { +if ($model instanceof CalendarTypeSetting) { $title = Yii::t('CalendarModule.views_container-config_typesConfig', 'Edit calendar'); $titleAttribute = 'title'; $titleDisabled = true; @@ -30,11 +30,11 @@ ?> Yii::t('CalendarModule.views_container-config_typesConfig', $title)]); ?> - - + + diff --git a/views/entry/edit-basic.php b/views/entry/edit-basic.php index e5e257b4..f0e2d82a 100644 --- a/views/entry/edit-basic.php +++ b/views/entry/edit-basic.php @@ -4,10 +4,10 @@ use humhub\modules\calendar\models\forms\CalendarEntryForm; use humhub\modules\calendar\Module; use humhub\modules\content\components\ContentContainerActiveRecord; +use humhub\modules\content\widgets\ContentTagDropDown; use humhub\modules\content\widgets\richtext\RichTextField; use humhub\modules\topic\widgets\TopicPicker; use humhub\modules\ui\form\widgets\ColorPicker; -use humhub\modules\content\widgets\ContentTagDropDown; use humhub\modules\ui\form\widgets\ContentHiddenCheckbox; use humhub\modules\ui\form\widgets\ContentVisibilitySelect; use humhub\modules\ui\form\widgets\TimePicker; @@ -34,7 +34,7 @@ {input} {error}{hint}' - ])->textInput(['placeholder' => Yii::t('CalendarModule.views_entry_edit', 'Title')])->label(false) ?> + ])->textInput(['placeholder' => Yii::t('CalendarModule.views_entry_edit', 'Title'), 'autofocus' => ''])->label(false) ?> formatter->timeZone = $calendarEntryForm->timeZone ?> @@ -58,18 +58,18 @@
-
+
field($calendarEntryForm->entry, 'all_day')->checkbox(['data-action-change' => 'toggleDateTime']) ?>
-
- field($calendarEntryForm, 'recurring')->checkbox(['data-action-change' => 'toggleRecurring']) ?> -
+
+ field($calendarEntryForm, 'recurring')->checkbox(['data-action-change' => 'toggleRecurring']) ?> +
entry->all_day ? ' hidden' : '' ?>> - $calendarEntryForm])?> + $calendarEntryForm]) ?>
@@ -80,20 +80,20 @@ field($calendarEntryForm->entry, 'location')->textInput() ?>
- +
recurring || $calendarEntryForm->isFutureEvent()) : ?> -
- field($calendarEntryForm, 'reminder')->checkbox(['data-action-change' => 'toggleReminder']) ?> -
+
+ field($calendarEntryForm, 'reminder')->checkbox(['data-action-change' => 'toggleReminder']) ?> +
field($calendarEntryForm, 'hidden')->widget(ContentHiddenCheckbox::class) ?>
- canCreatePublicEntry()) :?> -
- field($calendarEntryForm, 'is_public')->widget(ContentVisibilitySelect::class, ['contentOwner' => 'entry']) ?> -
+ canCreatePublicEntry()) : ?> +
+ field($calendarEntryForm, 'is_public')->widget(ContentVisibilitySelect::class, ['contentOwner' => 'entry']) ?> +