From b5908160bf6e8bc2968e62a65559323e2b8ec034 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Wed, 25 Jul 2012 23:16:34 -0400 Subject: [PATCH] Move copyvio error message to top. Order cookies in an interesting way. --- pages/copyvios.mako | 21 ++++++++++----------- pages/settings.mako | 8 +++++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pages/copyvios.mako b/pages/copyvios.mako index deba046..7b0db05 100644 --- a/pages/copyvios.mako +++ b/pages/copyvios.mako @@ -2,6 +2,15 @@ <%namespace module="toolserver.copyvios" import="main, highlight_delta"/>\ <%namespace module="toolserver.misc" import="urlstrip"/>\ <% query, bot, all_langs, all_projects, page, result = main(environ) %> + % if query.project and query.lang and query.title and not page: +
+

The given site (project=${query.project}, language=${query.lang}) doesn't seem to exist. It may also be closed or private. Confirm its URL.

+
+ % elif query.project and query.lang and query.title and page and not result: +
+

The given page doesn't seem to exist: ${page.title | h}.

+
+ % endif

Copyvio Detector

This tool attempts to detect copyright violations in articles. Simply give the title of the page you want to check and hit Submit. The tool will then search for its content elsewhere on the web and display a report if a similar webpage is found. If you also provide a URL, it will not query any search engines and instead display a report comparing the article to that particular webpage, like the Duplication Detector. Check out the FAQ for more information and technical details.

@@ -67,17 +76,7 @@
- % if query.project and query.lang and query.title and not page: -
-
-

The given site (project=${query.project}, language=${query.lang}) doesn't seem to exist. It may also be closed or private. Confirm its URL.

-
- % elif query.project and query.lang and query.title and page and not result: -
-
-

The given page doesn't seem to exist: ${page.title | h}.

-
- % elif page: + % if page:
% if result.violation: diff --git a/pages/settings.mako b/pages/settings.mako index 779680f..3eb68ac 100644 --- a/pages/settings.mako +++ b/pages/settings.mako @@ -69,9 +69,11 @@

Cookies

% if cookies: - % for cookie in cookies.itervalues(): + <% cookie_order = ["EarwigDefaultProject", "EarwigDefaultLang", "EarwigBackground", "EarwigCVShowDetails", "EarwigBackgroundCache"] %>\ + % for key in [key for key in cookie_order if key in cookies]: + <% cookie = cookies[key] %>\ - + % try: <% lines = dumps(loads(cookie.value), indent=4).splitlines() %>
${cookie.key | h}${key | h} @@ -85,7 +87,7 @@
- +