{"push_id":795675095,"size":39,"distinct_size":18,"ref":"refs/heads/zurich-2015-dev","head":"eadc48bdbff70d16f1e037490e38f261c2219f8d","before":"18e7bf4834cf152f5b1a922f426eb729080c7212","commits":[{"sha":"d3e0811f92bc06facb216a4d54ee2389f3734047","author":{"email":"ea6b243106897f1a7515c56fa7b92afaf1f2b2b2@mysociety.org","name":"Hakim Cassimally"},"message":"[Zurich] new status flags 672\n\nprogresses https://github.com/mysociety/FixMyStreet-Commercial/issues/672\n\nHave moved the generation of banner text from the template into\nproblem_as_hashref\n\nNote that translation texts are TODO.","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/d3e0811f92bc06facb216a4d54ee2389f3734047"},{"sha":"c60209a545aab798616d03038aa0e65b8d058c61","author":{"email":"ea6b243106897f1a7515c56fa7b92afaf1f2b2b2@mysociety.org","name":"Hakim Cassimally"},"message":"[Zurich] admin workflow changes available states 690\n\nhttps://github.com/mysociety/FixMyStreet-Commercial/issues/690\n\n - external_message for Extern/Wunsch states\n - as per PDF mockups, the \"public response\" field is now editable\n   from more states, namely:\n    - Ruckmeldung ausstehend\n    - Extern\n    - Zustandigkeit unbekannt\n    - Wunsch\n    - Nicht kontaktierbar\n    - Unsichtbar\n - test fixes\n    NB: slight hack to reorder Zurich report_display tests\n    As these remove 'investigating' from hidden_states, these break\n    tests for default cobrand (the FMS::App code expects to be called\n    once on request start, not multiple times within one test)\n - Not contactable button\n    and tests for this and the similar `send_back` functionality\n    (previously untested).\n    NB: Unsure why we need to specify form_number=2 just for these submits,\n    but test won't find the buttons otherwise.\n - Make sure SDMs' \"time_spent\" figure is recorded. 718","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/c60209a545aab798616d03038aa0e65b8d058c61"},{"sha":"a67d6c713fb3fecd2e7d7e86408b1b6017f76665","author":{"email":"f80d0ca101e967b50b730ddf8e8aca0de85e8df6@mysociety.org","name":"Matthew Somerville"},"message":"[Zurich] Updated email templates\n\n - submit-external-wish.txt includes a link with report's coordinates, template values are interpolated\n\nConflicts:\n\tperllib/FixMyStreet/SendReport/Zurich.pm","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/a67d6c713fb3fecd2e7d7e86408b1b6017f76665"},{"sha":"944c32168c37ffe43c90b048d18c55f02da1f963","author":{"email":"9135084b1fe0b09edc4faa3865ecd59194c0834e@mysociety.org","name":"Dave Arter"},"message":"Merge branch 'issues/commercial/zurich-b' into zurich-2015-dev-candidate\n\n[Zurich] First part of 672/690 (new statuses and admin workflow changes)","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/944c32168c37ffe43c90b048d18c55f02da1f963"},{"sha":"0b69c41adc78590fa1b6d400ff36a8412e4cc71b","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"[Zurich] improve admin view density for small screens 674 673\n\nFor mysociety/FixMyStreet-Commercial#674\nFor mysociety/FixMyStreet-Commercial#673\n\n - two-column layout on admin map pages\n - tightening up admin button sizes and optional labels\n - stack admin notes vertically, to avoid overflowing table layout\n - improve display of zurich admin notes and answers\n - only print admin note headings if there are notes\n - slightly shorter textareas in admin UI\n - simplify display of non-editable problem info, as per customer’s suggestion","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/0b69c41adc78590fa1b6d400ff36a8412e4cc71b"},{"sha":"32233e0192a363ee60f232c27f1e2302e4e82c1a","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"hide interactive form elements from print output 677","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/32233e0192a363ee60f232c27f1e2302e4e82c1a"},{"sha":"6f50d7649df2b9d9f959fcbc21247a00389eedfe","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"move admin note styling into base.scss so it can be used in print mode 677","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/6f50d7649df2b9d9f959fcbc21247a00389eedfe"},{"sha":"692921619a2b8a23926ae08101c534d692e749b8","author":{"email":"ea6b243106897f1a7515c56fa7b92afaf1f2b2b2@mysociety.org","name":"Hakim Cassimally"},"message":"[Zurich] additional closure statuses work 672 690\n\nAfter discussion with Tobias, this work should update\n - https://github.com/mysociety/FixMyStreet-Commercial/issues/672\n - https://github.com/mysociety/FixMyStreet-Commercial/issues/690\nas follows:\n\nRequirements:\n=============\n\n1: DM to be able to mark a problem as Wish, Extern, Not contactable,\nHidden, Jurisdiction unknown\n\n2: SDM to be able to mark a problem as Not contactable.\n\n3: DM to be able to add information to such a problem, and trigger\nemails to external agencies, and to user, closing the problem at the\nsame time.\n\n4: Closed reports must be categorized as Wish/Extern/NC/Hidden/JU for\nstatistical reporting\n\n5: Non-closed reports must appear as open, to allow DM to see them in\nthe list, similar to what is currently done for Ruckmeldung Ausstehend\n(Feedback outstanding).\n\n5b: however \"Hidden\" problems must be immediately hidden from public\nview.\n\nProposal:\n=========\n\na) Requirement 1 will be carried out in exactly the same way by\nDM.  e.g. Category dropdown select\n\nb) Requirement 2 will be carried out in exactly the same way by SDM.\ne.g. \"Not contactable\" button\n\nc) BUT, for a), c), the category will be diverted to \"Ruckmeldung\nAusstehend\" (Feedback outstanding), and metadata will be saved with the\nappropriate closure type.\n\nd) NOTE: this means the report will still be visible to public as \"In\nbearbeitung\" (Except for Hidden reports, as per 5b)\n\ne) The extra fields will be presented on the \"Ruckmeldung Ausstehend\"\npage, just as defined in the PDF, depending on the metadata.  e.g.\n    - Wish: Zustaendige Stelle + Message\n    - Extern: External body + Message2\n    - Not contactable: (no extra info)\n    - Hidden: (no extra info)\n    - Jurisdiction unknown: (no extra info)\n\nf) When the DM publishes the answer (e.g. \"Antwort Veroeffentlichen\"\nbutton), the state will normally change to Fixed. BUT in the new cases,\nthe metadata saved in step c) will be checked, and the report will\nchange state to Wish/Extern/Not contactable/Hidden/Jurisdiction unknown,\nas appropriate.  The report will now be visible/hidden as previously\ndiscussed depending on the new state.\n\ng) If the report is edited again (in /admin/report_edit) it will be in\nthe relevant state, and any extra fields will be visible as per e).\nThose fields may be updated.\nAlternatively, the state may be changed, possibly triggering a) again,\nand clearing any metadata.\n\nConflicts:\n\n\tt/cobrand/zurich.t\n\ttemplates/web/zurich/admin/report_edit.html\n\nsquash c#690 offizielle antwort => rueckmeldung an user\n\nvia Tobias\n\nhttps://github.com/mysociety/FixMyStreet-Commercial/issues/690\n\nSquash Fix javascript interactions c#690\n\nsee Tobias's comments to\nhttps://github.com/mysociety/FixMyStreet-Commercial/issues/690\n\nSQUASH c#690 show new statuses in summary\n\nSee Tobias's comments on\nhttps://github.com/mysociety/FixMyStreet-Commercial/issues/690\n\nSquash c#690 fix photos on SDM page\n\nSquash c#690 fix Planned => Planned+metadata transition\n\nsquash c#690 stop \"assignation .select\" js affecting templates\n\nSquash c#690 fix redirection for Extern and generally","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/692921619a2b8a23926ae08101c534d692e749b8"},{"sha":"e6cab1467fefcdfa764d631808091bf52815f480","author":{"email":"ea6b243106897f1a7515c56fa7b92afaf1f2b2b2@mysociety.org","name":"Hakim Cassimally"},"message":"Squash c#690 tweaks to redirect 690\n\nI understand redirection to summary page was introduced in\n7c1df92482fd5e69d by @dracos at ZWN's request, to make it easy to\nprocess reports and then quickly move onto the next one.\n\nHowever, during testing now, Tobias has mentioned this is a) slowing\nthings down and b) confusing because it's not obvious that the report\nhas been saved.\n\nI've tried to address (b) by adding the \"Aktualisiert!\" message when\nyou are redirected.\n\nAlso, for (a) I've removed the redirection from a few cases, and\ndisabled it for superuser.  If need be, I can remove redirection from\nmore (or all) cases.\n\nSquash c#690 Revert \"squash c#690 offizielle antwort => rueckmeldung an user\"\n\nThis reverts commit 80dc53b8d1c7044ef61004c4b296e0ac2ed08d98.\n\nSquash c#690 Fix Official answer/Reply to user\n\n - hide label for status update on state change\n - correct wording on button for closure (single wording)\n - correct wording on label for user reply (either \"Official answer\" or\n   \"Reply to user\" as appropriate)\n\nSquash c#690 publish_response\n\nMake sure the official response texts are shown for edit/static\nas appropriate, and test.\n\nSquash c#690 javascript improvements\n\nSquash c#690 honour public status update for Extern/Wunsch too\n\nAs per\nhttps://github.com/mysociety/FixMyStreet-Commercial/issues/690#issuecomment-96611954\n\nSquash c#690 with previous\n\n(don't show public message for Wunsch)\n\nfixup! Squash c#690 tweaks to redirect 690\n\nIgnore all other fields when rotating photos. 718","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/e6cab1467fefcdfa764d631808091bf52815f480"},{"sha":"ad89795adbf336de91725a8637fb7fa26e383d34","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"[Zurich] Styling for \"Updated!\" message 690\n\nThe message shown on form submission no longer pushes both columns\ndown, and disappears after 5 seconds.","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/ad89795adbf336de91725a8637fb7fa26e383d34"},{"sha":"1943ab6111901acba8314b090ebebc7e0f472c63","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"[Zurich] Make \"time spent\" labels inline to save space 690","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/1943ab6111901acba8314b090ebebc7e0f472c63"},{"sha":"3437aa110b456b53bbe8e75af6c3be7656e47b36","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"[Zurich] Simplify display of report admin category dropdown 690","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/3437aa110b456b53bbe8e75af6c3be7656e47b36"},{"sha":"8bcd3bf6c8a3165d8adf8bbb6012afbb9512baf4","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"[Zurich] Change order of report admin inputs for Division Managers 690","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/8bcd3bf6c8a3165d8adf8bbb6012afbb9512baf4"},{"sha":"cab367edbdf7112b81470de94591ef7fff9ab682","author":{"email":"ea6b243106897f1a7515c56fa7b92afaf1f2b2b2@mysociety.org","name":"Hakim Cassimally"},"message":"[Zurich] provide state translations (for templating) 690","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/cab367edbdf7112b81470de94591ef7fff9ab682"},{"sha":"312a4b2d1609cfc60c8ae8b374937b0f611169b0","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"[Zurich] 2-column layout for printed reports 677","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/312a4b2d1609cfc60c8ae8b374937b0f611169b0"},{"sha":"fb268ef884e2c61233dce3e9cd778921751f55e9","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"[Zurich] Refactor admin report print styles 677\n\nInvolves a not-as-bad-as-it-looks refactoring of the HTML markup for\nreport_edit.html and report_edit-sdm.html, with some actual indentation\nso you can tell what's going on, and definition lists to give the\nlabel/content pairs more logical structure.\n\nAlso replaces .report-edit-action with .print-only and .screen-only\nwhich are less semantic, but much more obvious to newcomers.\n\nfixup! [Zurich] Refactor admin report print styles 677\n\nAllows SDMs to enlarge images on report edit page 718\n\nfixup! [Zurich] Refactor admin report print styles 677\n\nDisplays category in report edit form on screen as well as in print","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/fb268ef884e2c61233dce3e9cd778921751f55e9"},{"sha":"724978f31a8cb5f35bd1e7622388c7e8781cae56","author":{"email":"1d6e1cf70ec6f9ab28d3ea4b27a49a77654d370e@zarino.co.uk","name":"Zarino Zappia"},"message":"[Zurich] Add mini map to Zurich admin report print view 677\n\nUses jQuery to clone a copy of the \"noscript\" map elsewhere into\nthe DOM, because the original is too far from where we need it.\n\nUses CSS transforms to make the map smaller, so it won't look\nright in IE8 or lower :-(","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/724978f31a8cb5f35bd1e7622388c7e8781cae56"},{"sha":"3bbe10a13550d2f961fa3e35e838ef8bcf66fe3c","author":{"email":"ea6b243106897f1a7515c56fa7b92afaf1f2b2b2@mysociety.org","name":"Hakim Cassimally"},"message":"[Zurich] noscript map for print report 677\n\nTo allow for the second map requested in\nhttps://github.com/mysociety/FixMyStreet-Commercial/issues/677\nthis commit\n\n - upgrades tiles to the new 512px ones already used by JS\n   as implemented in https://github.com/mysociety/FixMyStreet-Commercial/issues/668\n - extracts maps/openlayers.html to call maps/noscript_map.html\n - specialises the Zurich version to allow a richer structure to be\n   returned, including arbitrary sized map\n - Map::Zurich now returns nearly arbitrary sized map tiles (currently\n   only square e.g. 3x3, 4x4 etc.)\n - second larger map is prepared (only for admin/report_edit)\n\nConflicts:\n\n\ttemplates/web/zurich/admin/report_edit.html\n\n[Zurich] SQUASH into previous fix pin placement 677\n\n[Zurich] WIP noscript_map using percentage widths 677\n\nThe default noscript_map uses set pixel dimensions, which makes it\nreally hard to display at different sizes (eg: in print layout).\n\nThis commit alters the noscript_map markup and styling to use floated\ntiles with percentage widths, and then percentage positioning for the\nmarker pins.\n\nThe marker appears to be positioned in the wrong place, but Hakim is\ngoing to look into that. (Something to do with pin.px and pin.py)\n\nSquash: fix pin positioning 677","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/3bbe10a13550d2f961fa3e35e838ef8bcf66fe3c"},{"sha":"ff93948cb26d360def141d8bfa0b674d5551dbc1","author":{"email":"ea6b243106897f1a7515c56fa7b92afaf1f2b2b2@mysociety.org","name":"Hakim Cassimally"},"message":"[Zurich] allow non-square maps 677","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/ff93948cb26d360def141d8bfa0b674d5551dbc1"},{"sha":"f86b85c05864784a3b6e2c45d0cbef5d0865573b","author":{"email":"9135084b1fe0b09edc4faa3865ecd59194c0834e@mysociety.org","name":"Dave Arter"},"message":"Allow MAP_TYPE to be overridden by tests","distinct":false,"url":"https://api.github.com/repos/mysociety/fixmystreet/commits/f86b85c05864784a3b6e2c45d0cbef5d0865573b"}]}