diff options
| -rw-r--r-- | templates/web/fixmystreet/alert/index.html | 16 | ||||
| -rw-r--r-- | templates/web/fixmystreet/alert/list.html | 38 | ||||
| -rw-r--r-- | templates/web/fixmystreet/index.html | 2 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 32 |
4 files changed, 40 insertions, 48 deletions
diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index d8478cf98..2e1d81c34 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -16,13 +16,15 @@ within a certain distance of a particular location.') %] [% 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>[% loc('To find out what local alerts we have for you, please enter your GB + postcode or street name and area' ) %]</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="[% loc('e.g. ‘B1’ or ‘Hockley Birmingham’') %]"> + <input class="green-btn" type="submit" value="[% loc('Go') %]"> + </div> + </fieldset> </form> [% IF photos.size %] diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html index c763331cc..4b25b54b4 100644 --- a/templates/web/fixmystreet/alert/list.html +++ b/templates/web/fixmystreet/alert/list.html @@ -45,11 +45,13 @@ [% loc('The simplest alert is our geographic one:') %] </p> - <p id="rss_local"> + + <p> <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> - <label for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> - [% loc('(a default distance which covers roughly 200,000 people)') %] <a href='[% rss_feed_uri %]'> - <img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + <label class="inline" for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> + <a href='[% rss_feed_uri %]'><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + <br /> + [% loc('(a default distance which covers roughly 200,000 people)') %] </p> <p id="rss_local_alt"> @@ -62,19 +64,18 @@ </p> [% IF reported_to_options %] - <div id="rss_list"> <p><strong> [% loc('Problems within the boundary of:') %] </strong></p> <ul> [% ELSE %] - <div><ul id="rss_feed"> + <ul id="rss_feed" class="plain-list"> [% END %] [% FOREACH option IN options %] <li> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label for="[% option.id %]">[% option.text %]</label> + <label class="inline" for="[% option.id %]">[% option.text %]</label> <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="RSS feed" border="0"></a> </li> @@ -102,30 +103,19 @@ will be sent to the district council, so will appear in both of the district council’s alerts, but will only appear in the "Within the boundary" alert for the county council.' ) %] </small></p> -</div> -<div id="rss_buttons"> [% END %] - <p> - <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> - <p> + <input class="green-btn" type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> <p id="alert_or"> [% loc('or') %] </p> -[% UNLESS c.user_exists %] - - <p> - [% loc('Your email:') %] <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]" size="30"> - </p> - -[% END %] - - <p> - <input type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> - </p> - </div> <!-- ???? --> + [% UNLESS c.user_exists %] + <label for="rznvy">[% loc('Your email') %]</label> + <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]"> + [% END %] + <input style="margin-top:1em;" class="green-btn" type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> </form> [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index 1099b6182..c6e3e69c6 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -20,7 +20,7 @@ <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> <label for="pc">[% question %]:</label> <div> - <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="e.g. ‘B1’ or ‘Hockley Birmingham’"> + <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="[% loc('e.g. ‘B1’ or ‘Hockley Birmingham’') %]"> <input type="submit" value="[% loc('Go') %]" id="submit"> </div> </form> diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 61fa900ed..fc6f8f5aa 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -338,24 +338,8 @@ label{ background:#eeeeee; padding:1em 2em 1em 2em; max-width:26em; - .form-txt-submit-box { - min-height:3em; - input[type=password], - input[type=text] { - width: 65%; - float:left; - } - input[type=submit] { - float:right; - width:28%; - margin-right:0.25em; - padding-top:0.9em; - padding-bottom:0.8em; - } - } >input[type=text] { margin-bottom:1em; - // margin-top:1em; } .title { font-size:1.25em; @@ -374,6 +358,22 @@ label{ } } +.form-txt-submit-box { + min-height:3em; + input[type=password], + input[type=text] { + width: 65%; + float:left; + } + input[type=submit] { + float:right; + width:28%; + margin-right:0.25em; + padding-top:0.9em; + padding-bottom:0.8em; + } +} + .checkbox-group { margin:1em 0; } |