aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Determine location before possible redirect.Matthew Somerville2016-10-04-1/+1
| | | | | | If you changed the around filters on a URL with latitude/longitude, the co-ordinates were not passed through as determine_location needed to be called first.
* Don't show deleted bodies on /reports.Matthew Somerville2016-10-04-1/+3
|
* Apply form-control class to some more inputs.Matthew Somerville2016-10-04-15/+18
|
* Make sure btn class present on segmented controls.Matthew Somerville2016-10-04-9/+9
|
* Merge branch 'issues/forcouncils/36-mobile-inspector-improvements'Matthew Somerville2016-10-04-441/+680
|\
| * Handle extra field updates on report inspect pageDave Arter2016-10-04-43/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to make sure the extra metadata stored on a problem is kept in sync with the requirements of the category the report is in. Thus, if a report is moved to a category that collects extra metadata then the appropriate input fields should be shown so the inspector can enter the data. This commit shows the category extra HTML elements for every selectable category on the inspector page hiding those that don't apply to the selected category. JS is used to show/hide the extra fields when the category dropdown is changed. A consequence of the implementation is that any extra metadata from the original category is lost when the category is changed. Some thought was given to storing the old values elsewhere in the problem's extra field but I decided against this for the time being. For mysociety/fixmystreetforcouncils#45
| * Add .btn and .form-control classes to inputsZarino Zappia2016-10-04-156/+165
| |
| * More robust .with-notes CSS layoutZarino Zappia2016-10-04-50/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this commit is finished, modern browsers will have a far less buggy layout on .with-notes pages. The main improvements are: 1. Simplified padding on .with-notes columns, allowing us to link to an individual column (eg: /inspect#side-report-secondary) without the browser scrolling down to jump over the #map_sidebar padding on desktop browsers. Making hash fragment scrolling work means we can automatically scroll Inspectors down to the Inspect form, when they click the Inspect button on mobile devices, without worrying about it breaking the desktop experience. 2. Flexible .with-notes column widths, meaning the layout no longer breaks when long sidebar content triggers a scrollbar and decreases the usable width of the sidebar. A predefined width for #side-report means we can make sure .shadow-wrap is the correct width, despite its fixed position taking it out of the document flow. We make a trade-off on mid-size screens (768-960px), of hiding the map to keep the two-column sidebar usable. Will revisit if it turns out this causes problems later on.
| * Remove separate “Public update” form sectionZarino Zappia2016-10-04-27/+46
| | | | | | | | | | | | Inspectors can now tick the optional “Save with a public update” checkbox, to reveal the “Public update” textarea. This means there is no longer a need for two separate submit buttons.
| * Tidied up .btn class and button-reset mixinZarino Zappia2016-10-04-72/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | Even though FMS has had a `.btn` class for a while, styling buttons has still been difficult, mainly because of the very opinionated base styles applied to overpowered selectors like `input[type="submit"]`. This commit brings the FMS styles more in line with modern frameworks like Bootstrap – inputs and buttons are left completely unstyled by default, with an opt-in `.btn` class to add the styles back in. Since `.btn` is just a single class, it’s easy to override, and avoids selector bloat like `.green-btn, button.green-btn, input.green-btn`.
| * Restructure Inspect form into logical sectionsZarino Zappia2016-10-04-88/+142
| | | | | | | | | | | | | | | | IDs and locations at the top, then location-related actions (including a new “navigate to this problem” button), then status and category inputs (since these can have an effect on how we display the rest of the form), then any status/category-related inputs, and finally inputs for internal details like priority and traffic management.
| * Factor out contains_or_lacks test function.Matthew Somerville2016-09-29-22/+16
| |
* | Merge branch 'demographics-privacy-policy'Nick Jackson2016-09-30-15/+38
|\ \
| * | [fixmystreet.com] Update privacy policy to allow demographics capture.Nick Jackson2016-09-30-15/+38
| | |
* | | Merge branch '1540-cors-an-effect'Matthew Somerville2016-09-29-0/+2
|\ \ \
| * | | Include CORS cross-origin header in RSS output.Matthew Somerville2016-09-27-0/+2
| |/ /
* / / Don't show alert email box if signed in.Matthew Somerville2016-09-29-0/+2
|/ / | | | | | | | | | | | | It will default to your logged in address, ignoring what is put in this box. This should also fix an issue where the update email address field is initially blank when you are logged in and using the "Provide update as" functionality (due to both fields having the same name).
* | [UK] A few small JavaScript fixes.Matthew Somerville2016-09-23-3/+5
| | | | | | | | Cope better if things aren't defined.
* | Fix update moderation buttons.Matthew Somerville2016-09-23-3/+3
| |
* | Merge branch 'issues/forcouncils/56-user-reputation'Dave Arter2016-09-23-12/+144
|\ \ | |/ |/|
| * Update user reputation when inspecting reportDave Arter2016-09-23-3/+44
| |
| * Show current reputation level on user edit pageDave Arter2016-09-23-0/+8
| |
| * Add UI for managing category reputation thresholdDave Arter2016-09-23-1/+23
| |
| * Send reports immediately from users with enough reputationDave Arter2016-09-23-1/+40
| |
| * Add 'extra' field to User modelDave Arter2016-09-23-7/+29
|/
* Some minor admin fixesDave Arter2016-09-23-6/+6
| | | | | - Superusers couldn't view response priorities due to invalid $c->forward call - Navigation to other areas of admin was broken on response priority admin pages
* [Bromley] Update ‘contact us’ link in FAQDave Arter2016-09-23-3/+4
|
* Only show save and send fields to inspectors.Matthew Somerville2016-09-22-0/+2
|
* [UK] Make sure BNG handling always included.Matthew Somerville2016-09-22-20/+2
|
* Merge branch '1526-update-update-name-name'Matthew Somerville2016-09-22-5/+17
|\
| * [UK] Different validation for report/update names.Matthew Somerville2016-09-20-5/+17
| |
* | Use shared Template base for all templates.Matthew Somerville2016-09-20-95/+132
|/ | | | | | Reduce some duplicated code, and as a side effect gives HTML emails our internal html_para filter, allowing single line returns in contact form submissions.
* Merge branch 'issues/forcouncils/7-custom-open311-attributes'Matthew Somerville2016-09-20-528/+467
|\
| * Only include relevant bodies upon category choice.Matthew Somerville2016-09-20-43/+47
| |
| * New section headings in report form.Zarino Zappia2016-09-20-70/+139
| | | | | | | | | | The report form is now split into "Public" and "Private" sections, with a third, matching heading, for the category_extras, if shown.
| * Styling for .extra-category-questions containerZarino Zappia2016-09-20-24/+59
| |
| * Better vertical rhythm for labels and form inputsZarino Zappia2016-09-20-1/+4
| |
| * [Bromley] Upgrade to new style reporting formZarino Zappia2016-09-20-214/+126
| | | | | | | | | | | | | | | | | | Bromley previously had an override for fill_in_details_form.html, just so that it could display a custom sign-in arrangement. Now that the core fill_in_details_form.html delegates the sign-in stuff to form_user.html, Bromley can override just that template, and inherit all the other reporting form goodness from core.
| * New .form-control class for simpler input stylingZarino Zappia2016-09-20-126/+78
| | | | | | | | | | | | | | | | | | | | | | Form input styling is mostly left up to the browser default now. A custom border, drop-shadow, and border-radius can be applied by adding the `.form-control` class, which standardizes the appearance of inputs, selects, and textareas. The core reporting form, authentication forms, local alert forms, contact form, and questionnaire form have all been updated to use the new `.form-control` class.
| * [UK] Remove "primarily for physical problems"Zarino Zappia2016-09-20-1/+0
| | | | | | | | | | This message doesn’t make sense when displayed on a council’s website. (Maybe it was originally intended for FMS.com instead?)
| * Remove "Tips for perfect…" headings on reporting formZarino Zappia2016-09-20-13/+5
| | | | | | | | | | | | The ticks and crosses already imply that these are things you should and shouldn’t do. Removing the headings reduces visual clutter, and better associates the tips with the form input directly above.
| * Remove public/private badges on report form labelsZarino Zappia2016-09-20-17/+4
| |
| * Single template for all user-related form elementsZarino Zappia2016-09-20-5/+6
| | | | | | | | | | `form_user.html` now acts as a counterpart to `form_report.html` and contains all the form elements to do with login / personal details.
| * No colon after custom question labelsZarino Zappia2016-09-20-1/+1
| | | | | | | | | | Labels in category_extras.html now match the style of labels in the rest of the reporting form (ie: no closing colon).
| * Avoid nesting of #category_meta in report formZarino Zappia2016-09-20-1/+1
| | | | | | | | | | Switching between categories with / without extra questions no longer results in nested `#category_meta` elements.
| * Category selector at top of reporting formZarino Zappia2016-09-20-16/+2
| | | | | | | | | | | | | | Previously only Bristol, Angus, and FMS.com had the category select box at the top of the form. In our experience, this has worked well, and hasn’t affected the usability of the form, so let’s standardize and put it at the top of the form for all cobrands.
| * Include stash in render_fragment calls.Matthew Somerville2016-09-20-2/+1
| |
* | Merge remote-tracking branch ↵Matthew Somerville2016-09-20-77/+135
|\ \ | | | | | | | | | 'origin/issues/forcouncils/89-tidy-report-admin-actions'
| * | Organize report admin actions into single control.Zarino Zappia2016-09-20-76/+134
| | | | | | | | | | | | | | | | | | | | | | | | As part of this, rename "planned reports" to "shortlist". The `.segmented-control` component now supports basic usage (as in the admin report actions menu bar) and usage with hidden radio inputs and labels (as on the report questionnaire page).
* | | Merge branch '1529-cobrand-testing'Matthew Somerville2016-09-20-14/+153
|\ \ \