Permalink
Browse files

Add templates/web/fixmystreet to fixamingata's paths, and Remove any …

…identical unneeded templates.
  • Loading branch information...
1 parent 646b2de commit 942d6f7bd16efe9c223de770d1cead005d446de5 @dracos dracos committed Feb 22, 2013
Showing with 4 additions and 1,285 deletions.
  1. +4 −1 perllib/FixMyStreet/Cobrand/FixaMinGata.pm
  2. +0 −93 templates/web/fixamingata/alert/_list.html
  3. +0 −9 templates/web/fixamingata/alert/list-ajax.html
  4. +0 −32 templates/web/fixamingata/alert/updates.html
  5. +0 −31 templates/web/fixamingata/around/around_index.html
  6. +0 −9 templates/web/fixamingata/around/around_map_list_items.html
  7. +0 −118 templates/web/fixamingata/around/display_location.html
  8. +0 −7 templates/web/fixamingata/around/on_map_list_items.html
  9. +0 −34 templates/web/fixamingata/around/postcode_form.html
  10. +0 −14 templates/web/fixamingata/around/tabbed_lists.html
  11. +0 −100 templates/web/fixamingata/contact/index.html
  12. +0 −194 templates/web/fixamingata/faq/faq-en-gb.html
  13. +0 −11 templates/web/fixamingata/front/news.html
  14. +0 −74 templates/web/fixamingata/my/my.html
  15. +0 −15 templates/web/fixamingata/pagination.html
  16. +0 −6 templates/web/fixamingata/questionnaire/completed-open.html
  17. +0 −109 templates/web/fixamingata/questionnaire/index.html
  18. +0 −21 templates/web/fixamingata/report/_main.html
  19. +0 −11 templates/web/fixamingata/report/_support.html
  20. +0 −21 templates/web/fixamingata/report/banner.html
  21. +0 −196 templates/web/fixamingata/report/display.html
  22. +0 −24 templates/web/fixamingata/report/new/category_extras.html
  23. +0 −36 templates/web/fixamingata/report/new/fill_in_details.html
  24. +0 −8 templates/web/fixamingata/report/photo-js.html
  25. +0 −8 templates/web/fixamingata/report/photo.html
  26. +0 −28 templates/web/fixamingata/report/update.html
  27. +0 −24 templates/web/fixamingata/reports/_extras.html
  28. +0 −1 templates/web/fixamingata/reports/_list-entry.html
  29. +0 −19 templates/web/fixamingata/reports/_rss.html
  30. +0 −12 templates/web/fixamingata/reports/_ward-list.html
  31. +0 −19 templates/web/fixamingata/tracking_code.html
