aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch '1281-html-emails'Dave Arter2016-08-01-494/+1562
|\
| * [UK Councils] Email themes for 4 UK councilsZarino Zappia2016-08-01-0/+78
| | | | | | | | Email themes for Oxfordshire, Bromley, Warwickshire, and Greenwich.
| * Add HTML email templates.Matthew Somerville2016-08-01-433/+1322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Design is all Zarino. This adds the ability to send HTML emails, including attached inline images. When included, this is done as a multipart/related email containing a multipart/alternative (of plain and HTML) and any attached images, so that the images are available even if HTML mail is not. The alert emails list data has been improved so it can be constructed in the templates rather than the code. Various templates have been tidied. Various workarounds for email clients have been made, including: * <th> is used so that the Android 4.x mail client can give them `block` styling in the small screen media query. * Font settings defined on every table cell (<th>) so that sans-serif fonts are used in Outlook, rather than Times New Roman. * A three-column wrapper table to create a 620px centred content area that also shrinks down on narrow screens. (Outlook doesn’t like max-width, so this is the simplest alternative.) * Enforcing a sensible (500px) min-width for the main content area, on clients that don’t support media queries (eg: native Gmail app). * Giant borders on buttons so Outlook displays them * Image alignment with align rather than float.
| * Add static map output view for a report.Matthew Somerville2016-08-01-13/+113
| |
| * Move photoset stuff to new Role.Matthew Somerville2016-08-01-42/+39
| |
| * Test for Image::Magick installation better.Matthew Somerville2016-08-01-6/+10
|/ | | | (VERSION disappears in some recent version.)
* [Zurich] Send admin emails from the do-not-reply addressDave Arter2016-07-28-5/+4
| | | | | Also takes the opportunity to fix the incorrectly-encoded sender name which was appearing to some clients as "Züri Wie Neu".
* Merge branch 'pinished'Dave Arter2016-07-26-106/+78
|\
| * Refactor map pin/feature functions.Matthew Somerville2016-07-21-106/+78
|/
* Fix crash on /my page due to missing pin.problemDave Arter2016-07-21-0/+1
|
* Fix "keys on reference is experimental" warning in Perl 5.20+Dave Arter2016-07-21-1/+1
|
* Merge branch 'admin-using-normal-login'Dave Arter2016-07-20-179/+352
|\
| * Respect cobrand restriction for unsent reportsDave Arter2016-07-19-1/+1
| |
| * Disallow empty name when creating/editing bodies in adminDave Arter2016-07-19-17/+46
| |
| * Use improved TestMech::create_user_ok instead of User::find_or_createDave Arter2016-07-19-132/+47
| | | | | | | | | | This improves create_user_ok to work more like create_body_ok where extra params can be passed in and set on the model.
| * Restrict add/editing of bodies in admin to superusersDave Arter2016-07-19-17/+24
| |
| * [UK Councils] Council users can only see their own council's adminDave Arter2016-07-19-9/+50
| |
| * Use normal user authentication to control access to /adminMatthew Somerville2016-07-19-26/+207
|/ | | | | | | | | - Adds is_superuser flag to User - Logged-in user must be a superuser or have from_body set in order to access anything within /admin - has_permission_to on a superuser will always return true - Only superusers can create/grant superusers - New `createsuperuser` command for creating superusers
* Merge branch '400-editing-category'Matthew Somerville2016-07-15-41/+65
|\
| * Allow editing of category on admin report edit.Matthew Somerville2016-07-15-5/+50
| | | | | | | | This also updates the body column to match the category.
| * Remove bit of unused/needed code.Matthew Somerville2016-07-15-24/+3
| |
| * Check extras for all retrieved contacts.Matthew Somerville2016-07-15-12/+12
| |
* | Stop using collapse filter in category template.Matthew Somerville2016-07-15-33/+30
| | | | | | | | | | | | If a category had eg. a double space, the use of the filter meant it was output in the HTML with only a single space and so woudn't match the database entry. Switch to more explicit template space chomping.
* | Work correctly for alt-click/cmd-click etc.Matthew Somerville2016-07-14-3/+39
| |
* | Only set document.title after any pushState call.Matthew Somerville2016-07-14-2/+2
|/ | | | pushState stores the title at the time for e.g. the Back dropdown.
* Call two more set up functions on report pull.Matthew Somerville2016-07-13-1/+2
| | | | | This is so form valdation and the 'log in by email' button are set up appropriately if pulled in via JavaScript.
* Don't set up multiple handlers on drawers.Matthew Somerville2016-07-13-1/+3
|
* Fix issues with sub_map_links and JS navigation.Matthew Somerville2016-07-12-8/+18
| | | | | Have 'Get updates' displaying correctly on a report page again, fix some navigational problems.
* Fix going back to /reports page on mobile.Matthew Somerville2016-07-12-9/+13
| | | | | | Record the original page we're at, so that when we go back to it, we go back to the right one (the only difference between /around and /reports being the full screen map of /around).
* Zoom into map after second click on marker.Matthew Somerville2016-07-12-0/+7
|
* Make sure mobile map scrolled into view and fixed.Matthew Somerville2016-07-12-2/+12
| | | | | This prevents scrolling when we're on the full screen map, and makes sure the map is back in view when it is shown.
* Only create popstate event after page load.Matthew Somerville2016-07-12-28/+34
| | | | | Some older browers will fire a popstate event at page load, which can cause an issue if we assume it's only fired due to a history event.
* Fix a few JavaScript issues with reports pages.Matthew Somerville2016-07-12-2/+8
| | | | | | | Don't stringify pin problem ID, as get_marker_by_id assumes it will be an integer; only activate the bounding box strategy if it exists; make sure a refresh of the markers happens when going back to the list; set the Back link on a pulled-in report to the current URL.
* Add missing 'pin.problem' attributeDave Arter2016-07-11-0/+1
| | | | | Missed this from 8a8b34, and it was causing a crash on certain /reports/ pages when trying to display the list of problems.
* Tweak WMTS JavaScript to match merged branch.Matthew Somerville2016-07-11-16/+13
| | | | Use $.each rather than .forEach.
* Merge branch '1351-report-list-ajax'Matthew Somerville2016-07-11-1537/+1804
|\
| * [fixmystreet.com] Update share buttons to be linksMatthew Somerville2016-07-11-17/+23
| | | | | | | | | | Having them as SDK-included buttons causes issues with the ajax report pull-ins, plus Firefox doesn't like them being hidden.
| * Merge two fixmystreet.js file.Matthew Somerville2016-07-11-209/+201
| |
| * Add history polyfill for <=IE9.Matthew Somerville2016-07-11-1/+41
| |
| * Fix map page popstate / mobile nav menu bugZarino Zappia2016-07-11-1/+15
| | | | | | | | | | | | | | | | | | | | | | Previously, pressing the mobile menu icon would change the location hash, which fired a history popstate event with an empty state object, causing trouble for our map page JavaScript. Now, pressing the mobile menu icon triggers a pushState, instead of changing the location hash. This means our map page popstate logic is unaffected, but mobile users can still use their browser's Back button to escape out of the mobile menu.
| * Move to using pushState for new report.Zarino Zappia2016-07-11-95/+96
| | | | | | | | | | Update the URL whenever location of pin is updated (first time, drag, or reclick), make sure it works when clicking back.
| * Fix top of content display if scrolled previously.Matthew Somerville2016-07-11-1/+2
| |
| * Load in report details on around page via ajax.Zarino Zappia2016-07-11-51/+282
| | | | | | | | | | | | | | | | | | | | | | Include URL changing, using history.pushState. Show a larger marker icon for the selected report. Make sure title is updated, and correct sub_map_links are shown. The /report/new template is now wrapped in a <div id="side-form"> rather than <div id="side"> for consistency with the /around page, which keeps display_all_reports_in_area() simpler, because it can always assume "#side" means "list of reports".
| * Simplify "rap-notes" visibility togglingZarino Zappia2016-07-11-44/+42
| | | | | | | | | | On mobile, the notes in `#report-a-problem-sidebar` are hidden by default, and can be toggled using the `.rap-notes-trigger`.
| * Edge case fixes for window resizes mid process.Matthew Somerville2016-07-11-3/+3
| |
| * Only match the actual ID, not same-ending others.Matthew Somerville2016-07-11-2/+2
| |
| * Increase opacity a bit on non-hovered pins.Matthew Somerville2016-07-11-1/+1
| |
| * Tidy up JavaScript functions.Matthew Somerville2016-07-11-1240/+1215
| | | | | | | | Split big functions into smaller more descriptive ones.
| * Move most JavaScript mobile map changes to CSS.Zarino Zappia2016-07-01-36/+46
| |
* | Merge branch 'issues/commercial/500-cobrand-reporting-issues-redux'Dave Arter2016-07-08-79/+251
|\ \