diff options
| author | Josh Angell <josh@supercooldesign.co.uk> | 2012-02-28 10:46:19 +0000 |
|---|---|---|
| committer | Josh Angell <josh@supercooldesign.co.uk> | 2012-02-28 10:46:19 +0000 |
| commit | 8caf6e5aea7dddbc084dc8675d6c3346f22660bd (patch) | |
| tree | 3050e8078917ef69f4779d590a78bd1dc0d6e4f8 | |
| parent | b5fe45327561dbad2f83c0522b3df0830730c7de (diff) | |
| parent | 42b3535a00bfd0f8fd1e43207c63aa74c399b82b (diff) | |
Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into supercool
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Reports.pm | 1 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet/auth/general.html | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 0587a627a..5305b23b4 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -343,6 +343,7 @@ sub load_and_group_problems : Private { 'id', 'council', 'state', 'areas', 'latitude', 'longitude', 'title', 'cobrand', { duration => { extract => "epoch from current_timestamp-lastupdate" } }, { age => { extract => "epoch from current_timestamp-confirmed" } }, + { photo => 'photo is not null' }, ], order_by => { -desc => 'lastupdate' }, rows => 100, diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 5407e56e1..c2249fa46 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -20,7 +20,7 @@ [% IF loc_email_error %] <div class="form-error">[% loc_email_error %]</div> [% ELSIF sign_in_error %] - <div class="form-error">[% loc('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one.') %]</div> + <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> [% END %] <div class="form-field"> diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html index 2058ac60e..a0cb80726 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -21,7 +21,7 @@ [% IF loc_email_error %] <div class="form-error">[% loc_email_error %]</div> [% ELSIF sign_in_error %] - <div class="form-error">[% loc('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one.') %]</div> + <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> [% END %] <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]"> |