3 files changed, 47 insertions, 19 deletions

diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index 007ced4..4f5540c 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -17,13 +17,19 @@
     <input type="submit" value="Update configuration">
 
 
-    <h2>Passwords</h2>
-    <label for="admin">Admin password</label>
-    <input type="password" name="admin" id="admin" value="<?= Config::admin() ?>">
-    <label for="editor">Editor password</label>
-    <input type="password" name="editor" id="editor" value="<?= Config::editor() ?>">
-
     <h2>Page creation</h2>
+
+    <label for="defaultprivacy">Default privacy</label>
+    <select name="defaultprivacy" id="defaultprivacy">
+    <option value="0" <?= Config::defaultprivacy() == 0 ? 'selected' : '' ?>>public</option>
+    <option value="1" <?= Config::defaultprivacy() == 1 ? 'selected' : '' ?>>private</option>
+    <option value="2" <?= Config::defaultprivacy() == 2 ? 'selected' : '' ?>>not published</option>
+    </select>
+
+
+
+
+
     <label for="defaultart">Create new page BODY based on an already existing one</label>
     <select name="defaultart" id="defaultart">
     <option value="" <?= Config::defaultart() === '' || !$defaultartexist ? 'selected' : '' ?>>--use default BODY element--</option>
@@ -45,13 +51,34 @@
     ?>
 
 
+
     <h2>Editing</h2>
 
     <label for="existnot">Text to show when a page does not exist yet</label>
     <input type="text" name="existnot" id="existnot" value="<?= Config::existnot() ?>">
 
-    <label for="showeditmenu">Show editor menu in top right corner of pages</label>
+    <h3>Links</h3>
+    
+    <div class="checkbox">
+    <input type="hidden" name="externallinkblank" value="0">
+    <input type="checkbox" name="externallinkblank" id="externallinkblank" value="1" <?= Config::externallinkblank() ? 'checked' : '' ?>>
+    <label for="externallinkblank">Open external links in new tab</label>
+    </div>
+
+    <div class="checkbox">
+    <input type="hidden" name="internallinkblank" value="0">
+    <input type="checkbox" name="internallinkblank" id="internallinkblank" value="1" <?= Config::internallinkblank() ? 'checked' : '' ?>>
+    <label for="internallinkblank">Open internal links in new tab</label>
+    </div>
+
+
+
+    <h3>Edit quick menu</h3>
+
+    <div class="checkbox">
     <input type="checkbox" name="showeditmenu" id="showeditmenu" <?= Config::showeditmenu() === true ? 'checked' : '' ?>>
+    <label for="showeditmenu">Show editor menu in top right corner of pages</label>
+    </div>
 
     <?php
     if(Config::showeditmenu() === true) {
diff --git a/app/view/templates/edittopbar.php b/app/view/templates/edittopbar.php
index c547572..13a2a08 100644
--- a/app/view/templates/edittopbar.php
+++ b/app/view/templates/edittopbar.php
@@ -9,13 +9,10 @@
     <a href="<?= $this->url('home') ?>" class="icon" >⍇</a>
     </span>
     <span>
-    <input type="submit" value="update" accesskey="x" form="update">
+    <input type="submit" value="update" accesskey="s" form="update">
     </span>
 
 
-    <span>
-        <a href="<?= $this->uart('artconfirmdelete', $art->id()) ?>"><span class="symbol">✖</span><span class="text">delete</span></a>
-    </span>
 
 
 
@@ -24,15 +21,10 @@
     </span>
     <span id="headid"><?= $art->id() ?></span>
 
-    <span id="fontsize">
-
-    <label for="fontsize">Font-size</label>
-    <input type="number" name="fontsize" value="<?= Config::fontsize() ?>" id="fontsize" min="5" max="99">
-</span>
 
 
 
-<span id="menu" style="display: none;">
+<span id="menu" >
     <?php if($user->iseditor()) { ?>
 
     <a href="<?= $this->url('font') ?>"><span class="symbol">📝</span><span class="text">font</span></a>
@@ -49,6 +41,16 @@
 </span>
 
 
+<span id="delete">
+        <a href="<?= $this->uart('artconfirmdelete', $art->id()) ?>"><span class="symbol">✖</span><span class="text">delete</span></a>
+</span>
+
+
+<span id="fontsize">
+
+<label for="fontsize">Font-size</label>
+<input type="number" name="fontsize" value="<?= Config::fontsize() ?>" id="fontsize" min="5" max="99">
+</span>
 
 
 </div>
\ No newline at end of file
diff --git a/app/view/templates/homeopt.php b/app/view/templates/homeopt.php
index f240d0a..a37e65b 100644
--- a/app/view/templates/homeopt.php
+++ b/app/view/templates/homeopt.php
@@ -23,8 +23,7 @@ foreach ($opt->col('array') as $key => $col) {
 
 <fieldset><legend>Privacy</legend><ul>
 <li><input type="radio" id="4" name="secure" value="4"<?= $opt->secure() == 4 ? "checked" : "" ?>/><label for="4">all</label></li>
-<li><input type="radio" id="3" name="secure" value="3"<?= $opt->secure() == 3 ? "checked" : "" ?>/><label for="3">editor</label></li>
-<li><input type="radio" id="2" name="secure" value="2"<?= $opt->secure() == 2 ? "checked" : "" ?>/><label for="2">invite only</label></li>
+<li><input type="radio" id="2" name="secure" value="2"<?= $opt->secure() == 2 ? "checked" : "" ?>/><label for="2">not published</label></li>
 <li><input type="radio" id="1" name="secure" value="1"<?= $opt->secure() == 1 ? "checked" : "" ?>/><label for="1">private</label></li>
 <li><input type="radio" id="0" name="secure" value="0"<?= $opt->secure() == 0 ? "checked" : "" ?>/><label for="0">public</label></li>
 </ul></fieldset>