% elif query.project and query.lang and query.title and page and not result:
+
% elif page:
diff --git a/pages/settings.mako b/pages/settings.mako
index 413aec6..785c817 100644
--- a/pages/settings.mako
+++ b/pages/settings.mako
@@ -1,6 +1,9 @@
<%include file="/support/header.mako" args="environ=environ, title='Settings'"/>\
<%namespace module="toolserver.settings" import="main"/>\
-<% bot, cookies, langs, projects = main(environ, headers) %>
+<% bot, cookies, status, langs, projects = main(environ, headers) %>
+ % if status:
+
${status}
+ % endif
Settings
This page contains some configurable options for this Toolserver site. Settings are saved as cookies. You can view and delete all cookies generated by this site at the bottom of this page.
\ No newline at end of file
+
diff --git a/static/css/main.css b/static/css/main.css
index 3ae9777..5764c80 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -77,6 +77,20 @@ div.divider {
margin-bottom: 15px;
}
+div.green-box {
+ padding: 0 10px 0 10px;
+ margin: 0 5px 10px 5px;
+ background-color: #FEE;
+ border: 1px solid #F77;
+}
+
+div.red-box {
+ padding: 0 10px 0 10px;
+ margin: 0 5px 10px 5px;
+ background-color: #EFE;
+ border: 1px solid #7F7;
+}
+
p.toolname {
font-size: 18px;
margin: 6px 0 6px 0;
diff --git a/static/js/cookies.js b/static/js/cookies.js
new file mode 100644
index 0000000..7a0ebab
--- /dev/null
+++ b/static/js/cookies.js
@@ -0,0 +1,37 @@
+// Partially based on http://www.quirksmode.org/js/cookies.html
+
+function get_cookie(name) {
+ var nameEQ = name + "=";
+ var ca = document.cookie.split(";");
+ for (var i = 0; i < ca.length; i++) {
+ var c = ca[i];
+ while (c.charAt(0) == " ") {
+ c = c.substring(1, c.length);
+ }
+ if (c.indexOf(nameEQ) == 0) {
+ var value = window.atob(c.substring(nameEQ.length, c.length));
+ if (value.indexOf("--ets1") == 0) {
+ return value.substring("--ets1".length, value.length);
+ }
+ }
+ }
+ return null;
+}
+
+function set_cookie(name, value, days) {
+ value = window.btoa("--ets1" + value);
+ var path = window.location.pathname.split("/", 2)[1];
+ if (days) {
+ var date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ var expires = "; expires=" + date.toGMTString();
+ }
+ else {
+ var expires = "";
+ }
+ document.cookie = name + "=" + value + expires + "; path=/" + path;
+}
+
+function delete_cookie(name) {
+ set_cookie(name, "", -1);
+}
diff --git a/static/js/copyvios.js b/static/js/copyvios.js
index 47d18d8..1568b4c 100644
--- a/static/js/copyvios.js
+++ b/static/js/copyvios.js
@@ -1,38 +1,3 @@
-// Thanks to http://www.quirksmode.org/js/cookies.html for the cookie code.
-
-function get_cookie(name) {
- var nameEQ = name + "=";
- var ca = document.cookie.split(";");
- for (var i = 0; i < ca.length; i++) {
- var c = ca[i];
- while (c.charAt(0) == " ") {
- c = c.substring(1, c.length);
- }
- if (c.indexOf(nameEQ) == 0) {
- return c.substring(nameEQ.length, c.length);
- }
- }
- return null;
-}
-
-function set_cookie(name, value, days) {
- value = window.btoa("--ets1" + value);
- var path = window.location.pathname.split("/", 2)[1];
- if (days) {
- var date = new Date();
- date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
- var expires = "; expires=" + date.toGMTString();
- }
- else {
- var expires = "";
- }
- document.cookie = name + "=" + value + expires + "; path=/" + path;
-}
-
-function delete_cookie(name) {
- set_cookie(name, "", -1);
-}
-
function copyvio_toggle_details(details) {
link = document.getElementById("cv-result-detail-link");
details = document.getElementById("cv-result-detail");
diff --git a/static/js/potd.js b/static/js/potd.js
index 6b3273b..2095a24 100644
--- a/static/js/potd.js
+++ b/static/js/potd.js
@@ -1,6 +1,6 @@
function potd_set_background() {
var d = new Date();
- var callback = "like_a_boss";
+ var callback = "earwigpotd1";
var date = (d.getUTCFullYear()) + "-" + zero_pad(d.getUTCMonth() + 1, 2) + "-" + zero_pad(d.getUTCDate(), 2);
var base = "//commons.wikimedia.org/w/api.php?action=query&prop=revisions&rvprop=content&format=json&titles=Template:Potd/";
var url = base + date + "&callback=" + callback;
@@ -25,7 +25,7 @@ function parse_file_name(data) {
}
var filename = /\{\{Potd filename\|(1=)?(.*?)\|.*?\}\}/.exec(content)[2];
- var callback = "like_a_faust";
+ var callback = "earwigpotd2";
var base = "//commons.wikimedia.org/w/api.php?action=query&prop=imageinfo&iiprop=url|size&format=json&titles=File:";
var url = base + escape(filename) + "&callback=" + callback;
@@ -55,7 +55,10 @@ function parse_file_url(data, filename) {
imgwidth = r["width"];
imgheight = r["height"];
}
+ set_background(url, descurl, imgwidth, imgheight);
+}
+function set_background(url, descurl, imgwidth, imgheight) {
var s = get_window_size();
var winwidth = s[0];
var winheight = s[1];
diff --git a/toolserver/settings.py b/toolserver/settings.py
index fee9756..b42fd35 100644
--- a/toolserver/settings.py
+++ b/toolserver/settings.py
@@ -1,29 +1,51 @@
# -*- coding: utf-8 -*-
+from markupsafe import escape
+
from .cookies import parse_cookies, set_cookie, delete_cookie
from .misc import get_bot, Query
from .sites import get_sites
def main(context, environ, headers):
- cookies = parse_cookies(context, environ)
query = Query(environ, method="POST")
+ cookies = parse_cookies(context, environ)
if query.action == "set":
- if query.lang:
- key = "EarwigDefaultLang"
- if key not in cookies or cookies[key].value != query.lang:
- set_cookie(headers, cookies, key, query.lang, 365)
- if query.project:
- key = "EarwigDefaultProject"
- if key not in cookies or cookies[key].value != query.project:
- set_cookie(headers, cookies, key, query.project, 365)
+ status = _do_set(query, cookies)
elif query.action == "delete":
- if query.cookie in cookies:
- delete_cookie(headers, cookies, query.cookie.encode("utf8"))
- elif query.all:
- for cookie in cookies.values():
- delete_cookie(headers, cookies, cookie.key)
+ status = _do_delete(query, cookies)
+ else:
+ status = None
bot = get_bot()
langs, projects = get_sites(bot)
- return bot, cookies, langs, projects
+ return bot, cookies, status, langs, projects
+
+def _do_set(query, cookies):
+ changes = set()
+ if query.lang:
+ key = "EarwigDefaultLang"
+ if key not in cookies or cookies[key].value != query.lang:
+ set_cookie(headers, cookies, key, query.lang, 365)
+ changes.add("site")
+ if query.project:
+ key = "EarwigDefaultProject"
+ if key not in cookies or cookies[key].value != query.project:
+ set_cookie(headers, cookies, key, query.project, 365)
+ changes.add("site")
+ if changes:
+ changes = ", ".format(changes)
+ return "Updated {0}.".format(changes)
+ return None
+
+def _do_delete(query, cookies):
+ if query.cookie in cookies:
+ delete_cookie(headers, cookies, query.cookie.encode("utf8"))
+ template = "Deleted cookie {0}."
+ return template.format(escape(query.cookie))
+ elif query.all:
+ number = len(cookies)
+ for cookie in cookies.values():
+ delete_cookie(headers, cookies, cookie.key)
+ return "Deleted {0} cookies.".format(number)
+ return None