Loads of stuff.

publicwhip · Nov 16, 2008 · 9d698f2 · 9d698f2
1 parent b5e212e
commit 9d698f2
Show file tree

Hide file tree

Showing 15 changed files with 6,006 additions and 5,893 deletions.
diff --git a/website/.htaccess b/website/.htaccess
@@ -27,8 +27,8 @@ RewriteEngine On
 RewriteRule ^testrewrite$ /index.php [PT]
 RewriteRule ^[Nn]/([^;]+)$                      /newsletters/signup.php?token=$1
 RewriteRule ^[Uu]/([^;]+)$                      /newsletters/signup.php?token=$1&unsub=1
-RewriteRule ^byelection$ /election_crewe_and_nantwich_2008.php [PT]
-RewriteRule ^by-election$ /election_crewe_and_nantwich_2008.php?dash=yes [PT]
+RewriteRule ^byelection$ /election_glenrothes2008.php [PT]
+RewriteRule ^by-election$ /election_glenrothes2008.php?dash=yes [PT]
 RewriteRule ^fortytwodays$ /fortytwodays.php [PT]
 
 

diff --git a/website/divcoords.txt b/website/divcoords.txt
diff --git a/website/election2008articles.inc b/website/election2008articles.inc
@@ -1,5 +1,5 @@
 <?php
-# $Id: election2008articles.inc,v 1.6 2008/10/21 18:48:29 publicwhip Exp $
+# $Id: election2008articles.inc,v 1.7 2008/11/16 22:56:24 publicwhip Exp $
 
 # The Public Whip, Copyright (C) 2005 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
@@ -473,7 +473,7 @@ function WriteLongListNews($issuename)
                 print "<b>".$newsarticle["title"]."</b> ";
                 print "(".$newsarticle["publisher"].") ";
                 print "<p class=\"summ\"><i>".$newsarticle["summary"]."</i>";
-                print " (<a href=\"".$newsarticle["url"]."\" target=\"_blank\" title=\"Read rest of article\">more...</a>)</p>\n";
+                print " (<a href=\"".$newsarticle["url"]."\" target=\"_blank\" onclick=\"NotifyEvent('news-$issuename')\" title=\"Read rest of article\">more...</a>)</p>\n";
             }
             else
             {

diff --git a/website/election_crewe_and_nantwich_2008.php b/website/election_crewe_and_nantwich_2008.php
@@ -287,7 +287,7 @@ function WriteFrontPage()
 
     print "<div id=\"opform\">";
     print "<form action=\"\" method=\"get\">";
-    print "<div class=\"frontpostcodesec\">Type in <em>either</em>:\n";
+    print "<div class=\"frontpostcodesec\">To find out how your views compare to the main political parties, type in <em>either</em>:\n";
     print "<ul>\n";
     print "<li>Your postcode: <input type=\"text\" name=\"mppc\" id=\"mppc\" size=\"8\" onKeyDown=\"if(event.keyCode==13)event.keyCode=0\"> </input>, <em>or</em> </li>
            <li>Your parliamentary constituency: <input type=\"text\" name=\"mpc\" id=\"mpc\"> </input> </li>
@@ -668,6 +668,7 @@ function WritePartyScores($candidates)
             print "</tr>\n";
         }
         print "</table>\n";
+        print "<p id=\"ypartychoice\">Your answers are most similar to <span id=\"yourpartychoice\">unknown</span>.  You should strongly consider voting for them.</p>\n"; 
         print "<p class=\"seclinks\"><a href=\"#sec-upload\" class=\"st\">next &gt;&gt;</a>\n";
         print "</div>\n";
     }

diff --git a/website/header.inc b/website/header.inc
@@ -3,7 +3,7 @@
 <html>
 
 <?php
-# $Id: header.inc,v 1.97 2008/07/23 11:13:12 publicwhip Exp $
+# $Id: header.inc,v 1.98 2008/11/16 22:56:24 publicwhip Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
@@ -199,6 +199,10 @@ Newsletter (<a href="/newsletters/signup.php">info</a>): <INPUT TYPE="TEXT" NAME
 <!-- the rest of the content -->
 <tr><td colspan="3" class="content">
 
