summaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2022-11-15 13:20:16 +0000
committerGreg Roach <greg@subaqua.co.uk>2022-11-18 11:55:56 +0000
commit748dbe155a6d19d66918ad136947fa23ee8f8469 (patch)
treeed4743592d3b0aea968f9cbae7e5d32c00b546fe /resources
parentf783aa1f4cd6d54a90d24a3d6be2996a3951fced (diff)
downloadwebtrees-748dbe155a6d19d66918ad136947fa23ee8f8469.tar.gz
webtrees-748dbe155a6d19d66918ad136947fa23ee8f8469.tar.bz2
webtrees-748dbe155a6d19d66918ad136947fa23ee8f8469.zip
Use Validator
Diffstat (limited to 'resources')
-rw-r--r--resources/views/admin/media.phtml2
-rw-r--r--resources/views/modules/faq/config.phtml4
-rw-r--r--resources/views/modules/fix-place-names/options.phtml8
-rw-r--r--resources/views/modules/fix-search-and-replace/options.phtml8
-rw-r--r--resources/views/modules/media-list/page.phtml3
5 files changed, 13 insertions, 12 deletions
diff --git a/resources/views/admin/media.phtml b/resources/views/admin/media.phtml
index f86f4bd20a..691e0c1348 100644
--- a/resources/views/admin/media.phtml
+++ b/resources/views/admin/media.phtml
@@ -76,7 +76,7 @@ use Illuminate\Support\Collection;
<?php elseif ($files === 'external') : ?>
<?= I18N::translate('External media files have a URL instead of a filename.') ?>
<input type="hidden" name="media_folder" value="<?= e($media_folder) ?>">
-
+ <input type="hidden" name="subfolders" value="<?= e($subfolders) ?>">
<?php endif ?>
</td>
</tr>
diff --git a/resources/views/modules/faq/config.phtml b/resources/views/modules/faq/config.phtml
index 065fb889eb..d906f811d5 100644
--- a/resources/views/modules/faq/config.phtml
+++ b/resources/views/modules/faq/config.phtml
@@ -10,8 +10,8 @@ use Illuminate\Support\Collection;
/**
* @var Collection<int,object> $faqs
- * @var string $max_block_order
- * @var string $min_block_order
+ * @var int $max_block_order
+ * @var int $min_block_order
* @var string $title
* @var Tree $tree
* @var array<string,string> $tree_names
diff --git a/resources/views/modules/fix-place-names/options.phtml b/resources/views/modules/fix-place-names/options.phtml
index d06ca33824..df4b9b86a5 100644
--- a/resources/views/modules/fix-place-names/options.phtml
+++ b/resources/views/modules/fix-place-names/options.phtml
@@ -7,21 +7,21 @@ use Fisharebest\Webtrees\I18N;
?>
<div class="row mb-3">
- <label class="col-sm-3 col-form-label" for="search">
+ <label class="col-sm-3 col-form-label" for="search-for">
<?= I18N::translate('Search') ?>
</label>
<div class="col-sm-9">
- <input class="form-control" id="search" name="search">
+ <input class="form-control" id="search-for" name="search-for">
</div>
</div>
<div class="row mb-3">
- <label class="col-sm-3 col-form-label" for="replace">
+ <label class="col-sm-3 col-form-label" for="replace-with">
<?= I18N::translate('Replace') ?>
</label>
<div class="col-sm-9">
- <input class="form-control" id="replace" name="replace">
+ <input class="form-control" id="replace-with" name="replace-with">
</div>
</div>
diff --git a/resources/views/modules/fix-search-and-replace/options.phtml b/resources/views/modules/fix-search-and-replace/options.phtml
index 375e0f404e..9a1ccdd700 100644
--- a/resources/views/modules/fix-search-and-replace/options.phtml
+++ b/resources/views/modules/fix-search-and-replace/options.phtml
@@ -14,22 +14,22 @@ use Fisharebest\Webtrees\I18N;
?>
<div class="row mb-3">
- <label class="col-sm-3 col-form-label" for="search">
+ <label class="col-sm-3 col-form-label" for="search-for">
<?= I18N::translate('Search text/pattern') ?>
</label>
<div class="col-sm-9">
- <input class="form-control" id="search" name="search">
+ <input class="form-control" id="search-for" name="search-for">
</div>
</div>
<div class="row mb-3">
- <label class="col-sm-3 col-form-label" for="replace">
+ <label class="col-sm-3 col-form-label" for="replace-with">
<?= I18N::translate('Replacement text') ?>
</label>
<div class="col-sm-9">
- <input class="form-control" id="replace" name="replace">
+ <input class="form-control" id="replace-with" name="replace-with">
</div>
</div>
diff --git a/resources/views/modules/media-list/page.phtml b/resources/views/modules/media-list/page.phtml
index d3ea815d6f..8dcbdb9cb2 100644
--- a/resources/views/modules/media-list/page.phtml
+++ b/resources/views/modules/media-list/page.phtml
@@ -81,7 +81,8 @@ use League\Flysystem\FilesystemOperator;
<div class="col-sm-3 col-form-label wt-page-options-label"></div>
<div class="col-sm-3 wt-page-options-value">
- <button type="submit" name="go" value="1" class="btn btn-primary">
+ <input type="hidden" name="page" value="1">
+ <button type="submit" class="btn btn-primary">
<?= /* I18N: A button label. */ I18N::translate('search') ?>
</button>
<a class="btn btn-secondary" href="<?= e($module->listUrl($tree)) ?>">