aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/Page.pm7
-rwxr-xr-xweb/contact.cgi9
-rw-r--r--web/css.css2
-rwxr-xr-xweb/faq.cgi4
-rwxr-xr-xweb/report.cgi23
5 files changed, 26 insertions, 19 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm
index 44e78ed92..2826c7921 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.49 2007-05-15 13:43:21 matthew Exp $
+# $Id: Page.pm,v 1.50 2007-05-15 15:12:22 matthew Exp $
#
package Page;
@@ -113,8 +113,9 @@ sub footer {
</div></div>
<h2 class="v">Navigation</h2>
<ul id="navigation">
-<li><a href="/">Home</a></li>
-<li><a href="/faq">Information</a></li>
+<li><a href="/">Report a problem</a></li>
+<li><a href="/report">All reports</a></li>
+<li><a href="/faq">Help</a></li>
<li><a href="/contact">Contact</a></li>
</ul>
diff --git a/web/contact.cgi b/web/contact.cgi
index 14adc4a22..cffe254cd 100755
--- a/web/contact.cgi
+++ b/web/contact.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: contact.cgi,v 1.16 2007-05-09 11:18:36 matthew Exp $
+# $Id: contact.cgi,v 1.17 2007-05-15 15:12:22 matthew Exp $
use strict;
require 5.8.0;
@@ -24,6 +24,13 @@ use mySociety::Web qw(ent);
BEGIN {
mySociety::Config::set_file("$FindBin::Bin/../conf/general");
+ mySociety::DBHandle::configure(
+ Name => mySociety::Config::get('BCI_DB_NAME'),
+ User => mySociety::Config::get('BCI_DB_USER'),
+ Password => mySociety::Config::get('BCI_DB_PASS'),
+ Host => mySociety::Config::get('BCI_DB_HOST', undef),
+ Port => mySociety::Config::get('BCI_DB_PORT', undef)
+ );
}
# Main code for index.cgi
diff --git a/web/css.css b/web/css.css
index a2c6784e4..a0a08dba7 100644
--- a/web/css.css
+++ b/web/css.css
@@ -138,7 +138,7 @@ ul#error {
#navigation a {
display: -moz-inline-box;
display: inline-block;
- padding: 0.5em 2em;
+ padding: 0.5em 1em;
}
#navigation a:link, #navigation a:visited {
color: #5e552b;
diff --git a/web/faq.cgi b/web/faq.cgi
index dc2837808..19b7e0379 100755
--- a/web/faq.cgi
+++ b/web/faq.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: faq.cgi,v 1.18 2007-05-15 13:43:21 matthew Exp $
+# $Id: faq.cgi,v 1.19 2007-05-15 15:12:22 matthew Exp $
use strict;
require 5.8.0;
@@ -76,7 +76,7 @@ dragging an empty square."))
$q->dd(_('If you submit a problem, we pass on your details, and details
of the problem, to the council contact or contacts responsible for the
area where you located the problem. Your name is displayed upon the
-site, but not your email address; similarly with updates. We will
+site if you let us, but not your email address; similarly with updates. We will
never give or sell your email address to anyone else, unless we are
obliged to by law.')),
$q->dt(_('Will you send nasty, brutish spam to my email address?')),
diff --git a/web/report.cgi b/web/report.cgi
index b9ae1029f..fc06658bf 100755
--- a/web/report.cgi
+++ b/web/report.cgi
@@ -6,7 +6,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: matthew@mysociety.org. WWW: http://www.mysociety.org
#
-# $Id: report.cgi,v 1.30 2007-05-15 14:43:26 matthew Exp $
+# $Id: report.cgi,v 1.31 2007-05-15 15:12:22 matthew Exp $
use strict;
require 5.8.0;
@@ -77,10 +77,10 @@ sub main {
my $areas_info = mySociety::MaPit::get_voting_areas_info([keys %councils]);
if (!$one_council) {
print Page::header($q, 'Summary reports');
- print $q->p('This is a summary of all reports on this site that have been sent to a council; select \'show only\' to see the reports for just one council.');
+ print $q->p(_('This is a summary of all reports on this site that have been sent to a council; select a particular council to see the reports sent there.'));
print '<table>';
print '<tr><th>Name</th><th>New problems</th><th>Older problems</th>
-<th>Old problems, state unknown</th><th>Recently fixed</th><th>Old fixed</th></tr>';
+<th>Old problems,<br>state unknown</th><th>Recently fixed</th><th>Old fixed</th></tr>';
foreach (sort { Page::canonicalise_council($areas_info->{$a}->{name}) cmp Page::canonicalise_council($areas_info->{$b}->{name}) } keys %councils) {
print '<tr><td><a href="report?council=' . $_ . '">' .
Page::canonicalise_council($areas_info->{$_}->{name}) . '</a></td>';
@@ -93,7 +93,8 @@ sub main {
}
print '</table>';
} else {
- print Page::header($q, 'Summary reports', rss => [ 'Problems in this council, Neighbourhood Fix-It', "/rss/council/$one_council" ]);
+ my $name = Page::canonicalise_council($areas_info->{$one_council}->{name});
+ print Page::header($q, "$name - Summary reports", rss => [ "Problems within $name, Neighbourhood Fix-It", "/rss/council/$one_council" ]);
print $q->p(
$q->a({href => "/rss/council/$one_council"}, '<img align="right" src="/i/feed.png" width="16" height="16" title="RSS feed" alt="RSS feed of problems in this council" border="0" hspace="4">'),
'This is a summary of all reports for one council. You can ' .
@@ -101,14 +102,12 @@ sub main {
' or go back and ' .
$q->a({href => NewURL($q, all=>undef, council=>undef) }, 'show all councils') .
'.');
- foreach (sort { Page::canonicalise_council($areas_info->{$a}->{name}) cmp Page::canonicalise_council($areas_info->{$b}->{name}) } keys %councils) {
- print '<h2>' . Page::canonicalise_council($areas_info->{$_}->{name}) . "</h2>\n";
- list_problems('New problems', $open{$_}{new}, $all) if $open{$_}{new};
- list_problems('Older problems', $open{$_}{older}, $all) if $open{$_}{older};
- list_problems('Old problems, state unknown', $open{$_}{unknown}, $all) if $open{$_}{unknown};
- list_problems('Recently fixed', $fixed{$_}{new}, $all) if $fixed{$_}{new};
- list_problems('Old fixed', $fixed{$_}{old}, $all) if $fixed{$_}{old};
- }
+ print "<h2>$name</h2>\n";
+ list_problems('New problems', $open{$one_council}{new}, $all) if $open{$one_council}{new};
+ list_problems('Older problems', $open{$one_council}{older}, $all) if $open{$one_council}{older};
+ list_problems('Old problems, state unknown', $open{$one_council}{unknown}, $all) if $open{$one_council}{unknown};
+ list_problems('Recently fixed', $fixed{$one_council}{new}, $all) if $fixed{$one_council}{new};
+ list_problems('Old fixed', $fixed{$one_council}{old}, $all) if $fixed{$one_council}{old};
}
print Page::footer();
dbh()->rollback();
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-28 15:23:48 +0000