diff options
Diffstat (limited to 'templates')
| -rwxr-xr-x | templates/web/base/about/_sidebar.html | 15 | ||||
| -rwxr-xr-x | templates/web/base/about/faq-en-gb.html | 10 | ||||
| -rwxr-xr-x | templates/web/base/about/privacy.html | 10 | ||||
| -rw-r--r-- | templates/web/base/contact/blurb.html | 14 | ||||
| -rw-r--r-- | templates/web/base/contact/index.html | 166 | ||||
| -rw-r--r-- | templates/web/base/open311/index.html | 10 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/about/_sidebar.html | 16 | ||||
| -rwxr-xr-x | templates/web/fixmystreet.com/about/faq-en-gb.html | 11 | ||||
| -rwxr-xr-x | templates/web/fixmystreet.com/about/privacy.html | 10 | ||||
| -rw-r--r-- | templates/web/fixmystreet/contact/blurb.html | 15 | ||||
| -rw-r--r-- | templates/web/fixmystreet/contact/index.html | 126 |
11 files changed, 135 insertions, 268 deletions
diff --git a/templates/web/base/about/_sidebar.html b/templates/web/base/about/_sidebar.html new file mode 100755 index 000000000..ae32dfb51 --- /dev/null +++ b/templates/web/base/about/_sidebar.html @@ -0,0 +1,15 @@ +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li>[% INCLUDE link h='/faq' t=loc('Frequently Asked Questions') %]</li> + <li>[% INCLUDE link h='/about/privacy' t=loc('Privacy and cookies') %]</li> + <li>[% INCLUDE link h='/contact' t=tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</li> + </ul> + </aside> +</div> + +[% BLOCK link -%] +<[% IF c.req.uri.path == h %]strong[% ELSE %]a href="[% h %]"[% END %]> +[%- t -%] +</[% IF c.req.uri.path == h %]strong[% ELSE %]a[% END %]> +[%- END %] diff --git a/templates/web/base/about/faq-en-gb.html b/templates/web/base/about/faq-en-gb.html index b60f1102a..fc087a0e6 100755 --- a/templates/web/base/about/faq-en-gb.html +++ b/templates/web/base/about/faq-en-gb.html @@ -1,14 +1,6 @@ [% INCLUDE 'header.html', title = loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %] -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><strong>[% loc('Frequently Asked Questions') %]</strong></li> - <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> - <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> - </ul> - </aside> -</div> +[% INCLUDE 'about/_sidebar.html' %] <h1><a name="faq"></a>[% loc('Frequently Asked Questions') %]</h1> diff --git a/templates/web/base/about/privacy.html b/templates/web/base/about/privacy.html index 11ab65311..a794cfadf 100755 --- a/templates/web/base/about/privacy.html +++ b/templates/web/base/about/privacy.html @@ -2,15 +2,7 @@ title = loc('Privacy and cookies'), bodyclass = 'twothirdswidthpage' %] -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> - <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> - <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> - </ul> - </aside> -</div> +[% INCLUDE 'about/_sidebar.html' %] <h1>Privacy, cookies, and third party services</h1> diff --git a/templates/web/base/contact/blurb.html b/templates/web/base/contact/blurb.html index 463813449..3f9e88ed0 100644 --- a/templates/web/base/contact/blurb.html +++ b/templates/web/base/contact/blurb.html @@ -1,9 +1,15 @@ +[% IF c.cobrand.moniker == 'fixmystreet' %] +<h3>Send a message to FixMyStreet's technical support team</h3> + +<h4>If you have questions about FixMyStreet</h4> +[% END %] + +<p> +[% tprintf( loc("It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."), c.uri_for('/faq') ) %] +</p> + <p> [% loc('Please do <strong>not</strong> report problems through this form; messages go to the team behind this site, not a council. To report a problem, please <a href="/">go to the front page</a> and follow the instructions.') %] </p> - -<p> -[% tprintf( loc("We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:"), contact_email, contact_email) %] -</p> diff --git a/templates/web/base/contact/index.html b/templates/web/base/contact/index.html index 228a77def..86a0cec0d 100644 --- a/templates/web/base/contact/index.html +++ b/templates/web/base/contact/index.html @@ -1,106 +1,118 @@ [% INCLUDE 'header.html', title = loc('Contact Us') robots = 'noindex,nofollow' + bodyclass = 'twothirdswidthpage' %] +[% INCLUDE 'about/_sidebar.html' %] + +[% IF c.cobrand.moniker == 'fixmystreet' %] +<h1>FixMyStreet technical support</h1> +[% ELSE %] <h1>[% loc('Contact the team') %]</h1> +[% END %] <form method="post" action="/contact/submit" class="validate"> + <fieldset> + [% INCLUDE 'errors.html' %] + + [% IF update %] + + <p> + [% loc('You are reporting the following update for being abusive, containing personal information, or similar:') %] + </p> + + <blockquote> + <p> + [% IF update.anonymous %] + [% tprintf( loc('Update below added anonymously at %s'), prettify_dt( update.confirmed ) ) %] + [% ELSE %] + [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_dt( update.confirmed ) ) | html %] + [% END %] + </p> + + <p> + [% update.text | html %] + </p> + + </blockquote> + <input type="hidden" name="update_id" value="[% update.id %]"> + <input type="hidden" name="id" value="[% update.problem_id %]"> + + [% ELSIF problem %] + <p> + [% IF moderation_complaint %] + <input type="hidden" name="m" value="[% moderation_complaint %]"> + [% loc('You are complaining that this problem report was unnecessarily moderated:') %] + [% ELSE %] + [% loc('You are reporting the following problem report for being abusive, containing personal information, or similar:') %] + [% END %] + </p> -[% INCLUDE 'errors.html' %] + <blockquote> + <h2>[% problem.title_safe | html %]</h2> -[% IF update %] + <p> + [% IF problem.anonymous %] + [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed ) ) %] + [% ELSE %] + [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed ) ) | html %] + [% END %] + </p> - <p> - [% loc('You are reporting the following update for being abusive, containing personal information, or similar:') %] - </p> + <p> + [% problem.detail | html %] + </p> - <blockquote> - <p> - [% IF update.anonymous %] - [% tprintf( loc('Update below added anonymously at %s'), prettify_dt( update.confirmed ) ) %] - [% ELSE %] - [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_dt( update.confirmed ) ) | html %] - [% END %] - </p> - - <p> - [% update.text | html %] - </p> - - </blockquote> - <input type="hidden" name="update_id" value="[% update.id %]"> - <input type="hidden" name="id" value="[% update.problem_id %]"> - -[% ELSIF problem %] - <p> - [% IF moderation_complaint %] - <input type="hidden" name="m" value="[% moderation_complaint %]"> - [% loc('You are complaining that this problem report was unnecessarily moderated:') %] - [% ELSE %] - [% loc('You are reporting the following problem report for being abusive, containing personal information, or similar:') %] - [% END %] - </p> - - <blockquote> - <h2>[% problem.title_safe | html %]</h2> - - <p> - [% IF problem.anonymous %] - [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed ) ) %] - [% ELSE %] - [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed ) ) | html %] - [% END %] - </p> + </blockquote> + <input type="hidden" name="id" value="[% problem.id %]"> - <p> - [% problem.detail | html %] - </p> + [% ELSE %] - </blockquote> - <input type="hidden" name="id" value="[% problem.id %]"> + [% INCLUDE 'contact/blurb.html' %] -[% ELSE %] + [% END %] - [% INCLUDE 'contact/blurb.html' %] + <label for="form_name">[% loc('Your name') %]</label> + [% IF field_errors.name %] + <div class="form-error">[% field_errors.name %]</div> + [% END %] + <input type="text" class="required" name="name" id="form_name" value="[% form_name | html %]" size="30"> -[% END %] -[% IF field_errors.name %] - <div class="form-error">[% field_errors.name %]</div> -[% END %] -<div class="form-field"> -<label for="form_name">[% loc('Your name:') %]</label> -<input type="text" class="required" name="name" id="form_name" value="[% form_name | html %]" size="30"></div> + <label for="form_email">[% loc('Your email') %]</label> + [% IF field_errors.em %] + <div class="form-error">[% field_errors.em %]</div> + [% END %] + <input type="text" class="required email" name="em" id="form_email" value="[% em | html %]" size="30"> -[% IF field_errors.em %] - <div class="form-error">[% field_errors.em %]</div> -[% END %] -<div class="form-field"> -<label for="form_email">[% loc('Your email:') %]</label> -<input type="text" class="required email" name="em" id="form_email" value="[% em | html %]" size="30"></div> + <label for="form_subject">[% loc('Subject') %]</label> + [% IF field_errors.subject %] + <div class="form-error">[% field_errors.subject %]</div> + [% END %] + <input type="text" class="required" name="subject" id="form_subject" value="[% subject | html %]" size="30"> -[% IF field_errors.subject %] - <div class="form-error">[% field_errors.subject %]</div> -[% END %] -<div class="form-field"> -<label for="form_subject">[% loc('Subject:') %]</label> -<input type="text" class="required" name="subject" id="form_subject" value="[% subject | html %]" size="30"></div> + [% INCLUDE 'contact/who.html' %] -[% INCLUDE 'contact/who.html' %] + <label for="form_message">[% loc('Message') %]</label> + [% IF field_errors.message %] + <div class="form-error">[% field_errors.message %]</div> + [% END %] + <textarea class="required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea> -[% IF field_errors.message %] - <div class="form-error">[% field_errors.message %]</div> -[% END %] -<div class="form-field"> -<label for="form_message">[% loc('Message:') %]</label> -<textarea class="required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea></div> -<div class="checkbox"><input type="submit" value="[% loc('Post') %]"></div> + <input class="final-submit green-btn" type="submit" value="[% loc('Post') %]"> + </fieldset> </form> +<h4>[% loc("Don't like forms?") %]</h4> + +<p> +[% tprintf( loc("You can contact technical support on <a href='mailto:%s'>%s</a>"), contact_email, contact_email) %] +</p> + [% TRY %][% INCLUDE 'contact/address.html' %][% CATCH file %][% END %] -[% INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/base/open311/index.html b/templates/web/base/open311/index.html index d42cc2106..196cf0db6 100644 --- a/templates/web/base/open311/index.html +++ b/templates/web/base/open311/index.html @@ -1,14 +1,6 @@ [% INCLUDE 'header.html', title = 'Open311', bodyclass = 'twothirdswidthpage' %] -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> - <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> - <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> - </ul> - </aside> -</div> +[% INCLUDE 'about/_sidebar.html' %] <h1>FixMyStreet support for Open311</h1> diff --git a/templates/web/fixmystreet.com/about/_sidebar.html b/templates/web/fixmystreet.com/about/_sidebar.html new file mode 100644 index 000000000..7411fcb65 --- /dev/null +++ b/templates/web/fixmystreet.com/about/_sidebar.html @@ -0,0 +1,16 @@ +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li>[% INCLUDE link h='/faq' t=loc('Frequently Asked Questions') %]</li> + <li>[% INCLUDE link h='/about/posters' t='FixMyStreet Goodies' %]</li> + <li>[% INCLUDE link h='/about/privacy' t=loc('Privacy and cookies') %]</li> + <li>[% INCLUDE link h='/contact' t=tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</li> + </ul> + </aside> +</div> + +[% BLOCK link -%] +<[% IF c.req.uri.path == h %]strong[% ELSE %]a href="[% h %]"[% END %]> +[%- t -%] +</[% IF c.req.uri.path == h %]strong[% ELSE %]a[% END %]> +[%- END %] diff --git a/templates/web/fixmystreet.com/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html index 0748a50f8..8d907ef34 100755 --- a/templates/web/fixmystreet.com/about/faq-en-gb.html +++ b/templates/web/fixmystreet.com/about/faq-en-gb.html @@ -1,15 +1,6 @@ [% INCLUDE 'header.html', title = loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %] -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><strong>Frequently Asked Questions</strong></li> - <li><a href="/posters">FixMyStreet Goodies</a></li> - <li><a href="/privacy">Privacy and cookies</a></li> - <li><a href="/contact">Contact FixMyStreet</a></li> - </ul> - </aside> -</div> +[% INCLUDE 'about/_sidebar.html' %] <h1>FixMyStreet Frequently Asked Questions</h1> diff --git a/templates/web/fixmystreet.com/about/privacy.html b/templates/web/fixmystreet.com/about/privacy.html index 3b077d29e..2492eee89 100755 --- a/templates/web/fixmystreet.com/about/privacy.html +++ b/templates/web/fixmystreet.com/about/privacy.html @@ -2,15 +2,7 @@ title = loc('Privacy and cookies'), bodyclass = 'twothirdswidthpage' %] -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><a href="/faq">Frequently Asked Questions</a></li> - <li><strong>Privacy and cookies</strong></li> - <li><a href="/contact">Contact FixMyStreet</a></li> - </ul> - </aside> -</div> +[% INCLUDE 'about/_sidebar.html' %] <h1>Privacy, cookies, and third party services</h1> diff --git a/templates/web/fixmystreet/contact/blurb.html b/templates/web/fixmystreet/contact/blurb.html deleted file mode 100644 index 3f9e88ed0..000000000 --- a/templates/web/fixmystreet/contact/blurb.html +++ /dev/null @@ -1,15 +0,0 @@ -[% IF c.cobrand.moniker == 'fixmystreet' %] -<h3>Send a message to FixMyStreet's technical support team</h3> - -<h4>If you have questions about FixMyStreet</h4> -[% END %] - -<p> -[% tprintf( loc("It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."), c.uri_for('/faq') ) %] -</p> - -<p> -[% loc('Please do <strong>not</strong> report problems through this form; messages go to -the team behind this site, not a council. To report a problem, -please <a href="/">go to the front page</a> and follow the instructions.') %] -</p> diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html deleted file mode 100644 index 96ff7643d..000000000 --- a/templates/web/fixmystreet/contact/index.html +++ /dev/null @@ -1,126 +0,0 @@ -[% INCLUDE 'header.html', - title = loc('Contact Us') - robots = 'noindex,nofollow' - bodyclass = 'twothirdswidthpage' -%] - -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> - <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> - <li><strong>[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</strong></li> - </ul> - </aside> -</div> - -[% IF c.cobrand.moniker == 'fixmystreet' %] -<h1>FixMyStreet technical support</h1> -[% ELSE %] -<h1>[% loc('Contact the team') %]</h1> -[% END %] - -<form method="post" action="/contact/submit" class="validate"> - <fieldset> - [% INCLUDE 'errors.html' %] - - [% IF update %] - - <p> - [% loc('You are reporting the following update for being abusive, containing personal information, or similar:') %] - </p> - - <blockquote> - <p> - [% IF update.anonymous %] - [% tprintf( loc('Update below added anonymously at %s'), prettify_dt( update.confirmed ) ) %] - [% ELSE %] - [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_dt( update.confirmed ) ) | html %] - [% END %] - </p> - - <p> - [% update.text | html %] - </p> - - </blockquote> - <input type="hidden" name="update_id" value="[% update.id %]"> - <input type="hidden" name="id" value="[% update.problem_id %]"> - - [% ELSIF problem %] - <p> - [% IF moderation_complaint %] - <input type="hidden" name="m" value="[% moderation_complaint %]"> - [% loc('You are complaining that this problem report was unnecessarily moderated:') %] - [% ELSE %] - [% loc('You are reporting the following problem report for being abusive, containing personal information, or similar:') %] - [% END %] - </p> - - <blockquote> - <h2>[% problem.title_safe | html %]</h2> - - <p> - [% IF problem.anonymous %] - [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed ) ) %] - [% ELSE %] - [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed ) ) | html %] - [% END %] - </p> - - <p> - [% problem.detail | html %] - </p> - - </blockquote> - <input type="hidden" name="id" value="[% problem.id %]"> - - [% ELSE %] - - [% INCLUDE 'contact/blurb.html' %] - - [% END %] - - <label for="form_name">[% loc('Your name') %]</label> - [% IF field_errors.name %] - <div class="form-error">[% field_errors.name %]</div> - [% END %] - <input type="text" class="required" name="name" id="form_name" value="[% form_name | html %]" size="30"> - - - <label for="form_email">[% loc('Your email') %]</label> - [% IF field_errors.em %] - <div class="form-error">[% field_errors.em %]</div> - [% END %] - <input type="text" class="required email" name="em" id="form_email" value="[% em | html %]" size="30"> - - - <label for="form_subject">[% loc('Subject') %]</label> - [% IF field_errors.subject %] - <div class="form-error">[% field_errors.subject %]</div> - [% END %] - <input type="text" class="required" name="subject" id="form_subject" value="[% subject | html %]" size="30"> - - [% INCLUDE 'contact/who.html' %] - - <label for="form_message">[% loc('Message') %]</label> - [% IF field_errors.message %] - <div class="form-error">[% field_errors.message %]</div> - [% END %] - <textarea class="required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea> - - - <input class="final-submit green-btn" type="submit" value="[% loc('Post') %]"> - - </fieldset> -</form> - -<h4>[% loc("Don't like forms?") %]</h4> - -<p> -[% tprintf( loc("You can contact technical support on <a href='mailto:%s'>%s</a>"), contact_email, contact_email) %] -</p> - -[% TRY %][% INCLUDE 'contact/address.html' %][% CATCH file %][% END %] - -[% INCLUDE 'footer.html' pagefooter = 'yes' %] |