diff options
Diffstat (limited to 'templates')
32 files changed, 53 insertions, 211 deletions
diff --git a/templates/emails/alert-problem-area b/templates/email/default/alert-problem-area.txt index 8c41aaf5e..8c41aaf5e 100644 --- a/templates/emails/alert-problem-area +++ b/templates/email/default/alert-problem-area.txt diff --git a/templates/emails/alert-problem-council b/templates/email/default/alert-problem-council.txt index 572e057a6..572e057a6 100644 --- a/templates/emails/alert-problem-council +++ b/templates/email/default/alert-problem-council.txt diff --git a/templates/emails/alert-problem-nearby b/templates/email/default/alert-problem-nearby.txt index 0bf8483a7..0bf8483a7 100644 --- a/templates/emails/alert-problem-nearby +++ b/templates/email/default/alert-problem-nearby.txt diff --git a/templates/emails/alert-problem-ward b/templates/email/default/alert-problem-ward.txt index efcf15993..efcf15993 100644 --- a/templates/emails/alert-problem-ward +++ b/templates/email/default/alert-problem-ward.txt diff --git a/templates/emails/alert-problem b/templates/email/default/alert-problem.txt index 8369b8e28..8369b8e28 100644 --- a/templates/emails/alert-problem +++ b/templates/email/default/alert-problem.txt diff --git a/templates/emails/alert-update b/templates/email/default/alert-update.txt index ac0ddd50a..ac0ddd50a 100644 --- a/templates/emails/alert-update +++ b/templates/email/default/alert-update.txt diff --git a/templates/emails/reply-autoresponse b/templates/email/default/reply-autoresponse index 672c1f3c9..672c1f3c9 100644 --- a/templates/emails/reply-autoresponse +++ b/templates/email/default/reply-autoresponse diff --git a/templates/emails/emptyhomes/alert-problem-area b/templates/email/emptyhomes/en-gb/alert-problem-area.txt index 0fb11665c..0fb11665c 100644 --- a/templates/emails/emptyhomes/alert-problem-area +++ b/templates/email/emptyhomes/en-gb/alert-problem-area.txt diff --git a/templates/emails/emptyhomes/alert-problem-council b/templates/email/emptyhomes/en-gb/alert-problem-council.txt index 6c2d5b55c..6c2d5b55c 100644 --- a/templates/emails/emptyhomes/alert-problem-council +++ b/templates/email/emptyhomes/en-gb/alert-problem-council.txt diff --git a/templates/emails/emptyhomes/alert-problem-nearby b/templates/email/emptyhomes/en-gb/alert-problem-nearby.txt index abe027d20..abe027d20 100644 --- a/templates/emails/emptyhomes/alert-problem-nearby +++ b/templates/email/emptyhomes/en-gb/alert-problem-nearby.txt diff --git a/templates/emails/emptyhomes/alert-problem-ward b/templates/email/emptyhomes/en-gb/alert-problem-ward.txt index 14dabc386..14dabc386 100644 --- a/templates/emails/emptyhomes/alert-problem-ward +++ b/templates/email/emptyhomes/en-gb/alert-problem-ward.txt diff --git a/templates/emails/emptyhomes/alert-problem b/templates/email/emptyhomes/en-gb/alert-problem.txt index 30dc10c42..30dc10c42 100644 --- a/templates/emails/emptyhomes/alert-problem +++ b/templates/email/emptyhomes/en-gb/alert-problem.txt diff --git a/templates/emails/emptyhomes/alert-update b/templates/email/emptyhomes/en-gb/alert-update.txt index 9ae295b3e..9ae295b3e 100644 --- a/templates/emails/emptyhomes/alert-update +++ b/templates/email/emptyhomes/en-gb/alert-update.txt diff --git a/templates/email/emptyhomes/en-gb/problem-confirm.txt b/templates/email/emptyhomes/en-gb/problem-confirm.txt index 25d2a0afd..f8ff3e7ca 100644 --- a/templates/email/emptyhomes/en-gb/problem-confirm.txt +++ b/templates/email/emptyhomes/en-gb/problem-confirm.txt @@ -1,20 +1,20 @@ -Subject: Confirm your empty property on reportemptyhomes.com +Subject: Confirm your empty property report Hi [% report.user.name %], -Please click on the link below to confirm the empty property you just -added to reportemptyhomes.com: +Please click on the link below to confirm the empty property +report you just added to the site: [% token_url %] If your email program does not let you click on this link, copy and paste it into your web browser and press return. -Your empty property had the title: +Your report had the subject: [% report.title %] And details: [% report.detail %] Yours, -The reportemptyhomes.com team +reportemptyhomes.com diff --git a/templates/email/fiksgatami/update-confirm.txt b/templates/email/fiksgatami/update-confirm.txt index 4d6d12369..70e1c2444 100644 --- a/templates/email/fiksgatami/update-confirm.txt +++ b/templates/email/fiksgatami/update-confirm.txt @@ -2,7 +2,7 @@ Subject: Bekreft din oppdatering på FiksGataMi Hei [% update.user.name %], -Vennligst klikk på lenken under for å bekrefte oppdateringen du skrev " +Vennligst klikk på lenken under for å bekrefte oppdateringen du skrev nettopp: [% token_url %] diff --git a/templates/emails/alert-confirm b/templates/emails/alert-confirm deleted file mode 100644 index bb6288119..000000000 --- a/templates/emails/alert-confirm +++ /dev/null @@ -1,14 +0,0 @@ -Subject: Confirm your alert on FixMyStreet - -Hi, - -Please click on the link below to confirm the alert you just -asked to subscribe to on FixMyStreet: - - <?=$values['url']?> - -If you can't click the link, please copy and paste it to the -address bar of your web browser. - -Yours, -The FixMyStreet team diff --git a/templates/emails/empty property-confirm b/templates/emails/empty property-confirm deleted file mode 100644 index b7381eec8..000000000 --- a/templates/emails/empty property-confirm +++ /dev/null @@ -1,20 +0,0 @@ -Subject: Confirm your empty property report - -Hi <?=$values['name']?>, - -Please click on the link below to confirm the empty property -report you just added to the site: - -<?=$values['url']?> - -If your email program does not let you click on this link, -copy and paste it into your web browser and press return. - -Your report had the subject: -<?=$values['title']?> - -And details: -<?=$values['detail']?> - -Yours, -reportemptyhomes.com diff --git a/templates/emails/problem-confirm b/templates/emails/problem-confirm deleted file mode 100644 index 2a00e54a5..000000000 --- a/templates/emails/problem-confirm +++ /dev/null @@ -1,20 +0,0 @@ -Subject: Confirm your problem on FixMyStreet - -Hi <?=$values['name']?>, - -Please click on the link below to confirm the problem you just -added to FixMyStreet: - -<?=$values['url']?> - -If your email program does not let you click on this link, -copy and paste it into your web browser and press return. - -Your problem had the title: -<?=$values['title']?> - -And details: -<?=$values['detail']?> - -Yours, -The FixMyStreet team diff --git a/templates/emails/tms-confirm b/templates/emails/tms-confirm deleted file mode 100644 index 4821aed82..000000000 --- a/templates/emails/tms-confirm +++ /dev/null @@ -1,14 +0,0 @@ -Subject: Confirm your expression of interest in TextMyStreet - -Hi, - -Please click on the link below to confirm your expression of -interest in TextMyStreet: - - <?=$values['url']?> - -If you can't click the link, please copy and paste it to the -address bar of your web browser. - -Yours, -The FixMyStreet team diff --git a/templates/emails/update-confirm b/templates/emails/update-confirm deleted file mode 100644 index 11878ad0b..000000000 --- a/templates/emails/update-confirm +++ /dev/null @@ -1,17 +0,0 @@ -Subject: Confirm your update on FixMyStreet - -Hi <?=$values['name']?>, - -Please click on the link below to confirm the update you just wrote: - -<?=$values['url']?> - -If you can't click the link, please copy and paste it to the -address bar of your web browser. - -Your update reads: - -<?=$values['update']?> - -Yours, -The FixMyStreet team 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' %] diff --git a/templates/web/emptyhomes/tokens/confirm_problem.html b/templates/web/emptyhomes/tokens/confirm_problem.html index c4d246430..7bcf8acdf 100644 --- a/templates/web/emptyhomes/tokens/confirm_problem.html +++ b/templates/web/emptyhomes/tokens/confirm_problem.html @@ -28,7 +28,10 @@ %]</p> [% ELSE %] <p>[% - loc( 'Thank you for reporting an empty property on ReportEmptyHomes.com.' ) + loc( 'Thank you for reporting this empty property on ReportEmptyHomes.com. +At present the report cannot be sent through to the council for this area. We +are working with councils to link them into the system so that as many areas +as possible will be covered.') %]</p> [% END %] diff --git a/templates/web/fiksgatami/contact/address.html b/templates/web/fiksgatami/contact/address.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/fiksgatami/contact/address.html diff --git a/templates/website/contact b/templates/website/contact deleted file mode 100644 index b1103d3f1..000000000 --- a/templates/website/contact +++ /dev/null @@ -1,42 +0,0 @@ -<h1>{{ $header }}</h1> -{{ $errors }} -<form method="post" action="{{ $form_action }}"> -<input type="hidden" name="submit_form" value="1"> - -{{ $intro }} -{{ if ( $item_title ) { - "<blockquote><h2>$item_title</h2><p>$item_meta</p><p>$item_body</p></blockquote>"; - -} }} - -{{ $hidden_vals }} -{{ if ( $field_errors{name}) { - "<div class='form-error'>$field_errors{name}</div>"; -} }} -<div class="form-field"> -<label for="form_name">{{ $label_name }}</label> -<input type="text" name="name" id="form_name" value="{{ $input_h{name} }}" size="30"></div> - -{{ if ( $field_errors{email}) { - "<div class='form-error'>$field_errors{email}</div>"; -} }} -<div class="form-field"> -<label for="form_email">{{ $label_email }}</label> -<input type="text" name="em" id="form_email" value="{{ $input_h{em} }}" size="30"></div> -{{ if ( $field_errors{subject}) { - "<div class='form-error'>$field_errors{subject}</div>"; -} }} -<div class="form-field"> -<label for="form_subject">{{ $label_subject }}</label> -<input type="text" name="subject" id="form_subject" value="{{ $input_h{subject} }}" size="30"></div> -{{ if ( $field_errors{message}) { - "<div class='form-error'>$field_errors{message}</div>"; -} }} -<div class="form-field"> -<label for="form_message">{{ $label_message }}</label> -<textarea name="message" id="form_message" rows="7" cols="50">{{ $input_h{message} }}</textarea></div> -<div class="checkbox"><input type="submit" value="{{ $label_submit }}"></div> -{{ $cobrand_form_elements }} -</form> - -{{ $contact_details }} diff --git a/templates/website/questionnaire b/templates/website/questionnaire deleted file mode 100644 index 869552c4b..000000000 --- a/templates/website/questionnaire +++ /dev/null @@ -1,34 +0,0 @@ -{{ $map_start }} - -<h1>{{ $heading }}</h1> - -<form method="post" action="{{ $form_action }}" id="questionnaire"{{ $enctype }}> -<input type="hidden" name="token" value="{{ $input_h{token} }}"> - -{{ $blurb_eh }} - -<p>{{ $blurb_report }} {{ $blurb_report2 }}</p> - -{{ $errors }} - -<p>{{ $fixed_question }}</p> -<p> -<input type="radio" name="been_fixed" id="been_fixed_yes" value="Yes"{{ $been_fixed{yes} }}> -<label for="been_fixed_yes">{{ $yes }}</label> -<input type="radio" name="been_fixed" id="been_fixed_no" value="No"{{ $been_fixed{no} }}> -<label for="been_fixed_no">{{ $no }}</label> -<input type="radio" name="been_fixed" id="been_fixed_unknown" value="Unknown"{{ $been_fixed{unknown} }}> -<label for="been_fixed_unknown">{{ $dontknow }}</label> -</p> - -{{ $ever_reported }} - -{{ $blurb_update }} -<p><textarea name="update" style="max-width:90%" rows="7" cols="30">{{ $input_h{update} }}</textarea></p> -{{ $photo_input }} - -{{ $another_questionnaire }} - -<p><input type="submit" name="submit" value="{{ $submit }}"></p> </form> - -{{ $map_end }} |