aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/base
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/base')
-rwxr-xr-xtemplates/web/base/around/display_location.html43
-rw-r--r--templates/web/base/header.html1
-rw-r--r--templates/web/base/my/my.html9
-rw-r--r--templates/web/base/questionnaire/index.html4
-rw-r--r--templates/web/base/report/display.html6
-rw-r--r--templates/web/base/report/new/fill_in_details.html34
-rw-r--r--templates/web/base/report/new/fill_in_details_form.html2
-rw-r--r--templates/web/base/report/new/login_success_form.html2
-rw-r--r--templates/web/base/report/new/oauth_email_form.html2
-rwxr-xr-xtemplates/web/base/reports/body.html4
10 files changed, 63 insertions, 44 deletions
diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html
index 7bf62e528..337b97b8e 100755
--- a/templates/web/base/around/display_location.html
+++ b/templates/web/base/around/display_location.html
@@ -7,7 +7,7 @@
= pc
? c.uri_for( "/rss/pc", pc )
: c.uri_for( "/rss/l/$latitude,$longitude" );
-
+
email_url = c.uri_for(
'/alert/list',
{
@@ -28,6 +28,7 @@
);
PROCESS "maps/${map.type}.html" around_page = 1;
+ sidebar_html = PROCESS 'report/new/sidebar.html' js = 1 report.used_map = 1;
SET bodyclass = 'mappage';
SET rss = [ tprintf(loc('Recent local problems, %s', "%s is the site name"), site_name), rss_url ];
@@ -71,32 +72,32 @@
</div>
+ <div id="map_sidebar">
-
- <div id="side">
-
- [% IF allow_creation %]
+ <div id="side">
+ [% IF allow_creation %]
[% INCLUDE 'around/_report_banner.html' %]
[% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %]
- [% END %]
-
- [% INCLUDE 'around/_updates.html' %]
+ [% END %]
+
+ [% INCLUDE 'around/_updates.html' %]
+ <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 %]
- <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 %]
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index 7ef37675a..5f4fba1df 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -34,7 +34,6 @@
<![endif]-->
<script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
- <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
[% extra_js %]
diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html
index c3911d4c1..b56998161 100644
--- a/templates/web/base/my/my.html
+++ b/templates/web/base/my/my.html
@@ -7,9 +7,11 @@
[% IF problems.size %]
[% map_html %]
</div>
- <div id="side">
+ <div id="map_sidebar">
+ <div id="side">
[% ELSE %]
- <div id="skipped-map">
+ <div id="map_sidebar">
+ <div id="skipped-map">
[% END %]
<h1>[% loc('Your Reports') %]</h1>
@@ -63,6 +65,7 @@
[% "</ul>" IF loop.last %]
[% END %]
-</div>
+ </div>
+ </div>
[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 1068e21e3..312300b9d 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -9,6 +9,8 @@
</div>
+<div id="map_sidebar">
+
<h1>[% loc('Questionnaire') %]</h1>
<h2 class="questionnaire-report-header">[% loc('Your report') %]</h2>
@@ -107,4 +109,6 @@
</form>
+</div>
+
[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html
index 05e07d501..e9f0b2914 100644
--- a/templates/web/base/report/display.html
+++ b/templates/web/base/report/display.html
@@ -1,4 +1,4 @@
-[%
+[%
SET bodyclass = 'mappage';
PROCESS "report/photo-js.html";
PROCESS "maps/${map.type}.html";
@@ -13,6 +13,8 @@
[% map_html %]
</div>
+<div id="map_sidebar">
+
[% IF login_success %]
<p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p>
[% INCLUDE 'report/update-form.html' %]
@@ -41,4 +43,6 @@
[% INCLUDE 'report/update-form.html' %]
[% END %]
+</div>
+
[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html
index 55b3a5207..fc272b533 100644
--- a/templates/web/base/report/new/fill_in_details.html
+++ b/templates/web/base/report/new/fill_in_details.html
@@ -1,6 +1,9 @@
[%
+ sidebar_html = PROCESS 'report/new/sidebar.html';
+
SET bodyclass = '';
SET bodyclass = 'mappage' IF report.used_map;
+ SET bodyclass = bodyclass _ " with-notes" IF sidebar_html;
PROCESS "maps/${map.type}.html" IF report.used_map;
INCLUDE 'header.html', title => loc('Reporting a problem');
%]
@@ -25,24 +28,27 @@
<input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]">
<input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]">
- [% IF report.used_map %]
- [% map_html %]
- </div>
+ [% IF report.used_map %]
+ [% map_html %]
+ </div>
+ <div id="map_sidebar">
<div id="side">
- [% ELSE %]
+ [% ELSE %]
+ <div id="map_sidebar">
<div id="skipped-map">
- [% END %]
+ [% END %]
+
+ <div id="report-a-problem-main">
+ [% IF login_success %]
+ [% PROCESS 'report/new/login_success_form.html' %]
+ [% ELSIF oauth_need_email %]
+ [% PROCESS 'report/new/oauth_email_form.html' %]
+ [% ELSE %]
+ [% PROCESS 'report/new/fill_in_details_form.html' %]
+ [% END %]
+ </div>
- <div id="report-a-problem-main">
- [% IF login_success %]
- [% PROCESS 'report/new/login_success_form.html' %]
- [% ELSIF oauth_need_email %]
- [% PROCESS 'report/new/oauth_email_form.html' %]
- [% ELSE %]
- [% PROCESS 'report/new/fill_in_details_form.html' %]
- [% END %]
</div>
-
</div>
</form>
diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html
index f9da3753f..663b13e6a 100644
--- a/templates/web/base/report/new/fill_in_details_form.html
+++ b/templates/web/base/report/new/fill_in_details_form.html
@@ -23,7 +23,7 @@
<p class="form-error">[% loc('Sorry, we could not log you in. Please fill in the form below.') %]</p>
[% END %]
-[% TRY %][% PROCESS 'report/new/sidebar.html' %][% CATCH file %][% END %]
+[% sidebar_html %]
[% INCLUDE 'errors.html' %]
diff --git a/templates/web/base/report/new/login_success_form.html b/templates/web/base/report/new/login_success_form.html
index 45d0221a7..2eade7c7d 100644
--- a/templates/web/base/report/new/login_success_form.html
+++ b/templates/web/base/report/new/login_success_form.html
@@ -2,7 +2,7 @@
<p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p>
-[% TRY %][% PROCESS 'report/new/sidebar.html' %][% CATCH file %][% END %]
+[% sidebar_html %]
[% INCLUDE 'errors.html' %]
diff --git a/templates/web/base/report/new/oauth_email_form.html b/templates/web/base/report/new/oauth_email_form.html
index c897aaeea..2c9b1a3ca 100644
--- a/templates/web/base/report/new/oauth_email_form.html
+++ b/templates/web/base/report/new/oauth_email_form.html
@@ -5,7 +5,7 @@
[% loc('We need your email address, please give it below.') %]
</p>
-[% TRY %][% PROCESS 'report/new/sidebar.html' %][% CATCH file %][% END %]
+[% sidebar_html %]
[% INCLUDE 'errors.html' %]
diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html
index 2ec409765..55f9a0881 100755
--- a/templates/web/base/reports/body.html
+++ b/templates/web/base/reports/body.html
@@ -27,7 +27,8 @@
[% map_html %]
</div>
-<div id="side">
+<div id="map_sidebar">
+ <div id="side">
<h1 id="reports_heading">
[% IF ward %]
@@ -66,5 +67,6 @@
[% INCLUDE 'pagination.html', param = 'p' %]
+ </div>
</div>
[% INCLUDE 'footer.html' %]
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 05:13:57 +0000