Add HTML email templates.

Design is all Zarino. This adds the ability to send HTML emails,
including attached inline images. When included, this is done as a
multipart/related email containing a multipart/alternative (of plain and
HTML) and any attached images, so that the images are available even if
HTML mail is not.

The alert emails list data has been improved so it can be constructed in
the templates rather than the code. Various templates have been tidied.

Various workarounds for email clients have been made, including:
* <th> is used so that the Android 4.x mail client can give them
  `block` styling in the small screen media query.
* Font settings defined on every table cell (<th>) so that sans-serif
  fonts are used in Outlook, rather than Times New Roman.
* A three-column wrapper table to create a 620px centred content area
  that also shrinks down on narrow screens. (Outlook doesn’t like
  max-width, so this is the simplest alternative.)
* Enforcing a sensible (500px) min-width for the main content area,
  on clients that don’t support media queries (eg: native Gmail app).
* Giant borders on buttons so Outlook displays them
* Image alignment with align rather than float.

3 files changed, 67 insertions, 28 deletions

diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm
index 062601044..91f5cd6ef 100644
--- a/perllib/FixMyStreet/Script/Alerts.pm
+++ b/perllib/FixMyStreet/Script/Alerts.pm
@@ -15,9 +15,13 @@ use RABX;
 use FixMyStreet::Cobrand;
 use FixMyStreet::DB;
 use FixMyStreet::Email;
+use FixMyStreet::Map;
+use FixMyStreet::App::Model::PhotoSet;
 
 FixMyStreet->configure_mysociety_dbhandle;
 
+my $parser = DateTime::Format::Pg->new();
+
 # Child must have confirmed, id, email, state(!) columns
 # If parent/child, child table must also have name and text
 #   and foreign key to parent must be PARENT_id
