| Commit message (Collapse) | Author | Age | Lines |
|
|
|
| |
This has been running for a year, added in e17eb20.
|
| |
|
|
|
|
|
| |
Tidy up use of absolute URLs when in the admin.
Have the 404 handler spot static files in admin as a fallback.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
And associated, e.g. nothing references fixmystreet-old-box.js any more.
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
Use a central get_param and get_param_list functions dependent on
whether we're after a scalar or a list (almost always a scalar). This
prevents any possibility of confusion where param() could return a list,
or params->{} an arrayref.
|
|
|
|
|
|
|
| |
Includes:
* [UK] Don't show topic form field when reporting abuse.
* Use token in moderation response URL to prevent hidden report leak.
* Make sure successful submission page is full width.
|
| |
|
|
|
|
|
|
| |
only on FMS and only if from outside the uk
Fixes #571
|
|
|
|
|
|
|
|
|
|
|
| |
In order to try and cut down on people mistakingly using this form to
try and contact their council all some 'who are you trying to contact'
options to the form that display appropriate messaged unless the 'FMS
team option is selected.
Add the validation code for this in the cobrand module.
Fixes #41
|
|
|
|
|
|
| |
Remove from admin_base_url (which wraps config vars like
{ADMIN_,}BASE_URL) and add to places in code which aren't
expecting it.
|
|
|
|
|
| |
This is so that the mobile app can use the list to build the appropriate
UI as fixing the HTML that is sent for the site is too awful.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
Setting MAPIT_URL to .../fakemapit/ will then return one area, ID 161 and
type ZZZ, whatever co-ordinate it is given. This means the default area
type is now ZZZ, the UK specific types are moved into the UK cobrands, and
the tests updated accordingly to still function (they assume UK-ness a lot,
so probably need an ALLOWED_COBRANDS entry of "fixmystreet: 'localhost'" and
for your host's domain to show fixmystreet too).
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
perllib/FixMyStreet/Cobrand/UKCouncils.pm
templates/web/default/reports/council.html
templates/web/fixmystreet/header.html
templates/web/fixmystreet/report/display.html
web/cobrands/bromley/layout.scss
web/cobrands/fixmystreet/fixmystreet.js
web/js/map-OpenLayers.js
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/send-reports
perllib/FixMyStreet/Geocode/Bing.pm
web/js/map-OpenLayers.js
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
|
| | | |
|
| | | |
|
| |/
|/| |
|
|/
|
|
| |
my stupid use of c as a variable.
|
|
|