diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-01-07 15:40:55 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-01-07 15:40:55 +0000 |
| commit | 673ecc9eb64251ed5e5423a81acbb1914c431552 (patch) | |
| tree | e63ec2c2ad4d40bc85f68bc2f42b40ba6a418f2a | |
| parent | 8692e451268eaba507f64d3de99fdd40c7b63f80 (diff) | |
| parent | 70815a5b7fe371ae38d28a0b633c867c1dbab035 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Contact.pm | 3 | ||||
| -rw-r--r-- | templates/web/default/admin/header.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/list_updates.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/problem_row.html | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm index c8b0c2046..04360301e 100644 --- a/perllib/FixMyStreet/App/Controller/Contact.pm +++ b/perllib/FixMyStreet/App/Controller/Contact.pm @@ -113,6 +113,9 @@ sub validate : Private { or $c->req->param('update_id') && $c->req->param('update_id') !~ /^[1-9]\d*$/; + push @errors, _('There was a problem showing this page. Please try again later.') + if $c->req->params->{message} && $c->req->params->{message} =~ /\[url=/; + unshift @errors, _('There were problems with your report. Please see below.') if scalar keys %field_errors; diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html index 114c96a18..93254f5e3 100644 --- a/templates/web/default/admin/header.html +++ b/templates/web/default/admin/header.html @@ -2,7 +2,7 @@ <style type="text/css"> dt { clear: left; float: left; font-weight: bold; } dd { margin-left: 8em; } -.hidden { color: #666666; } +.adminhidden { color: #666666; } .error { color: red; } select { width: auto; } </style> diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html index 0a05ba4ac..d21919b16 100644 --- a/templates/web/default/admin/list_updates.html +++ b/templates/web/default/admin/list_updates.html @@ -15,7 +15,7 @@ <th>*</th> </tr> [% FOREACH update IN updates -%] - <tr[% ' class="hidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]> + <tr[% ' class="adminhidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]> <td>[%- IF update.state == 'confirmed' && update.problem.state != 'hidden' -%] [%- cobrand_data = update.cobrand_data %] [%- cobrand_data = c.data_for_generic_update IF !update.cobrand %] diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html index 22825429a..5aa8bbfee 100644 --- a/templates/web/default/admin/problem_row.html +++ b/templates/web/default/admin/problem_row.html @@ -1,5 +1,5 @@ [%- FOR problem IN problems %] - <tr[% ' class="hidden"' IF problem.state == 'hidden' %]> + <tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]> <td>[%- IF problem.is_visible -%] [%- cobrand_data = problem.cobrand_data %] [%- cobrand_data = c.data_for_generic_problem IF !problem.cobrand %] |