aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/web/fixmystreet/around/around_index.html2
-rw-r--r--templates/web/fixmystreet/around/around_map_list_items.html2
-rw-r--r--templates/web/fixmystreet/around/on_map_list_items.html2
-rw-r--r--templates/web/fixmystreet/auth/general.html20
-rw-r--r--templates/web/fixmystreet/contact/index.html16
-rw-r--r--templates/web/fixmystreet/report/display.html25
-rw-r--r--templates/web/fixmystreet/report/new/category_extras.html4
-rw-r--r--templates/web/fixmystreet/report/new/fill_in_details_form.html34
-rw-r--r--templates/web/fixmystreet/report/photo.html2
-rw-r--r--web/cobrands/fixmystreet/base.scss25
-rw-r--r--web/cobrands/fixmystreet/layout.scss6
-rw-r--r--web/js/fixmystreet.js4
12 files changed, 64 insertions, 78 deletions
diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html
index 53deec871..a465eae63 100644
--- a/templates/web/fixmystreet/around/around_index.html
+++ b/templates/web/fixmystreet/around/around_index.html
@@ -17,7 +17,7 @@
<fieldset>
<label for="pc">[% question %]:</label>
<input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200">
- <input type="submit" value="[% loc('Go') %]" id="submit">
+ <input class="green-btn final-submit" type="submit" value="[% loc('Go') %]" id="submit">
[% IF partial_token %]
<input type="hidden" name="partial" value="[% partial_token.token %]">
diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html
index 65cfd783b..edf8dcbf1 100644
--- a/templates/web/fixmystreet/around/around_map_list_items.html
+++ b/templates/web/fixmystreet/around/around_map_list_items.html
@@ -14,7 +14,7 @@
</div>
[% IF p.photo %]
<div class="img">
- <img alt="" height="" width="100" src="/photo?id=[% p.id %]">
+ <img height="60" width="90" src="/photo?id=[% p.id %];fp=1" alt="">
</div>
[% END %]
</a>
diff --git a/templates/web/fixmystreet/around/on_map_list_items.html b/templates/web/fixmystreet/around/on_map_list_items.html
index 11aa5dedd..3c3b66cf9 100644
--- a/templates/web/fixmystreet/around/on_map_list_items.html
+++ b/templates/web/fixmystreet/around/on_map_list_items.html
@@ -11,7 +11,7 @@
</div>
[% IF p.photo %]
<div class="img">
- <img alt="" height="" width="100" src="/photo?id=[% p.id %]">
+ <img height="60" width="90" src="/photo?id=[% p.id %];fp=1" alt="">
</div>
[% END %]
</a>
diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html
index 8b7b5639a..2058ac60e 100644
--- a/templates/web/fixmystreet/auth/general.html
+++ b/templates/web/fixmystreet/auth/general.html
@@ -17,14 +17,12 @@
loc_email_error = errors.$email_error || errors.other;
END %]
-
- [% IF loc_email_error %]
- <div class="form-error">[% loc_email_error %]</div>
- [% ELSIF sign_in_error %]
- <div class="form-error">[% loc('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet &ndash; please fill in the right hand side of this form to get one.') %]</div>
- [% END %]
-
- <label class="hidden n" for="email">[% loc('Your email address') %]</label>
+ <label class="hidden-js n" for="email">[% loc('Your email address') %]</label>
+ [% IF loc_email_error %]
+ <div class="form-error">[% loc_email_error %]</div>
+ [% ELSIF sign_in_error %]
+ <div class="form-error">[% loc('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet &ndash; please fill in the right hand side of this form to get one.') %]</div>
+ [% END %]
<input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]">
<div id="form_sign_in">
@@ -33,7 +31,7 @@
<div id="form_sign_in_yes" class="form-box">
<h5>[% loc('<strong>Yes</strong> I have a password') %]</h5>
- <label class="hidden n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password') %]</label>
+ <label class="hidden-js n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password') %]</label>
<div class="form-txt-submit-box">
<input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
@@ -51,10 +49,10 @@
<p>Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.</p>
</div>
- <label class="hidden" for="name">[% loc('Your name') %]</label>
+ <label class="hidden-js" for="name">[% loc('Your name') %]</label>
<input type="text" name="name" value="" placeholder="[% loc('Your name') %]">
- <label class="hidden" for="password_register">[% loc('Enter a new password (optional)') %]</label>
+ <label class="hidden-js" for="password_register">[% loc('Enter a new password (optional)') %]</label>
<div class="form-txt-submit-box">
<input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]">
diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html
index 78cff82af..87096bd8a 100644
--- a/templates/web/fixmystreet/contact/index.html
+++ b/templates/web/fixmystreet/contact/index.html
@@ -61,39 +61,31 @@
[% END %]
+ <label for="form_name">[% loc('Your name') %]</label>
[% IF field_errors.name %]
<div class="form-error">[% field_errors.name %]</div>
[% END %]
-
-
- <label for="form_name">[% loc('Your name') %]</label>
<input type="text" class="required" name="name" id="form_name" value="[% form_name | html %]" size="30">
+ <label for="form_email">[% loc('Your email') %]</label>
[% IF field_errors.em %]
<div class="form-error">[% field_errors.em %]</div>
[% END %]
-
-
- <label for="form_email">[% loc('Your email') %]</label>
<input type="text" class="required email" name="em" id="form_email" value="[% em | html %]" size="30">
+ <label for="form_subject">[% loc('Subject') %]</label>
[% IF field_errors.subject %]
<div class="form-error">[% field_errors.subject %]</div>
[% END %]
-
-
- <label for="form_subject">[% loc('Subject') %]</label>
<input type="text" class="required" name="subject" id="form_subject" value="[% subject | html %]" size="30">
+ <label for="form_message">[% loc('Message') %]</label>
[% IF field_errors.message %]
<div class="form-error">[% field_errors.message %]</div>
[% END %]
-
-
- <label for="form_message">[% loc('Message') %]</label>
<textarea class="required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea>
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index 630a34cae..5a7ccfd2f 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -70,11 +70,10 @@
<input type="hidden" name="submit_update" value="1">
<input type="hidden" name="id" value="[% problem.id | html %]">
+ <label for="form_update">[% loc( 'Update' ) %]</label>
[% IF field_errors.update %]
<div class='form-error'>[% field_errors.update %]</div>
[% END %]
-
- <label for="form_update">[% loc( 'Update' ) %]</label>
<textarea name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea>
[% IF c.user && c.user.belongs_to_council( problem.council ) %]
@@ -103,16 +102,15 @@
[% END %]
[% IF c.cobrand.allow_photo_upload %]
- [% IF field_errors.photo %]
- <p class='form-error'>[% field_errors.photo %]</p>
- [% END %]
-
<div id="fileupload_normalUI">
[% IF upload_fileid %]
<p>[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]</p>
<input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
[% END %]
<label for="form_photo">[% loc('Photo') %]</label>
+ [% IF field_errors.photo %]
+ <p class='form-error'>[% field_errors.photo %]</p>
+ [% END %]
<input type="file" name="photo" id="form_photo">
</div>
[% END %]
@@ -126,11 +124,10 @@
[% ELSE %]
+ <label for="form_rznvy">[% loc('Your email address' ) %]</label>
[% IF field_errors.email %]
<p class='form-error'>[% field_errors.email %]</p>
[% END %]
-
- <label for="form_rznvy">[% loc('Your email address' ) %]</label>
<input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" required>
<div id="form_sign_in">
@@ -138,13 +135,12 @@
<h2>[% loc("Do you have a FixMyStreet password?") %]</h2>
<div id="form_sign_in_yes" class="form-box">
+ <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5>
+
+ <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
[% IF field_errors.password %]
<p class='form-error'>[% field_errors.password %]</p>
[% END %]
-
- <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5>
-
- <label class="hidden n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
<div class="form-txt-submit-box">
<input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
<input class="green-btn" type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]">
@@ -160,7 +156,7 @@
[% INCLUDE name %]
- <label class="hidden" for="password_register">[% loc('Enter a new password (optional)') %]</label>
+ <label class="hidden-js" for="password_register">[% loc('Enter a new password (optional)') %]</label>
<div class="form-txt-submit-box">
<input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]">
@@ -179,11 +175,10 @@
[% INCLUDE 'footer.html' %]
[% BLOCK name %]
+ <label class="hidden-js" for="form_name">[% loc('Your name') %]</label>
[% IF field_errors.name %]
<p class='form-error'>[% field_errors.name %]</p>
[% END %]
-
- <label class="hidden" for="form_name">[% loc('Your name') %]</label>
<input type="text" name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]">
<div class="general-sidebar-notes">
diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html
index 8cb169522..c2a213225 100644
--- a/templates/web/fixmystreet/report/new/category_extras.html
+++ b/templates/web/fixmystreet/report/new/category_extras.html
@@ -5,12 +5,10 @@
[%- FOR meta IN category_extras.$category %]
[%- meta_name = meta.code -%]
+ <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label>
[% IF field_errors.$meta_name %]
<p class='form-error'>[% field_errors.$meta_name %]</p>
[% END -%]
-
- <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label>
-
[% IF meta.exists('values') %]
<select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
[% FOR option IN meta.values.value.keys %]
diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html
index 10662183f..dc81ba564 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -1,10 +1,10 @@
-<div id="report-a-poblem-main">
+<div id="report-a-problem-main">
<h1>[% loc('Reporting a problem') %]</h1>
<!-- THIS NEED THE NAME OF THE COUNCIL -->
<p>[% loc('This report will be sent to <strong>Name of the Council</strong>.') %]</p>
- <div id="report-a-poblem-sidebar">
+ <div id="report-a-problem-sidebar">
<!--
The text for this section needs checking, but I can't work out which bit comes from where
-->
@@ -56,20 +56,18 @@
<p class='form-error'>[% field_errors.council %]</p>
[% END %]
- [% IF field_errors.title %]
- <p class='form-error'>[% field_errors.title %]</p>
- [% END %]
<label for="form_title">[% loc('Subject') %]</label>
+ [% IF field_errors.title %]
+ <p class='form-error'>[% field_errors.title %]</p>
+ [% END %]
<input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('Provide a title') %]" required>
+ <label for="form_detail">[% loc('Details') %]</label>
[% IF field_errors.detail %]
<p class='form-error'>[% field_errors.detail %]</p>
[% END %]
-
-
- <label for="form_detail">[% loc('Details') %]</label>
<textarea name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem here') %]" required>[% report.detail | html %]</textarea>
[% IF js %]
@@ -121,26 +119,25 @@
[% ELSE %]
+ <label for="form_email">[% loc('Your email') %]</label>
[% IF field_errors.email %]
<p class='form-error'>[% field_errors.email %]</p>
[% END %]
-
- <label for="form_email">[% loc('Your email') %]</label>
- <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" required>
+ <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required>
<div id="form_sign_in">
<h3>[% loc("Now to submit your report&hellip;") %]</h3>
<h2>[% loc("Do you have a FixMyStreet password?") %]</h2>
<div id="form_sign_in_yes" class="form-box">
- [% IF field_errors.password %]
- <p class='form-error'>[% field_errors.password %]</p>
- [% END %]
<h5>[% loc('<strong>Yes</strong> I have a password') %]</h5>
- <label class="hidden n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
+ <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
<div class="form-txt-submit-box">
+ [% IF field_errors.password %]
+ <p class='form-error'>[% field_errors.password %]</p>
+ [% END %]
<input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
<input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]">
</div>
@@ -154,11 +151,10 @@
<div id="form_sign_in_no" class="form-box">
<h5>[% loc('<strong>No</strong> Let me confirm my report by email') %]</h5>
+ <label class="hidden-js" for="form_may_show_nameme">[% loc('Your name') %]</label>
[% IF field_errors.name %]
<p class='form-error'>[% field_errors.name %]</p>
[% END %]
-
- <label class="hidden" for="form_may_show_nameme">[% loc('Your name') %]</label>
<input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
<div class="general-sidebar-notes form-focus-hidden">
@@ -173,10 +169,10 @@
<label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
</div>
- <label class="hidden" for="form_phone">[% loc('Your phone number (optional)') %]</label>
+ <label class="hidden-js" for="form_phone">[% loc('Your phone number (optional)') %]</label>
<input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]">
- <label class="hidden" for="password_register">[% loc('Enter a new password (optional)') %]</label>
+ <label class="hidden-js" for="password_register">[% loc('Enter a new password (optional)') %]</label>
<div class="form-txt-submit-box form-focus-hidden">
<input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]">
diff --git a/templates/web/fixmystreet/report/photo.html b/templates/web/fixmystreet/report/photo.html
index f266792b2..e74f0bbfe 100644
--- a/templates/web/fixmystreet/report/photo.html
+++ b/templates/web/fixmystreet/report/photo.html
@@ -1,6 +1,6 @@
[% IF c.cobrand.allow_photo_display && object.photo %]
[% photo = object.get_photo_params %]
<div class="update-img">
- <img alt="" height="" width="100px" src="[% photo.url %]">
+ <img src="[% photo.url %]">
</div>
[% END %]
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 03ae1af65..43cf82617 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -388,22 +388,24 @@ div.form-error,
p.form-error {
background:#ff0000;
color:#fff;
- padding:0.5em;
- margin:0 1em 0 0;
+ padding:0 0.5em;
+ margin:0 0.6em 0 -0.5em;
width:auto;
- margin-bottom:0.5em;
- @include border-radius(0.25em);
+ @include border-radius(0.25em 0.25em 0 0);
}
input.form-error,
textarea.form-error {
border-color:#ff0000;
- background-color:#ffeeee;
+ @include border-radius(0 0 0.25em 0.25em);
}
-// XXX This is a repeat from core
-div.label-valid {
- background-color: white;
+// don't display valid error boxes as now the jump won't be
+// until the user submits, which is fine
+div.label-valid,
+p.label-valid {
+ display:none !important;
+ visibility: hidden;
}
/* LAYOUT */
@@ -849,7 +851,7 @@ a:hover.button-left {
}
-// only on mobile, this is a sidebar on desk (#report-a-poblem-sidebar)
+// only on mobile, this is a sidebar on desk (#report-a-problem-sidebar)
a.rap-notes-trigger,
a:hover.rap-notes-trigger {
display:block;
@@ -915,6 +917,11 @@ a:hover.rap-notes-trigger {
display:none !important;
}
+// hide anything with this class if js is working
+.js .hidden-js {
+ display: none !important;
+ visibility: hidden;
+}
/* Front page */
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index 42330266c..1347c4482 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -325,7 +325,7 @@ textarea{
}
/* Report a problem sidebar notes */
-#report-a-poblem-sidebar {
+#report-a-problem-sidebar {
position:absolute;
left:29.5em;
top:2em;
@@ -345,7 +345,7 @@ textarea{
}
}
.ie6, .ie7 {
- #report-a-poblem-sidebar {
+ #report-a-problem-sidebar {
top:5em;
}
}
@@ -697,7 +697,7 @@ body.frontpage {
}
//put the RAP notes into the main copy area
- #report-a-poblem-sidebar {
+ #report-a-problem-sidebar {
position: static;
width: auto;
@include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0);
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
index 513d6da29..47ca6efb7 100644
--- a/web/js/fixmystreet.js
+++ b/web/js/fixmystreet.js
@@ -139,13 +139,13 @@ $(function(){
},
messages: validation_strings,
onkeyup: false,
+ onfocusout: false,
errorElement: 'div',
errorClass: 'form-error',
// we do this to stop things jumping around on blur
success: function (err) { if ( form_submitted ) { err.addClass('label-valid').removeClass('label-valid-hidden').html( '&nbsp;' ); } else { err.addClass('label-valid-hidden'); } },
errorPlacement: function( error, element ) {
- var l = element.prev('label') || element;
- l.before( error );
+ element.before( error );
},
submitHandler: function(form) {
if (form.submit_problem) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 23:15:09 +0000