From e9d0ee3227966918e26b83fca744ee1d07877fd6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 11 Oct 2020 12:40:53 +0100
Subject: [PATCH] Move editing links to editor role

---
 daemon.py       | 6 +++---
 webinterface.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/daemon.py b/daemon.py
index f72146a5..63c717ef 100644
--- a/daemon.py
+++ b/daemon.py
@@ -2727,10 +2727,10 @@ class PubServer(BaseHTTPRequestHandler):
 
             # get the nickname
             nickname = getNicknameFromActor(actorStr)
-            moderator = None
+            editor = None
             if nickname:
-                moderator = isModerator(baseDir, nickname)
-            if not nickname or not moderator:
+                editor = isEditor(baseDir, nickname)
+            if not nickname or not editor:
                 if callingDomain.endswith('.onion') and \
                    onionDomain:
                     actorStr = \
diff --git a/webinterface.py b/webinterface.py
index dfd47ad0..e053517a 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1224,7 +1224,7 @@ def htmlEditLinks(translate: {}, baseDir: str, path: str,
         return ''
 
     # is the user a moderator?
-    if not isModerator(baseDir, nickname):
+    if not isEditor(baseDir, nickname):
         return ''
 
     cssFilename = baseDir + '/epicyon-links.css'
@@ -1399,8 +1399,8 @@ def htmlEditNewsPost(translate: {}, baseDir: str, path: str,
     editNewsPostForm += \
         '    <div class="container">\n'
     editNewsPostForm += \
-        '      <a href="' + pathOriginal + '/tlnews"><button class="cancelbtn">' + \
-        translate['Go Back'] + '</button></a>\n'
+        '      <a href="' + pathOriginal + '/tlnews">' + \
+        '<button class="cancelbtn">' + translate['Go Back'] + '</button></a>\n'
     editNewsPostForm += \
         '      <input type="submit" name="submitEditedNewsPost" value="' + \
         translate['Submit'] + '">\n'