From b5908160bf6e8bc2968e62a65559323e2b8ec034 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@verizon.net>
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:
+                <div class="red-box">
+                    <p>The given site (project=<b><tt>${query.project}</tt></b>, language=<b><tt>${query.lang}</tt></b>) doesn't seem to exist. It may also be closed or private. <a href="//${query.lang}.${query.project}.org/">Confirm its URL.</a></p>
+                </div>
+            % elif query.project and query.lang and query.title and page and not result:
+                <div class="red-box">
+                    <p>The given page doesn't seem to exist: <a href="${page.url}">${page.title | h}</a>.</p>
+                </div>
+            % endif
             <h1>Copyvio Detector</h1>
             <p>This tool attempts to detect <a href="//en.wikipedia.org/wiki/WP:COPYVIO">copyright violations</a> 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 <a href="//toolserver.org/~dcoetzee/duplicationdetector/">Duplication Detector</a>. Check out the <a href="//en.wikipedia.org/wiki/User:EarwigBot/Copyvios/FAQ">FAQ</a> for more information and technical details.</p>
             <form action="${environ['PATH_INFO']}" method="get">
@@ -67,17 +76,7 @@
                     </tr>
                 </table>
             </form>
-            % if query.project and query.lang and query.title and not page:
-                <div class="divider"></div>
-                <div class="red-box">
-                    <p>The given site (project=<b><tt>${query.project}</tt></b>, language=<b><tt>${query.lang}</tt></b>) doesn't seem to exist. It may also be closed or private. <a href="//${query.lang}.${query.project}.org/">Confirm its URL.</a></p>
-                </div>
-            % elif query.project and query.lang and query.title and page and not result:
-                <div class="divider"></div>
-                <div class="red-box">
-                    <p>The given page doesn't seem to exist: <a href="${page.url}">${page.title | h}</a>.</p>
-                </div>
-            % elif page:
+            % if page:
                 <div class="divider"></div>
                 <div id="cv-result-${'yes' if result.violation else 'no'}">
                     % 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 @@
             <h2>Cookies</h2>
             % if cookies:
                 <table>
-                % 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] %>\
                     <tr>
-                        <td><b><tt>${cookie.key | h}</tt></b></td>
+                        <td><b><tt>${key | h}</tt></b></td>
                         % try:
                             <% lines = dumps(loads(cookie.value), indent=4).splitlines() %>
                             <td>
@@ -85,7 +87,7 @@
                         <td>
                             <form action="${environ['PATH_INFO']}" method="post">
                                 <input type="hidden" name="action" value="delete">
-                                <input type="hidden" name="cookie" value="${cookie.key | h}">
+                                <input type="hidden" name="cookie" value="${key | h}">
                                 <button type="submit">Delete</button>
                             </form>
                         </td>