aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/Page.pm71
-rw-r--r--templates/website/scambs-footer19
-rw-r--r--templates/website/scambs-header79
-rw-r--r--web/css/core.css (renamed from web/css.css)142
-rw-r--r--web/css/main-scambs.css19
-rw-r--r--web/css/main.css131
-rw-r--r--web/css/scambs.css1110
-rwxr-xr-xweb/index.cgi29
-rw-r--r--web/js.js4
9 files changed, 1431 insertions, 173 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm
index e9f931d40..557163084 100644
--- a/perllib/Page.pm
+++ b/perllib/Page.pm
@@ -6,7 +6,7 @@
# Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: Page.pm,v 1.79 2008-02-03 19:23:51 matthew Exp $
+# $Id: Page.pm,v 1.80 2008-03-12 17:06:56 matthew Exp $
#
package Page;
@@ -38,6 +38,7 @@ sub do_fastcgi {
try {
my $W = new mySociety::WatchUpdate();
while (my $q = new mySociety::CGIFast()) {
+ microsite($q);
&$func($q);
dbh()->rollback() if $mySociety::DBHandle::conf_ok;
$W->exit_if_changed();
@@ -62,6 +63,18 @@ sub do_fastcgi {
exit(0);
}
+=item microsite Q
+
+Work out what site we're on, template appropriately
+
+=cut
+sub microsite {
+ my $q = shift;
+ my $host = $ENV{HTTP_HOST} || '';
+ $q->{site} = 'fixmystreet';
+ $q->{site} = 'scambs' if $host =~ /scambs/;
+}
+
=item header Q [PARAM VALUE ...]
Return HTML for the top of the page, given PARAMs (TITLE is required).
@@ -79,35 +92,37 @@ sub header ($%) {
$title .= ' - ' if $title;
$title = ent($title);
- print $q->header(-charset=>'utf-8');
- my $html = <<EOF;
+ my $home = !$title && $ENV{SCRIPT_NAME} eq '/index.cgi' && !$ENV{QUERY_STRING};
+
+ print $q->header(-charset => 'utf-8');
+
+ my $html;
+ if ($q->{site} eq 'scambs') {
+ open FP, '../templates/website/scambs-header';
+ $html = join('', <FP>);
+ close FP;
+ $html =~ s#<!-- TITLE -->#$title#;
+ } else {
+ $html = <<EOF;
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en-gb">
<head>
-EOF
-# Causes onLoad never to fire in IE...
-# <!--[if lt IE 7.]>
-# <script defer type="text/javascript" src="/pngfix.js"></script>
-# <![endif]-->
- $html .= <<EOF;
<script type="text/javascript" src="/yui/utilities.js"></script>
<script type="text/javascript" src="/js.js"></script>
<title>${title}FixMyStreet</title>
- <style type="text/css">\@import url("/css.css");</style>
-EOF
- if ($params{rss}) {
- $html .= '<link rel="alternate" type="application/rss+xml" title="'
- . $params{rss}[0] . '" href="' . $params{rss}[1] . '">';
- }
- $html .= <<EOF;
+ <style type="text/css">\@import url("/css/core.css"); \@import url("/css/main.css");</style>
+ <!-- RSS -->
</head>
<body>
EOF
- my $home = !$title && $ENV{SCRIPT_NAME} eq '/index.cgi' && !$ENV{QUERY_STRING};
- $html .= $home ? '<h1 id="header">' : '<div id="header"><a href="/">';
- $html .= 'Fix<span id="my">My</span>Street <span id="beta">' . _('Beta') . '</span>';
- $html .= $home ? '</h1>' : '</a></div>';
- $html .= '<div id="wrapper"><div id="content">';
+ $html .= $home ? '<h1 id="header">' : '<div id="header"><a href="/">';
+ $html .= 'Fix<span id="my">My</span>Street <span id="beta">' . _('Beta') . '</span>';
+ $html .= $home ? '</h1>' : '</a></div>';
+ $html .= '<div id="wrapper"><div id="content">';
+ }
+ if ($params{rss}) {
+ $html =~ s#<!-- RSS -->#<link rel="alternate" type="application/rss+xml" title="'{$params{rss}[0]}" href="{$params{rss}[1]}">#;
+ }
if (mySociety::Config::get('STAGING_SITE')) {
$html .= '<p id="error">This is a developer site; things might break at any time, and councils are not sent emails (they\'d get annoyed!).</p>';
}
@@ -119,6 +134,14 @@ EOF
=cut
sub footer {
my ($q, $extra) = @_;
+
+ if ($q->{site} eq 'scambs') {
+ open FP, '../templates/website/scambs-footer';
+ my $html = join('', <FP>);
+ close FP;
+ return $html;
+ }
+
my $pc = $q->param('pc') || '';
$pc = "?pc=" . ent($pc) if $pc;
$extra = $q->{scratch} if $q->{scratch}; # Overrides
@@ -129,7 +152,7 @@ sub footer {
<ul id="navigation">
<li><a href="/">Report a problem</a></li>
<li><a href="/reports">All reports</a></li>
-<li id="nav_new"><a href="/alert$pc">Local alerts</a></li>
+<li><a href="/alert$pc">Local alerts</a></li>
<li><a href="/faq">Help</a></li>
<li><a href="/contact">Contact</a></li>
</ul>
@@ -169,7 +192,7 @@ sub display_map {
$params{pins} ||= '';
$params{pre} ||= '';
$params{post} ||= '';
- my $px = defined($params{px}) ? $params{px}-254 : 0;
+ my $px = defined($params{px}) ? 254-$params{px} : 0;
my $py = defined($params{py}) ? 254-$params{py} : 0;
my $x = int($params{x})<=0 ? 0 : $params{x};
my $y = int($params{y})<=0 ? 0 : $params{y};
@@ -216,7 +239,7 @@ var drag_x = $px; var drag_y = $py;
<div id="map_box">
$params{pre}
<div id="map"><div id="drag">
- $img_type alt="NW map tile" id="t2.2" name="tile_$tl" src="$tl_src" style="top:0px; left:0px;">$img_type alt="NE map tile" id="t2.3" name="tile_$tr" src="$tr_src" style="top:0px; left:$imgw;"><br>$img_type alt="SW map tile" id="t3.2" name="tile_$bl" src="$bl_src" style="top:$imgh; left:0px;">$img_type alt="SE map tile" id="t3.3" name="tile_$br" src="$br_src" style="top:$imgh; left:$imgw;">
+ $img_type alt="NW map tile" id="t2.2" name="tile_$tl" src="$tl_src" style="top:0px; right:$imgw;">$img_type alt="NE map tile" id="t2.3" name="tile_$tr" src="$tr_src" style="top:0px; right:0;"><br>$img_type alt="SW map tile" id="t3.2" name="tile_$bl" src="$bl_src" style="top:$imgh; right:$imgw;">$img_type alt="SE map tile" id="t3.3" name="tile_$br" src="$br_src" style="top:$imgh; right:0;">
$params{pins}
</div>
EOF
diff --git a/templates/website/scambs-footer b/templates/website/scambs-footer
new file mode 100644
index 000000000..4a0a319cc
--- /dev/null
+++ b/templates/website/scambs-footer
@@ -0,0 +1,19 @@
+</div></div>
+
+</div>
+
+<div id="bottominfo">
+ <ul>
+ <li><script type="text/javascript">printPageXHTML();</script></li><li><img src="http://www.scambs.gov.uk/images/southcambridgeshiredistrictcouncil/icons/internet/email.gif" alt="" height="15" width="15"> <a href="http://www.scambs.gov.uk/friend.asp?page=">email this page</a></li><li><img src="http://www.scambs.gov.uk/images/southcambridgeshiredistrictcouncil/icons/internet/ask.gif" alt="" height="15" width="15"> <a href="http://www.scambs.gov.uk/question.asp?page=&amp;owner=39">ask a question</a></li>
+ </ul>
+</div>
+
+<div style="clear: left;" id="footer">
+ <div id="footertext">
+ <a href="http://www.scambs.gov.uk/disclaimer.htm">Disclaimer</a> | <a href="http://www.scambs.gov.uk/privacy.htm">Privacy Statement</a> | <a href="http://www.scambs.gov.uk/accesskeys.htm">Access Keys / Accessibility</a> | <a href="http://www.scambs.gov.uk/CouncilAndDemocracy/Consultation/complaints_compliments.htm">Complaints &amp; Compliments Procedure</a>
+ </div>
+</div>
+
+</div>
+</body>
+</html>
diff --git a/templates/website/scambs-header b/templates/website/scambs-header
new file mode 100644
index 000000000..3a6845afe
--- /dev/null
+++ b/templates/website/scambs-header
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en-gb">
+<head>
+<title><!-- TITLE -->Envirocrime - South Cambridgeshire District Council</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javascript" src="/yui/utilities.js"></script>
+<script type="text/javascript" src="/js.js"></script>
+<style type="text/css" media="screen, projection">
+@import "/css/core.css";
+@import "/css/main-scambs.css";
+@import "/css/scambs.css";
+</style>
+<link rel="stylesheet" type="text/css" href="http://www.scambs.gov.uk/system/css/print.css" media="print">
+<script type="text/javascript" src="http://www.scambs.gov.uk/system/js/external.js"></script>
+<!-- RSS -->
+</head>
+<body>
+
+<div class="test">
+
+<div id="top">
+ <div id="topnav">
+ <ul style="float: right;"><li style="float: left; padding-top: 2px;"><a href="#start" title="Accessibility: bypass navigation bar" accesskey="s">Skip to Content</a>&nbsp;|&nbsp;</li><li style="float: left; padding-top: 2px;"><a href="http://www.scambs.gov.uk/accesskeys.htm" title="Accessibility" accesskey="0">Accessibility</a>&nbsp;|&nbsp;</li><li style="float: left;"><a target="_blank" style="float: left;" href="http://spoxy4.insipio.com/generator/en/www.scambs.gov.uk/default.htm" class="ISI_REMOVE" accesskey="5" rel="external"><img style="float: left;" src="http://www.scambs.gov.uk/system/images/speakericon.gif" alt="Listen to this Page" height="20" width="23"><span style="padding: 2px 0pt 0pt 2px; display: block;">&nbsp;Listen to page</span><span class="hide"> (This link will open in a new window)</span></a></li></ul>
+ </div>
+</div>
+
+<div id="masthead">
+ <div id="bannerimage">
+ <div id="logo"><a href="http://www.scambs.gov.uk/default.htm"><img src="http://www.scambs.gov.uk/system/images/scambs/banner_right.gif" alt="South Cambridgeshire District Council Logo" height="150" width="327"></a></div>
+ </div>
+</div>
+
+<div id="header">
+ <div id="headernav">
+ <a href="http://www.scambs.gov.uk/" title="South Cambridgeshire District Council Home Page" accesskey="1">Home</a> |
+ <a href="http://search2.openobjects.com/kbroker/cambridgeshire/scambs/a2z/search.a2z?letter=a&amp;action=browseEntries&amp;servlet=search.lsim&amp;provider=6" title="A to Z listing of council services" accesskey="3">A-Z</a> |
+ <a href="http://www.scambs.gov.uk/siteindex/default.htm?flat=1" title="Site map">Site Map</a> |
+ <a href="http://www.scambs.gov.uk/form_builder/default.asp?mode=10&amp;sid=33&amp;pid=64" title="Feedback" accesskey="4">Contact us</a> |
+ <a href="http://www.scambs.gov.uk/events/" title="Listing of current events">Events</a> |
+ <a href="http://www.scambs.gov.uk/pressreleases/" title="News releases">News releases</a>
+ </div>
+ <form id="search" action="http://search2.openobjects.com/kbroker/cambridgeshire/scambs/search/search.lsim" method="get">
+ <noscript><div class="floatright"><input type="submit" value="Go" /></div></noscript>
+ <div id="headersearch">
+ <img src="http://www.scambs.gov.uk/system/images/scambs/search.gif" alt="Search the South Cambridgeshire website" height="21" width="32"><a href="http://search2.openobjects.com/kbroker/cambridgeshire/scambs/search/asearch.jsp" title="Search site using advance functions" accesskey="2">Advanced Search</a> | <label class="n" for="q">Search: <input size="12" class="form" name="qt" id="q" value="enter text " type="text"></label><input value="R" name="order" type="hidden">
+ <input name="sr" value="0" type="hidden">
+ <input name="nh" value="10" type="hidden">
+ <input name="cs" value="iso-8859-1" type="hidden">
+ <input name="sc" value="scambs" type="hidden">
+ <input name="sm" value="0" type="hidden">
+ <input name="sf" value="" type="hidden">
+ <input name="mt" value="1" type="hidden">
+ <input name="ha" value="1115" type="hidden">
+ </div>
+ </form>
+</div>
+
+<div id="breadcrumb">
+ <div id="breadcrumbtext">
+ <a title="Breadcrumb link: Home" href="http://www.scambs.gov.uk/">Home</a> &gt; <a href="/">Envirocrime</a>
+ </div>
+</div>
+
+<div id="content">
+ <a name="start" id="start"></a>
+ <div id="left">
+ <div id="leftnav">
+ <ul>
+ <li class="first"><a href="/">Report a problem</a>
+ <li class="first">About
+ <li class="first">Recent successes
+ <li class="first">Name and shame
+ <li class="first">Contact
+ <li class="first">Help
+ </ul>
+ </div>
+ </div>
+ <!-- <div id="right"></div> --> <!-- OPTIONAL -->
+ <div id="middle"><div id="maintext">
diff --git a/web/css.css b/web/css/core.css
index dc24424e2..57cfcebe9 100644
--- a/web/css.css
+++ b/web/css/core.css
@@ -1,32 +1,7 @@
/* Generics */
-body {
- font-family: "Gill Sans", "Gill Sans MT", Helvetica, Arial, sans-serif;
- margin: 0;
- padding: 0;
- /* color: #a9aeb0; */
-}
-
-h1 {
- margin: 0;
- font-size: 175%;
-}
-h2 {
- font-size: 140%;
-}
-
-a:link {
- color: #0000ff;
-}
-a:visited {
- color: #000099;
-}
-a:hover, a:active {
- color: #ff0000;
-}
-
blockquote {
- border-left: solid 4px #5e552b;
+ border-left: solid 4px #666666;
padding-left: 0.5em;
}
blockquote h2, blockquote p {
@@ -48,7 +23,7 @@ label {
width: 5em;
}
-fieldset {
+#fieldset {
border: none;
padding: 0.5em;
}
@@ -64,11 +39,6 @@ dt {
.v { display: none; }
-.a {
- color: #000000;
- background-color: #f3e5a5;
-}
-
#error {
text-align: center;
color: #cc0000;
@@ -90,92 +60,6 @@ ul#error {
/* Site-wide layout */
-#header {
- font-size: 200%;
- font-weight: bold;
- border-bottom: solid 2px #5e552b;
- margin: 0;
- padding: 5px 0.5em;
- background-color: #e3d595;
- color: #5e552b;
-}
-
-#my {
- color: #4e451b;
- background-color: #e3d595;
-}
-#beta {
- color: #6e653b;
- background-color: #e3d595;
- font-size: 50%;
- font-style: italic;
-}
-
-#header a:link, #header a:visited {
- color: #5e552b;
- background-color: #e3d595;
- text-decoration: none;
-}
-#header a:active, #header a:hover {
- text-decoration: underline;
-}
-
-#content {
- width: 100%; /* Must specify a width or IE goes crazy wrong! */
- position: relative;
- margin: 0 auto;
- max-width: 60em;
-}
-
-/* Can't put the margin in #content because of above IE craziness */
-#wrapper {
- margin: 2em;
-}
-
-#navigation {
- position: absolute;
- top: 1em;
- right: 1em;
- padding: 0;
- margin: 0;
- list-style-type: none;
-}
-#navigation li {
- display: inline;
- padding: 0;
- margin: 0;
-}
-
-#navigation a {
- display: -moz-inline-box;
- display: inline-block;
- padding: 0.5em 1em;
-}
-#navigation a:link, #navigation a:visited {
- color: #5e552b;
-}
-#navigation a:hover, #navigation a:active {
- background-color: #5e552b;
- color: #e3d595;
-}
-
-#nav_new a {
- background-image: url("/i/new.png");
- background-repeat: no-repeat;
- background-position: 100% 0;
-}
-
-
-#footer {
- clear: both;
- text-align: right;
- font-size: 83%;
- border-top: solid 1px #5e552b;
- display: table;
- margin: 2em 0 1em auto;
- padding: 2px 4px;
-}
-
#advert_thin {
width: 50%;
margin: 1em auto;
@@ -201,7 +85,6 @@ ul#error {
font-size: 150%;
margin: 1em auto;
padding: 1em;
- background-color: #e3d595;
-moz-border-radius: 1em;
border-radius: 1em;
}
@@ -228,7 +111,6 @@ ul#error {
#front_stats div {
text-align: center;
width: 5.5em;
- background-color: #e3d595;
-moz-border-radius: 0.5em;
border-radius: 0.5em;
float: left;
@@ -255,14 +137,14 @@ ul#error {
/* Forms */
-fieldset div {
+#fieldset div {
margin-top: 2px;
clear: left;
}
-fieldset div.checkbox {
+#fieldset div.checkbox {
padding-left: 5.5em;
}
-fieldset div.checkbox label, label.n {
+#fieldset div.checkbox label, label.n {
float: none;
text-align: left;
padding-right: 0;
@@ -281,6 +163,7 @@ fieldset div.checkbox label, label.n {
float: right;
width: 510px;
position: relative;
+ margin-left: 20px;
}
p#copyright {
@@ -302,14 +185,10 @@ p#copyright {
position: absolute;
width: 508px;
height: 508px;
- left: 0;
+ right: 0;
top: 0;
}
-#side {
- margin-right: 530px;
-}
-
#drag input {
cursor: crosshair;
background-color: #cccccc;
@@ -352,13 +231,6 @@ p#copyright {
margin-top: 0;
}
-/*
-ol#current img {
- position: absolute;
- border: none;
-}
-*/
-
/* Problem pages */
#fixed, #unknown {
diff --git a/web/css/main-scambs.css b/web/css/main-scambs.css
new file mode 100644
index 000000000..08ed4011e
--- /dev/null
+++ b/web/css/main-scambs.css
@@ -0,0 +1,19 @@
+blockquote {
+ border-left: solid 4px #013B63;
+}
+
+.a {
+ color: #000000;
+ background-color: #427499;
+}
+
+#postcodeForm, #front_stats div {
+ background-color: #427499;
+ color: #ffffff;
+}
+
+#front_stats div {
+ padding: 0.5em 0;
+ width: 7em;
+}
+
diff --git a/web/css/main.css b/web/css/main.css
new file mode 100644
index 000000000..ab3522825
--- /dev/null
+++ b/web/css/main.css
@@ -0,0 +1,131 @@
+/* Generics */
+
+body {
+ font-family: "Gill Sans", "Gill Sans MT", Helvetica, Arial, sans-serif;
+ margin: 0;
+ padding: 0;
+ /* color: #a9aeb0; */
+}
+
+h1 {
+ margin: 0;
+ font-size: 175%;
+}
+h2 {
+ font-size: 140%;
+}
+
+a:link {
+ color: #0000ff;
+}
+a:visited {
+ color: #000099;
+}
+a:hover, a:active {
+ color: #ff0000;
+}
+
+blockquote {
+ border-left: solid 4px #5e552b;
+}
+
+.a {
+ color: #000000;
+ background-color: #f3e5a5;
+}
+
+/* Site layout */
+
+#header {
+ font-size: 200%;
+ font-weight: bold;
+ border-bottom: solid 2px #5e552b;
+ margin: 0;
+ padding: 5px 0.5em;
+ background-color: #e3d595;
+ color: #5e552b;
+}
+
+#my {
+ color: #4e451b;
+ background-color: #e3d595;
+}
+#beta {
+ color: #6e653b;
+ background-color: #e3d595;
+ font-size: 50%;
+ font-style: italic;
+}
+
+#header a:link, #header a:visited {
+ color: #5e552b;
+ background-color: #e3d595;
+ text-decoration: none;
+}
+#header a:active, #header a:hover {
+ text-decoration: underline;
+}
+
+#content {
+ width: 100%; /* Must specify a width or IE goes crazy wrong! */
+ position: relative;
+ margin: 0 auto;
+ max-width: 60em;
+}
+
+/* Can't put the margin in #content because of above IE craziness */
+#wrapper {
+ margin: 2em;
+}
+
+#navigation {
+ position: absolute;
+ top: 1em;
+ right: 1em;
+ padding: 0;
+ margin: 0;
+ list-style-type: none;
+}
+#navigation li {
+ display: inline;
+ padding: 0;
+ margin: 0;
+}
+
+#navigation a {
+ display: -moz-inline-box;
+ display: inline-block;
+ padding: 0.5em 1em;
+}
+#navigation a:link, #navigation a:visited {
+ color: #5e552b;
+}
+#navigation a:hover, #navigation a:active {
+ background-color: #5e552b;
+ color: #e3d595;
+}
+
+#nav_new a {
+ background-image: url("/i/new.png");
+ background-repeat: no-repeat;
+ background-position: 100% 0;
+}
+
+#footer {
+ clear: both;
+ text-align: right;
+ font-size: 83%;
+ border-top: solid 1px #5e552b;
+ display: table;
+ margin: 2em 0 1em auto;
+ padding: 2px 4px;
+}
+
+#postcodeForm {
+ background-color: #e3d595;
+}
+
+#front_stats div {
+ background-color: #e3d595;
+}
+
diff --git a/web/css/scambs.css b/web/css/scambs.css
new file mode 100644
index 000000000..38733d294
--- /dev/null
+++ b/web/css/scambs.css
@@ -0,0 +1,1110 @@
+/************************************************/
+/* scambs_web.css */
+/* Use for website and ActiveEdit */
+/************************************************/
+
+/***********************************************/
+/* HTML tag styles */
+/***********************************************/
+
+html {
+ margin: 0px 10px;
+ background: #E3E3CB;
+ border-left: #999 solid 1px;
+ border-right: #999 solid 1px;
+}
+/*added an extra pixel to make sure the background lines are seen in all browsers, especialy Opera*/
+
+body {
+ margin: 0px;
+ color: #333;
+ padding: 0px;
+ min-height: 100%;
+ background: #fff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+* html body {
+ margin: 0px 10px;
+ border-left: #999 solid 1px;
+ border-right: #999 solid 1px;
+ height: 100%;
+}
+
+a {
+ color: #336699;
+ text-decoration: none;
+}
+
+a:link{
+ color: #336699;
+ text-decoration: none;
+}
+
+a:visited{
+ color: #336699;
+ text-decoration: none;
+}
+
+a:hover{
+ color: #666;
+ text-decoration: underline;
+}
+
+a:active, a:focus {
+ color: #fff;
+ background: #660000;
+}
+
+form {
+ margin: 0px;
+}
+
+h1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 1em;
+ color: #003366;
+ text-transform: uppercase;
+ font-weight: bold;
+ letter-spacing: 0.1em;
+}
+
+h2{
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 1em;
+ line-height: 1.2em;
+ font-weight: bold;
+ color: #006699;
+}
+
+h3{
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 1em;
+ line-height: 1.1em;
+ color: #003366;
+}
+
+h4{
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 1em;
+ line-height: 1em;
+ color: #000000;
+}
+
+ul li {
+ list-style-type: disc;
+ font-size: 1em;
+}
+
+
+ol li {
+ list-style-type: decimal;
+}
+
+img {
+ border: 0px;
+}
+
+th {
+ color: #000000;
+ text-align: left;
+}
+
+/* Structured Pages Styles */
+
+#menupanel span.year {
+ font-size: 1.2em;
+}
+
+#centrepanel table.listings {
+ border: 1px solid #006699;
+ width: 100%;
+}
+
+#centrepanel th {
+ color: #003366;
+ text-align: left;
+ border-bottom: 1px solid #006699;
+}
+
+#centrepanel th.day {
+ width: 40px;
+}
+
+#centrepanel th.date {
+ width: 100px;
+}
+
+#centrepanel th.type {
+ width: 60px;
+}
+
+.lefttop
+{
+ text-align: left;
+ vertical-align:top;
+}
+
+/*** Search Result Styles***/
+
+table.searchresults td {
+ text-align: left;
+ vertical-align: top;
+}
+
+tr.resultrow td {
+ background: #eee;
+}
+
+tr.result td {
+ padding-bottom: 20px;
+}
+
+span.resultdate {
+ color: #006699;
+ font-style: italic;
+}
+
+/***********************************************/
+/* Layout Divs */
+/***********************************************/
+/* Skip content links*/
+a.skip {
+ float: left;
+ position: absolute; left: -500em; width: 20em;
+}
+
+.test {
+ background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-y 180px 0px;
+ min-height: 1000px;
+ height: 100%;
+ clear: both;
+ }
+
+/*allcontent*/
+#content{
+ background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots_right.gif) repeat-y top right;
+ width: 100%;
+ height: 100%;
+ margin: 0px;
+ clear: both;
+}
+
+#contentnodots{
+ width: 100%;
+ height: 100%;
+ margin: 0px;
+ clear: both;
+}
+
+/*top layer*/
+#top {
+ clear: both;
+ height: 1.7em;
+ padding: 0px 0px 0px 0px;
+ border-bottom: 1px solid #fff;
+ background: #013B63 url(http://www.scambs.gov.uk/system/images/scambs/topbck.jpg) repeat-y;
+}
+
+#topnav {
+ padding: 4px 10px 0px 15px;
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 0.7em;
+ text-align: right;
+ color: #fff;
+}
+
+#topnav a:link {
+ color: #fff;
+}
+
+#topnav a:visited {
+ color: #fff;
+}
+#topnav a:hover {
+ color: #CCCCCC;
+}
+
+#topnav a:active, #topnav a:focus {
+ color: #fff;
+}
+
+#topnav ul, #topnav li {
+ display: inline;
+ margin: 0px;
+ }
+
+/***********************************************/
+
+.floatleft {
+ float: left;
+}
+
+.floatright {
+ float: right;
+}
+
+.block {
+ display: block;
+}
+
+.clear {
+ clear: both;
+}
+
+/*use for hidden text */
+.hide {
+ display: none;
+}
+
+.uline {
+ text-decoration: underline;
+}
+
+.italic {
+ text-decoration: italic;
+}
+
+.dotted {
+background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-x left center;
+height: 1px;
+}
+
+.dottedgreyback {
+background: #f7f7f7 url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-x left center;
+height: 1px;
+}
+
+.greyback {
+background: #f7f7f7;
+}
+
+.dkgreyback {
+background: #efefef;
+}
+
+.blueback {
+background: #e0f1ff;
+}
+
+.pinkback {
+background: #ffe0e6;
+}
+
+.yellowback {
+background: #ffffd0;
+}
+
+.blackback {
+background: #000000;
+}
+
+.purpleback {
+background: #813f62;
+}
+
+.greenback {
+background: #008000;
+}
+
+.redtext {
+color: red;
+}
+
+.whitetext {
+color: white;
+}
+
+.bluetext {
+color: #006699;
+}
+
+.centertext {
+text-align: center
+}
+
+.AZ {
+ padding-right: 2px;
+ padding-left: 2px;
+ border: 1px solid gray;
+ font-weight: bold;
+ float: left;
+ margin: 1px;
+ width: 10px;
+ text-align: center;
+}
+
+.AZselected {
+ padding-right: 2px;
+ padding-left: 2px;
+ border: 1px solid gray;
+ font-weight: bold;
+ float: left;
+ margin: 1px;
+ text-decoration: underline;
+}
+
+/*job vacancies styles*/
+#jobvacs div {
+ /*float: left;*/
+ /*width: 240px;*/
+ padding-right: 5px;
+}
+
+#jobvacs span {
+ /*float: left;*/
+}
+
+#jobvacs div div {
+ width: 100px;
+ font-weight: bold;
+ float: left;
+}
+
+#jobvacs br {
+ /*clear: left;*/
+}
+
+/***********************************************/
+
+/*masthead*/
+#masthead {
+ clear: both;
+ display: block;
+ height: 150px;
+ width: 100%;
+ border-bottom: 1px solid #fff;
+ background: #013B63;
+}
+
+#bannerimage {
+ height: 150px;
+ background: url(http://www.scambs.gov.uk/images/southcambridgeshiredistrictcouncil/headers/defaultBg.jpg) no-repeat top left;
+}
+
+#Housingbannerimage {
+ height: 150px;
+ background: url(http://www.scambs.gov.uk/images/southcambridgeshiredistrictcouncil/headers/housing.jpg) no-repeat top left;
+}
+
+#homeimage {
+ display: block;
+ float:left;
+ height: 150px;
+ width:420px;
+ margin: 0;
+}
+
+#homeimage img {
+ display: inline;
+ float:left;
+}
+
+#logo{
+ display: block;
+ float:right;
+ height: 150px;
+ margin: 0px;
+ border-left: 2px solid #fff;
+}
+
+/***********************************************/
+
+/*header layer*/
+#header {
+ clear: both;
+ display: block;
+ height: 1.9em;
+ background: #427499 url(http://www.scambs.gov.uk/system/images/scambs/headerbck.jpg) repeat-y;
+}
+
+/*Header navigation*/
+#headernav {
+ display: block;
+ float: left;
+ padding: 7px 10px 0px 15px;
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 0.8em;
+ text-align: left;
+ color: #fff;
+}
+
+#headernav a:link {
+ color: #fff;
+}
+
+#headernav a:visited {
+ color: #fff;
+}
+#headernav a:hover {
+ color: #CCCCCC;
+}
+
+#headernav a:active, #headernav a:focus {
+ color: #fff;
+}
+
+/*Search navigation*/
+#headersearch {
+ padding: 2px 10px 0px 5px;
+ display: block;
+ float: right;
+ width: 300px;
+ height: 27px;
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 0.7em;
+ text-align: right;
+ color: #fff;
+}
+
+#headersearch a:link {
+ color: #fff;
+}
+
+#headersearch a:visited {
+ color: #fff;
+}
+#headersearch a:hover {
+ color: #CCCCCC;
+}
+
+#headersearch a:active, #headersearch a:focus {
+ color: #fff;
+}
+
+.form {
+ padding: 0px 5px 0px 5px;
+}
+
+/***********************************************/
+
+
+/*Breadcrumb layer*/
+#breadcrumb {
+ clear: both;
+ width: 100%;
+ height: 1.9em;
+ margin: 0px;
+ background: url(http://www.scambs.gov.uk/system/images/scambs/breadcrumb.jpg) repeat-y;
+}
+
+/*Breadcrumb navigation*/
+#breadcrumbtext {
+ display: block;
+ float: left;
+ padding: 7px 10px 0px 15px;
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 0.7em;
+ text-align: left;
+ color: #006699;
+}
+
+#breadcrumbtext a:link {
+ color: #003366;
+}
+
+#breadcrumbtext a:visited {
+ color: #003366;
+}
+
+#breadcrumbtext a:hover {
+ color: #333;
+}
+
+#breadcrumbtext a:active, #breadcrumbtext a:focus {
+ color: #fff;
+}
+
+/*************************/
+/*Content layer*/
+/* mySociety commented out
+#maintext img {
+ border: 1px solid #999;
+ padding: 2px;
+ margin: 0px;
+}
+*/
+
+#maintext {
+ display: block;
+ margin: 20px 0px 0px 0px;
+ padding: 5px 15px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ line-height: 1.4em;
+ font-weight: normal;
+ color: #333;
+ height: 100%;
+}
+
+#maintext h1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 1em;
+ color: #003366;
+ text-transform: uppercase;
+ font-weight: bold;
+ letter-spacing: 0.1em;
+}
+
+/*Use for subheadings*/
+#maintext h2{
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 1em;
+ line-height: 1.2em;
+ font-weight: bold;
+ color: #006699;
+}
+
+/*Use for textheadings*/
+#maintext h3{
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.9em;
+ line-height: 1em;
+ color: #003366;
+}
+
+/* mySociety commented out
+#maintext ul, #maintext ol {
+ margin: 0;
+ padding: 0px 0px 0px 15px;
+ border: none;
+}
+*/
+
+/* Style for unordered list*/
+/* mySociety commented out
+#maintext ul li {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ color: #333;
+ line-height: 1.4em;
+ padding: 0;
+ list-style-type: disc;
+}
+*/
+
+/* Style for ordered list*/
+/* mySociety commented out
+#maintext ol li {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ color: #333;
+ line-height: 1.4em;
+ padding: 0;
+ list-style-type: decimal;
+}
+*/
+
+#formtable img {
+ border: 0px;
+ padding: 5px;
+}
+
+#maintext ul.hlist, #maintext ul.hlist li {
+ display: block;
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+
+#maintext ul.hlist li {
+ float: left;
+}
+
+#maintext ul.eventdate-year, #maintext ul.eventdate-month {
+ height: 30px;
+}
+
+#maintext ul.eventdate-year {
+ font-size: 1em;
+}
+
+#maintext ul.eventdate-year li, #maintext ul.eventdate-month li {
+ margin: 0 5px 0 0;
+}
+
+#maintext ul.eventdate-year li strong, #maintext ul.eventdate-month li strong {
+ margin: 0 0 0 5px;
+}
+
+#maintext ul.eventdate-year li a, #maintext ul.eventdate-month li a {
+ margin: 0 0 0 5px;
+}
+
+#maintext ul.eventdate-year li a strong, #maintext ul.eventdate-month li a strong {
+ margin: 0;
+}
+
+/***********************************************/
+
+/*Content Left Column layer*/
+#left{
+ float: left;
+ width: 183px;
+ height: 100%;
+ background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-y right top;
+}
+
+#sectiontitle {
+ display: block;
+ height: 25px;
+ background: #003366;
+ margin-right: 1px;
+}
+
+#sectiontitle ul{
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 0.8em;
+ color: #fff;
+ padding: 5px 0px 0px 15px;
+ margin: 0px;
+}
+
+#sectiontitle ul li {
+ list-style-type: none;
+}
+
+#sectiontitle a:link {
+ color: #fff;
+ text-decoration: none;
+}
+
+#sectiontitle a:visited {
+ color: #fff;
+ text-decoration: none;
+}
+
+#sectiontitle a:hover {
+ color: #cccccc;
+ text-decoration: underline;
+}
+
+#sectiontitle a:active, #sectiontitle a:focus {
+ color: #fff;
+}
+
+#leftnav ul {
+ margin: 0;
+ padding: 0;
+ border: none;
+ display: block;
+ clear: both;
+ background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-x left bottom;
+}
+
+#leftnav ul li {
+ list-style-type: none;
+}
+
+/*First level headings*/
+#leftnav ul li.first{
+ padding: 6px 5px 10px 15px;
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 0.8em;
+ color: #003366;
+ background-image: url(http://www.scambs.gov.uk/system/images/scambs/menu1_arrow.gif);
+ background-repeat: no-repeat;
+}
+
+#leftnav ul li a:link {
+ color: #003366;
+}
+
+#leftnav ul li a:visited {
+ color: #003366;
+}
+
+#leftnav ul li a:hover {
+ color: #666;
+}
+
+#leftnav ul li a:active, #leftnav ul li a:focus {
+ color: #fff;
+}
+
+/*Second level headings*/
+#leftnav ul li ul.second{
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-weight: normal;
+ line-height: 1.1em;
+ text-align: left;
+ margin: 0;
+ padding: 0;
+ border: none;
+ color: #663300;
+ background: url(http://www.scambs.gov.uk/system/images/scambs/blank.gif) repeat-x left bottom;
+}
+
+#leftnav ul li ul li
+{
+ padding-right: 0px;
+ padding-left: 15px;
+ background-image: url(http://www.scambs.gov.uk/system/images/scambs/menu2_arrow.gif);
+ padding-bottom: 0px;
+ padding-top: 0px;
+ background-repeat: no-repeat;
+}
+
+#leftnav ul li ul a:link {
+ color: #663300;
+}
+
+#leftnav ul li ul a:visited {
+ color: #663300;
+}
+
+#leftnav ul li ul a:hover {
+ color: #666;
+ text-decoration: underline;
+}
+
+#leftnav ul li ul a:active, #leftnav ul li ul a:focus {
+ color: #fff;
+}
+
+/***********************************************/
+/*Content Middle Column layer*/
+
+#middle{
+ padding: 0px 0px 30px 0px;
+ /* margin: 0px 235px 0px 182px; mySociety changed */
+ margin: 0 0 0 182px;
+ height: 100%;
+ background: #fff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+}
+
+#middle .padding {
+ padding: 0px 10px 10px 10px;
+}
+
+#middletop h1, #middleleft h1, #middleright h1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ color: #003366;
+ text-transform: uppercase;
+ font-weight: bold;
+ letter-spacing: 0.1em;
+ font-size: 1em;
+}
+
+#middle a:link {
+ color: #006699;
+ text-decoration: none;
+}
+
+#middle a:visited {
+ color: #006699;
+ text-decoration: none;
+}
+
+#middle a:hover {
+ color: #666;
+ text-decoration: underline;
+}
+
+#middle a:active, #middle a:focus {
+ color: #fff;
+}
+
+/*************************/
+/*Content Middle Top layer*/
+#middletop {
+ padding-top: 22px;
+ margin: 0px;
+ height: 1px;
+}
+
+#middletop p {
+ color: #000000;
+ line-height: 1.2em;
+}
+
+#mtfeature1, #mtfeature2, #mtfeature3, #mtfeature4, .mtfeature {
+ display: block;
+}
+
+#mtimage1, #mtimage2, #mtimage3, #mtimage4, .mtimage {
+ display:block;
+ float: left;
+}
+
+#mtimage1 img, #mtimage2 img, #mtimage3, #mtimage4 img, .mtimage img{
+ border: 1px solid #999;
+ padding: 2px;
+ margin: 0px 10px 0px 0px;
+}
+
+#mttext1, #mttext2, #mttext3, #mttext4, .mttext {
+ display: block;
+}
+
+
+#middletop h2{
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 1em;
+ line-height: 1em;
+ font-weight:bold;
+ color: #003366;
+ margin: 0px;
+}
+
+
+/*************************/
+/*Content Middle left layer*/
+
+#middleleft a:link, #middleright a:link, #middlebottom a:link {
+ text-decoration: none;
+}
+
+#middleleft {
+ width: 49%;
+ float: left;
+ padding: 10px;
+ margin: 0px;
+ margin-right: -10px;
+ height: 1%;
+}
+
+#middleleft ul {
+ margin: 0;
+ padding: 0px 0px 0px 15px;
+ border: none;
+ clear: both;
+}
+
+#middleleft ul li{
+ color: #000000;
+ line-height: 1.5em;
+ padding: 0px 10px 0px 0px;
+ list-style-image: url(http://www.scambs.gov.uk/system/images/scambs/arrow2.gif) ;
+}
+
+
+/*************************/
+/*Content Middle right layer*/
+
+#middleright {
+ margin-left: 49%;
+ background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-y left top;
+ padding: 10px;
+ height: 1%;
+}
+
+#middleright ul {
+ margin: 0;
+ padding: 0;
+ border: none;
+}
+
+#middleright ul li{
+ padding: 0;
+ margin: 0;
+ list-style: none;
+}
+
+
+/*************************/
+/*Content Middle bottom layer*/
+
+#middlebottom, .middlebottom {
+ margin-top: 10px;
+ padding: 2px;
+ background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-x;
+ height: 1%;
+}
+
+/***********************************************/
+/*Content Right Column layer*/
+
+#right{
+ float: right;
+ width: 235px;
+ background: #fff url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-y left top;
+ height: 100%;
+ margin: 0px;
+}
+
+.rightcontent{
+ padding: 0px 3px 10px 8px;
+}
+
+.rightcontent h1 {
+ color: #663300;
+ font-weight: bold;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+}
+
+#right .title {
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-size: 1em;
+ color: #663300;
+ text-transform: uppercase;
+ font-weight: bold;
+ letter-spacing: 0.1em;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+ line-height: 0.8em;
+}
+
+.rightcontent ul {
+ margin: 0px;
+ padding: 0px 0px 0px 17px;
+ border: none;
+}
+
+.rightcontent ul li {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+ line-height: 1.5em;
+ padding: 0px;
+ list-style-image: url(http://www.scambs.gov.uk/system/images/scambs/arrow2.gif) ;
+}
+
+/**Right Content 1**/
+#rightcontent1, #address, div.address {
+ padding: 5px 3px 10px 8px;
+ background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-x left bottom;
+}
+
+#rightcontent1 h1, #address h1, div.address h1 {
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-size: 1em;
+ color: #663300;
+ text-transform: uppercase;
+ font-weight: bold;
+ letter-spacing: 0.1em;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+ line-height: 0.8em;
+}
+
+#rightcontent1 h2, #address h2, div.address h2{
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+ color: #333;
+ margin: 0px;
+ padding: 0px;
+ line-height: 0.8em;
+}
+
+
+#rightcontent1 p, #address p, div.address p {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+ color: #000000;
+ line-height: 1.2em;
+}
+
+
+/**Right Content 2**/
+#rightcontent2 {
+ padding: 0px 3px 10px 8px;
+ background: url(http://www.scambs.gov.uk/system/images/scambs/bgdots.gif) repeat-x left bottom;
+}
+#rightcontent2 h1{ font-family: "trebuchet MS", Helvetica, sans-serif;
+ color: #663300;
+ font-weight: bold;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+ line-height: 1em;
+}
+
+#rightcontent2 ul, #rightcontent3 ul {
+ margin: 0px;
+ padding: 0px 0px 0px 17px;
+ border: none;
+}
+
+#rightcontent2 ul li, #rightcontent3 ul li {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+ line-height: 1.5em;
+ padding: 0px;
+ list-style-image: url(http://www.scambs.gov.uk/system/images/scambs/arrow2.gif) ;
+}
+
+/**Right Content 3**/
+#rightcontent3 {
+ padding: 0px 3px 10px 8px;
+}
+#rightcontent3 h1{
+ color: #663300;
+ font-weight: bold;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 0.7em;
+}
+
+#bottominfo {
+ margin: -40px 235px 0px 200px;
+ display: block;
+ clear: both;
+ height: 30px;
+ text-align: right;
+ font-size: 0.7em;
+ padding: 5px;
+}
+
+#bottominfo img {
+ width: 15px;
+ height: 15px;
+ margin-left: 5px;
+}
+
+#bottominfo ul {
+ margin: 0px;
+ padding: 2px;
+}
+
+#bottominfo ul li {
+ list-style-type: none;
+ display: inline;
+}
+
+/***********************************************/
+/*Footer layer*/
+#footer{
+ display: block;
+ width: 100%;
+ height: 30px;
+ background: #427499 url(http://www.scambs.gov.uk/system/images/scambs/headerbck.jpg) no-repeat;
+}
+
+#footertext{
+ padding: 5px 0px 0px 15px;
+ font-family: "trebuchet MS", Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 0.7em;
+ text-align: left;
+ color: #fff;
+}
+
+#footertext a:link {
+ color: #fff;
+}
+
+#footertext a:visited {
+ color: #fff;
+}
+#footertext a:hover {
+ color: #CCCCCC;
+}
+
+#footertext a:active, #footertext a:focus {
+ color: #fff;
+}
+
+#centrepanel img {
+ border: 0px;
+ padding: 0px;
+}
+
+/***********************************************/
+
+.aligncentre{
+ text-align: center;
+}
diff --git a/web/index.cgi b/web/index.cgi
index 96a4a1246..d568dd9c6 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -6,7 +6,7 @@
# Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
# Email: matthew@mysociety.org. WWW: http://www.mysociety.org
#
-# $Id: index.cgi,v 1.178 2008-02-11 14:39:03 matthew Exp $
+# $Id: index.cgi,v 1.179 2008-03-12 17:06:56 matthew Exp $
use strict;
use Standard;
@@ -424,6 +424,11 @@ sub display_form {
next if $_->{category} eq 'Other';
push @categories, $_->{category};
}
+ if ($q->{site} eq 'scambs') {
+ @categories = ('Abandoned vehicles', 'Discarded hypodermic needles',
+ 'Dog fouling', 'Flytipping', 'Graffiti', 'Lighting (e.g. security lights)',
+ 'Litter', 'Neighbourhood noise');
+ }
if (@categories) {
@categories = ('-- Pick a category --', @categories, 'Other');
$category = $q->div($q->label({'for'=>'form_category'}, 'Category:'),
@@ -456,13 +461,13 @@ EOF
my $pins = Page::display_pin($q, $px, $py, 'purple');
$out .= Page::display_map($q, x => $input{x}, y => $input{y}, type => 2,
pins => $pins, px => $px, py => $py );
- $out .= '<h1>Reporting a problem</h1> <ul>';
- $out .= '<li>You have located the problem at the point marked with a purple pin on the map.
+ $out .= '<h1>Reporting a problem</h1> ';
+ $out .= '<p>You have located the problem at the point marked with a purple pin on the map.
If this is not the correct location, simply click on the map again. ';
}
if ($details eq 'all') {
- $out .= '<li>All the details you provide here will be sent to <strong>'
+ $out .= '<p>All the details you provide here will be sent to <strong>'
. join('</strong> or <strong>', map { $areas_info->{$_}->{name} } @$all_councils)
. '</strong>. We show the subject and details of the problem on
the site, along with your name if you give us permission.';
@@ -476,7 +481,7 @@ If this is not the correct location, simply click on the map again. ';
}
my $n = @missing;
my $list = join(' or ', map { $areas_info->{$_}->{name} } @missing);
- $out .= '<li>All the details you provide here will be sent to <strong>'
+ $out .= '<p>All the details you provide here will be sent to <strong>'
. join('</strong> or <strong>', map { $areas_info->{$_}->{name} } @councils)
. '</strong>. We show the subject and details of the problem on
the site, along with your name if you give us permission.';
@@ -490,7 +495,7 @@ problems for $list and emailing it to us at <a href='mailto:$e'>$e</a>.";
my $e = mySociety::Config::get('CONTACT_EMAIL');
my $list = join(' or ', map { $areas_info->{$_}->{name} } @$all_councils);
my $n = @$all_councils;
- $out .= '<li>We do not yet have details for the council';
+ $out .= '<p>We do not yet have details for the council';
$out .= ($n>1) ? 's that cover' : ' that covers';
$out .= " this location. If you submit a problem here it will be
left on the site, but <strong>not</strong> reported to the council.
@@ -499,17 +504,17 @@ problems for $list and emailing it to us at <a href='mailto:$e'>$e</a>.";
$out .= '<input type="hidden" name="council" value="-1">';
}
if ($input{skipped}) {
- $out .= '<li>Please fill in the form below with details of the problem, and
+ $out .= '<p>Please fill in the form below with details of the problem, and
describe the location as precisely as possible in the details box.';
} elsif ($details ne 'none') {
- $out .= '<li>Please fill in details of the problem below. The council won\'t be able
+ $out .= '<p>Please fill in details of the problem below. The council won\'t be able
to help unless you leave as much detail as you can, so please describe the exact location of
the problem (e.g. on a wall), what it is, how long it has been there, a description (and a
photo of the problem if you have one), etc.';
} else {
- $out .= '<li>Please fill in details of the problem below.';
+ $out .= '<p>Please fill in details of the problem below.';
}
- $out .= '</ul>
+ $out .= '
<input type="hidden" name="easting" value="' . $easting . '">
<input type="hidden" name="northing" value="' . $northing . '">';
@@ -518,7 +523,7 @@ photo of the problem if you have one), etc.';
}
my $anon = ($input{anonymous}) ? ' checked' : ($input{title} ? '' : ' checked');
$out .= <<EOF;
-<fieldset><legend>Problem details</legend>
+<div id="fieldset">
$category
<div><label for="form_title">Subject:</label>
<input type="text" value="$input_h{title}" name="title" id="form_title" size="30"></div>
@@ -560,7 +565,7 @@ submission via this site remember that you can contact your council
directly using their own website.
</ul>
<p align="right"><input type="submit" name="submit_problem" value="Submit"></p>
-</fieldset>
+</div>
EOF
$out .= Page::display_map_end(1);
return $out;
diff --git a/web/js.js b/web/js.js
index 58ca485a0..c732dc52d 100644
--- a/web/js.js
+++ b/web/js.js
@@ -140,7 +140,7 @@ function update_tiles(dx, dy, force) {
drag_y += dy;
var drag = document.getElementById('drag');
- drag.style.left = drag_x + 'px';
+ drag.style.right = drag_x + 'px';
drag.style.top = drag_y + 'px';
var horizontal = Math.floor(old_drag_x/tilewidth) - Math.floor(drag_x/tilewidth);
@@ -182,7 +182,7 @@ function urls_loaded(o) {
}
img = cloneNode();
img.style.top = ((ii-2)*tileheight) + 'px';
- img.style.left = ((jj-2)*tilewidth) + 'px';
+ img.style.right = ((3-jj)*tilewidth) + 'px';
img.name = [ 'tile_', xx, '.', yy ].join('')
img.id = id;
if (browser) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 06:12:55 +0000