From 696f5b06e4781cc61274eb3969103cb3be76e8d3 Mon Sep 17 00:00:00 2001
From: Greg Roach <greg@subaqua.co.uk>
Date: Fri, 22 Jan 2021 10:39:54 +0000
Subject: Fix dangling slash in media file fields modal

---
 resources/views/modals/media-file-fields.phtml   | 30 +++++++++++++++---------
 resources/views/modals/media-object-fields.phtml |  7 ++++++
 2 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'resources')

diff --git a/resources/views/modals/media-file-fields.phtml b/resources/views/modals/media-file-fields.phtml
index 84eb81adf6..c66fb135f3 100644
--- a/resources/views/modals/media-file-fields.phtml
+++ b/resources/views/modals/media-file-fields.phtml
@@ -3,11 +3,19 @@
 use Fisharebest\Webtrees\GedcomTag;
 use Fisharebest\Webtrees\Http\RequestHandlers\AutoCompleteFolder;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\MediaFile;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var string               $max_upload_size
+ * @var MediaFile|null       $media_file
+ * @var Tree                 $tree
+ * @var array<string,string> $unused_files
+ */
 
 ?>
-<?php ?>
 
-<div class="form-group row <?= $media_file ? 'd-none' : '' ?>">
+<div class="form-group row <?= $media_file instanceof MediaFile ? 'd-none' : '' ?>">
     <label class="col-form-label col-sm-2" for="file-location">
         <?= I18N::translate('Media file') ?>
     </label>
@@ -28,7 +36,7 @@ use Fisharebest\Webtrees\I18N;
     </div>
 </div>
 
-<div class="form-group row file-location file-location-upload <?= $media_file ? 'd-none' : '' ?>">
+<div class="form-group row file-location file-location-upload <?= $media_file instanceof MediaFile ? 'd-none' : '' ?>">
     <label class="col-form-label col-sm-2" for="file">
         <?= I18N::translate('A file on your computer') ?>
     </label>
@@ -41,7 +49,7 @@ use Fisharebest\Webtrees\I18N;
     </div>
 </div>
 
-<div class="form-group row file-location file-location-upload <?= $media_file && $media_file->isExternal() ? 'd-none' : '' ?>">
+<div class="form-group row file-location file-location-upload <?= $media_file instanceof MediaFile && $media_file->isExternal() ? 'd-none' : '' ?>">
     <label class="col-form-label col-sm-2" for="folder">
         <?= I18N::translate('Filename on server') ?>
     </label>
@@ -50,18 +58,18 @@ use Fisharebest\Webtrees\I18N;
             <div class="col-sm-6">
                 <div class="form-check">
                     <label class="form-check-label">
-                        <input class="form-check-input" type="radio" name="auto" value="0" checked>
-                        <input class="form-control" id="folder" name="folder" placeholder="<?= I18N::translate('Folder') ?>" type="text" value="<?= e(dirname($media_file ? $media_file->filename() : '') === '.' ? '' : dirname($media_file ? $media_file->filename() : '')) ?>" data-autocomplete-url="<?= e(route(AutoCompleteFolder::class, ['tree' => $tree->name()])) ?>" autocomplete="off">
-                        <div class="input-group">
-                            <div class="input-group-append">
+                        <span class="input-group">
+                            <input class="form-check-input" type="radio" name="auto" value="0" checked>
+                            <input class="form-control" id="folder" name="folder" placeholder="<?= I18N::translate('Folder') ?>" type="text" value="<?= e(dirname($media_file instanceof MediaFile ? $media_file->filename() : '') === '.' ? '' : dirname($media_file instanceof MediaFile ? $media_file->filename() : '')) ?>" data-autocomplete-url="<?= e(route(AutoCompleteFolder::class, ['tree' => $tree->name()])) ?>" autocomplete="off">
+                            <span class="input-group-append">
                                 <span class="input-group-text">/</span>
-                            </div>
-                        </div>
+                            </span>
+                        </span>
                     </label>
                 </div>
             </div>
             <div class="col-sm-6">
-                <input class="form-control" name="new_file" type="text" placeholder="<?= I18N::translate('Same as uploaded file') ?>" value="<?= e(basename($media_file ? $media_file->filename() : '')) ?>">
+                <input aria-label="<?= I18N::translate('Filename') ?>" class="form-control" name="new_file" type="text" placeholder="<?= I18N::translate('Same as uploaded file') ?>" value="<?= e(basename($media_file ? $media_file->filename() : '')) ?>">
             </div>
         </div>
         <p class="small text-muted">
diff --git a/resources/views/modals/media-object-fields.phtml b/resources/views/modals/media-object-fields.phtml
index d380b3da1a..e5f8cb236a 100644
--- a/resources/views/modals/media-object-fields.phtml
+++ b/resources/views/modals/media-object-fields.phtml
@@ -1,6 +1,13 @@
 <?php
 
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var string               $max_upload_size
+ * @var Tree                 $tree
+ * @var array<string,string> $unused_files
+ */
 
 ?>
 
-- 
cgit v1.3