aboutsummaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeLines
* Merge branch 'version-2.0'v2.0Matthew Somerville2016-11-15-61/+61
|\
| * Update translation files from source.Matthew Somerville2016-11-08-61/+61
| |
* | Merge branch 'issues/commercial/787-bristol-assets'Matthew Somerville2016-11-11-20/+33
|\ \
| * | [UK] Hide usrn/asset_id Open311 fields.Matthew Somerville2016-11-11-13/+21
| | |
| * | [UK] Refactor WFS asset handling.Matthew Somerville2016-11-11-5/+10
| | | | | | | | | | | | | | | | | | Allow multiple asset layers, and setting of multiple asset attributes. [Bristol] Add Bristol asset layers.
| * | [Bristol] Upgrade to OpenLayers master (with WFS).Matthew Somerville2016-11-11-1/+1
| | | | | | | | | | | | Including WFS for forthcoming assets layers.
| * | Fix extra "required" by testing correct value.Matthew Somerville2016-11-11-1/+1
| |/
* / [fixmystreet.com] Remove council message from /reports.Matthew Somerville2016-11-10-7/+0
|/
* Add sort order options to list pages.Matthew Somerville2016-11-04-0/+12
| | | | | | | | Includes newest, oldest, least/most recently updated, and most comments. The default remains the same, which is last updated on /reports, and newest on /my and /around (the latter plus not-in-view sorted-by-distance ones).
* Merge branch '1544-category-change-leave-update'Matthew Somerville2016-11-01-1/+1
|\
| * Add ability for admin users to italic updates.Matthew Somerville2016-10-28-1/+1
| |
* | Pre-filter map pages if user has categories assignedDave Arter2016-10-31-3/+6
| | | | | | | | | | This pre-filters the 'all reports' link in the main nav and the /around page reached via the front page postcode form
* | Add UI for assigning categories to a user in adminDave Arter2016-10-28-0/+13
| | | | | | | | | | - A user can be assigned to any number of its body's categories - The category ids are stored as a list in the user's extra field
* | Add all/none UI to user permissionsDave Arter2016-10-28-0/+4
|/
* Show admin user edit errors.Matthew Somerville2016-10-26-4/+7
| | | | Fix title if error in adding user. Fixes #1510.
* Title case filter dropdown options.Matthew Somerville2016-10-25-6/+6
|
* Merge branch 'issues/forcouncils/67-mop-up'Matthew Somerville2016-10-24-0/+6
|\
| * Hide confirmed column if all categories confirmed.Matthew Somerville2016-10-24-0/+6
| |
* | Have report page show inspect form if available.Matthew Somerville2016-10-24-15/+2
|/
* Merge branch '1543-reports-page-fixes'Matthew Somerville2016-10-21-4/+19
|\
| * Update pagination when status/categories changed.Matthew Somerville2016-10-18-2/+10
| |
| * Add ajax pin fetching to reports/my pages.Matthew Somerville2016-10-14-2/+6
| | | | | | | | | | This matches the behaviour on /around, and prevents a refresh when changing the state or category filters.
| * Include fancybox code on reports/my pages.Matthew Somerville2016-10-14-0/+3
| | | | | | | | | | This is so the photo modal works for pulled in report pages. Fixes #1543.
* | Add ‘form-control’ class where missing from <select> elementsDave Arter2016-10-19-6/+6
| |
* | Clarify category behaviour for response prioritiesDave Arter2016-10-19-0/+10
| | | | | | | | | | - Priorities with no categories selected are available to all categories - Display active categories in response priorities table
* | Refactor template/priority category checkboxes into own templateDave Arter2016-10-19-26/+34
| | | | | | | | | | - Also adds add select all/none UI - Adds admin hint for empty category list behaviour
* | Add ‘description’ field to ResponsePriority modelDave Arter2016-10-19-1/+7
| | | | | | | | Used internally to provide more details about when a priority is applicable.
* | Factor Open311 fields into own template for devolved contactsDave Arter2016-10-19-110/+136
| |
* | Extract category edit form into its own templateDave Arter2016-10-19-181/+145
| | | | | | | | | | | | | | | | | | | | * The same template is now used for creating new contacts as well as editing existing ones. * Zurich template for editing contacts has been left unchanged for now * Reputation threshold is included on form * Fields are in a more intuitive order * Required fields are marked as such in DOM for client-side validation * Rename ‘notes’ field to make its meaning clearer
* | [Zurich] Fix bug on image thumbnail in adminDave Arter2016-10-18-1/+1
|/ | | | | | | | | | Clicking the thumbnail on a report admin page was causing the 'rotating photo will discard changes' alert to appear unnecessarily. This was due to the data-confirm attribute on the parent <dd>, the meaning of which was changed by f5b171f. Fixed by using a different attribute name. Spotted another bug that I think caused the dialog to never actually be shown with the correct message because 'this' was the form and not the clicked button element.
* Merge branch 'issues/forcouncils/95-multi-select-list-filters'Matthew Somerville2016-10-13-11/+14
|\
| * Allow multiple selections in report list filter.Zarino Zappia2016-10-13-11/+14
| | | | | | | | | | | | This lets people filter by multiple categories or states. It uses our jQuery multi-select plugin to turn the <select multiple>s into little overlay lists of checkboxes. HTML5 history is also supported.
* | Show shortlist owner on report page.Matthew Somerville2016-10-11-0/+7
|/
* Merge remote-tracking branch ↵Matthew Somerville2016-10-06-1/+4
|\ | | | | | | 'origin/issues/forcouncils/36-mobile-inspector-improvements'
| * [Oxfordshire] Link to Shortlist in mobile footer nav menuZarino Zappia2016-10-06-1/+4
| |
* | 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-255/+301
|\|
| * Handle extra field updates on report inspect pageDave Arter2016-10-04-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-154/+159
| |
| * More robust .with-notes CSS layoutZarino Zappia2016-10-04-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-24/+13
| | | | | | | | | | | | 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-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-60/+72
| | | | | | | | | | | | | | | | 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.
* | 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
| | |
* | | 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/+1
| | | | | | | | Cope better if things aren't defined.
* | Fix update moderation buttons.Matthew Somerville2016-09-23-2/+2
| |
* | Update user reputation when inspecting reportDave Arter2016-09-23-1/+1
| |