summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2020-06-20 22:13:22 +0100
committerGreg Roach <greg@subaqua.co.uk>2020-06-20 22:13:22 +0100
commita907ae444ee9e5c94de12917f8eb2ee22b571ddf (patch)
tree460bae4a73e167b4ca23912bc1428bc9a068000f
parent8548b21ce6b37d4b56a7697c0316d6cf7ebf7717 (diff)
downloadwebtrees-a907ae444ee9e5c94de12917f8eb2ee22b571ddf.tar.gz
webtrees-a907ae444ee9e5c94de12917f8eb2ee22b571ddf.tar.bz2
webtrees-a907ae444ee9e5c94de12917f8eb2ee22b571ddf.zip
Fix: #3368 - use PHP class basenames for CSS class names
Diffstat
-rw-r--r--resources/views/layouts/administration.phtml3
-rw-r--r--resources/views/layouts/default.phtml53
2 files changed, 31 insertions, 25 deletions
diff --git a/resources/views/layouts/administration.phtml b/resources/views/layouts/administration.phtml
index 92efe0362d..0ab7b69936 100644
--- a/resources/views/layouts/administration.phtml
+++ b/resources/views/layouts/administration.phtml
@@ -11,7 +11,6 @@ use Fisharebest\Webtrees\Module\ModuleCustomInterface;
use Fisharebest\Webtrees\Module\ModuleGlobalInterface;
use Fisharebest\Webtrees\Services\ModuleService;
use Fisharebest\Webtrees\View;
-use Psr\Http\Message\ServerRequestInterface;
/** @var string $title */
/** @var string $content */
@@ -40,7 +39,7 @@ use Psr\Http\Message\ServerRequestInterface;
<?= DebugBar::renderHead() ?>
</head>
- <body class="container wt-global wt-control-panel wt-route-<?= e(app(ServerRequestInterface::class)->getAttribute('route')->name) ?>">
+ <body class="container wt-global wt-control-panel">
<header>
<div class="wt-accessibility-links position-fixed">
<a class="sr-only sr-only-focusable btn btn-info btn-sm" href="#content">
diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml
index 137fb64365..bb973bce02 100644
--- a/resources/views/layouts/default.phtml
+++ b/resources/views/layouts/default.phtml
@@ -8,13 +8,16 @@ use Fisharebest\Webtrees\Module\ModuleFooterInterface;
use Fisharebest\Webtrees\Module\ModuleGlobalInterface;
use Fisharebest\Webtrees\Module\ModuleThemeInterface;
use Fisharebest\Webtrees\Services\ModuleService;
+use Fisharebest\Webtrees\Tree;
use Fisharebest\Webtrees\View;
use Fisharebest\Webtrees\Webtrees;
use Psr\Http\Message\ServerRequestInterface;
/**
- * @var string $title
- * @var string $content
+ * @var string $content
+ * @var ServerRequestInterface $request
+ * @var string $title
+ * @var Tree $tree
*/
?>
@@ -59,13 +62,13 @@ use Psr\Http\Message\ServerRequestInterface;
<?= View::stack('styles') ?>
<?= app(ModuleService::class)->findByInterface(ModuleGlobalInterface::class)->map(static function (ModuleGlobalInterface $module): string {
- return $module->headContent();
+ return $module->headContent();
})->implode('') ?>
<?= DebugBar::renderHead() ?>
</head>
- <body class="wt-global wt-theme-<?= e(app(ModuleThemeInterface::class)->name()) ?> wt-route-<?= e(app(ServerRequestInterface::class)->getAttribute('route')->name) ?>">
+ <body class="wt-global wt-theme-<?= e(app(ModuleThemeInterface::class)->name()) ?> wt-route-<?= e(substr(strrchr($request->getAttribute('route')->name, '\\'),1)) ?>">
<header class="wt-header-wrapper d-print-none">
<div class="container wt-header-container">
<div class="row wt-header-content">
@@ -81,11 +84,14 @@ use Psr\Http\Message\ServerRequestInterface;
<h1 class="col wt-site-title"><?= e($tree->title()) ?></h1>
<div class="col wt-header-search">
- <form method="post" action="<?= e(route(SearchQuickAction::class, ['tree' => $tree->name()])) ?>" class="wt-header-search-form" role="search">
+ <form method="post"
+ action="<?= e(route(SearchQuickAction::class, ['tree' => $tree->name()])) ?>"
+ class="wt-header-search-form" role="search">
<?= csrf_field() ?>
<div class="input-group">
<label class="sr-only" for="quick-search"><?= I18N::translate('Search') ?></label>
- <input type="search" class="form-control wt-header-search-field" id="quick-search" name="query" size="15" placeholder="<?= I18N::translate('Search') ?>">
+ <input type="search" class="form-control wt-header-search-field" id="quick-search"
+ name="query" size="15" placeholder="<?= I18N::translate('Search') ?>">
<div class="input-group-append">
<button type="submit" class="btn btn-primary wt-header-search-button">
<?= view('icons/search') ?>
@@ -122,7 +128,8 @@ use Psr\Http\Message\ServerRequestInterface;
<div class="flash-messages">
<?php foreach (FlashMessages::getMessages() as $message) : ?>
<div class="alert alert-<?= e($message->status) ?> alert-dismissible" role="alert">
- <button type="button" class="close" data-dismiss="alert" aria-label="<?= I18N::translate('close') ?>">
+ <button type="button" class="close" data-dismiss="alert"
+ aria-label="<?= I18N::translate('close') ?>">
<span aria-hidden="true">&times;</span>
</button>
<?= $message->text ?>
@@ -136,7 +143,7 @@ use Psr\Http\Message\ServerRequestInterface;
<footer class="wt-footers container d-print-none">
<?= app(ModuleService::class)->findByInterface(ModuleFooterInterface::class)->map(static function (ModuleFooterInterface $module) use ($request): string {
- return $module->getFooter($request);
+ return $module->getFooter($request);
})->implode('') ?>
</footer>
@@ -149,24 +156,24 @@ use Psr\Http\Message\ServerRequestInterface;
// Enable colorbox for images
$("a[type^=image].gallery").colorbox({
// Don't scroll window with document
- fixed: true,
- width: "85%",
- height: "85%",
- current: "",
- previous: '<i class="fas fa-arrow-left wt-icon-flip-rtl" title="<?= I18N::translate('previous') ?>"></i>',
- next: '<i class="fas fa-arrow-right wt-icon-flip-rtl" title="<?= I18N::translate('next') ?>"></i>',
+ fixed: true,
+ width: "85%",
+ height: "85%",
+ current: "",
+ previous: '<i class="fas fa-arrow-left wt-icon-flip-rtl" title="<?= I18N::translate('previous') ?>"></i>',
+ next: '<i class="fas fa-arrow-right wt-icon-flip-rtl" title="<?= I18N::translate('next') ?>"></i>',
slideshowStart: '<i class="fas fa-play" title="<?= I18N::translate('Play') ?>"></i>',
- slideshowStop: '<i class="fas fa-stop" title="<?= I18N::translate('Stop') ?>"></i>',
- close: '<i class="fas fa-times" title="<?= I18N::translate('close') ?>"></i>',
- title: function () {
+ slideshowStop: '<i class="fas fa-stop" title="<?= I18N::translate('Stop') ?>"></i>',
+ close: '<i class="fas fa-times" title="<?= I18N::translate('close') ?>"></i>',
+ title: function () {
return this.dataset.title;
},
- photo: true,
- rel: "gallery", // Turn all images on the page into a slideshow
- slideshow: true,
- slideshowAuto: false,
+ photo: true,
+ rel: "gallery", // Turn all images on the page into a slideshow
+ slideshow: true,
+ slideshowAuto: false,
// Add wheelzoom to the displayed image
- onComplete: function () {
+ onComplete: function () {
// Disable click on image triggering next image
// https://github.com/jackmoore/colorbox/issues/668
$(".cboxPhoto").unbind("click");
@@ -180,7 +187,7 @@ use Psr\Http\Message\ServerRequestInterface;
<?= View::stack('javascript') ?>
<?= app(ModuleService::class)->findByInterface(ModuleGlobalInterface::class)->map(static function (ModuleGlobalInterface $module): string {
- return $module->bodyContent();
+ return $module->bodyContent();
})->implode('') ?>
<?= DebugBar::render() ?>
generated by cgit v1.3 (git 2.53.0) at 2026-07-05 17:06:09 +0000