diff options
Diffstat (limited to 'templates/web/default/report')
23 files changed, 0 insertions, 910 deletions
diff --git a/templates/web/default/report/_council_sent_info.html b/templates/web/default/report/_council_sent_info.html deleted file mode 100644 index 958562dc2..000000000 --- a/templates/web/default/report/_council_sent_info.html +++ /dev/null @@ -1,5 +0,0 @@ -[% IF problem.whensent || problem.can_display_external_id %] - <small class="council_sent_info"><br> - [% problem.processed_summary_string(c) %] - </small> -[% END %] diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html deleted file mode 100644 index 0124052c0..000000000 --- a/templates/web/default/report/_main.html +++ /dev/null @@ -1,23 +0,0 @@ -<div class="problem-header cf"> - <h1>[% problem.title | html %]</h1> - - <p><em> - [% problem.meta_line(c) | html %] - [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] - [% IF problem.bodies_str %] - [% INCLUDE 'report/_council_sent_info.html' %] - [% ELSE %] - <br><small>[% loc('Not reported to council') %]</small> - [% END %] - </em></p> - [% INCLUDE 'report/_support.html' %] - - [% IF c.cobrand.moniker == 'southampton' %] - [% add_links( problem.detail ) | html_para %] - [% INCLUDE 'report/photo.html' object=problem %] - [% ELSE %] - [% INCLUDE 'report/photo.html' object=problem %] - [% add_links( problem.detail ) | html_para %] - [% END %] - -</div> diff --git a/templates/web/default/report/_support.html b/templates/web/default/report/_support.html deleted file mode 100644 index 3e372ba69..000000000 --- a/templates/web/default/report/_support.html +++ /dev/null @@ -1,17 +0,0 @@ -[% IF c.cobrand.can_support_problems %] -[% - IF !problem.interest_count; - SET text = loc('No supporters'); - ELSE; - SET text = tprintf( nget( "%d supporter", "%d supporters", problem.interest_count ), problem.interest_count ); - END; -%] - - [% IF c.user AND c.user.from_body %] - <form action="[% c.uri_for( '/report/support' ) %]"> - <p id="supporter"><small>[% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support"></small></p> - </form> - [% ELSE %] - <p id="supporter"><small>[% text %]</small></p> - [% END %] -[% END %] diff --git a/templates/web/default/report/banner.html b/templates/web/default/report/banner.html deleted file mode 100644 index bd7798d79..000000000 --- a/templates/web/default/report/banner.html +++ /dev/null @@ -1,22 +0,0 @@ -[% USE date %] -[% BLOCK banner %] -<p class="banner" id="[% id %]"> - [% text %] -</p> -[% END %] - -[% IF problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] - [% INCLUDE banner, id = 'unknown', text = loc('This problem is old and of unknown status.') %] -[% END %] -[% IF problem.is_fixed %] - [% INCLUDE banner, id = 'fixed', text = loc('This problem has been fixed') %] -[% END %] -[% IF problem.is_closed %] - [% INCLUDE banner, id = 'closed', text = loc('This problem has been closed') %] -[% END %] -[% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ]; - IF states.grep(problem.state).size %] - [% INCLUDE banner, id = 'progress', text = loc('This problem is in progress') %] -[% END %] - - diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html deleted file mode 100644 index fd7580ac1..000000000 --- a/templates/web/default/report/display.html +++ /dev/null @@ -1,56 +0,0 @@ -[% - PROCESS "maps/${map.type}.html"; - - problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); - SET rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] IF c.cobrand.moniker != 'emptyhomes'; - SET robots = 'index, nofollow'; - SET robots = 'noindex, nofollow' IF c.cobrand.moniker == 'emptyhomes'; - INCLUDE 'header.html' - title = problem_title -%] - -[% IF c.cobrand.moniker != 'emptyhomes' %] - [% map_html %] - </div> -[% END %] - -<div id="side"> - -[% INCLUDE 'report/banner.html' %] -[% INCLUDE 'report/_main.html' %] - -<p align="right"> - <small> - <a rel="nofollow" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Offensive? Unsuitable? Tell us' ) %]</a> - </small> -</p> - -[% IF c.cobrand.moniker != 'emptyhomes' %] -<p style="padding-bottom: 0.5em; border-bottom: dotted 1px #999999;" align="right"> - <a href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'More problems nearby' ) %]</a> -</p> - -<div id="alert_links"> - <a rel="nofollow" id="email_alert" href="[% c.uri_for( '/alert/subscribe', { 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> - <label class="n" for="alert_rznvy">[% loc('Email:') %]</label> - <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30"> - <input type="hidden" name="id" value="[% problem.id %]"> - <input type="hidden" name="type" value="updates"> - <input type="submit" value="[% loc('Subscribe') %]"> - </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 this problem' ) %]" border="0" style="vertical-align: middle"> - </a> -</div> - -[% INCLUDE 'report/updates.html' %] -[% INCLUDE 'report/update-form.html' %] -[% END %] - -</div> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html deleted file mode 100644 index ee47adc9e..000000000 --- a/templates/web/default/report/new/category.html +++ /dev/null @@ -1,20 +0,0 @@ -[% FILTER collapse %] -[% IF category_options.size %] - [% IF category; - category = category | lower; - END; %] - <label for='form_category' id="form_category_label"> - [%- IF c.cobrand.moniker == 'emptyhomes' %] - [%- loc('Property type:') %] - [%- ELSE %] - [%- loc('Category') %] - [%- END -%]</label> - <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> - [% FOREACH cat_op IN category_options %] - [% cat_op_lc = cat_op | lower %] - <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc || (category_options.size == 2 AND loop.last) -%] - >[% IF loop.first %][% cat_op %][% ELSE %][% cat_op | html %][% END %]</option> - [% END %] - </select> -[% END %] -[% END -%] diff --git a/templates/web/default/report/new/category_extras.html b/templates/web/default/report/new/category_extras.html deleted file mode 100644 index 928b61041..000000000 --- a/templates/web/default/report/new/category_extras.html +++ /dev/null @@ -1,26 +0,0 @@ -<div id="category_meta"> - [%- IF report_meta %] - [%- category = report.category %] - <h4>Additional Information</h4> - [%- FOR meta IN category_extras.$category %] - [%- meta_name = meta.code -%] - -[% IF field_errors.$meta_name %] - <div class='form-error'>[% field_errors.$meta_name %]</div> -[% END -%] - - <div class="form-field"> - <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> - [% IF meta.exists('values') %] - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value.value %] - <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> - [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% END %] - </div> - [%- END %] - [%- END %] -</div> diff --git a/templates/web/default/report/new/councils_extra_text.html b/templates/web/default/report/new/councils_extra_text.html deleted file mode 100644 index 1088b9f8b..000000000 --- a/templates/web/default/report/new/councils_extra_text.html +++ /dev/null @@ -1 +0,0 @@ -[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] diff --git a/templates/web/default/report/new/councils_text.html b/templates/web/default/report/new/councils_text.html deleted file mode 100644 index f526beb28..000000000 --- a/templates/web/default/report/new/councils_text.html +++ /dev/null @@ -1,9 +0,0 @@ -[% FILTER collapse %] -[% IF bodies_to_list.size == 0 %] - [% PROCESS 'report/new/councils_text_none.html' %] -[% ELSIF bodies_to_list.size == bodies.size %] - [% PROCESS 'report/new/councils_text_all.html' %] -[% ELSE %] - [% PROCESS 'report/new/councils_text_some.html' %] -[% END %] -[% END -%] diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/default/report/new/councils_text_all.html deleted file mode 100644 index e9a008e90..000000000 --- a/templates/web/default/report/new/councils_text_all.html +++ /dev/null @@ -1,27 +0,0 @@ -[%# XXX The below type checking is assuming that a body ID can be used to look up a mapit type. %] -<p> -[% IF bodies_to_list.0 != 2489 && bodies_to_list.0 != 2482 && all_areas.${bodies_to_list.0}.type == 'LBO' %] -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'), - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% ELSIF all_areas.${bodies_to_list.0}.type == 'LGD' %] -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>.'), - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% ELSE %] -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.'), - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% END %] - -[% INCLUDE 'report/new/councils_extra_text.html' %] -</p> diff --git a/templates/web/default/report/new/councils_text_none.html b/templates/web/default/report/new/councils_text_none.html deleted file mode 100644 index 9293c03a7..000000000 --- a/templates/web/default/report/new/councils_text_none.html +++ /dev/null @@ -1,28 +0,0 @@ -<p>[% - nget( - "We do not yet have details for the council that covers this location.", - "We do not yet have details for the councils that cover this location.", - missing_details_bodies.size || all_areas.size - ); -%] -[% - loc("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."); -%] -[% IF c.cobrand.moniker == 'fixamingata' AND all_body_names.size == 1 %] -[% - tprintf( - "Du kan istället kontakta %s via <a href='%s'>deras webbsida</a>.", - all_body_names.first, all_body_urls.first); -%] -[% ELSE %] -[% - tprintf( - loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), - missing_details_body_names.join( loc(' or ') ) || all_area_names.join( loc(' or ') ), - c.cobrand.contact_email, - c.cobrand.contact_email - ); - -%] -[% END %] -</p> diff --git a/templates/web/default/report/new/councils_text_some.html b/templates/web/default/report/new/councils_text_some.html deleted file mode 100644 index 8d4768612..000000000 --- a/templates/web/default/report/new/councils_text_some.html +++ /dev/null @@ -1,28 +0,0 @@ -<p> -[% loc('All the information you provide here will be sent to') %] - -[% FOREACH body_id IN bodies_to_list %] - [% loc( ' or ') IF ! loop.first %] - <strong>[% bodies.$body_id.name %]</strong> - [%- '.' IF loop.last %] -[% END %] - -[% - loc('The subject and details of the problem will be public, plus your name if you give us permission.'); -%] -[% - nget( - "We do <strong>not</strong> yet have details for the other council that covers this location.", - "We do <strong>not</strong> yet have details for the other councils that cover this location.", - missing_details_bodies.size - ); -%] -[% - tprintf( - loc("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), - missing_details_body_names.join( loc(' or ') ), - c.cobrand.contact_email, - c.cobrand.contact_email - ); -%] -</p> diff --git a/templates/web/default/report/new/extra_name.html b/templates/web/default/report/new/extra_name.html deleted file mode 100644 index dede1000c..000000000 --- a/templates/web/default/report/new/extra_name.html +++ /dev/null @@ -1,18 +0,0 @@ -[% IF extra_name_info %] -<label for="form_fms_extra_title">Title</label> -[% IF field_errors.fms_extra_title %] - <p class='form-error'>[% field_errors.fms_extra_title %]</p> -[% END %] -[% title = '' %] -[% IF fms_extra_title %][% title = fms_extra_title | upper %] -[% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %] -<select class="form-focus-trigger required" id="form_fms_extra_title" - name="fms_extra_title"> - <option></option> - <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option> - <option value="MISS"[% ' selected' IF title == 'MISS' %]>Miss</option> - <option value="MRS"[% ' selected' IF title == 'MRS' %]>Mrs</option> - <option value="MS"[% ' selected' IF title == 'MS' %]>Ms</option> - <option value="DR"[% ' selected' IF title == 'DR' %]>Dr</option> -</select> -[% END %] diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html deleted file mode 100644 index 22d1ee739..000000000 --- a/templates/web/default/report/new/fill_in_details.html +++ /dev/null @@ -1,35 +0,0 @@ -[% - PROCESS "maps/${map.type}.html" IF report.used_map; - INCLUDE 'header.html', title => loc('Reporting a problem') -%] - -[% IF report.used_map %] -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> -[% IF c.req.params.map_override %] -<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> -[% END %] -<input type="hidden" name="pc" value="[% pc | html %]"> -[% ELSE %] -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> -<input type="hidden" name="pc" value="[% pc | html %]"> -<input type="hidden" name="skipped" value="1"> -[% END %] - -<input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> -<input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> - -[% IF report.used_map %] - [% map_html %] - </div> - <div id="side"> -[% ELSE %] - <div id="skipped-map"> -[% END %] - -[% PROCESS 'report/new/fill_in_details_form.html' %] - -</div> -</form> - -[% INCLUDE 'footer.html' %] - diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html deleted file mode 100644 index 5eff4e147..000000000 --- a/templates/web/default/report/new/fill_in_details_form.html +++ /dev/null @@ -1,220 +0,0 @@ -<h1>[% loc('Reporting a problem') %]</h1> - -[% IF report.used_map %] - [% IF partial_token %] - <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> - [% END %] -<p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> -[% END %] - -[% IF js %] - <p id="councils_text">[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.'), - loc('the local council') - ); - %] - [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] - </p> -[% ELSE %] - [% PROCESS 'report/new/councils_text.html' %] -[% END %] - -<p> -[% IF report.used_map %] - [% INCLUDE 'report/new/fill_in_details_text.html' %] -[% ELSE %] - [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] -[% END %] -</p> - -[% INCLUDE 'errors.html' %] - -<div id="problem_form"> - -[% INCLUDE 'report/new/form_heading.html' %] - -<div class="fieldset"> - - - - - -[% IF field_errors.bodies %] - <div class='form-error'>[% field_errors.bodies %]</div> -[% END %] - -[% IF field_errors.title %] - <div class='form-error'>[% field_errors.title %]</div> -[% END %] - -<div class="form-field"> - <label for="form_title">[% loc('Subject:') %]</label> - <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25" required> -</div> - -[% IF field_errors.detail %] - <div class='form-error'>[% field_errors.detail %]</div> -[% END %] - -<div class="form-field"> - <label for="form_detail">[% loc('Details:') %]</label> - <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> -</div> - -[% IF js %] - <div class="form-field" id="form_category_row"> - <label for="form_category">[% loc('Category:') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> -[% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <div class='form-error'>[% field_errors.category %]</div> - [% END %] - - <div class="form-field"> - [% PROCESS "report/new/category.html" %] - </div> - [% END %] -[% END %] - -[%- IF category_extras %] -[% PROCESS "report/new/category_extras.html" %] -[%- END %] - -[% IF c.cobrand.allow_photo_upload %] - [% IF field_errors.photo %] - <div class='form-error'>[% field_errors.photo %]</div> - [% END %] - - <div class='form-field'> - [% IF upload_fileid || report.photo %] - <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> - [% IF upload_fileid %] - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> - [% END %] - [% IF report.photo %] - <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> - [% END %] - [% END %] - - <label for="form_photo">[% loc('Photo:') %]</label> - <input type="file" name="photo" id="form_photo" style="width:20em"> - </div> -[% END %] - -[% IF c.user_exists %] - - [% INCLUDE name_phone %] - - [% INCLUDE 'report/new/notes.html' %] - - <p id="problem_submit"> - <input type="submit" value="[% loc('Submit') %]"> - </p> - -[% ELSE %] - - [% IF field_errors.email %] - <div class='form-error'>[% field_errors.email %]</div> - [% END %] - - <div class="form-field"> - <label for="form_email">[% loc('Your email:') %]</label> - <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> - </div> - -[% INCLUDE 'report/new/notes.html' %] - -<div id="form_sign_in"> - <h3>[% loc("Now to submit your report… do you have a FixMyStreet password?") %]</h3> - - <div id="form_sign_in_yes"> - - [% IF field_errors.password %] - <div class='form-error'>[% field_errors.password %]</div> - [% END %] - - <div class="form-field"> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> - <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> - </div> - - <div class="fieldset"> - - <p> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="n" for="remember_me"> - [% loc('Keep me signed in on this computer') %] - </label> - </p> - - <p> - <input type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> - </p> - - </div> - - </div> - <div id="form_sign_in_no"> - - <p>[% loc('<strong>No</strong>, let me confirm my report by email:') %]</p> - - <div class="fieldset"> - - [% INCLUDE name_phone %] - - <div class="form-field"> - <label for="password_register">[% loc('Enter a new password:') %]</label> - <input type="password" name="password_register" id="password_register" value="" size="25"> - </div> - - <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> - - <p> - <input type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> - </p> - - </div> - - </div> - -</div> - -[% END %] - -[% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> -[% END %] - -<input type="hidden" name="submit_problem" value="1"> - -</div> -</div> - - -[% BLOCK name_phone %] - [% 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="validName" value="[% report.name | html %]" name="name" id="form_name" size="25"> - </div> - - <div class="checkbox"> - [%# if there is nothing in the name field then set check box as default on form %] - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %]> - <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> - <br><small>[% loc('(we never show your email address or phone number)') %]</small> - </div> - - <div> - <label for="form_phone">[% loc('Phone:') %]</label> - <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" size="15"> - <small>[% loc('(optional)') %]</small> - </div> -[% END %] - diff --git a/templates/web/default/report/new/fill_in_details_text.html b/templates/web/default/report/new/fill_in_details_text.html deleted file mode 100644 index 5d9716915..000000000 --- a/templates/web/default/report/new/fill_in_details_text.html +++ /dev/null @@ -1,13 +0,0 @@ -[% - IF area_ids_to_list.size != 0; - loc('Please fill in details of the problem below. The council won\'t be able -to help unless you leave as much detail as you can, so please describe the exact location of -the problem (e.g. on a wall), what it is, how long it has been there, a description (and a -photo of the problem if you have one), etc.'); - IF category_extras; - ' ' _ loc('Some categories may require additional information.'); - END; - ELSE; - loc('Please fill in details of the problem below.'); - END; -%] diff --git a/templates/web/default/report/new/form_heading.html b/templates/web/default/report/new/form_heading.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/default/report/new/form_heading.html +++ /dev/null diff --git a/templates/web/default/report/new/notes.html b/templates/web/default/report/new/notes.html deleted file mode 100644 index 68408acc7..000000000 --- a/templates/web/default/report/new/notes.html +++ /dev/null @@ -1,11 +0,0 @@ -<p style="clear:both">[% loc("Please note:") %]</p> - -<ul> - - <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li> - <li>[% loc("Please be polite, concise and to the point.") %]</li> - <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> - <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> - <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> - -</ul> diff --git a/templates/web/default/report/new/report_import.html b/templates/web/default/report/new/report_import.html deleted file mode 100644 index 7aa105afe..000000000 --- a/templates/web/default/report/new/report_import.html +++ /dev/null @@ -1,92 +0,0 @@ -[% INCLUDE 'header.html', title => 'External import' %] - -<h1>External import</h1> - -<p>You may inject problem reports into FixMyStreet programatically using this -simple interface. Upon receipt, an email will be sent to the address given, -with a link the user must click in order to check the details of their report, -add any other information they wish, and then submit to the council. - -<p>This interface returns a plain text response; either <samp>SUCCESS</samp> if -the report has been successfully received, or if not, a list of errors, one per -line each starting with <samp>ERROR:</samp>. - -<p>You may submit the following information by POST to this URL -(i.e. <samp>[% c.uri_for('/import') %]</samp> ):</p> - -<style type="text/css" media="screen"> - input { - /* Hide the form elements - they are just here for simpler testing */ - display: none; - } -</style> - -<form method="POST" action="/import" enctype="multipart/form-data"> - -<dl> - <dt>service</dt> - <dd> - <em>Required</em>. - Name of application/service using this interface. - <input type="text" name="service" /> - </dd> - - <dt>id</dt> - <dd> - Unique ID of a user/device, for possible future use.<br> - <small>(e.g. used by Flickr import to know which accounts to look at)</small> - <input type="text" name="id" /> - </dd> - - <dt>subject</dt> - <dd> - <em>Required</em>. Subject of problem report. - <input type="text" name="subject" /> - </dd> - - <dt>detail</dt> - <dd> - Main body and details of problem report. - <input type="text" name="detail" /> - </dd> - - <dt>name</dt> - <dd> - <em>Required</em>. Name of problem reporter. - <input type="text" name="name" /> - </dd> - - <dt>email</dt> - <dd> - <em>Required</em>. Email address of problem reporter. - <input type="text" name="email" /> - </dd> - - <dt>phone</dt> - <dd> - Telephone number of problem reporter. - <input type="text" name="phone" /> - </dd> - - <dt>easting / northing</dt> - <dt>lat / lon</dt> - <dd> - Location of problem report. You can either supply eastings/northings, or WGS84 latitude/longitude. - <input type="text" name="easting" /> - <input type="text" name="northing" /> - <input type="text" name="lat" /> - <input type="text" name="lon" /> - </dd> - - <dt>photo</dt> - <dd> - Photo of problem (JPEG only). - <input type="file" name="photo" /> - </dd> -</dl> - -<input type="submit" /> - -</form> - -[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/report/photo.html b/templates/web/default/report/photo.html deleted file mode 100644 index c463c34c4..000000000 --- a/templates/web/default/report/photo.html +++ /dev/null @@ -1,8 +0,0 @@ -[% IF c.cobrand.allow_photo_display(object) && object.photo %] -[% photo = object.get_photo_params %] -<div class="update-img"> - [% IF photo.url_full %]<a href="[% photo.url_full %]" rel="fancy">[% END - %]<img alt="Photo of this report" [% IF photo.height %]height="[% photo.height %]" width="[% photo.width %]"[% END %] src="[% photo.url %]"> - [%- IF photo.url_full %]<span>zoom</span></a>[% END %] -</div> -[% END %] diff --git a/templates/web/default/report/update-form.html b/templates/web/default/report/update-form.html deleted file mode 100644 index 50bc2906c..000000000 --- a/templates/web/default/report/update-form.html +++ /dev/null @@ -1,165 +0,0 @@ -<div id="update_form"> - - <h2>[% loc( 'Provide an update') %]</h2> - - [% IF c.cobrand.moniker != 'emptyhomes' %] - <p> - <small>[% loc( 'Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>' ) %]</small> - </p> - [% END %] - - [% INCLUDE 'errors.html' %] - - <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" class="fieldset validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> - - <input type="hidden" name="submit_update" value="1"> - <input type="hidden" name="id" value="[% problem.id | html %]"> - - [% IF field_errors.update %] - <div class='form-error'>[% field_errors.update %]</div> - [% END %] - <div class="form-field"> - <label for="form_update">[% loc( 'Update:' ) %]</label> - <textarea name="update" id="form_update" rows="7" cols="30" required>[% update.text | html %]</textarea> - </div> - - [% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %] - <div class="form-field"> - <label for="form_state">[% loc( 'State:' ) %]</label> - <select name="state" id="form_state"> - [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', - loc('Investigating')], ['action scheduled', loc('Action Scheduled')], - ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], - ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], - ['fixed', loc('Fixed')] ] %] - <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> - [% END %] - </select> - </div> - [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] - <div class="checkbox"> - <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> - <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> - </div> - [% ELSIF !problem.is_fixed %] - <div class="checkbox"> - <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> - <label class="inline" for="form_fixed">[% loc('This problem has been fixed') %]</label> - </div> - [% END %] - [% END %] - - [% IF c.cobrand.allow_photo_upload %] - [% IF field_errors.photo %] - <div class='form-error'>[% field_errors.photo %]</div> - [% END %] - <div id="fileupload_normalUI"> - [% IF upload_fileid %] - <p>[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]</p> - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> - [% END %] - <label for="form_photo">[% loc('Photo:') %]</label> - <input type="file" name="photo" id="form_photo" style="width:20em"> - </div> - [% END %] - -[% IF c.user_exists %] - - [% INCLUDE name %] - - <div class="checkbox"> - <input type="submit" id="update_post" value="[% loc('Post') %]"> - </div> - -[% ELSE %] - - [% IF field_errors.email %] - <div class='form-error'>[% field_errors.email %]</div> - [% END %] - <div class="form-field"> - <label for="form_rznvy">[% loc('Your email:' ) %]</label> - <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" size="30" required> - </div> - -<div id="form_sign_in"> - <h3>[% loc("Now to submit your update… do you have a FixMyStreet password?") %]</h3> - - <div id="form_sign_in_yes"> - - [% IF field_errors.password %] - <div class='form-error'>[% field_errors.password %]</div> - [% END %] - - <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> - <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> - </p> - - <div class="fieldset"> - - <p> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="n" for="remember_me"> - [% loc('Keep me signed in on this computer') %] - </label> - </p> - - <p> - <input type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]"> - </p> - - </div> - - </div> - <div id="form_sign_in_no"> - - <p>[% loc('<strong>No</strong>, let me confirm my update by email:') %]</p> - - <div class="fieldset"> - - [% INCLUDE name %] - - <div class="form-field"> - <label for="password_register">[% loc('Enter a new password:') %]</label> - <input type="password" name="password_register" id="password_register" value="" size="25"> - </div> - - <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> - - <p> - <input type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> - </p> - - </div> - - </div> - -</div> - -[% END %] - - </form> -</div> - -[% BLOCK name %] - [% IF field_errors.name %] - <div class='form-error'>[% field_errors.name %]</div> - [% END %] - - <div> - <label for="form_name">[% loc('Your name:') %]</label> - <input type="text" name="name" id="form_name" value="[% update.name || c.user.name | html %]" size="25"> - </div> - - <div class="checkbox"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF update.anonymous==0 OR (c.cobrand.default_show_name AND update.anonymous=='') %]> - <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> - <small>[% loc('(we never show your email)') %]</small> - </div> - - <div class="checkbox"> - <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> - <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> - </div> -[% END %] diff --git a/templates/web/default/report/update.html b/templates/web/default/report/update.html deleted file mode 100644 index 048968eae..000000000 --- a/templates/web/default/report/update.html +++ /dev/null @@ -1,22 +0,0 @@ -[% IF loop.first %] -<div id="updates"> - <h2 class="problem-update-list-header">[% loc('Updates') %]</h2> -[% END %] - <div><div class="problem-update"><p><a name="update_[% update.id %]"></a><em> - [% INCLUDE meta_line %] - </em></p></div> -[% IF NOT update.whenanswered %] - <div class="update-text"> - [% add_links( update.text ) | html_para %] - - [% INCLUDE 'report/photo.html' object=update %] - - [% IF c.cobrand.allow_update_reporting %] - <p align="right"> - <small><a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact', { id => update.problem_id, update_id => update.id } ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a></small> - </p> - [% END %] - </div> -[% END %] - </div> -[% '</div>' IF loop.last %] diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html deleted file mode 100644 index b0a015f03..000000000 --- a/templates/web/default/report/updates.html +++ /dev/null @@ -1,64 +0,0 @@ -[% global.last_state = '' %] -[% FOREACH update IN updates %] -[% INCLUDE 'report/update.html' %] -[% END %] - -[% BLOCK meta_line %] - - [% IF update.whenanswered %] - [%# A questionnaire update, currently saying report is still open %] - [% tprintf( loc( 'Still open, via questionnaire, %s' ), prettify_dt( update.whenanswered ) ) %] - [% RETURN %] - [% END %] - - [% IF update.anonymous || update.name == '' %] - [% tprintf( loc( 'Posted anonymously at %s' ), prettify_dt( update.confirmed ) ) -%] - [%- ELSIF update.user.from_body; - user_name = update.user.name | html; - body = update.user.body; - IF body == 'Bromley Council'; - body = "$body <img src='/cobrands/bromley/favicon.png' alt=''>"; - END %] - [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, body, prettify_dt( update.confirmed ) ) -%] - [%- ELSE %] - [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_dt( update.confirmed ) ) | html -%] - [%- END -%] - - [%- update_state = '' %] - [%- IF update.mark_fixed %][% update_state = loc( 'marked as fixed' ) %][% END %] - [%- IF update.mark_open %][% update_state = loc( 'reopened' ) %][% END %] - [%- IF !update_state && update.problem_state %] - [%- state = update.meta_problem_state %] - [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %] - [%- SET update_state = 'marked as no further action' IF state == 'unable to fix' %] - [%- SET update_state = 'marked as third party responsibility' IF state == 'not responsible' %] - [%- END %] - [%- END %] - [%- IF !update_state && update.problem_state %] - [%- IF state == 'confirmed' AND global.last_state != '' %] - [%- update_state = loc( 'reopened' ) %] - [%- ELSIF state == 'investigating' %] - [%- update_state = loc( 'marked as investigating' ) %] - [%- ELSIF state == 'planned' %] - [%- update_state = loc( 'marked as planned' ) %] - [%- ELSIF state == 'in progress' %] - [%- update_state = loc( 'marked as in progress' ) %] - [%- ELSIF state == 'action scheduled' %] - [%- update_state = loc( 'marked as action scheduled' ) %] - [%- ELSIF state == 'closed' %] - [%- update_state = loc( 'marked as closed' ) %] - [%- ELSIF state == 'fixed' %] - [%- update_state = loc( 'marked as fixed' ) %] - [%- ELSIF state == 'unable to fix' %] - [%- update_state = loc( 'marked as unable to fix' ) %] - [%- ELSIF state == 'not responsible' %] - [%- update_state = loc( "marked as not the council's responsibility" ) %] - [%- ELSIF state == 'duplicate' %] - [%- update_state = loc( 'marked as a duplicate report' ) %] - [%- ELSIF state == 'internal referral' %] - [%- update_state = loc( 'marked as an internal referral' ) %] - [%- END %] - [%- END %] - [%- ", " _ update_state IF update_state != global.last_state %] - [%- global.last_state = update_state %] -[% END %] |