aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Cobrand
Commit message (Collapse)AuthorAgeLines
...
* [Zurich] Call add_links filter correctlyDave Arter2016-09-06-2/+2
| | | | Fixes a bug with updates not being displayed correctly in the app.
* Allow searching for reports with ref: prefix in postcode fieldDave Arter2016-08-22-0/+15
| | | | | | | | | Searches the `id` and `external_id` fields. This takes you directly to the report if only a single report matches, otherwise a disambiguation page is shown. For mysociety/fixmystreetforcouncils#16
* Restrict admin config/stats pagesDave Arter2016-08-17-1/+27
| | | | | The config page is only accessible by superusers. The stats page only shows figures for the user’s from_body unless superuser.
* Allow user permissions to be granted/revoked in adminDave Arter2016-08-17-0/+41
|
* Restrict user editing in adminDave Arter2016-08-17-0/+51
| | | | | | | | The 'user_edit' permission is required to edit users. The admin pages on UK council cobrands only allow editing of users whose from_body is the same as the logged-in user, or who have sent reports or updates to the council.
* [fixmystreet.com] Add Content-Security-Policy.Matthew Somerville2016-08-16-0/+7
|
* [East Sussex] Remove East Sussex cobrandDave Arter2016-08-02-134/+0
|
* Add HTML email templates.Matthew Somerville2016-08-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* [Zurich] Send admin emails from the do-not-reply addressDave Arter2016-07-28-4/+3
| | | | | Also takes the opportunity to fix the incorrectly-encoded sender name which was appearing to some clients as "Züri Wie Neu".
* [UK Councils] Council users can only see their own council's adminDave Arter2016-07-19-0/+7
|
* Use normal user authentication to control access to /adminMatthew Somerville2016-07-19-2/+25
| | | | | | | | | - 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
* [UK Councils] Show all reports on cobrand /around mapDave Arter2016-07-08-0/+35
| | | | | | | | | | | | | | There is a concern that excluding district council reports from a two-tier council's cobrand's /around page might lead to duplicate reports or reports never being seen. This commit adds them to the map and the sidebar and displays the destination council in the report list item. Clicking the pin or the report link leads to the report on FMS.com. Reports sent to the a council other than the the active cobrand are shown as grey pins on the map, and the receiving council's name is shown in the sidebar list.
* Include link back to originating cobrand on fms.com reportsDave Arter2016-07-08-1/+57
| | | | | | | | | When viewing a report on FMS.com whose recipient council has a FMS cobrand, turns the council name into a link to view the same report on that council's cobranded site. Includes methods cribbed from Hakim's Open311 refactor branch from commit 47daa02420a4f5a4264c31efcf2a2e8611c2f23e.
* [UK Councils] Use correct cobrand base URL if STAGING_SITEDave Arter2016-07-08-6/+12
| | | | | Instead of using BASE_URL as the base URL on council cobrands when STAGING is true, use the UK councils default (which is cobrand name prepended to BASE_URL).
* [East Herts] Cobranded frontendDave Arter2016-07-08-0/+54
| | | | For mysociety/FixMyStreet-Commercial#773.
* [Bristol] Only show Open311 categories on Bristol cobrandDave Arter2016-07-08-4/+24
| | | | | | | | | | | | This adds a new Cobrand::Default::categories_restriction method that can be used to limit what categories are available when making a new report on a per-cobrand basis. This is used by Cobrand::Bristol to only show Open311 categories when making a new report on fixmystreet.bristol.gov.uk but allowing all categories on FMS.com. Also removes the Hart::hidden_categories and uses the new categories_restriction method to achieve the same thing.
* [Zurich] Don’t include unpublished photos in CSV exportDave Arter2016-07-08-1/+1
|
* Merge branch 'fix-admin-proxy'Matthew Somerville2016-07-04-13/+4
|\
| * Make sure map JS works through an admin proxy.Matthew Somerville2016-07-04-13/+4
| | | | | | | | | | Tidy up use of absolute URLs when in the admin. Have the 404 handler spot static files in admin as a fallback.
* | [Oxfordshire] Remove broken JS and update base URLMatthew Somerville2016-07-04-1/+1
|/
* [UK] Update base urls for Harrogate, Stevenage.Matthew Somerville2016-06-27-3/+12
| | | | Default future unknown ones to HTTPS.
* Merge branch '360-change-email'Matthew Somerville2016-06-20-3/+3
|\
| * Improve CSRF tokens and add to more forms.Matthew Somerville2016-06-20-3/+3
| |
* | [Bristol] Use BCC's base map tilesDave Arter2016-06-17-0/+4
| | | | | | | | | | | | | | | | | | This refactors the Map::Zurich module into something that makes it easier to use custom map tiles for a cobrand. This also includes some refactoring of the JS & map templates to make it easier to use a custom WMTS base map in future cobrands.
* | [Bristol] Bristol City Council cobrand frontendDave Arter2016-06-17-0/+54
| | | | | | | | For mysociety/FixMyStreet-Commercial#766.
* | Remove stringify call from template pathsDave Arter2016-06-15-10/+10
| |
* | [UK Councils] Send correct confirm emails for updatesDave Arter2016-06-15-0/+35
|/ | | | | | | | | | | | | | | | | | | | | | Some UK councils with Open311 integrations (e.g. Bromley) have a custom wording in the confirmation email sent when updates are left on reports, to make the user aware that the update is sent to the council in question. Bromley noticed that some emails were being sent without this wording, leading at least one user to contact the council directly about the report. It turns out that although the email template contains an IF clause to use the appropriate wording for Bromley (and Stevenage) reports, the incorrect template file was being used when updates were made via the Bromley cobrand. This commit solves the problem by introducing a new `Cobrand::Default::path_to_email_templates` method, which is overridden by `Cobrand::UKCouncils` to include the `templates/email/fixmystreet` path. Paths returned by this method are used as the `additional_template_paths` param when templating emails. A regression test is included. Additionally moves email templates for fixmystreet.com to a directory name reflecting their purpose, in the same way the web templates are arranged.
* Move some cobrands into separate repository.Matthew Somerville2016-06-08-35/+0
|
* Use only one templating system for emails.Matthew Somerville2016-05-25-8/+0
| | | | | | | Historically, emails sent offline (alerts, questionnaires, etc) used a different templating system from those sent by the website (e.g. login emails), though the newer system was also being used for the site name and signature of offline emails.
* Remove final web/fixmystreet templates.Matthew Somerville2016-04-20-4/+1
| | | | And associated, e.g. nothing references fixmystreet-old-box.js any more.
* Remove some unused cobrands.Matthew Somerville2016-04-20-713/+0
|
* Merge remote-tracking branch 'origin/1302-support-pngs'Matthew Somerville2016-04-20-4/+5
|\
| * Add PNG image support.Matthew Somerville2016-04-08-4/+5
| | | | | | | | | | | | | | Store image type along with hash in photo column, and use that when outputting images / generating URLs. Make sure all public photo URL generation goes through appropriate functions, and change temp URLs so the filename can be output directly from the list.
* | Cope with a '/' in body name in body slug.Matthew Somerville2016-04-20-2/+3
|/ | | | Fixes #574.
* Merge remote-tracking branch 'mysociety/refactor-email'Matthew Somerville2016-03-31-1/+1
|\
| * Refactor email handling to use Email::MIME alone.Matthew Somerville2016-03-30-1/+1
| |
* | [fixmystreet.com] Move country lookup client side.Matthew Somerville2016-03-31-12/+0
| | | | | | | | | | There's no need for the IP->country lookup, only used in JavaScript to display a banner, to require a call to the FixMyStreet server.
* | [Angus, Greenwich] Add base_url to resolve mixed content issueDave Arter2016-03-30-0/+10
| | | | | | | | | | | | Some img tags were using http://[cobrand].fixmystreet.com/ URLs when their including page was served over HTTPS, causing mixed content warnings on IE.
* | [Oxfordshire] Add emergencies-only templated response message for street ↵Dave Arter2016-03-30-1/+3
| | | | | | | | | | | | lighting reports Fixes mysociety/FixMyStreet-Commercial#767
* | [Angus] Add clickable street light layer to report mapDave Arter2016-03-29-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Angus provide a WFS endpoint for their existing streetlight assets and known faults. This commit: - Displays clickable markers when the 'street lighting' category is selected on the report a problem page. - Displays known faults on the map - Includes a custom OpenLayers build for the Angus cobrand that includes WFS support The custom code for adding the layers to the map is within position_map.js, as this seemed to be currently the best place for cobrand-specific map logic.
* | [Angus] SOAP interface/send method for Angus CRMDave Arter2016-03-29-0/+73
| |
* | [Angus] Cobrand module, templates & designDave Arter2016-03-29-0/+49
|/ | | | | This adds a cobrand for Angus Council that fits in with their existing styling on angus.gov.uk
* [fixmystreet.com] Friendly A/B test setup.Zarino Zappia2016-03-11-0/+21
| | | | | | | | Includes a smiley, bright yellow homepage, and updated nav bar and footer across the entire site; a few content changes; request for gender information from users. Fixes #1341.
* Add cobrand-specific custom reporting fields.Matthew Somerville2016-03-09-10/+13
| | | | | | This adds a new cobrand variable, report_form_extras, which contains a list of extra fields that will be saved in the 'extra' metadata of the report. Fields may optionally be marked as required.
* Rename process_extras to process_open311_extras.Matthew Somerville2016-03-08-5/+5
| | | | | It is currently only used for processing extra fields (the list, not the metadata hash) which is really only of relevance to Open311.
* Only load images from disk when needed.Matthew Somerville2016-02-23-7/+5
| | | | Fixes #1337.
* Switch to JSON::MaybeXS, remove JSON::XS.Matthew Somerville2016-01-22-0/+1
| | | | | | Travis has Cpanel::JSON::XS preinstalled, which means that the build would fail there, as JSON::MaybeXS would try and upgrade JSON::XS to version 3 which the snapshot did not contain.
* Factor multiple photo details into nicer function.Matthew Somerville2016-01-12-1/+1
| | | | | Remove get_photo_params, which only looked at the first photo, make explicit when we're doing that using `.first`.
* Fix cobrand restriction of My/Nearby.Matthew Somerville2015-12-15-20/+36
| | | | | | | | | | | | 5c79337 simplified a bit too far, as after then a particular cobrand could in Nearby and My only filter reports to a particular body, not any other criteria. To fix this, introduce more generic functions in the default cobrand to allow more flexibility. Make sure a few tests delete their bodies fully so that new tests pass when run as part of the suite. Fixes #1289.
* Merge branch 'reduce-fixmystreet-app'Matthew Somerville2015-12-02-6/+6
|\
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 10:56:06 +0000