aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/default
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/default')
-rwxr-xr-xtemplates/web/default/around/display_location.html2
-rw-r--r--templates/web/default/auth/change_password.html2
-rw-r--r--templates/web/default/auth/general.html76
-rw-r--r--templates/web/default/auth/sign_out.html (renamed from templates/web/default/auth/logout.html)0
-rw-r--r--templates/web/default/maps/openlayers.html6
-rw-r--r--templates/web/default/report/display.html2
-rw-r--r--templates/web/default/report/new/fill_in_details.html18
-rw-r--r--templates/web/default/report/new/notes.html2
8 files changed, 68 insertions, 40 deletions
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index 88300113b..aa1dc86d6 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -23,7 +23,6 @@
pc => pc
latitude => short_latitude,
longitude => short_longitude,
- submit_map => 1,
skipped => 1,
}
);
@@ -37,7 +36,6 @@
%]
<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm">
-<input type="hidden" name="submit_map" value="1">
<input type="hidden" name="map" value="[% c.req.params.map | html %]">
<input type="hidden" name="pc" value="[% pc | html %]">
[% c.cobrand.form_elements('mapForm') %]
diff --git a/templates/web/default/auth/change_password.html b/templates/web/default/auth/change_password.html
index 2dd37cb91..be7c14e43 100644
--- a/templates/web/default/auth/change_password.html
+++ b/templates/web/default/auth/change_password.html
@@ -3,7 +3,7 @@
<h1>[% loc('Change Password') %]</h1>
[% IF password_changed %]
- <p>Your password has been changed!</p>
+ <p id="fixed">[% loc('Your password has been changed') %]</p>
[% END %]
diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html
index 5a5e63480..d30fefcee 100644
--- a/templates/web/default/auth/general.html
+++ b/templates/web/default/auth/general.html
@@ -1,6 +1,6 @@
[% INCLUDE 'header.html', title = loc('Sign in or create an account') %]
-<h1>[% loc('Sign in or create an account') %]</h1>
+<h1>[% loc('Sign in') %]</h1>
<form action="[% c.uri_for() %]" method="post" name="general_auth">
<input type="hidden" name="r" value="[% c.req.params.r | html %]">
@@ -17,42 +17,66 @@
loc_email_error = errors.$email_error || errors.other;
END %]
-
- <div id="fieldset">
+ [% IF loc_email_error %]
+ <div class="form-error">[% loc_email_error %]</div>
+ [% ELSIF sign_in_error %]
+ <div class="form-error">[% loc('Email or password wrong - please try again.') %]</div>
+ [% END %]
- [% IF loc_email_error %]
- <div class="form-error">[% loc_email_error %]</div>
- [% ELSIF login_error %]
- <div class="form-error">Email or password wrong - please try again.</div>
- [% END %]
+ <div class="form-field">
+ <label class="n" for="email">[% loc('Your email address:') %]</label>
+ <input type="email" size="30" id="email" name="email" value="[% email | html %]">
+ </div>
- <div class="form-field">
- <label for="email">[% loc('Email:') %]</label>
- <input type="text" name="email" value="[% email || '' | html %]">
- </div>
+<div id="form_sign_in">
+ <h3>[% loc("Do you have a FixMyStreet password?") %]</h3>
- <div class="form-field">
- <label for="password">[% loc('Password:') %]</label>
- <input type="password" name="password" value="">
- </div>
+ <div id="form_sign_in_yes">
- <div class="checkbox">
+ <p>
+ <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label>
+ <input type="password" name="password_sign_in" id="password_sign_in" value="">
+ </p>
+
+ <p>
<input type="checkbox" name="remember_me" value='1'[% ' checked' IF remember_me %]>
- <label for="remember_me">
- [% loc('Remember me - do not use on a public computer') %]
+ <label class="n" for="remember_me">
+ [% loc('Keep me signed in on this computer') %]
</label>
- </div>
+ </p>
- <div class="checkbox">
- <input type="submit" name="login" value="[% loc('Sign me in') %]">
- </div>
+ <p>
+ <input type="submit" name="sign_in" value="[% loc('Sign in') %]">
+ </p>
- <h3>I don't have an account, or I've forgotten my password...</h3>
- <div class="checkbox">
- <input type="submit" name="email_login" value="[% loc('Email the details I need to the address I entered above') %]">
+ </div>
+ <div id="form_sign_in_no">
+
+ <p>[% loc('<strong>No</strong>, I do not, let me sign in by email:') %]</p>
+
+ <div id="fieldset">
+ <div class="form-field">
+ <label for="name">[% loc('Your name:') %]</label>
+ <input type="text" name="name" value="">
+ </div>
+
+ <div class="form-field">
+ <label for="password_register">[% loc('Enter a new password:') %]</label>
+ <input type="password" name="password_register" id="password_register" value="">
+ </div>
</div>
+ <p><small>Providing a name and password is optional, but doing so
+ will allow you to more easily report problems, leave updates and
+ manage your reports.</small></p>
+
+ <p>
+ <input type="submit" name="email_sign_in" value="[% loc('Sign in by email') %]">
+ </p>
+
</div>
+
+</div>
</form>
diff --git a/templates/web/default/auth/logout.html b/templates/web/default/auth/sign_out.html
index 3d8df60e4..3d8df60e4 100644
--- a/templates/web/default/auth/logout.html
+++ b/templates/web/default/auth/sign_out.html
diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html
index ae670ce13..7da732913 100644
--- a/templates/web/default/maps/openlayers.html
+++ b/templates/web/default/maps/openlayers.html
@@ -12,6 +12,8 @@ var fixmystreet = {
[% IF map.zoom -%]
'zoom': [% map.zoom %],
[%- END %]
+ 'numZoomLevels': [% map.numZoomLevels %],
+ 'zoomOffset': [% map.zoomOffset %],
'map_type': [% map.map_type %],
'pins': [% INCLUDE maps/pins_js.html %]
}
@@ -51,9 +53,9 @@ var fixmystreet = {
east = c.uri_with( { lat = map.compass.east.0, lon = map.compass.east.1, zoom = map.zoom } )
west = c.uri_with( { lat = map.compass.west.0, lon = map.compass.west.1, zoom = map.zoom } )
world = c.uri_with( { zoom = 0 } );
- SET zoom_in = c.uri_with( { zoom = map.zoom + 1 } ) IF map.zoom < map.zoom_levels - 1;
+ SET zoom_in = c.uri_with( { zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1;
SET zoom_out = c.uri_with( { zoom = map.zoom - 1 } ) IF map.zoom > 0;
- SET zoom_in = '#' IF map.zoom >= map.zoom_levels - 1;
+ SET zoom_in = '#' IF map.zoom >= map.numZoomLevels - 1;
SET zoom_out = '#' IF map.zoom <= 0;
%]
<div style="position: absolute; left: 4px; top: 4px; z-index: 1007;" class="olControlPanZoom olControlNoSelect" unselectable="on">
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index 38c3014fa..25f3892a6 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -129,7 +129,7 @@
<small>[% loc('(we never show your email)') %]</small>
</div>
-[% IF NOT c.user %]
+[% IF NOT c.user_exists %]
[% IF field_errors.email %]
<div class='form-error'>[% field_errors.email %]</div>
diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html
index 48407bb45..4a40dd707 100644
--- a/templates/web/default/report/new/fill_in_details.html
+++ b/templates/web/default/report/new/fill_in_details.html
@@ -141,14 +141,18 @@
<small>[% loc('(we never show your email address or phone number)') %]</small>
</div>
-[% IF field_errors.email %]
- <div class='form-error'>[% field_errors.email %]</div>
-[% END %]
+[% IF NOT c.user_exists %]
-<div class="form-field">
- <label for="form_email">[% loc('Email:') %]</label>
- <input type="text" value="[% report.user.email | html %]" name="email" id="form_email" size="25">
-</div>
+ [% IF field_errors.email %]
+ <div class='form-error'>[% field_errors.email %]</div>
+ [% END %]
+
+ <div class="form-field">
+ <label for="form_email">[% loc('Email:') %]</label>
+ <input type="text" value="[% report.user.email | html %]" name="email" id="form_email" size="25">
+ </div>
+
+[% END %]
<div>
<label for="form_phone">[% loc('Phone:') %]</label>
diff --git a/templates/web/default/report/new/notes.html b/templates/web/default/report/new/notes.html
index 38c8bfb7b..be605ddaa 100644
--- a/templates/web/default/report/new/notes.html
+++ b/templates/web/default/report/new/notes.html
@@ -1,4 +1,4 @@
-<p>[% loc("Please note:") %]</p>
+<p style="clear:both">[% loc("Please note:") %]</p>
<ul>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 07:49:40 +0000