@@ -19,7 +19,10 @@ sub site_title {
sub path_to_web_templates {
my $self = shift;
- return [ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify ];
+ return [
+ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify,
+ FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify
+ ];
}
sub country {
@@ -1,93 +0,0 @@
- <input type="hidden" name="type" value="local">
- <input type="hidden" name="pc" value="[% pc | html %]">
- <input type="hidden" name="latitude" value="[% latitude | html %]">
- <input type="hidden" name="longitude" value="[% longitude | html %]">
-
- <p>
- [% IF pretty_pc %]
- [% tprintf( loc('Here are the types of local problem alerts for &lsquo;%s&rsquo;.'), pretty_pc ) %]
- [% 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>
-
- [% INCLUDE 'errors.html' %]
-
- <p>
- [% loc('The simplest alert is our geographic one:') %]
- </p>
-
- <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 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">
- [% loc('(alternatively the RSS feed can be customised, within') %]
- <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>)
- </p>
-
- <p>
- [% IF c.cobrand.is_council %]
- Or you can subscribe to an alert for all council problems or one based upon what ward you&rsquo;re in:
- [% ELSE %]
- [% loc("Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:") %]
- [% END %]
- </p>
-
- [% IF reported_to_options %]
- <p><strong>
- [% loc('Problems within the boundary of:') %]
- </strong></p>
- <ul class="plain-list">
- [% ELSE %]
- <ul id="rss_feed" class="plain-list">
- [% END %]
-
- [% FOREACH option IN options %]
- <li[% IF ! (loop.count % 2) %] class="a"[% END %]>
- <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]>
- <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16"
-title="[% option.rss_text %]" alt="RSS feed" border="0"></a>
- <label class="inline" for="[% option.id %]">[% option.text %]</label>
- </li>
- [% END %]
-</ul>
- [% IF reported_to_options %]
- <p><strong>
- [% loc('Or problems reported to:') %]
- </strong></p>
- <ul class="plain-list">
- [% FOREACH option IN reported_to_options %]
- <li[% IF ! (loop.count % 2) %] class="a"[% END %]>
- <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]>
- <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16"
- title="[% option.rss_text %]" alt="RSS feed" border="0"></a>
- <label class="inline" for="[% option.id %]">[% option.text %]</label>
- </li>
- [% END %]
- </ul>
- <p><small>
- [% loc( 'FixMyStreet sends different categories of problem
-to the appropriate council, so problems within the boundary of a particular council
-might not match the problems sent to that council. For example, a graffiti report
-will be sent to the district council, so will appear in both of the district
-council&rsquo;s alerts, but will only appear in the "Within the boundary" alert
-for the county council.' ) %]
- </small></p>
- [% END %]
-
- <input id="alert_rss_button" 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 %]
- <label for="rznvy">[% loc('Your email') %]</label>
- <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]">
- [% END %]
- <input id="alert_email_button" style="margin-top:1em;" class="green-btn" type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]">
-
@@ -1,9 +0,0 @@
-[% IF pretty_pc %]
- [%
- pretty_pc = pretty_pc | html | replace(' ', '&nbsp;');
- %]
-[% END %]
-
-<div id="alerts">
- [% INCLUDE 'alert/_list.html' %]
-</div>
@@ -1,32 +0,0 @@
-[% title = loc('Local RSS feeds and email alerts') %]
-
-[% INCLUDE 'header.html', title => title %]
-
-
-[% INCLUDE 'errors.html' %]
-
-<p><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="float:right">
- </a>
-</p>
-
-<p>
-[% loc('Receive email when updates are left on this problem.') %]
-</p>
-
-<form action="/alert/subscribe" method="post">
- <fieldset>
- <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label>
-
- <div class="form-txt-submit-box">
- <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" placeholder="[% loc('Your email') %]">
- <input class="green-btn" type="submit" value="[% loc('Subscribe') %]">
- </div>
-
- <input type="hidden" name="id" value="[% problem_id | html %]">
- <input type="hidden" name="type" value="updates">
- </fieldset>
-</form>
-
-
-[% INCLUDE 'footer.html' %]
@@ -1,31 +0,0 @@
-[% pre_container_extra = INCLUDE 'around/postcode_form.html' %]
-[% INCLUDE 'header.html', title = loc('Reporting a problem'), bodyclass = 'frontpage fullwidthpage' %]
-
-[%
- # NOTE ON PARTIAL REPORTS:
- #
- # partial reports get a bit of extra text added, the form goes to
- # '/report/new' and the partial hidden field is added to the form.
-%]
-
-[% IF location_error %]
- <p class="form-error">[% location_error %]</p>
-[% END %]
-
-[% IF possible_location_matches %]
- <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p>
- <ul class="pc_alternatives">
- [% FOREACH match IN possible_location_matches %]
- <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li>
- [% END %]
- </ul>
-[% END %]
-
-[% IF partial_token %]
- <p style="margin-top: 0; color: #cc0000;">
- <img align="right" src="/photo/[% partial_report.id %].jpeg" hspace="5">
- [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:") %]
- </p>
-[% END %]
-
-[% INCLUDE 'footer.html' %]
@@ -1,9 +0,0 @@
-[% IF around_map.size %]
- [% FOREACH p IN around_map %]
- [% INCLUDE 'report/_item.html'
- problem = p.problem,
- dist = tprintf("%.1f", (p.distance || 0) ) %]
- [% END %]
-[% ELSE %]
- <li><p>[% loc('No problems found.') %]</p></li>
-[% END %]
@@ -1,118 +0,0 @@
-[%
-
- rss_alt = loc('RSS feed');
- rss_title = loc('RSS feed of recent local problems');
-
- rss_url
- = pc
- ? c.uri_for( "/rss/pc", pc )
- : c.uri_for( "/rss/l/$short_latitude,$short_longitude" );
-
- email_url = c.uri_for(
- '/alert/list',
- {
- lat => short_latitude,
- lon => short_longitude,
- feed => "local:$short_latitude:$short_longitude",
- }
- );
-
- url_skip = c.uri_for(
- '/report/new',
- {
- pc => pc
- latitude => short_latitude,
- longitude => short_longitude,
- skipped => 1,
- }
- );
-
- PROCESS "maps/${map.type}.html";
-
- INCLUDE 'header.html',
- title => loc('Viewing a location')
- rss => [ loc('Recent local problems, FixMyStreet'), rss_url ],
- bodyclass => 'mappage',
- robots => 'noindex,nofollow';
-
- allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council);
-%]
-
-[% IF allow_creation %]
-<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" 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 %]">
-
- <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]">
- <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]">
-[% END %]
-
- [% map_html %]
-
- <p id='sub_map_links'>
- [% IF c.req.params.no_pins %]
- <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a>
- [% ELSE %]
- <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a>
- [% END %]
- [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %]
- [% IF c.req.params.all_pins %]
- <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide old') %]</a>
- [% ELSE %]
- <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Show old') %]</a>
- [% END %]
- [% END %]
- </p>
-
- </div>
-
-
-
-
- <div id="side">
-
- [% IF allow_creation %]
- <h1 class="big-green-banner">
- [% loc( 'Click map to report a problem' ) %]
- [% IF c.cobrand.moniker == 'bromley' %]
- <span>Yellow pins show existing reports</span>
- [% END %]
- </h1>
- <p id="skip-this-step">
- [%
- tprintf(
- loc("Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"),
- url_skip
- )
- %]
- </p>
- [% END %]
-
- <div class="shadow-wrap">
- <ul id="key-tools" class="singleton">
- <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li>
- </ul>
- </div>
-
- <section class="full-width">
- [% INCLUDE "around/tabbed_lists.html" %]
- </section>
- </div>
-
- [% IF allow_creation %]
- <div style="display:none" id="side-form">
- [% INCLUDE "report/new/fill_in_details_form.html"
- js = 1,
- report.used_map = 1
- report.name = c.user.name
- %]
- </div>
- [% END %]
-
-[% IF allow_creation %]
-</form>
-[% END %]
-
-[% INCLUDE 'footer.html' %]
@@ -1,7 +0,0 @@
-[% IF on_map.size %]
- [% FOREACH problem IN on_map %]
- [% INCLUDE 'report/_item.html' %]
- [% END %]
-[% ELSE %]
- <li><p>[% loc('No problems have been reported yet.') %]</p></li>
-[% END %]
@@ -1,34 +0,0 @@
-<div id="front-main">
- <div id="front-main-container">
- [% IF c.cobrand.moniker == 'bromley' %]
- <h1 class="main mob-only">Reporting a problem in Bromley&rsquo;s streets or parks</h1>
- [% ELSIF c.cobrand.moniker == 'fixmybarangay' %]
- <h1>View local problems</h1>
- <h2>(potholes or street lighting)</h2>
- [% ELSE %]
- <h1>[% loc('Report, view, or discuss local problems') %]</h1>
- <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2>
- [% END %]
-
- [%
- question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area');
- %]
-
- [% IF c.cobrand.moniker == 'fixmybarangay' %]
- [% INCLUDE '_barangay_buttons.html' %]
- [% ELSE %]
- <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
- <label for="pc">[% question %]:</label>
- <div>
- <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]">
- <input type="submit" value="[% loc('Go') %]" id="submit">
- </div>
-
- [% IF partial_token %]
- <input type="hidden" name="partial" value="[% partial_token.token %]">
- [% END %]
-
- </form>
- [% END %]
- </div>
-</div>
@@ -1,14 +0,0 @@
-<menu id="problems-nav" class="tab-nav">
- <ul>
- <li><a href="#current">[% loc('Problems on the map') %]</a></li>
- <li><a href="#current_near">[% loc( 'Problems nearby' ) %]</a></li>
- </ul>
-</menu>
-
-<ul id="current" class="issue-list-a tab">
- [% INCLUDE "around/on_map_list_items.html" %]
-</ul>
-
-<ul id="current_near" class="issue-list-a tab">
- [% INCLUDE "around/around_map_list_items.html" %]
-</ul>
Oops, something went wrong.

0 comments on commit 942d6f7

Please sign in to comment.