From b7e1666dd4afbf840bd92171a543906eba932d09 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Jul 2018 18:49:59 -0700 Subject: [PATCH] allow isso to be accessed/mounted on a server subdirectory, e.g., https://example.com/isso --- isso/templates/admin.html | 32 ++++++++++++++++---------------- isso/templates/login.html | 8 ++++---- isso/views/comments.py | 11 ++++++----- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/isso/templates/admin.html b/isso/templates/admin.html index 484a949..0ea7d54 100644 --- a/isso/templates/admin.html +++ b/isso/templates/admin.html @@ -1,8 +1,8 @@ Isso admin - - + +
- +

Isso

@@ -232,16 +232,16 @@ function send_edit(com_id, hash) { Edit - + {% if comment.mode != 4 %} + onClick="javascript:delete_com({{comment.id}}, '{{comment.hash}}', '{{isso_host_script}}')"> Delete {% endif %} {% if comment.mode == 2 %} Validate + onClick="javascript:validate_com({{comment.id}}, '{{comment.hash}}', '{{isso_host_script}}')">Validate {% endif %}
diff --git a/isso/templates/login.html b/isso/templates/login.html index a9aa888..6579817 100644 --- a/isso/templates/login.html +++ b/isso/templates/login.html @@ -1,14 +1,14 @@ Isso admin - - + +
- +

Isso

@@ -20,7 +20,7 @@
Administration secured by password: -
+
diff --git a/isso/views/comments.py b/isso/views/comments.py index b76be46..0fb2854 100644 --- a/isso/views/comments.py +++ b/isso/views/comments.py @@ -1001,7 +1001,7 @@ class API(object): response = redirect(re.sub( r'/login$', '/admin', - get_current_url(env, strip_querystring=True) + get_current_url(env, strip_querystring=True) #iwozere )) cookie = functools.partial(dump_cookie, value=self.isso.sign({"logged": True}), @@ -1010,16 +1010,16 @@ class API(object): response.headers.add("X-Set-Cookie", cookie("isso-admin-session")) return response else: - return render_template('login.html') + return render_template('login.html', isso_host_script=local.host) def admin(self, env, req): try: data = self.isso.unsign(req.cookies.get('admin-session', ''), max_age=60 * 60 * 24) except BadSignature: - return render_template('login.html') + return render_template('login.html',isso_host_script=local.host) if not data or not data['logged']: - return render_template('login.html') + return render_template('login.html',isso_host_script=local.host) page_size = 100 page = int(req.args.get('page', 0)) order_by = req.args.get('order_by', None) @@ -1039,4 +1039,5 @@ class API(object): page=int(page), mode=int(mode), conf=self.conf, max_page=max_page, counts=comment_mode_count, - order_by=order_by, asc=asc) + order_by=order_by, asc=asc, + isso_host_script=local.host)