diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2011-04-11 15:01:07 +0100 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2011-04-11 15:01:07 +0100 |
| commit | ac446ecb8fa1930329919aedae1454f7624621e0 (patch) | |
| tree | 634f3fb618683c146847457e909eb72938ef192d | |
| parent | 6c675d28e4e170ef1fc1d33e5985b706e7431675 (diff) | |
| parent | ac527fae7168c2c4f0dc5dcaeb2146ad99c1f835 (diff) | |
Merge branch 'migrate_to_catalyst' of ssh://evdb@git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst
| -rw-r--r-- | templates/web/default/footer.html | 2 | ||||
| -rw-r--r-- | templates/web/default/report/new/report_new.html | 46 |
2 files changed, 18 insertions, 30 deletions
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html index 90c419734..40b44b870 100644 --- a/templates/web/default/footer.html +++ b/templates/web/default/footer.html @@ -5,7 +5,7 @@ <ul id="navigation"> <li><a href="/report/new" >[% loc("Report a problem") %]</a></li> <li><a href="/reports" >[% loc("All reports") %]</a></li> -<li><a href="[% c.uri_for('/alert', {pc => pc}) | html %]">[% loc("Local alerts") %]</a></li> +<li><a href="/alert[% pc | uri %]">[% loc("Local alerts") %]</a></li> <li><a href="/faq" >[% loc("Help") %]</a></li> <li><a href="/contact" >[% loc("Contact") %]</a></li> </ul> diff --git a/templates/web/default/report/new/report_new.html b/templates/web/default/report/new/report_new.html index 55e4ec679..57a1d0a72 100644 --- a/templates/web/default/report/new/report_new.html +++ b/templates/web/default/report/new/report_new.html @@ -6,6 +6,15 @@ <div class="error">[% location_error %]</div> [% 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="/?pc=[% match | uri %]">[% match | html %]</a></li> + [% END %] + </ul> +[% END %] + [% IF partial_token %] <p style="margin-top: 0; color: #cc0000;"> @@ -15,37 +24,16 @@ <input type="hidden" name="partial" value="[% partial_token.token %]"> -[% ELSE %] - Please select where to create this report: [% END %] -<form action="/report/new" method="POST"> - - [% IF pc_error %] - <div class='form-error'>[% pc_error %]</div> - [% END %] - - <div class="form-field"> - <label for="pc">Location:</label> - <input type="text" name="pc" value="[% pc %]"> - </div> - - <p> - [% c.cobrand.form_elements %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - <input type="submit" value="[% loc('Search') %]"> - </p> - +[% IF pc_error %] +<p class="error">[% pc_error %]</p> +[% END %] +<form action="/" method="get" name="postcodeForm" id="postcodeForm"><label for="pc">[% loc("Enter a nearby GB postcode, or street name and area") %]:</label> + <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> + <input type="submit" value="[% loc('Go') %]" id="submit"> +[% c.cobrand.form_elements %] </form> -[% 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="[% c.uri_for( '', { pc => match }) %]">[% match | html %]</a></li> - [% END %] - </ul> -[% END %] - -[% INCLUDE 'footer.html' %]
\ No newline at end of file +[% INCLUDE 'footer.html' %] |