diff options
| -rw-r--r-- | templates/web/fixmystreet/index.html | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index 72dba9376..4bc2c0faf 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -16,47 +16,11 @@ Modernizr.load({ </script> [% END %] -<<<<<<< HEAD -[% pre_container_extra = BLOCK %] -<div id="front-main"> - <div id="front-main-container"> - [% IF c.cobrand.moniker == 'bromley' %] - <h1 class="main mob-only">Reporting a problem in Bromley’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(); - %] - - <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - [% IF c.cobrand.moniker == 'fixmybarangay' %] - <p> - <a href="/around?latitude=10.322;longitude=123.907" class="yellow-btn">Bgy. Luz</a> - <a href="/around?latitude=10.288;longitude=123.870" class="yellow-btn">Bgy. Basak San Nicolas</a> - </p> - [% ELSE %] - <label for="pc">[% question %]:</label> - <div> - <input type="text" name="pc" value="" 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> - [% END %] - </form> - </div> -</div> -======= [% pre_container_extra = PROCESS 'around/postcode_form.html' %] [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] [% IF error %] <p class="form-error">[% error %]</p> ->>>>>>> origin/master [% END %] [% IF c.cobrand.moniker == 'bromley' %] |