Fix: #1292 - edit media files/folders

4 files changed, 25 insertions, 12 deletions

diff --git a/resources/views/modals/add-media-file.php b/resources/views/modals/add-media-file.php
index 14b26e9f05..305e41a0c1 100644
--- a/resources/views/modals/add-media-file.php
+++ b/resources/views/modals/add-media-file.php
@@ -6,7 +6,7 @@
 	<?= view('modals/header', ['title' => I18N::translate('Add a media file')]) ?>
 
 	<div class="modal-body">
-		<?= view('modals/media-file-fields', ['max_upload_size' => $max_upload_size, 'unused_files' => $unused_files]) ?>
+		<?= view('modals/media-file-fields', ['max_upload_size' => $max_upload_size, 'unused_files' => $unused_files, 'media_file' => null]) ?>
 	</div>
 
 	<?= view('modals/footer-save-cancel') ?>
diff --git a/resources/views/modals/edit-media-file.php b/resources/views/modals/edit-media-file.php
new file mode 100644
index 0000000000..dfacab7b43
--- /dev/null
+++ b/resources/views/modals/edit-media-file.php
@@ -0,0 +1,13 @@
+<?php use Fisharebest\Webtrees\I18N; ?>
+
+<form action="<?= e(Route('edit-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->getName(), 'fact_id' => $media_file->factId()])) ?>" enctype="multipart/form-data" method="POST">
+	<?= csrf_field() ?>
+
+	<?= view('modals/header', ['title' => I18N::translate('Edit a media file')]) ?>
+
+	<div class="modal-body">
+		<?= view('modals/media-file-fields', ['max_upload_size' => $max_upload_size, 'unused_files' => [], 'media_file' => $media_file]) ?>
+	</div>
+
+	<?= view('modals/footer-save-cancel') ?>
+</form>
diff --git a/resources/views/modals/media-file-fields.php b/resources/views/modals/media-file-fields.php
index c359cac36e..5756663545 100644
--- a/resources/views/modals/media-file-fields.php
+++ b/resources/views/modals/media-file-fields.php
@@ -2,7 +2,7 @@
 <?php use Fisharebest\Webtrees\GedcomTag; ?>
 <?php use Fisharebest\Webtrees\I18N; ?>
 
-<div class="form-group row">
+<div class="form-group row <?= $media_file ? 'd-none' : '' ?>">
 	<label class="col-form-label col-sm-2" for="file-location">
 		<?= I18N::translate('Media file') ?>
 	</label>
@@ -23,7 +23,7 @@
 	</div>
 </div>
 
-<div class="form-group row file-location file-location-upload">
+<div class="form-group row file-location file-location-upload <?= $media_file ? 'd-none' : '' ?>">
 	<label class="col-form-label col-sm-2" for="file">
 		<?= I18N::translate('A file on your computer') ?>
 	</label>
@@ -36,7 +36,7 @@
 	</div>
 </div>
 
-<div class="form-group row file-location file-location-upload">
+<div class="form-group row file-location file-location-upload <?= $media_file && $media_file->isExternal() ? 'd-none' : '' ?>">
 	<label class="col-form-label col-sm-2" for="type">
 		<?= I18N::translate('Filename on server') ?>
 	</label>
@@ -45,9 +45,9 @@
 			<label class="form-check-label">
 				<input class="form-check-input" type="radio" name="auto" value="0" checked>
 				<span class="input-group">
-					<input class="form-control" name="folder" placeholder="<?= I18N::translate('Folder') ?>" data-autocomplete-type="folder" type="text">
+					<input class="form-control" name="folder" placeholder="<?= I18N::translate('Folder') ?>" data-autocomplete-type="folder" type="text" value="<?= e($media_file ? $media_file->dirname() : '') ?>">
 					<span class="input-group-addon">/</span>
-					<input class="form-control" name="new_file" type="text" placeholder="<?= I18N::translate('Same as uploaded file') ?>">
+					<input class="form-control" name="new_file" type="text" placeholder="<?= I18N::translate('Same as uploaded file') ?>" value="<?= e($media_file ? $media_file->basename() : '') ?>">
 				</span>
 			</label>
 		</div>
@@ -74,14 +74,14 @@
 	</div>
 </div>
 
-<div class="form-group row file-location file-location-url d-none">
+<div class="form-group row file-location file-location-url <?= $media_file && $media_file->isExternal() ? '' : 'd-none' ?>">
 	<label class="col-form-label col-sm-2" for="remote">
 		<?= I18N::translate('URL') ?>
 	</label>
 	<div class="col-sm-10">
-		<input class="form-control" type="url" id="remote" name="remote" placeholder="https://www.example.com/photo.jpeg">
+		<input class="form-control" type="url" id="remote" name="remote" placeholder="https://www.example.com/photo.jpeg" value="<?= e($media_file ? $media_file->filename() : '') ?>">
 		<small class="text-muted">
-			<?= \Fisharebest\Webtrees\FontAwesome::semanticIcon('warning', I18N::translate('Cuation!')) ?>
+			<?= \Fisharebest\Webtrees\FontAwesome::semanticIcon('warning', I18N::translate('Caution!')) ?>
 			<?= I18N::translate('The GEDCOM standard does not allow URLs in media objects.') ?>
 			<?= I18N::translate('Other genealogy applications might not recognize this data.') ?>
 		</small>
@@ -93,7 +93,7 @@
 		<?= I18N::translate('Title') ?>
 	</label>
 	<div class="col-sm-10">
-		<input class="form-control" id="title" name="title" type="text">
+		<input class="form-control" id="title" name="title" type="text" value="<?= e($media_file ? $media_file->title() : '') ?>">
 	</div>
 </div>
 
@@ -102,7 +102,7 @@
 		<?= I18N::translate('Media type') ?>
 	</label>
 	<div class="col-sm-10">
-		<?= Bootstrap4::select(['' => ''] + GedcomTag::getFileFormTypes(), '', ['id'   => 'type', 'name' => 'type']) ?>
+		<?= Bootstrap4::select(['' => ''] + GedcomTag::getFileFormTypes(), $media_file ? $media_file->type() : '', ['id'   => 'type', 'name' => 'type']) ?>
 	</div>
 </div>
 
diff --git a/resources/views/modals/media-object-fields.php b/resources/views/modals/media-object-fields.php
index 51fec9843a..7867ecbefe 100644
--- a/resources/views/modals/media-object-fields.php
+++ b/resources/views/modals/media-object-fields.php
@@ -1,6 +1,6 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 
-<?= view('modals/media-file-fields', ['max_upload_size' => $max_upload_size, 'unused_files' => $unused_files]) ?>
+<?= view('modals/media-file-fields', ['max_upload_size' => $max_upload_size, 'unused_files' => $unused_files, 'media_file' => null]) ?>
 
 <div class="form-group row">
 	<label class="col-form-label col-sm-2" for="media-note">