diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /templates/web/default/alert/index.html | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to 'templates/web/default/alert/index.html')
| -rw-r--r-- | templates/web/default/alert/index.html | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index 274d61780..1f0635ae4 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -1,37 +1,50 @@ -[% INCLUDE 'header.html', title => loc('Local RSS feeds and email alerts') %] +[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] <h1>[% loc('Local RSS feeds and email alerts') %]</h1> <p> +[% IF c.cobrand.is_council %] +FixMyStreet has a variety of RSS feeds and email alerts for local problems, including +alerts for all problems within a particular ward, or all problems +within a certain distance of a particular location. +[% ELSE %] [% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including alerts for all problems within a particular ward or council, or all problems within a certain distance of a particular location.') %] +[% END %] </p> -[% IF location_offshore %] - <ul class="error"><li>[% loc('That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific.') %]</li></ul> -[% ELSIF location_error %] - <ul class="error"><li>[% location_error %]</li></ul> +[% IF location_error %] + <div class="error">[% location_error %]</div> [% ELSE %] [% INCLUDE 'errors.html' %] [% END %] -<form method="get" action="/alert/list"> - <p> - [% loc('To find out what local alerts we have for you, please enter your GB -postcode or street name and area:' ) %] - <input type="text" name="pc" value="[% pc | html %]"> - <input type="submit" value="[% loc('Go') %]"> - </p> +<p> +[% IF c.cobrand.is_council %] +To find out what local alerts we have for you, please enter your [% c.cobrand.council_area %] postcode or street name and area: +[% ELSE %] +[% loc('To find out what local alerts we have for you, please enter your postcode or street name and area' ) %] +[% END %] +</p> +<form method="get" action="/alert/list" class="full-width"> + <fieldset> + <div class="form-txt-submit-box"> + <input type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input class="green-btn" type="submit" value="[% loc('Go') %]"> + </div> + </fieldset> </form> [% IF photos.size %] -<div id="alert_recent"> - <h2>[% loc('Some photos of recent reports') %]</h2> +<div class="sticky-sidebar" id="alert_recent"> + <aside> + <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] + </aside> </div> [% END %] |