From 21bbbbdfeab31f28fe8f2be2b4ec194e6ed786e7 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Wed, 20 Jan 2016 01:52:49 -0600
Subject: [PATCH] Reorder/tweak template more.

---
 static/style.css     | 24 ++++++++++++------------
 templates/index.mako | 45 +++++++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/static/style.css b/static/style.css
index da19a33..c9ce040 100644
--- a/static/style.css
+++ b/static/style.css
@@ -63,22 +63,16 @@ div#info-box {
     margin: 10px 5px;
 }
 
-div#turnitin-container {
-    padding: 5px 10px;
-    margin: 15px 5px 10px 5px;
-}
-
-div#turnitin-title {
-    margin-bottom: -5px;
-    text-align: center;
-    font-weight: bold;
-}
-
 div#cv-result {
     padding: 5px;
     margin: 10px 5px;
 }
 
+div#turnitin-container {
+    padding: 5px;
+    margin: 15px 5px 10px 5px;
+}
+
 div#sources-container {
     padding: 5px 10px;
     margin: 15px 5px 10px 5px;
@@ -86,12 +80,17 @@ div#sources-container {
     border: 1px solid #BBB;
 }
 
-div#sources-title {
+div#turnitin-title, div#sources-title {
     margin-bottom: -5px;
     text-align: center;
     font-weight: bold;
 }
 
+div#turnitin-summary {
+    padding-bottom: 5px;
+    font-style: italic;
+}
+
 div#cv-additional {
     display: none;
 }
@@ -146,6 +145,7 @@ table#cv-result-head-table {
     width: 100%;
     text-align: center;
     table-layout: fixed;
+    border-spacing: 0;
 }
 
 table#cv-result-head-table col:nth-child(odd) {
diff --git a/templates/index.mako b/templates/index.mako
index d1da714..5aed91d 100644
--- a/templates/index.mako
+++ b/templates/index.mako
@@ -167,28 +167,6 @@
         <a href="${request.script_root | h}?lang=${query.lang | h}&amp;project=${query.project | h}&amp;oldid=${query.oldid or query.page.lastrevid | h}&amp;action=${query.action | h}&amp;${"use_engine={0}&use_links={1}".format(int(query.use_engine not in ("0", "false")), int(query.use_links not in ("0", "false"))) if query.action == "search" else "" | h}${"url=" if query.action == "compare" else ""}${query.url if query.action == "compare" else "" | u}">Permalink.</a>
     </div>
 
-    % if query.turnitin_result:
-        <div id="turnitin-container" class="${'red' if query.turnitin_result.reports else 'green'}-box">
-            <div id="turnitin-title">Turnitin Results</div>
-            % if query.turnitin_result.reports:
-                <p><a href="//en.wikipedia.org/wiki/Wikipedia:Turnitin">Turnitin</a> (through <a href="https://en.wikipedia.org/wiki/User:EranBot">EranBot</a>) found revisions that may have been plagiarized. Please review them.</p>
-
-                <table id="turnitin-table"><tbody>
-                % for report in turnitin_result.reports:
-                    <tr><td class="turnitin-table-cell"><a href="https://tools.wmflabs.org/eranbot/ithenticate.py?rid=${report.reportid}">Turnitin report ${report.reportid}</a> for text added <a href="https://${query.lang}.wikipedia.org/w/index.php?title=${query.title}&amp;diff=${report.diffid}"> at ${report.time_posted}</a>:
-                    <ul>
-                    % for source in report.sources:
-                          <li> ${source['percent']}% of revision text (${source['words']} words) found at <a href="${source['url']}">${source['url']}</a></li>
-                    % endfor
-                    </ul></td></tr>
-                % endfor
-                </tbody></table>
-            % else:
-                <p>Turnitin (through <a href="https://en.wikipedia.org/wiki/User:EranBot">EranBot</a>) found no matching sources.</p>
-            % endif
-        </div>
-    % endif
-
     <div id="cv-result" class="${'red' if result.confidence >= T_SUSPECT else 'yellow' if result.confidence >= T_POSSIBLE else 'green'}-box">
         <table id="cv-result-head-table">
             <colgroup>
@@ -232,6 +210,29 @@
             </tr>
         </table>
     </div>
+
+    % if query.turnitin_result:
+        <div id="turnitin-container" class="${'red' if query.turnitin_result.reports else 'green'}-box">
+            <div id="turnitin-title">Turnitin Results</div>
+            % if query.turnitin_result.reports:
+                <p><a href="//en.wikipedia.org/wiki/Wikipedia:Turnitin">Turnitin</a> (through <a href="https://en.wikipedia.org/wiki/User:EranBot">EranBot</a>) found revisions that may have been plagiarized. Please review them.</p>
+
+                <table id="turnitin-table"><tbody>
+                % for report in turnitin_result.reports:
+                    <tr><td class="turnitin-table-cell"><a href="https://tools.wmflabs.org/eranbot/ithenticate.py?rid=${report.reportid}">Turnitin report ${report.reportid}</a> for text added <a href="https://${query.lang}.wikipedia.org/w/index.php?title=${query.title}&amp;diff=${report.diffid}"> at ${report.time_posted}</a>:
+                    <ul>
+                    % for source in report.sources:
+                          <li> ${source['percent']}% of revision text (${source['words']} words) found at <a href="${source['url']}">${source['url']}</a></li>
+                    % endfor
+                    </ul></td></tr>
+                % endfor
+                </tbody></table>
+            % else:
+                <div id="turnitin-summary">No matching sources found.</div>
+            % endif
+        </div>
+    % endif
+
     % if query.action == "search":
         <% skips = False %>
         <div id="sources-container">