@@ -37,6 +41,7 @@ sub send() {
                    $item_table.id as item_id, $item_table.text as item_text,
                    $item_table.name as item_name, $item_table.anonymous as item_anonymous,
                    $item_table.confirmed as item_confirmed,
+                   $item_table.photo as item_photo,
                    $head_table.*
             from alert, $item_table, $head_table
                 where alert.parameter::integer = $head_table.id
@@ -63,7 +68,7 @@ sub send() {
         $query = dbh()->prepare($query);
         $query->execute();
         my $last_alert_id;
-        my %data = ( template => $alert_type->template, data => '', schema => $schema );
+        my %data = ( template => $alert_type->template, data => [], schema => $schema );
         while (my $row = $query->fetchrow_hashref) {
 
             my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($row->{alert_cobrand})->new();
@@ -84,7 +89,7 @@ sub send() {
             } );
             if ($last_alert_id && $last_alert_id != $row->{alert_id}) {
                 _send_aggregated_alert_email(%data);
-                %data = ( template => $alert_type->template, data => '', schema => $schema );
+                %data = ( template => $alert_type->template, data => [], schema => $schema );
             }
 
             # create problem status message for the templates
@@ -116,30 +121,50 @@ sub send() {
                 } else {
                     $data{problem_url} = $url . "/report/" . $row->{id};
                 }
-                $data{data} .= $row->{item_name} . ' : ' if $row->{item_name} && !$row->{item_anonymous};
-                if ( $cobrand->include_time_in_update_alerts ) {
-                    my $parser = DateTime::Format::Pg->new();
-                    my $dt = $parser->parse_timestamp( $row->{item_confirmed} );
-                    # We need to always set this otherwise we end up with the DateTime
-                    # object being in the floating timezone in which case applying a
-                    # subsequent timezone set will have no effect. 
-                    # this is basically recreating the code from the inflate wrapper
-                    # in the database model.
-                    FixMyStreet->set_time_zone($dt);
-                    $data{data} .= $cobrand->prettify_dt( $dt, 'alert' ) . "\n\n";
-                }
-                $data{data} .= $row->{item_text} . "\n\n------\n\n";
+
+                my $dt = $parser->parse_timestamp( $row->{item_confirmed} );
+                # We need to always set this otherwise we end up with the DateTime
+                # object being in the floating timezone in which case applying a
+                # subsequent timezone set will have no effect.
+                # this is basically recreating the code from the inflate wrapper
+                # in the database model.
+                FixMyStreet->set_time_zone($dt);
+                $row->{confirmed} = $dt;
+
+                # Hack in the image for the non-object updates
+                $row->{get_first_image_fp} = sub {
+                    return FixMyStreet::App::Model::PhotoSet->new({
+                        db_data => $row->{item_photo},
+                    })->get_image_data( num => 0, size => 'fp' );
+                };
+
             # this is ward and council problems
             } else {
-                $data{data} .= $url . "/report/" . $row->{id} . " - $row->{title}\n\n";
                 if ( exists $row->{geocode} && $row->{geocode} && $ref =~ /ward|council/ ) {
                     my $nearest_st = _get_address_from_gecode( $row->{geocode} );
-                    $data{data} .= $nearest_st if $nearest_st;
+                    $row->{nearest} = $nearest_st;
                 }
-                $data{data} .= "\n\n------\n\n";
+
+                my $dt = $parser->parse_timestamp( $row->{confirmed} );
+                FixMyStreet->set_time_zone($dt);
+                $row->{confirmed} = $dt;
+
+                # Hack in the image for the non-object reports
+                $row->{get_first_image_fp} = sub {
+                    return FixMyStreet::App::Model::PhotoSet->new({
+                        db_data => $row->{photo},
+                    })->get_image_data( num => 0, size => 'fp' );
+                };
             }
+
+            push @{$data{data}}, $row;
+
             if (!$data{alert_user_id}) {
                 %data = (%data, %$row);
+                if ($ref eq 'new_updates') {
+                    # Get a report object for its photo and static map
+                    $data{report} = $schema->resultset('Problem')->find({ id => $row->{id} });
+                }
                 if ($ref eq 'area_problems' || $ref eq 'council_problems' || $ref eq 'ward_problems') {
                     my $va_info = mySociety::MaPit::call('area', $row->{alert_parameter});
                     $data{area_name} = $va_info->{name};
@@ -149,7 +174,7 @@ sub send() {
                     $data{ward_name} = $va_info->{name};
                 }
             }
-            $data{cobrand} = $row->{alert_cobrand};
+            $data{cobrand} = $cobrand;
             $data{cobrand_data} = $row->{alert_cobrand_data};
             $data{lang} = $row->{alert_lang};
             $last_alert_id = $row->{alert_id};
@@ -183,15 +208,16 @@ sub send() {
         my $states = "'" . join( "', '", FixMyStreet::DB::Result::Problem::visible_states() ) . "'";
         my %data = (
             template => $template,
-            data => '',
+            data => [],
             alert_id => $alert->id,
             alert_email => $alert->user->email,
             lang => $alert->lang,
-            cobrand => $alert->cobrand,
+            cobrand => $cobrand,
             cobrand_data => $alert->cobrand_data,
             schema => $schema,
         );
-        my $q = "select problem.id, problem.bodies_str, problem.postcode, problem.geocode, problem.title from problem_find_nearby(?, ?, ?) as nearby, problem, users
+        my $q = "select problem.id, problem.bodies_str, problem.postcode, problem.geocode, problem.confirmed,
+            problem.title, problem.detail, problem.photo from problem_find_nearby(?, ?, ?) as nearby, problem, users
             where nearby.problem_id = problem.id
             and problem.user_id = users.id
             and problem.state in ($states)
@@ -207,24 +233,31 @@ sub send() {
                 alert_id  => $alert->id,
                 parameter => $row->{id},
             } );
-            my $url = $cobrand->base_url_for_report($row);
-            $data{data} .= $url . "/report/" . $row->{id} . " - $row->{title}\n\n";
             if ( exists $row->{geocode} && $row->{geocode} ) {
                 my $nearest_st = _get_address_from_gecode( $row->{geocode} );
-                $data{data} .= $nearest_st if $nearest_st;
+                $row->{nearest} = $nearest_st;
             }
-            $data{data} .= "\n\n------\n\n";
+            my $dt = $parser->parse_timestamp( $row->{confirmed} );
+            FixMyStreet->set_time_zone($dt);
+            $row->{confirmed} = $dt;
+            $row->{get_first_image_fp} = sub {
+                return FixMyStreet::App::Model::PhotoSet->new({
+                    db_data => $row->{photo},
+                })->get_image_data( num => 0, size => 'fp' );
+            };
+            push @{$data{data}}, $row;
         }
-        _send_aggregated_alert_email(%data) if $data{data};
+        _send_aggregated_alert_email(%data) if @{$data{data}};
     }
 }
 
 sub _send_aggregated_alert_email(%) {
     my %data = @_;
 
-    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($data{cobrand})->new();
+    my $cobrand = $data{cobrand};
 
     $cobrand->set_lang_and_domain( $data{lang}, 1, FixMyStreet->path_to('locale')->stringify );
+    FixMyStreet::Map::set_map_class($cobrand->map_type);
 
     if (!$data{alert_email}) {
         my $user = $data{schema}->resultset('User')->find( {
diff --git a/perllib/FixMyStreet/Script/Questionnaires.pm b/perllib/FixMyStreet/Script/Questionnaires.pm
index c5bc6bfe0..3f22eb150 100644
--- a/perllib/FixMyStreet/Script/Questionnaires.pm
+++ b/perllib/FixMyStreet/Script/Questionnaires.pm
@@ -5,6 +5,7 @@ use warnings;
 use Utils;
 use FixMyStreet::DB;
 use FixMyStreet::Email;
+use FixMyStreet::Map;
 use FixMyStreet::Cobrand;
 
 sub send {
@@ -41,6 +42,7 @@ sub send_questionnaires_period {
 
         my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($row->cobrand)->new();
         $cobrand->set_lang_and_domain($row->lang, 1);
+        FixMyStreet::Map::set_map_class($cobrand->map_type);
 
         # Not all cobrands send questionnaires
         next unless $cobrand->send_questionnaires;
@@ -53,6 +55,7 @@ sub send_questionnaires_period {
         next unless $cobrand->email_host;
 
         my %h = map { $_ => $row->$_ } qw/name title detail category/;
+        $h{report} = $row;
         $h{created} = Utils::prettify_duration( time() - $row->confirmed->epoch, 'week' );
 
         my $questionnaire = $rs->create( {
diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index 30d24f640..311d8fec4 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -14,6 +14,7 @@ use FixMyStreet;
 use FixMyStreet::Cobrand;
 use FixMyStreet::DB;
 use FixMyStreet::Email;
+use FixMyStreet::Map;
 use FixMyStreet::SendReport;
 
 sub send(;$) {
@@ -60,6 +61,7 @@ sub send(;$) {
         }
 
         $cobrand->set_lang_and_domain($row->lang, 1);
+        FixMyStreet::Map::set_map_class($cobrand->map_type);
         if ( $row->is_from_abuser) {
             $row->update( { state => 'hidden' } );
             debug_print("hiding because its sender is flagged as an abuser", $row->id) if $debug_mode;
@@ -73,6 +75,7 @@ sub send(;$) {
         # Template variables for the email
         my $email_base_url = $cobrand->base_url_for_report($row);
         my %h = map { $_ => $row->$_ } qw/id title detail name category latitude longitude used_map/;
+        $h{report} = $row;
         map { $h{$_} = $row->user->$_ || '' } qw/email phone/;
         $h{confirmed} = DateTime::Format::Pg->format_datetime( $row->confirmed->truncate (to => 'second' ) )
             if $row->confirmed;