From 580cbf28855e0d4b8c1a0e4802bdfb7bb42697de Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Wed, 16 Oct 2019 16:59:02 +0200 Subject: better autofocus and logout redirection --- app/class/modelrender.php | 4 +++- app/view/templates/backtopbar.php | 11 ++++++++--- app/view/templates/edit.php | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/class/modelrender.php b/app/class/modelrender.php index d0be54c..3db21f6 100644 --- a/app/class/modelrender.php +++ b/app/class/modelrender.php @@ -247,7 +247,9 @@ class Modelrender extends Modelart $templatejsart = $this->art->templatejavascript(); $head .= '' . PHP_EOL; } - $head .= '' . PHP_EOL; + if (!empty($this->art->javascript())) { + $head .= '' . PHP_EOL; + } if (!empty(Config::analytics())) { diff --git a/app/view/templates/backtopbar.php b/app/view/templates/backtopbar.php index 19b9cf0..76ec90f 100644 --- a/app/view/templates/backtopbar.php +++ b/app/view/templates/backtopbar.php @@ -2,7 +2,7 @@
-> +isvisitor() ? 'autofocus' : '' ?>> iseditor() ? '' : '' ?> @@ -49,7 +49,7 @@ if($user->isadmin()) { - +
@@ -64,7 +64,12 @@ if($user->isadmin()) {
- + + + + + +
diff --git a/app/view/templates/edit.php b/app/view/templates/edit.php index b097378..7cebcc7 100644 --- a/app/view/templates/edit.php +++ b/app/view/templates/edit.php @@ -10,7 +10,7 @@
- insert('backtopbar', ['user' => $user, 'tab' => 'edit', 'pagelist' => $pagelist]) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'edit', 'pagelist' => $pagelist, 'pageid' => $art->id()]) ?> insert('edittopbar', ['art' => $art, 'user' => $user]) ?> -- cgit v1.2.3