diff options
| -rw-r--r-- | perllib/Page.pm | 5 | ||||
| -rw-r--r-- | web/css.css | 5 | ||||
| -rwxr-xr-x | web/faq.cgi | 108 | ||||
| -rwxr-xr-x | web/index.cgi | 14 |
4 files changed, 119 insertions, 13 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm index 368952b8f..896a35e29 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.18 2006-09-26 16:11:50 matthew Exp $ +# $Id: Page.pm,v 1.19 2006-09-26 18:31:54 matthew Exp $ # package Page; @@ -90,8 +90,7 @@ sub footer { <h2 class="v">Navigation</h2> <ul id="navigation"> <li><a href="/contact">Contact</a> -<li><a href="/faq">FAQ</a> -<li><a href="/about">About</a> +<li><a href="/faq">Information</a> <li><a href="/">Home</a> </ul> diff --git a/web/css.css b/web/css.css index f145d3520..075345d57 100644 --- a/web/css.css +++ b/web/css.css @@ -42,6 +42,11 @@ fieldset { padding: 0.5em; } +dt { + font-weight: bold; + margin-top: 0.5em; +} + .v { display: none; } #error { diff --git a/web/faq.cgi b/web/faq.cgi index 832f3ceaf..361c11710 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.2 2006-09-25 18:39:54 matthew Exp $ +# $Id: faq.cgi,v 1.3 2006-09-26 18:31:54 matthew Exp $ use strict; require 5.8.0; @@ -29,8 +29,110 @@ Page::do_fastcgi(\&main); sub faq { my $out = <<EOF; <h1>Frequently Asked Questions</h1> -<p>FAQ stuff here</p> -</div> + +<dl> + +<dt>What is Neighbourhood Fix-It for?</dt> +<dd>Neighbourhood Fix-It is a site to help people report, view, or discuss local problems +they've found to their local council by simply locating them on a map.</dd> + +<dt>Can you give me some examples?</dt> +<dd>Sure. Graffiti, unlit lampposts, abandoned beds, broken glass on a cycle +path; anything like that that could be usefully reported to your council +to be fixed.</dd> + +<dt>How does it work?</dt> +<dd>After entering a postcode, users are presented with a map of that +area. They can view problems already reported in that area, or report +ones of their own simply by clicking on the map at the location of the +problem.</dd> + +<dt>Is it free?</dt> +<dd>The site is free to use, yes. Neighbourhood Fix-It +is run by a charitable organisation, though, so if you want to make +a contribution, please contact us.</dd> +</dl> + +<dt>Do you remove silly or illegal content?</dt> +<dd>We reserve the right to remove any problems or comments which we +consider to be inappropriate.</dd> + +<h2>Privacy Questions</h2> +<dl> + +<dt>Who gets to see my email address?</dt> +<dd>If you submit a problem, we (do we?) pass on your name, email address, and details +of the problem to the council contact responsible for the area where you +located the problem. Your name is displayed upon the site, but not your email address; +similarly with comments. + +We will never give or sell your +email address to anyone else, unless we are obliged to by law. + +</dd> + +<dt>Will you send nasty, brutish spam to my email address?</dt> +<dd>Never. If you opt to when adding a problem or comment, you will receive emails +about updates to that problem, but that's it. +</dd> + + +</dl> + +<h2>Organisation Questions</h2> + +<dl> + +<dt>Who built Neighbourhood Fix-It?</dt> +<dd>This site was built by <a href="http://www.mysociety.org">mySociety</a>. +mySociety is a charitable organisation which has grown out of this community of +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. +mySociety's primary +mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. Our first project +was <a href="http://www.writetothem.com/">WriteToThem.com</a>, where you can write to any of your +elected representatives, for free.</dd> + +<dt>Who pays for it?</dt> +<dd>Neighbourhood Fix-It has been built by mySociety thanks to the effort +of a combination of paid core developers and unpaid volunteers. The +core developers were paid for by ???. +</dd> + +<dt>Do you need any help with the project?</dt> +<dd>Yes, we can use help in all sorts of ways, technical or non-technical. +Please see our <a href="http://www.mysociety.org/volunteertasks">volunteers page</a>.</dd> + +<dt>Where's the "source code" to this site?</dt> +<dd>The software behind this site is open source, and available to you +mainly under the Affero GPL software license. You can <a +href="https://secure.mysociety.org/cvstrac/dir?d=mysociety">download the source +code</a> (look under 'bci') and help us develop it. You're welcome to use it +in your own projects, although you must also make available the source code to +any such projects. +</dd> + +<dt>People build things, not organisations. Who <em>actually</em> built it?</dt> +<dd>OK, we are +Francis Irving, +Chris Lightfoot, +Richard Pope, +Matthew Somerville, +and +Tom Steinberg. + +Thanks also to +<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps and UK postcodes), +the entire free software community (FreeBSD, Linux, PHP, Perl, Python, Apache, +MySQL, PostgreSQL, we love and use you all!) and +<a href="http://www.easynet.net/publicsector/">Easynet</a> (who kindly host all +our servers). + +Let us know if we've missed anyone. +</dd> + +</dl> + EOF return $out; } diff --git a/web/index.cgi b/web/index.cgi index 6cbe7f81c..8123d84e8 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.27 2006-09-26 17:20:19 matthew Exp $ +# $Id: index.cgi,v 1.28 2006-09-26 18:31:54 matthew Exp $ # TODO # Nothing is done about the update checkboxes - not stored anywhere on anything! @@ -145,8 +145,9 @@ sub submit_comment { To => [[$input{email}, $input{name}]], }); my $result = mySociety::Util::send_email($email, mySociety::Config::get('CONTACT_EMAIL'), $input{email}); + my $out; if ($result == mySociety::Util::EMAIL_SUCCESS) { - my $out = <<EOF; + $out = <<EOF; <h1>Nearly Done! Now check your email...</h1> <p>The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.</p> <p>If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.</p> @@ -155,11 +156,10 @@ sub submit_comment { <p>(Don't worry - we'll hang on to your comment while you're checking your email.)</p> EOF } else { - my $out = <<EOF; + $out = <<EOF; <p>I'm afraid something went wrong when we tried to send your email. Please click Back, check your details, and try again.</p> EOF } - return $out; } @@ -198,8 +198,9 @@ sub submit_problem { To => [[$input{email}, $input{name}]], }); my $result = mySociety::Util::send_email($email, mySociety::Config::get('CONTACT_EMAIL'), $input{email}); + my $out; if ($result == mySociety::Util::EMAIL_SUCCESS) { - my $out = <<EOF; + $out = <<EOF; <h1>Nearly Done! Now check your email...</h1> <p>The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.</p> <p>If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.</p> @@ -208,11 +209,10 @@ sub submit_problem { <p>(Don't worry - we'll hang on to your information while you're checking your email.)</p> EOF } else { - my $out = <<EOF; + $out = <<EOF; <p>I'm afraid something went wrong when we tried to send your email. Please click Back, check your details, and try again.</p> EOF } - return $out; } |