aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/base/around
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/base/around')
-rw-r--r--templates/web/base/around/_error_multiple.html19
-rw-r--r--templates/web/base/around/_main.html8
-rwxr-xr-xtemplates/web/base/around/_report_banner.html16
-rw-r--r--templates/web/base/around/around_index.html27
-rw-r--r--templates/web/base/around/index.html13
-rw-r--r--templates/web/base/around/intro.html2
-rw-r--r--templates/web/base/around/location_error.html2
-rw-r--r--templates/web/base/around/on_map_list_items.html14
-rw-r--r--templates/web/base/around/postcode_form.html39
-rwxr-xr-xtemplates/web/base/around/tabbed_lists.html31
10 files changed, 89 insertions, 82 deletions
diff --git a/templates/web/base/around/_error_multiple.html b/templates/web/base/around/_error_multiple.html
new file mode 100644
index 000000000..15089ba6b
--- /dev/null
+++ b/templates/web/base/around/_error_multiple.html
@@ -0,0 +1,19 @@
+[% IF location_error %]
+ [% INCLUDE 'around/location_error.html' %]
+[% 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 %]
diff --git a/templates/web/base/around/_main.html b/templates/web/base/around/_main.html
new file mode 100644
index 000000000..1b832cb49
--- /dev/null
+++ b/templates/web/base/around/_main.html
@@ -0,0 +1,8 @@
+<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
+ <div id="side-form">
+ <div id="report-a-problem-main">
+ [% pre_container_extra %]
+ [% INCLUDE 'around/_error_multiple.html' %]
+ </div>
+ </div>
+</form>
diff --git a/templates/web/base/around/_report_banner.html b/templates/web/base/around/_report_banner.html
index 024fe08d9..9fcfe3640 100755
--- a/templates/web/base/around/_report_banner.html
+++ b/templates/web/base/around/_report_banner.html
@@ -1,10 +1,6 @@
-<p id="text_map" class="banner">
- [% loc( 'To <strong>report a problem</strong>, click on the map at the correct location.' ) %]
- [%
- tprintf(
- loc("<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"),
- url_skip
- )
- %]
- <span id="text_map_arrow"></span>
-</p>
+<h1 class="big-green-banner">
+ [% loc( 'Click map to report a problem' ) %]
+</h1>
+<a id="skip-this-step" href="[% url_skip %]" rel="nofollow">
+ [% loc("Can't see the map? <em>Skip this step</em>") %]
+</a>
diff --git a/templates/web/base/around/around_index.html b/templates/web/base/around/around_index.html
deleted file mode 100644
index 3b2714643..000000000
--- a/templates/web/base/around/around_index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-[%
- SET bodyclass = 'mappage';
- INCLUDE 'header.html', title => loc('Reporting a problem')
-%]
-
-<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
- <div id="side-form">
- <div id="report-a-problem-main">
- [% INCLUDE 'around/postcode_form.html' %]
-
- [% IF location_error %]
- [% INCLUDE 'around/location_error.html' %]
- [% 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 %]
- </div>
- </div>
-</form>
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/around/index.html b/templates/web/base/around/index.html
new file mode 100644
index 000000000..f2be5575c
--- /dev/null
+++ b/templates/web/base/around/index.html
@@ -0,0 +1,13 @@
+[% 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.
+%]
+
+[% INCLUDE 'around/_main.html' %]
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/around/intro.html b/templates/web/base/around/intro.html
new file mode 100644
index 000000000..d71dad1d5
--- /dev/null
+++ b/templates/web/base/around/intro.html
@@ -0,0 +1,2 @@
+ <h1>[% loc('Report, view, or discuss local problems') %]</h1>
+ <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2>
diff --git a/templates/web/base/around/location_error.html b/templates/web/base/around/location_error.html
index 9b907b64b..fc9b2b8ce 100644
--- a/templates/web/base/around/location_error.html
+++ b/templates/web/base/around/location_error.html
@@ -1 +1 @@
-<p class="error">[% location_error %]</p>
+<p class="form-error">[% location_error %]</p>
diff --git a/templates/web/base/around/on_map_list_items.html b/templates/web/base/around/on_map_list_items.html
index 70a071406..7b66d4267 100644
--- a/templates/web/base/around/on_map_list_items.html
+++ b/templates/web/base/around/on_map_list_items.html
@@ -1,15 +1,7 @@
[% IF on_map.size %]
- [% FOREACH p IN on_map %]
- <li>
- <a href="[% c.uri_for('/report', p.id ) %]">[% p.title | html %]</a>
- <small>[% prettify_dt( p.confirmed, 1 ) %]</small>
- [% IF p.is_fixed %]
- <small>[% loc('(fixed)') %]</small>
- [% ELSIF p.is_closed %]
- <small>[% loc('(closed)') %]</small>
- [% END %]
- </li>
+ [% FOREACH problem IN on_map %]
+ [% INCLUDE 'report/_item.html' %]
[% END %]
[% ELSE %]
- <li>[% loc('No problems have been reported yet.') %]</li>
+ <li><p>[% loc('No problems have been reported yet.') %]</p></li>
[% END %]
diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html
index f58d7285d..601f0ee9e 100644
--- a/templates/web/base/around/postcode_form.html
+++ b/templates/web/base/around/postcode_form.html
@@ -1,13 +1,26 @@
-[%
- question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area');
-%]
-
-<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
- <label for="pc">[% question %]:</label>
- <span><input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200">
- <input type="submit" value="[% loc('Go') %]" id="sub">
- </span>
- [% IF partial_token %]
- <input type="hidden" name="partial" value="[% partial_token.token %]">
- [% END %]
-</form>
+<div id="front-main">
+ <div id="front-main-container">
+ [% INCLUDE 'around/intro.html' %]
+
+ [%
+ 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="sub">
+ </div>
+
+ [% IF partial_token %]
+ <input type="hidden" name="partial" value="[% partial_token.token %]">
+ [% END %]
+
+ </form>
+ [% END %]
+ </div>
+</div>
diff --git a/templates/web/base/around/tabbed_lists.html b/templates/web/base/around/tabbed_lists.html
index 4ad7b35fc..40048f6b2 100755
--- a/templates/web/base/around/tabbed_lists.html
+++ b/templates/web/base/around/tabbed_lists.html
@@ -1,23 +1,14 @@
-<div id="nearby_lists">
-
- <h2>[% loc('Reports on and around the map') %]</h2>
-
- <ul id="current">
- [% INCLUDE "around/on_map_list_items.html" %]
- </ul>
-
- <h2>
- [%
- tprintf(
- loc( 'Closest nearby problems <small>(within&nbsp;%skm)</small>' ),
- distance
- )
- %]
- </h2>
-
- <ul id="current_near">
- [% INCLUDE "around/around_map_list_items.html" %]
+<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>
-</div>
+<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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 09:52:22 +0000