diff options
| author | Zarino Zappia <mail@zarino.co.uk> | 2016-01-04 17:19:03 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2016-01-05 15:30:02 +0000 |
| commit | beb328eac14323135998d4a1dcb4721b4dde5904 (patch) | |
| tree | 9731103e859e2f643b0b17f3693d15af6e339f49 /templates | |
| parent | c74b7286cdd213f38b5e9a816bb4dc9ba2611170 (diff) | |
Move alert page "recent photos" out of sidebar
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/alert/index.html | 22 | ||||
| -rw-r--r-- | templates/web/base/alert/list.html | 32 |
2 files changed, 28 insertions, 26 deletions
diff --git a/templates/web/base/alert/index.html b/templates/web/base/alert/index.html index 2b12182df..7057c83a3 100644 --- a/templates/web/base/alert/index.html +++ b/templates/web/base/alert/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] +[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'fullwidthpage' %] <h1>[% loc('Local RSS feeds and email alerts') %]</h1> @@ -37,16 +37,16 @@ within a certain distance of a particular location.', "%s is the site name"), si </form> [% IF photos.size %] -<div id="alert_recent"> - <aside> - <h2>[% loc('Some photos of recent reports') %]</h2> - [% FOREACH p IN photos; - photo = p.get_photo_params; - %] - <a href="/report/[% p.id %]"><img border="0" height="100" - src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> - [% END %] - </aside> +<h2>[% loc('Some photos of recent reports') %]</h2> +<div class="alerts__nearby-activity__photos"> + [% FOREACH p IN photos; + photo = p.get_photo_params; + %] + <a href="/report/[% p.id %]"> + <img border="0" height="100" src="[% photo.url_tn %]" + alt="[% p.title | html %]" title="[% p.title | html %]"> + </a> + [% END %] </div> [% END %] diff --git a/templates/web/base/alert/list.html b/templates/web/base/alert/list.html index 7b262f9e7..289eb40af 100644 --- a/templates/web/base/alert/list.html +++ b/templates/web/base/alert/list.html @@ -6,7 +6,7 @@ END; %] -[% INCLUDE 'header.html', title = title, bodyclass = 'twothirdswidthpage' %] +[% INCLUDE 'header.html', title = title, bodyclass = 'fullwidthpage' %] [% IF pretty_pc %] [% @@ -18,21 +18,23 @@ <h1>[% title %]</h1> -<form id="alerts" name="alerts" method="post" action="/alert/subscribe"> - - [% IF photos.size %] - <div id="alert_photos"> - <aside> - <h2>[% loc('Photos of recent nearby reports') %]</h2> - [% FOREACH p IN photos; - photo = p.get_photo_params; - %] - <a href="/report/[% p.id %]"><img border="0" height="100" - src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> - [% END %] - </aside> +[% IF photos.size %] +<div class="alerts__nearby-activity"> + <h2>[% loc('Photos of recent nearby reports') %]</h2> + <div class="alerts__nearby-activity__photos"> + [% FOREACH p IN photos; + photo = p.get_photo_params; + %] + <a href="/report/[% p.id %]"> + <img border="0" height="100" src="[% photo.url_tn %]" + alt="[% p.title | html %]" title="[% p.title | html %]"> + </a> + [% END %] </div> - [% END %] +</div> +[% END %] + +<form id="alerts" name="alerts" method="post" action="/alert/subscribe"> [% INCLUDE 'alert/_list.html' %] |