aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Look for gone body template, not hard-code cobrandMatthew Somerville2015-10-08-2/+2
| | | | This means other cobrands could use the same mechanism.
* [Bromley/Greenwich/Oxfordshire] Tidy overrides.Matthew Somerville2015-10-08-106/+18
| | | | | | | | | | Have the around, my, and reports pages use the same low level template for individual list items, which can then be overridden for these cobrands, meaning they no longer need to override higher level templates. The logic in 2b9178d was incorrect; fix this so that the correct information is included in those templates.
* Add state/category filters to base cobrand.Matthew Somerville2015-10-07-391/+216
| | | | | | | This removes the on map/nearby tabs, replacing them with one combined list. The styling is moved to the base, so that it is used on mobile too. A closed option is added to the existing dropdown, and the base/fixmystreet my templates are also combined. Fixes #1141.
* Fix lint issues in moderate.js.Matthew Somerville2015-10-07-6/+6
|
* Merge branch '1141-list-css'Matthew Somerville2015-10-07-326/+150
|\
| * Combine some base/fixmystreet templates.Matthew Somerville2015-10-07-271/+129
| | | | | | | | | | | | | | | | The aim is to combine base and fixmystreet as much as possible, providing enough template/styling hooks for any cobrand. This commit removes the need for separate base/fixmystreet templates for the front page, almost all of the /around templates, the open graph headers, and the low level item list templates.
| * Include last update in around/my pages.Matthew Somerville2015-10-07-9/+11
| | | | | | | | | | Keep sent information still only on all reports pages. Also fix possible space before comma in _item.html.
| * [Bromley] Fix positioning of logged in message.Matthew Somerville2015-10-06-2/+1
| | | | | | | | Make sure the site's max-width is applied on map pages also.
| * [Bromley] Combine _item/_list-entry templates.Matthew Somerville2015-10-01-31/+2
| |
| * Remove unneeded report-list and list-a classes.Matthew Somerville2015-10-01-14/+8
| |
* | [Zurich] Fix map on /reportsDave Arter2015-10-06-0/+1
| |
* | Fix display of comment photosDave Arter2015-10-06-4/+24
| | | | | | | | | | These still use the old method of storing photos, not PhotoSet, and so don't have a get_photoset method.
* | Merge branch 'zurich-2015-dev-candidate'Dave Arter2015-10-06-1655/+4692
|\ \ | | | | | | | | | This is the work done in early 2015 to improve the Zürich admin interface, primarily.
| * | [Zurich] Use FMS::App->get_param() instead of req->paramDave Arter2015-10-06-18/+17
| | |
| * | [Zurich] Fix map positioning on report pagesSteven Day2015-10-06-1/+1
| | |
| * | [Zurich] Set report's public response before sending email to userDave Arter2015-10-06-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | The 'public response' to a problem was being omitted from the email sent to the user when the problem is closed, because the email was sent before the report's 'extra' field was updated with the response body text. This commit sets the public response on the problem before sending the email.
| * | Base 64 decode uploaded images if requiredSteven Day2015-10-06-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new Zurich app has to base64 encode some images into a multipart request so that it can (ab)use Phonegap's FileTransfer plugin to send more than one image in a single request to /report/new/mobile. Catalyst's Request::Upload module doesn't look at the Content-Transfer-Encoding header inside multipart requests to do this automatically, so we perform the decoding manually when we process the images in the PhotoSet model.
| * | [Zurich] Update de_CH .po fileHakim Cassimally2015-10-06-615/+618
| | |
| * | Autofocus email field on login formDave Arter2015-10-06-2/+2
| | |
| * | [Zurich] Don't include external messages in a report's internal notices sectionDave Arter2015-10-06-4/+8
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#674, mysociety/FixMyStreet-Commercial#673
| * | [Zurich] Display message sent to user when report is closedDave Arter2015-10-06-6/+17
| | | | | | | | | | | | | | | | | | On the report admin page, include the message the user received when the report was closed. See mysociety/FixMyStreet-Commercial#718
| * | [Zurich] Prevent 'success' message interfering with all input fieldsDave Arter2015-10-06-2/+7
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#717
| * | [Zurich] Make a few template strings localizableDave Arter2015-10-06-4/+4
| | |
| * | [Zurich] Keep DM on report edit page after closing reportDave Arter2015-10-06-2/+2
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#690
| * | [Zurich] Ask for confirmation when rotating photo if other fields have changed.Dave Arter2015-10-06-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Because there is no easy way to do the photo rotation asynchronously, make sure the user is aware that any changes they've made to the other form fields will be lost when clicking the rotate photo buttons. See mysociety/FixMyStreet-Commercial#690
| * | [Zurich] Always display current year in footerDave Arter2015-10-06-1/+2
| | |
| * | [Zurich] Add JS validation for external body fieldDave Arter2015-10-06-1/+22
| | | | | | | | | | | | | | | | | | Ensures that an external body has been selected if the field is visible. See mysociety/FixMyStreet-Commercial#718
| * | [Zurich] Test that external message is visible for certain statesDave Arter2015-10-06-6/+6
| | |
| * | [Zurich] Improve display of external body message when presentDave Arter2015-10-06-34/+50
| | | | | | | | | | | | | | | | | | | | | Make external/competent body message read-only and displayed like public response when submitted. See mysociety/FixMyStreet-Commercial#718
| * | [Zurich] Make sure external/competent body message is savedDave Arter2015-10-06-1/+5
| | | | | | | | | | | | | | | | | | | | | - Only send external_message when the problem state has the correct value - But make sure the message is preserved for editing when problem state is 'planned' See mysociety/FixMyStreet-Commercial#718
| * | [Zurich] Add link to Street View on report edit page.Dave Arter2015-10-06-2/+6
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#716
| * | [Zurich] Restore display of user links on admin stats pageDave Arter2015-10-06-1/+1
| | | | | | | | | | | | | | | The 'c' variable used in the category loop was clobbering an existing variable used in admin/footer.html to render the summary/logout links.
| * | [Zurich] Override MAP_TYPE in tests where appropriateDave Arter2015-10-06-0/+23
| | |
| * | Allow MAP_TYPE to be overridden by testsDave Arter2015-10-06-1/+14
| | |
| * | [Zurich] Add maps to Zurich admin report print viewZarino Zappia2015-10-06-95/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Includes a small map at the top of the first page and a second full-width map on a separate page. - upgrades tiles to the new 512px ones already used by JS as implemented in https://github.com/mysociety/FixMyStreet-Commercial/issues/668 - Uses jQuery to clone a copy of the "noscript" map elsewhere into the DOM, because the original is too far from where we need it. - extracts maps/openlayers.html to call maps/noscript_map.html - specialises the Zurich version to allow a richer structure to be returned, including arbitrary sized map - Map::Zurich now returns nearly arbitrary sized map tiles - second larger map is prepared (only for admin/report_edit) See mysociety/FixMyStreet-Commercial#677
| * | [Zurich] 2-column layout for printed reportsZarino Zappia2015-10-06-200/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Involves a not-as-bad-as-it-looks refactoring of the HTML markup for report_edit.html and report_edit-sdm.html, with some actual indentation so you can tell what's going on, and definition lists to give the label/content pairs more logical structure. - Also replaces .report-edit-action with .print-only and .screen-only which are less semantic, but much more obvious to newcomers. - Allows SDMs to enlarge images on report edit page - Displays category in report edit form on screen as well as in print See mysociety/FixMyStreet-Commercial#677
| * | [Zurich] UI improvements for DM/SDM report edit adminZarino Zappia2015-10-06-107/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Styling for "Updated!" message The message shown on form submission no longer pushes both columns down, and disappears after 5 seconds. - Make "time spent" labels inline to save space - Simplify display of report admin category dropdown - Change order of report admin inputs for Division Managers See mysociety/FixMyStreet-Commercial#690
| * | [Zurich] Tweaks to redirectHakim Cassimally2015-10-06-65/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#690 I understand redirection to summary page was introduced at ZWN's request, to make it easy to process reports and then quickly move onto the next one. However, during testing now, Tobias has mentioned this is a) slowing things down and b) confusing because it's not obvious that the report has been saved. I've tried to address (b) by adding the "Aktualisiert!" message when you are redirected. Also, for (a) I've removed the redirection from a few cases, and disabled it for superuser. If need be, I can remove redirection from more (or all) cases. Fix Official answer/Reply to user - hide label for status update on state change - correct wording on button for closure (single wording) - correct wording on label for user reply (either "Official answer" or "Reply to user" as appropriate) - Make sure the official response texts are shown for edit/static as appropriate, and test. - javascript improvements - honour public status update for Extern/Wunsch too - don't show public message for Wunsch - Ignore all other fields when rotating photos. (See mysociety/FixMyStreet-Commercial#718)
| * | [Zurich] additional closure statuses workHakim Cassimally2015-10-06-175/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requirements: ============= 1: DM to be able to mark a problem as Wish, Extern, Not contactable, Hidden, Jurisdiction unknown 2: SDM to be able to mark a problem as Not contactable. 3: DM to be able to add information to such a problem, and trigger emails to external agencies, and to user, closing the problem at the same time. 4: Closed reports must be categorized as Wish/Extern/NC/Hidden/JU for statistical reporting 5: Non-closed reports must appear as open, to allow DM to see them in the list, similar to what is currently done for Ruckmeldung Ausstehend (Feedback outstanding). 5b: however "Hidden" problems must be immediately hidden from public view. Proposal: ========= a) Requirement 1 will be carried out in exactly the same way by DM. e.g. Category dropdown select b) Requirement 2 will be carried out in exactly the same way by SDM. e.g. "Not contactable" button c) BUT, for a), c), the category will be diverted to "Ruckmeldung Ausstehend" (Feedback outstanding), and metadata will be saved with the appropriate closure type. d) NOTE: this means the report will still be visible to public as "In bearbeitung" (Except for Hidden reports, as per 5b) e) The extra fields will be presented on the "Ruckmeldung Ausstehend" page, just as defined in the PDF, depending on the metadata. e.g. - Wish: Zustaendige Stelle + Message - Extern: External body + Message2 - Not contactable: (no extra info) - Hidden: (no extra info) - Jurisdiction unknown: (no extra info) f) When the DM publishes the answer (e.g. "Antwort Veroeffentlichen" button), the state will normally change to Fixed. BUT in the new cases, the metadata saved in step c) will be checked, and the report will change state to Wish/Extern/Not contactable/Hidden/Jurisdiction unknown, as appropriate. The report will now be visible/hidden as previously discussed depending on the new state. g) If the report is edited again (in /admin/report_edit) it will be in the relevant state, and any extra fields will be visible as per e). Those fields may be updated. Alternatively, the state may be changed, possibly triggering a) again, and clearing any metadata. - Fix javascript interactions 690 - show new statuses in summary - fix photos on SDM page - fix Planned => Planned+metadata transition - stop "assignation .select" js affecting templates - fix redirection for Extern and generally See mysociety/FixMyStreet-Commercial#672, mysociety/FixMyStreet-Commercial#690
| * | [Zurich] Refactory admin note styling so it can be used in print modeZarino Zappia2015-10-06-46/+46
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#677
| * | [Zurich] Hide form elements from report admin print outputZarino Zappia2015-10-06-12/+14
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#677
| * | [Zurich] improve admin view density for small screensZarino Zappia2015-10-06-108/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#674, mysociety/FixMyStreet-Commercial#673 - two-column layout on admin map pages - tightening up admin button sizes and optional labels - stack admin notes vertically, to avoid overflowing table layout - improve display of zurich admin notes and answers - only print admin note headings if there are notes - slightly shorter textareas in admin UI - simplify display of non-editable problem info, as per customer’s suggestion
| * | [Zurich] Updated email templatesMatthew Somerville2015-10-06-94/+50
| | | | | | | | | | | | | | | | | | | | | - submit-external-wish.txt includes a link with report's coordinates, template values are interpolated Conflicts: perllib/FixMyStreet/SendReport/Zurich.pm
| * | [Zurich] admin workflow changes available statesHakim Cassimally2015-10-06-279/+558
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#690 - external_message for Extern/Wunsch states - as per PDF mockups, the "public response" field is now editable from more states, namely: - Ruckmeldung ausstehend - Extern - Zustandigkeit unbekannt - Wunsch - Nicht kontaktierbar - Unsichtbar - test fixes NB: slight hack to reorder Zurich report_display tests As these remove 'investigating' from hidden_states, these break tests for default cobrand (the FMS::App code expects to be called once on request start, not multiple times within one test) - Not contactable button and tests for this and the similar `send_back` functionality (previously untested). NB: Unsure why we need to specify form_number=2 just for these submits, but test won't find the buttons otherwise. - Make sure SDMs' "time_spent" figure is recorded. (See mysociety/FixMyStreet-Commercial#718)
| * | [Zurich] new status flagsHakim Cassimally2015-10-06-26/+41
| | | | | | | | | | | | | | | | | | | | | Have moved the generation of banner text from the template into problem_as_hashref See mysociety/FixMyStreet-Commercial#672
| * | [Zurich] prevent invalid bodies_strHakim Cassimally2015-10-06-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | See issue in mysociety/FixMyStreet-Commercial#663 with problems not appearing in the "Erfasst" filter. It looks like Zurich requires a single id in the `bodies_str` (like '4'), and may rely on the configuration of bodies/contacts in database to be perfect to avoid them becoming something like '4|47,48'.
| * | [Zurich] Display problem extras on report edit page for DM & superuserDave Arter2015-10-06-0/+9
| | | | | | | | | | | | Part of mysociety/FixMyStreet-Commercial#663
| * | Add "time spent" admin logging.Hakim Cassimally2015-10-06-9/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mechanism is general, but current implementation only used for Zurich. - Zurich: Record time_spent field mysociety/FixMyStreet-Commercial#676 - template changes (including jQuery spinner) - backend changes to save data are made: - in log_edit, if supplied - and time on category change (and arbitrary actions) - Add update_admin_log to all paths for DM, ensuring that it gets called, while resetting the `time_spent` parameter, to make sure that there is never a duplicate record created. - Also quell warning about using DateTime values in query. - Also add (seemingly unrelated) parens to stop misparsing of OK line in questionnaire test now that DT::Format::Pg is used in Zurich cobrand See mysociety/FixMyStreet-Commercial#676
| * | [Zurich] Response templates for report admin.Hakim Cassimally2015-10-06-11/+300
| | | | | | | | | | | | | | | | | | | | | This provides a ResponseTemplate model that an admin/staff user can choose from when responding to problems. For mysociety/FixMyStreet-Commercial#671.
| * | [Zurich] Attach images to external bodyHakim Cassimally2015-10-06-2/+130
| | | | | | | | | | | | See mysociety/FixMyStreet-Commercial#675
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 06:41:28 +0000