Merge remote-tracking branch 'origin/master' into council-dashboard

7 files changed, 149 insertions, 61 deletions

diff --git a/conf/packages b/conf/packages
index 0f0c48df2..bc87d73be 100644..120000
--- a/conf/packages
+++ b/conf/packages
@@ -1,38 +1 @@
-jhead
-libdatetime-format-w3cdtf-perl
-libcache-memcached-perl
-libdbd-pg-perl
-libdbi-perl
-libdigest-sha1-perl
-liberror-perl
-libfcgi-perl
-libfile-slurp-perl
-libgeography-nationalgrid-perl
-libhtml-parser-perl
-libio-string-perl
-liblingua-en-inflect-perl
-liblocale-gettext-perl
-libsoap-lite-perl
-libstatistics-distributions-perl
-liburi-perl
-libwww-perl
-libxml-rss-perl
-memcached
-perl
-perl-base
-perl-modules
-perlmagick
-libjson-perl
-libimage-size-perl
-libmath-bigint-gmp-perl
-gettext
-libtest-exception-perl
-libipc-run3-perl
-libyaml-perl
-liblist-moreutils-perl
-ruby-compass | libhaml-ruby
-libtemplate-perl
-postgresql-8.4
-postgresql-server-dev-8.4
-gnuplot
-ttf-bitstream-vera
+packages.debian-squeeze
\ No newline at end of file
diff --git a/conf/packages.debian-squeeze b/conf/packages.debian-squeeze
new file mode 100644
index 000000000..cb494157d
--- /dev/null
+++ b/conf/packages.debian-squeeze
@@ -0,0 +1,38 @@
+jhead
+libdatetime-format-w3cdtf-perl
+libcache-memcached-perl
+libdbd-pg-perl
+libdbi-perl
+libdigest-sha1-perl
+liberror-perl
+libfcgi-perl
+libfile-slurp-perl
+libgeography-nationalgrid-perl
+libhtml-parser-perl
+libio-string-perl
+liblingua-en-inflect-perl
+liblocale-gettext-perl
+libsoap-lite-perl
+libstatistics-distributions-perl
+liburi-perl
+libwww-perl
+libxml-rss-perl
+memcached
+perl
+perl-base
+perl-modules
+perlmagick
+libjson-perl
+libimage-size-perl
+libmath-bigint-gmp-perl
+gettext
+libtest-exception-perl
+libipc-run3-perl
+libyaml-perl
+liblist-moreutils-perl
+libhaml-ruby
+libtemplate-perl
+postgresql-8.4
+postgresql-server-dev-8.4
+gnuplot
+ttf-bitstream-vera
diff --git a/notes/INSTALL.pod b/notes/INSTALL.pod
index ea549bd7e..701112b45 100644
--- a/notes/INSTALL.pod
+++ b/notes/INSTALL.pod
@@ -13,6 +13,11 @@ following command from inside the fixmystreet directory:
 
     git submodule update --init
 
+If you're using git version 1.6.5 or later, you can do those steps in
+one go with:
+
+    git clone --recursive https://github.com/mysociety/fixmystreet.git
+
 =head1 REQUIREMENTS
 
 On the server you are installing FixMyStreet on you will need the following things:
@@ -50,17 +55,24 @@ to CSS convertor. You can get one from L<http://sass-lang.com/>
 
 If you're expecting a lot of traffic it's recommended that you install memcached: L<http://memcached.org/>
 
-If you're using a Debian based Linux distribution then the packages to install
-some required dependencies (though not all the required Perl modules) are
-listed in C<conf/packages>. To install all of them you can run:
+If you're using Debian 6.0 ("squeeze") then the packages to install
+some required dependencies (though not all the required Perl modules)
+are listed in C<conf/packages.debian-squeeze>. To install all of them
+you can run:
 
-    xargs -a conf/packages apt-get install
+    sudo xargs -a conf/packages.debian-squeeze apt-get install
 
-Note, you will need to either be logged in as root or to use
+A similar list of packages should work for other Debian-based
+distributions.  (Please let us know if you would like to contribute
+such a package list or instructions for other distributions.)
 
-    sudo xargs -a conf/packages apt-get install
+To generate the CSS for the current design of FixMyStreet you will
+also need Compass L<http://compass-style.org/>, but unfortunately
+it is not packaged in Debian squeeze (or squeeze-backports).  You
+will either need to install the package from testing, or you could
+install it from the Ruby gem with:
 
-for this to work.
+    gem install compass
 
 =head2 Service dependencies
 
@@ -81,22 +93,70 @@ geolocation services.
 
 =head1 DETAILED INSTALLATION INSTRUCTIONS
 
-=head2 Unpacking the Code
-
-Once you've downloaded the code you should unpack it. The best place to do this
-is in the location you want the web server vhost to be.
-
 =head2 Creating the database
 
-The default settings file assumes the database is called fms and the user the same. 
+The default settings file (C<conf/general.yml>) assumes the database is called fms and the user the same.
 You can change these if you like.
 
+If you wish to create this new database and database user with
+password authentication, the following steps may help.  First, create
+the fms user:
+
+    $ sudo -u postgres createuser fms
+    Shall the new role be a superuser? (y/n) n
+    Shall the new role be allowed to create databases? (y/n) n
+    Shall the new role be allowed to create more new roles? (y/n) n
+
+Then create the fms database:
+
+    $ sudo -u postgres createdb fms
+
+Set the password of the fms user, and change the owner of the fms database to be the fms user:
+
+    $ sudo -u postgres psql
+    postgres=# ALTER USER fms WITH PASSWORD 'somepassword'
+    ALTER ROLE
+    postgres=# ALTER DATABASE fms OWNER to fms;
+    ALTER DATABASE
+    postgres=# \q
+    $
+
+Then you need to configure PostgreSQL to allow password-based access
+to the fms database as the user fms from using Unix-domain sockets.
+Edit the file C</etc/postgresql/8.4/main/pg_hba.conf> and add as the
+first line:
+
+    local   fms     fms     md5
+
+You will then need to restart PostgreSQL with:
+
+    $ sudo /etc/init.d/postgresql restart
+
+If you want to access the database from the command line, you can add
+the following line to C<~/.pgpass>:
+
+    localhost:*:fms:fms:somepassword
+
+Then you should be able to access the database with:
+
+    $ psql -U fms fms
+
 =head2 Set up the database
 
