aboutsummaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeLines
...
| * Body/category translation admin interface.Struan Donald2017-08-10-2/+26
| |
| * correct mismatched header tags in admin contact form templateStruan Donald2017-08-10-1/+1
| |
| * Set up translatable category columns.Matthew Somerville2017-08-10-38/+41
| | | | | | | | | | | | As category is used both for display and as a link between Problem and Contact tables, add `category_display` for use whenever a category is displayed.
* | [Borsetshire] Custom Google Map stylesZarino Zappia2017-08-09-1/+1
| | | | | | | | Fixes #1792.
* | [Borsetshire] Demo behaviour and help.Matthew Somerville2017-08-08-0/+60
|/ | | | | The front page redirects to report area, ignoring whatever is entered, and the sign in page includes details of the demo accounts.
* Merge branch 'always-show-list-numbers'Matthew Somerville2017-08-08-1/+1
|\
| * Always show pagination figures if >1 report.Matthew Somerville2017-08-08-1/+1
| | | | | | | | Even if no next/previous page, the number of items can be useful.
* | Merge branch 'issues/forcouncils/208-shortlisted-tooltip'Matthew Somerville2017-08-08-1/+3
|\ \ | |/ |/|
| * Output current shortlist holder in list tooltips.Matthew Somerville2017-08-04-1/+3
| |
* | [fixmystreet.com] Send demo request emails to bettercities@ instead of the ↵Dave Arter2017-08-07-1/+1
| | | | | | | | whole team
* | Stop errors from JS validator due to form in form.Matthew Somerville2017-08-05-1/+1
|/ | | | | | | | | The outer form is using the JS validator, which means the validator is called for any event on the inner form fields. If the inner form isn't using the JS validator, it errors as it assumes the closest form has a validator object on it. Having the inner form use the JS validator shouldn't have any effect.
* Make map image in HTML emails clickableZarino Zappia2017-08-03-8/+21
| | | | | | | | Emails that contain a report’s title, description, and location in the ”sidebar” will now have a map that takes you to the report’s web page when clicked. Fixes #1596. Thanks to @MyfanwyNixon for the suggestion!
* Use standard JS translation for show/hide pins.Matthew Somerville2017-08-03-0/+3
|
* [fixmystreet.com] /about/professional, not /about/councilDave Arter2017-07-28-0/+0
|
* Option to redirect to custom URL from Contact formZarino Zappia2017-07-28-2/+8
| | | | | | | | If a `success_url` parameter is provided along with the contact form fields, the user will be redirected to that URL upon successful form submission. We use it for the first time on the (UK) FixMyStreet Pro marketing page.
* [fixmystreet.com] FMS Pro demo access request formZarino Zappia2017-07-28-1/+27
|
* Show reporter's phone number on inspector formDave Arter2017-07-26-0/+8
| | | | | | | If the reporter of a problem left their phone number, it will be shown at the top of the inspector form as a 'tel:' link Fixes mysociety/fixmystreetforcouncils#200
* Merge branch 'version-2.1'Matthew Somerville2017-07-18-2/+2
|\
| * Update translations with new source strings.Matthew Somerville2017-07-18-2/+2
| | | | | | | | Plus a few new ca_ES strings.
* | [East Herts] Update template design.Matthew Somerville2017-07-18-118/+70
|/
* [Oxfordshire] Clarify wording on report archiving emailDave Arter2017-07-17-5/+5
|
* Merge branch 'issues/forcouncils/192-unused-categories'Matthew Somerville2017-07-14-39/+38
|\
| * Add inactive state to categories.Matthew Somerville2017-07-14-39/+38
| | | | | | | | | | A new 'state' column replaces confirmed and deleted, allowing categories to be unconfirmed, confirmed, deleted or inactive.
* | Merge branch 'new-reports-in-core'Matthew Somerville2017-07-14-153/+105
|\ \
| * | New version of /reports main page.Matthew Somerville2017-07-14-153/+105
| |/ | | | | | | | | | | | | | | | | | | | | This is a much broader summary page, plus a body name autocomplete. This was originally implemented for fixmystreet.com in 8a6a4ccb7. It also adds '(no longer exists)' in the autocomplete next to bodies not covering any areas. You can supply the `--table` argument to `update-all-reports` to generate the old-style data.
* / Allow static home page template override.Matthew Somerville2017-07-14-1/+1
|/ | | | | | If an /about/homepage.html template exists in your cobrand, it will be used as the front page, and the normal front page will be available at /report.
* [FixaMinGata] Consolidate with upstream.Jon Kristensen2017-07-07-37/+699
| | | | | Add hook for post-title field content in report form. Update translations.
* Make three strings translatable.Jon Kristensen2017-07-07-3/+3
| | | | Fixes #1744.
* [fixmystreet.com] Fix /reports displaying months.Matthew Somerville2017-07-07-1/+1
| | | | | | Month strings weren't escaped in data label, and would never match database data (using month number). Also issues displaying current day/month in graph.
* Add missing closing </dl> to base FAQ.Matthew Somerville2017-07-07-0/+1
|
* Merge branch 'issues/forcouncils/195-overloaded-action-scheduled'Matthew Somerville2017-07-07-4/+12
|\
| * [Oxfordshire] Separate defect creation from state.Matthew Somerville2017-07-07-4/+12
| | | | | | | | | | | | | | Revert the behaviour from 36baff2d, so that everyone can use the 'action scheduled' state, and instead if someone with report_instruct permission has the state set to 'action scheduled', add an extra mandatory question asking whether they want to raise a defect or not.
* | Merge branch 'issues/commercial/864-update-contact-form'Matthew Somerville2017-07-07-8/+29
|\ \
| * | Change the contact form Post button label to Send.Martin Wright2017-07-07-1/+1
| | | | | | | | | | | | | | | 'Post' suggest you're putting this somewhere, like a message board, whereas 'Send' is more conventional for contact forms.
| * | Add an optional phone field to the contact form.Martin Wright2017-07-07-1/+5
| | |
| * | [fixmystreet.com] Add a note to the contact blurb.Martin Wright2017-07-07-6/+18
| | | | | | | | | | | | | | | To encourage local council people interested in FixMyStreet Pro to use our sales enquiry form instead of the general contact form.
| * | [fixmystreet.com] Optional phone on council form.Martin Wright2017-07-07-0/+5
| |/
* | [fixmystreet.com] New version of /reports page.Zarino Zappia2017-07-06-31/+111
| | | | | | | | | | | | | | | | | | | | | | This is a much broader summary page, plus a body name autocomplete. This uses a cut down version of chart.js. [1] [1] The full version was 149Kb (41Kb gzipped) plus you needed moment (50Kb/17Kb), for a total of 199Kb/58Kb. By stripping out unused graphs and code and config options, and switching to category axis rather than time, it is now a total of 39Kb/13Kb.
* | Better handling of JS geolocation.Matthew Somerville2017-07-06-2/+2
|/ | | | Puts it back on alert page, lost in July 2016.
* Fix clickable spaces on inspect form/ward page.Matthew Somerville2017-06-30-6/+9
| | | | | Make the relevant labels inline-block so that their click area is not wider than their content; move the body name outside of the heading.
* Update templates when category/state changed.Matthew Somerville2017-06-30-2/+2
| | | | | | When the category or state changes, the list of available templates updates (previously it was frozen at what the category was on page load, and didn't care about the state).
* Return Response Priorities as JSON.pezholio2017-06-20-2/+2
| | | | | This now lets the response priority and defect type handling share the same code.
* Populate defect types dropdown on category changepezholio2017-06-20-2/+5
|
* [UK] Remove requirement for fixed body IDs.Matthew Somerville2017-06-20-3/+3
| | | | | | | | | | | | Historically in UK cobrands, bodies have had IDs the same as the MapIt area ID they cover. This can be confusing (if you are setting up a dev environment, say) and should not be necessary. This commit removes the requirement entirely, by switching any ID checks to either the name of the body, or the actual area it covers. One note: the body name in the test has to match so that we do not get two bodies both covering 2237 created. This will not be necessary when the tests are compartmentalized in the next commit.
* [Borsetshire] New cobrand for fictional councilZarino Zappia2017-06-15-0/+20
|
* Refactor pretty state display.Matthew Somerville2017-06-10-47/+27
|
* [Oxfordshire] Custom pin images with iconsZarino Zappia2017-06-09-1/+4
| | | | | | | Oxfordshire map pins now have icons on, and some use different colours, to better communicate the status of reports. Fixes mysociety/fixmystreetforcouncils#170
* Allow cobrands to define pin colour for new reportsZarino Zappia2017-06-09-0/+1
| | | | | | Previously, a green marker would be used for reports as they were being created. Now, cobrands can override `pin_new_report_colour` to show a different pin image when users are creating a new report.
* Merge branch 'csssss'Matthew Somerville2017-06-08-50/+33
|\
| * Basic white label cobrand.Dave Arter2017-06-08-0/+0
| | | | | | | | | | | | This removes most of the FMS/mySociety branding, but uses the same logic as the fixmystreet.com cobrand wrt problem restrictions, handling, etc. Suitable for UK council demos.