3 files changed, 12 insertions, 5 deletions
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 .= '<script src="' . Model::renderpath() . $templatejsart . '.js" async/></script>' . PHP_EOL;
 		}
-		$head .= '<script src="' . Model::renderpath() . $this->art->id() . '.js" async/></script>' . PHP_EOL;
+		if (!empty($this->art->javascript())) {
+			$head .= '<script src="' . Model::renderpath() . $this->art->id() . '.js" async/></script>' . 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 @@
 
 <span id="search">
 <form action="<?= $this->url('search') ?>" method="post">
-<input type="text" list="searchdatalist" name="id" id="search" placeholder="page id" required <?= $tab !== 'edit' ? 'autofocus' : '' ?>>
+<input type="text" list="searchdatalist" name="id" id="search" placeholder="page id" required <?= $tab !== 'edit' && !$user->isvisitor() ? 'autofocus' : '' ?>>
 <input type="submit" name="action" value="read">
 <?= $user->iseditor() ? '<input type="submit" name="action" value="edit">' : '' ?>
 
@@ -49,7 +49,7 @@ if($user->isadmin()) {
 
 
 <form action="<?= $this->url('log') ?>" method="post" id="connect">
-<input type="password" name="pass" id="loginpass" placeholder="password">
+<input type="password" name="pass" id="loginpass" placeholder="password" autofocus>
 <input type="hidden" name="route" value="home">
 <input type="submit" name="log" value="login">
 </form>
@@ -64,7 +64,12 @@ if($user->isadmin()) {
 
 
 <form action="<?= $this->url('log') ?>" method="post" id="connect">
-<input type="submit" name="log" value="logout">
+<input type="submit" name="log" value="logout" >
+<?php if($tab === 'edit') { ?>
+    <input type="hidden" name="route" value="artread/">
+    <input type="hidden" name="id" value="<?= $pageid ?>">
+<?php } ?>
+
 </form>
 
 
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 @@
 <body>
 <main class="editor">
 
-    <?php $this->insert('backtopbar', ['user' => $user, 'tab' => 'edit', 'pagelist' => $pagelist]) ?>
+    <?php $this->insert('backtopbar', ['user' => $user, 'tab' => 'edit', 'pagelist' => $pagelist, 'pageid' => $art->id()]) ?>
 
 
     <?php $this->insert('edittopbar', ['art' => $art, 'user' => $user]) ?>