diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 1a5e063..9d4a6ef 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -6,6 +6,7 @@ Changelog
- Fix #216: Fix image space rending on wall entry
- Enh #224: Unifying positions of button on modals for consistency and better UX
- Enh #227: Use PHP CS Fixer
+- Fix: Add autofocus on file or folder edit (for HumHub 1.17 - see https://github.com/humhub/humhub/issues/7136)
0.16.6 - March 14, 2024
-------------------------
diff --git a/views/edit/modal_edit_file.php b/views/edit/modal_edit_file.php
index 6e41266..8bee59f 100644
--- a/views/edit/modal_edit_file.php
+++ b/views/edit/modal_edit_file.php
@@ -15,25 +15,25 @@
?>
Yii::t('CfilesModule.base', 'Edit file'),
+ 'header' => Yii::t('CfilesModule.base', 'Edit file'),
'animation' => 'fadeIn',
'size' => 'small']) ?>
-
+
-
- = $form->field($file->baseFile, 'file_name'); ?>
- = $form->field($file, 'description')->widget(RichTextField::class); ?>
- = $form->field($file, 'topics')->widget(TopicPicker::class, ['contentContainer' => $file->content->container])->label(false); ?>
- = $form->field($file, 'visibility')->widget(ContentVisibilitySelect::class, ['readonly' => $file->parentFolder->content->isPrivate()]); ?>
- = $form->field($file, 'hidden')->widget(ContentHiddenCheckbox::class, []); ?>
- = $form->field($file, 'download_count')->staticControl(['style' => 'display:inline']); ?>
-
+
+ = $form->field($file->baseFile, 'file_name')->textInput(['autofocus' => '']) ?>
+ = $form->field($file, 'description')->widget(RichTextField::class) ?>
+ = $form->field($file, 'topics')->widget(TopicPicker::class, ['contentContainer' => $file->content->container])->label(false) ?>
+ = $form->field($file, 'visibility')->widget(ContentVisibilitySelect::class, ['readonly' => $file->parentFolder->content->isPrivate()]) ?>
+ = $form->field($file, 'hidden')->widget(ContentHiddenCheckbox::class, []) ?>
+ = $form->field($file, 'download_count')->staticControl(['style' => 'display:inline']) ?>
+
-
-
+
+
-
\ No newline at end of file
+
diff --git a/views/edit/modal_edit_folder.php b/views/edit/modal_edit_folder.php
index 8780160..6f98731 100644
--- a/views/edit/modal_edit_folder.php
+++ b/views/edit/modal_edit_folder.php
@@ -9,30 +9,30 @@
/* @var $folder \humhub\modules\cfiles\models\Folder */
/* @var $submitUrl string */
-$header = ($folder->isNewRecord)
- ? Yii::t('CfilesModule.base', 'Create folder')
- : Yii::t('CfilesModule.base', 'Edit folder');
+$header = ($folder->isNewRecord)
+ ? Yii::t('CfilesModule.base', 'Create folder')
+ : Yii::t('CfilesModule.base', 'Edit folder');
?>
$header,
+ 'header' => $header,
'animation' => 'fadeIn',
'size' => 'small']) ?>
-
-
-
- = $form->field($folder, 'title'); ?>
- = $form->field($folder, 'description'); ?>
- = $form->field($folder, 'visibility')->widget(ContentVisibilitySelect::class, ['readonly' => !$folder->isRoot() && $folder->parentFolder->content->isPrivate()]) ?>
- = $form->field($folder, 'hidden')->widget(ContentHiddenCheckbox::class) ?>
-
-
-
-
+
+
+
+ = $form->field($folder, 'title')->textInput(['autofocus' => '']) ?>
+ = $form->field($folder, 'description') ?>
+ = $form->field($folder, 'visibility')->widget(ContentVisibilitySelect::class, ['readonly' => !$folder->isRoot() && $folder->parentFolder->content->isPrivate()]) ?>
+ = $form->field($folder, 'hidden')->widget(ContentHiddenCheckbox::class) ?>
+
+
+
+