diff options
Diffstat (limited to 'templates/web/default')
| -rw-r--r-- | templates/web/default/alert/list.html | 6 | ||||
| -rwxr-xr-x | templates/web/default/around/display_location.html | 4 | ||||
| -rw-r--r-- | templates/web/default/auth/token.html | 4 | ||||
| -rw-r--r-- | templates/web/default/contact/index.html | 42 | ||||
| -rw-r--r-- | templates/web/default/contact/submit.html | 18 | ||||
| -rw-r--r-- | templates/web/default/questionnaire/completed.html | 2 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 6 | ||||
| -rw-r--r-- | templates/web/default/static/about.html | 4 |
8 files changed, 43 insertions, 43 deletions
diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index 5b1677e8b..931636f06 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -3,7 +3,7 @@ [% INCLUDE 'header.html', title => title %] [% IF pretty_pc %] -[% title = tprintf( loc('Local RSS feeds and email alerts for %s'), pretty_pc ) %] +[% title = tprintf( loc('Local RSS feeds and email alerts for ‘%s’'), pretty_pc ) %] [% END %] @@ -24,7 +24,7 @@ <p> [% IF pretty_pc %] - [% tprintf( loc('Here are the types of local problem alerts for %s.'), pretty_pc ) | html %] + [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) | html %] [% END %] [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert') %] </p> @@ -38,7 +38,7 @@ <p id="rss_local"> <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 %]'> + [% 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> </p> diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index de970e98a..4c728806b 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -74,8 +74,8 @@ <p id="alert_links_area"> <a id="email_alert" rel="nofollow" href="[% email_url | html %]"> - [% loc('Email me new local problems') %] - </a> | + [%- loc('Email me new local problems') -%] +</a> | <a href="[% rss_url | html %]" id="rss_alert"> <span>[% rss_alt %]</span> <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top"> diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html index 16dfbb11c..b3a3d5cc8 100644 --- a/templates/web/default/auth/token.html +++ b/templates/web/default/auth/token.html @@ -14,7 +14,7 @@ [% ELSE %] -<h1>[% loc('Please check you email') %]</h1> +<h1>[% loc('Please check your email') %]</h1> <p>We have sent you an email containing a link to confirm your account.</p> @@ -22,4 +22,4 @@ [% END %] -[% INCLUDE 'footer.html' %]
\ No newline at end of file +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html index 35c7f7e36..dc64dd554 100644 --- a/templates/web/default/contact/index.html +++ b/templates/web/default/contact/index.html @@ -1,20 +1,20 @@ -[% INCLUDE 'header.html', title => loc('Contact Us') %] +[% INCLUDE 'header.html', + title = loc('Contact Us') + robots = 'noindex,nofollow' +%] <h1>[% loc('Contact the team') %]</h1> <form method="post" action="/contact/submit"> -<input type="hidden" name="submit_form" value="1"> - - [% INCLUDE 'errors.html' %] [% IF update %] + <p> [% loc('You are reporting the following update for being abusive, containing personal information, or similar:') %] </p> - [% IF update.text %] <blockquote> <p> [% IF update.anonymous %] @@ -29,15 +29,14 @@ </p> </blockquote> - [% END %] <input type="hidden" name="update_id" value="[% update.id %]"> - <input type="hidden" name="id" value="[% problem.id %]"> + <input type="hidden" name="id" value="[% update.problem_id %]"> + [% ELSIF problem %] <p> [% loc('You are reporting the following problem report for being abusive, containing personal information, or similar:') %] </p> - [% IF problem.title %] <blockquote> <h2>[% problem.title | html %]</h2> @@ -55,13 +54,10 @@ </blockquote> <input type="hidden" name="id" value="[% problem.id %]"> - [% END %] + [% ELSE %] -[% IF id %] -<input type="hidden" name="id" value="[% id %]"> -[% END %] -[% INCLUDE 'contact/blurb.html' %] + [% INCLUDE 'contact/blurb.html' %] [% END %] @@ -69,32 +65,34 @@ <div class="form-error">[% field_errors.name %]</div> [% END %] <div class="form-field"> -<label for="form_name">Your name:</label> -<input type="text" name="name" id="form_name" value="[% form_name %]" size="30"></div> +<label for="form_name">[% loc('Your name:') %]</label> +<input type="text" name="name" id="form_name" value="[% form_name | html %]" size="30"></div> [% IF field_errors.em %] <div class="form-error">[% field_errors.em %]</div> [% END %] <div class="form-field"> -<label for="form_email">Your email:</label> -<input type="text" name="em" id="form_email" value="[% em %]" size="30"></div> +<label for="form_email">[% loc('Your email:') %]</label> +<input type="text" name="em" id="form_email" value="[% em | html %]" size="30"></div> [% IF field_errors.subject %] <div class="form-error">[% field_errors.subject %]</div> [% END %] <div class="form-field"> -<label for="form_subject">Subject:</label> -<input type="text" name="subject" id="form_subject" value="[% subject %]" size="30"></div> +<label for="form_subject">[% loc('Subject:') %]</label> +<input type="text" name="subject" id="form_subject" value="[% subject | html %]" size="30"></div> [% IF field_errors.message %] <div class="form-error">[% field_errors.message %]</div> [% END %] <div class="form-field"> -<label for="form_message">Message:</label> +<label for="form_message">[% loc('Message:') %]</label> + +<textarea name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea></div> +<div class="checkbox"><input type="submit" value="[% loc('Post') %]"></div> -<textarea name="message" id="form_message" rows="7" cols="50">[% message %]</textarea></div> -<div class="checkbox"><input type="submit" value="Post"></div> +[% c.cobrand.form_elements('contactForm') %] </form> diff --git a/templates/web/default/contact/submit.html b/templates/web/default/contact/submit.html index 12f3f30a6..3845e9210 100644 --- a/templates/web/default/contact/submit.html +++ b/templates/web/default/contact/submit.html @@ -1,18 +1,20 @@ -[% INCLUDE 'header.html', title => loc('Contact Us') %] +[% INCLUDE 'header.html', title = loc('Contact Us') %] <h1>[% loc('Contact the team') %]</h1> -<form method="post" action="/contact/submit"> - -<input type="hidden" name="submit_form" value="1"> - - -<p> [% IF success %] + + <p> [% loc("Thanks for your feedback. We'll get back to you as soon as we can!") %] + </p> + [% display_crosssell_advert( em, form_name, 'emailunvalidated', 1 ) %] + [% ELSE %] + + <p> [% tprintf( loc('Failed to send message. Please try again, or <a href="mailto:%s">email us</a>.'), contact_email ) %] + </p> + [% END %] -</p> [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/questionnaire/completed.html b/templates/web/default/questionnaire/completed.html index afac7aa29..4a6419ccb 100644 --- a/templates/web/default/questionnaire/completed.html +++ b/templates/web/default/questionnaire/completed.html @@ -23,6 +23,6 @@ why not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? [% END %] [% IF advert_outcome %] - [% display_crosssell_advert( problem.user.email, problem.name, council, problem.council ) %] + [% display_crosssell_advert( problem.user.email, problem.name, 'council', problem.council ) %] [% END %] diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 8ea902aa2..4fa58c1db 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -1,7 +1,7 @@ [% PROCESS "maps/${map.type}.html"; - problem_title = problem.title | html; + problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html; INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] @@ -42,7 +42,7 @@ <a rel="nofollow" id="email_alert" href="[% c.uri_for( '/alert', { type => 'updates', id => problem.id } ) %]">[% loc('Email me updates' ) %]</a> <form action="[% c.uri_for( '/alert/subscribe' ) %]" method="post" id="email_alert_box"> - <p>[% loc('Receive email when updates are left on this problem' ) %]</p> + <p>[% loc('Receive email when updates are left on this problem.' ) %]</p> <label class="n" for="alert_rznvy">[% loc('Email') %]</label> <input type="text" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30"> <input type="hidden" name="id" value="[% problem.id %]"> @@ -52,7 +52,7 @@ </form> <a href="[% c.uri_for( '/rss', problem.id ) %]"> - <img src="/i/feed.png" width="16" height="16" title="[% loc('Rss feed') %]" alt="[% loc('Rss feed of updates to the problem' ) %]" border="0" style="vertical-align: middle"> + <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="vertical-align: middle"> </a> </div> diff --git a/templates/web/default/static/about.html b/templates/web/default/static/about.html index 7219f6320..9c319f051 100644 --- a/templates/web/default/static/about.html +++ b/templates/web/default/static/about.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title => loc('About Us') %] +[% INCLUDE 'header.html', title => loc('About us') %] <h1>[% loc('About us') %]</h1> @@ -6,4 +6,4 @@ [%# FIXME - put in blurb here %] -[% INCLUDE 'footer.html' %]
\ No newline at end of file +[% INCLUDE 'footer.html' %] |