-Once you've created the database you can use the sql in C<db/schema.sql> to create the required
+Before creating the database schema, you will need to install the
+PostgreSQL's SQL procedural language into the database:
+
+    createlang -U fms plpgsql fms
+
+Now you can use the sql in C<db/schema.sql> to create the required
 tables, triggers and stored procedures. You will also need to run
-C<db/alert_types.sql> which
-populates the alert_types table.
+C<db/alert_types.sql> which populates the alert_types table.  For
+example, you might run:
+
+    $ psql -U fms fms < db/schema.sql
+    ...
+    $ psql -U fms fms < db/alert_types.sql
+    ...
 
 =head2 Install Perl modules
 
@@ -130,6 +190,21 @@ the required development tools.
 
 =head2 Set up Webserver
 
+For production use of FixMyStreet, we suggest you use Apache and
+FastCGI.  (See below.)  For local development, however, you can use
+the Catalyst development server.  First, install the Catalyst
+development tools with:
+
+    ./bin/cron-wrapper local/bin/carton install Catalyst::Devel
+
+Then the development server can be run with:
+
+     CATALYST_DEBUG=1 ./bin/cron-wrapper ./script/fixmystreet_app_server.pl -r
+
+The server will be accessible as L<http://localhost:3000/>.
+
+=head3 Setting up Apache
+
 It is recommended that you run FixMyStreet using FastCGI. It should also be
 possible to run it using Plack/PSGI.
 
diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm
index 83b36dbcd..1ab347066 100644
--- a/perllib/FixMyStreet/Geocode/Google.pm
+++ b/perllib/FixMyStreet/Geocode/Google.pm
@@ -75,7 +75,14 @@ sub string {
         my $address = $_->{address};
         next unless $c->cobrand->geocoded_string_check( $address );
         ( $longitude, $latitude ) = @{ $_->{Point}->{coordinates} };
-        push (@$error, { address => $address, latitude => $latitude, longitude => $longitude });
+        # These co-ordinates are output as query parameters in a URL, make sure they have a "."
+        mySociety::Locale::in_gb_locale {
+            push (@$error, {
+                address => $address,
+                latitude => sprintf('%0.6f', $latitude),
+                longitude => sprintf('%0.6f', $longitude)
+            });
+        };
         push (@valid_locations, $_);
     }
     return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1;
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index 3969bfde4..a61fa4e0b 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -149,10 +149,12 @@ img {
 
 select, input, textarea {
   font-size: 99%;
-  width: 100%;
   max-width: 95%;
 }
-
+// To deal with bug from drop-down being wider than holder
+select {
+  width: 100%;
+}
 
 // links
 a,
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index f73290b7b..9d5151189 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -503,6 +503,7 @@ $.fn.drawer = function(id, ajax) {
     $('.container').on('click', '#alert_email_button', function(e){
         e.preventDefault();
         var form = $('<form/>').attr({ method:'post', action:"/alert/subscribe" });
+        form.append($('<input name="alert" value="Subscribe me to an email alert" type="hidden" />'));
         $('#alerts input[type=text], #alerts input[type=hidden], #alerts input[type=radio]:checked').each(function() {
             var $v = $(this);
             $('<input/>').attr({ name:$v.attr('name'), value:$v.val(), type:'hidden' }).appendTo(form);
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 1574754c9..7ddaae299 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -118,10 +118,10 @@ function fixmystreet_onload() {
     var markers = fms_markers_list( fixmystreet.pins, true );
     fixmystreet.markers.addFeatures( markers );
     if (fixmystreet.page == 'around' || fixmystreet.page == 'reports' || fixmystreet.page == 'my') {
-        var select = new OpenLayers.Control.SelectFeature( fixmystreet.markers );
+        fixmystreet.select_feature = new OpenLayers.Control.SelectFeature( fixmystreet.markers );
         var selectedFeature;
         function onPopupClose(evt) {
-            select.unselect(selectedFeature);
+            fixmystreet.select_feature.unselect(selectedFeature);
             OpenLayers.Event.stop(evt);
         }
         fixmystreet.markers.events.register( 'featureunselected', fixmystreet.markers, function(evt) {
@@ -142,8 +142,8 @@ function fixmystreet_onload() {
             feature.popup = popup;
             fixmystreet.map.addPopup(popup);
         });
-        fixmystreet.map.addControl( select );
-        select.activate();
+        fixmystreet.map.addControl( fixmystreet.select_feature );
+        fixmystreet.select_feature.activate();
     } else if (fixmystreet.page == 'new') {
         fixmystreet_activate_drag();
     }
@@ -164,9 +164,11 @@ function fixmystreet_onload() {
         for (var i=0; i<showhide.length; i+=2) {
             if (this.innerHTML == showhide[i]) {
                 fixmystreet.markers.setVisibility(true);
+                fixmystreet.select_feature.activate();
                 this.innerHTML = showhide[i+1];
             } else if (this.innerHTML == showhide[i+1]) {
                 fixmystreet.markers.setVisibility(false);
+                fixmystreet.select_feature.deactivate();
                 this.innerHTML = showhide[i];
             }
         }