+<?
+//<div style="margin-left:80px; margin-right:80px; margin-top:30px; margin-bottom:30px; background-color:#eeeedd; font-size:200%; text-align:center; color: #886611; padding:20px; border:thick blue dashed;\"><a style="color:#886611" href="/byelection">Try the Glenrothes Byelection Quiz</a></div>
+?>
+
 <? 
 print $h1title;  # the actual heading
 ?>

diff --git a/website/lordcoords.txt b/website/lordcoords.txt
diff --git a/website/mpcoords-2005.txt b/website/mpcoords-2005.txt
diff --git a/website/quiz/election2008.css b/website/quiz/election2008.css
@@ -346,7 +346,7 @@ p.seclinks
     text-align:left;
     margin-top:10px;
     margin-left:0px;
-    Zclear:both;
+    clear:both;
 }
 p.seclinks a.ss
 {
@@ -391,9 +391,10 @@ td.elerowtd
 table.elecalc-single
 {
     width:50%;
-    float:right;
+    float:left;
     border: thin black solid;
     padding-left:10px;
+    margin-right:10px; 
 }
 table.elecalc-print
 {
@@ -462,14 +463,19 @@ div.footq a
     margin-left:2em;
 }
 
-div.usecpol li
+div.usecpol p
+{
+    margin-left:20px; 
+}
+div.usecpol p.usecprint
 {
     background-color:#aaffaa; 
     border: thin black solid; 
-    margin:10px; 
+    Zmargin:10px; 
     padding:3px;
     font-size:120%;
 }
+
 p.empara
 {
     font-size:120%;
@@ -487,22 +493,40 @@ td.tds
 td.LDem
 {
     background-color:yellow;
+    Zbackground-image: url(/images/libdemico.png);
+    Zbackground-position: top right; 
+    Zbackground-repeat: no-repeat; 
 }
 td.Lab
 {
     background-color:red;
+    Zbackground-image: url(/images/labico.png);
+    Zbackground-position: top right; 
+    Zbackground-repeat: no-repeat; 
 }
 td.Con
 {
     background-color:blue; 
+    Zbackground-image: url(/images/conico.png);
+    Zbackground-position: top right; 
+    Zbackground-repeat: no-repeat; 
 }
 td.SNP
 {
     background-color:#ffff60; 
+    Zbackground-image: url(/images/snpico.png);
+    Zbackground-position: top right; 
+    Zbackground-repeat: no-repeat; 
 }
 td.incumbant
 {
     background-color:white; 
 }
 
+p#ypartychoice
+{
+    font-size:120%; 
+    margin-left:20px; 
+    background-color:#ccffcc; 
+}
 
diff --git a/website/quiz/election_glenrothes2008.js b/website/quiz/election_glenrothes2008.js
@@ -123,6 +123,7 @@ function UpdateCItable(vevent)
 
     // now mark the best by colour
     bestlist.reverse();
+    var summarycell = document.getElementById("yourpartychoice");
     for (var i = 0; i < candidates.length; i++)
     {
         var bbest = ((bestlist.length != 0) && (bestlist[bestlist.length - 1] == i))
@@ -137,7 +138,10 @@ function UpdateCItable(vevent)
         var rkcell = document.getElementById(rkcellid);
         rkcell.style.backgroundColor = (bbest ? "#eeffee" : "#9999ee");
         if (bbest)
+        {
             rkcell.innerHTML += " (best)";
+            summarycell.innerHTML = mpcell.innerHTML;
+        }
 
         // copy best selections into lower duplicate row
         //var mpcelll = document.getElementById(mpcellid + "l");

diff --git a/website/votemap/divsee.png b/website/votemap/divsee.png
diff --git a/website/votemap/divseethumb.png b/website/votemap/divseethumb.png
diff --git a/website/votemap/lordsee.png b/website/votemap/lordsee.png
diff --git a/website/votemap/lordseethumb.png b/website/votemap/lordseethumb.png
diff --git a/website/votemap/mpsee-2005.png b/website/votemap/mpsee-2005.png
diff --git a/website/votemap/mpseethumb.png b/website/votemap/mpseethumb.png