aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/default
Commit message (Collapse)AuthorAgeLines
* Rename 'default' web directory to 'base'.Matthew Somerville2014-07-08-5049/+0
| | | | This should reduce confusion with the Default cobrand and override order.
* Move UK-specific text to separate templates.Matthew Somerville2014-07-08-3/+3
|
* A few more https links/removal of unused http.Matthew Somerville2014-07-07-1/+1
|
* Merge branch '571-show-local-deploys-banner'Matthew Somerville2014-07-04-0/+0
|\ | | | | | | | | Conflicts: web/cobrands/fixmystreet/base.scss
| * Display a banner to non UK FixMyStreet visitorsStruan Donald2014-07-03-0/+0
| | | | | | | | | | | | only on FMS and only if from outside the uk Fixes #571
* | Merge branch 'mysociety/771-front-page-changes'Matthew Somerville2014-07-04-1/+1
|\ \ | | | | | | | | | | | | Conflicts: templates/web/fixmystreet/footer.html
| * | sort out display on mobileStruan Donald2014-07-01-1/+1
| |/ | | | | | | | | hide footer menu on mobile add privacy link to main menu, hide on desktop
* | Merge branch 'mysociety/798-show-reports-subset'Matthew Somerville2014-07-04-5/+5
|\ \
| * | Link through from all reports page to sub categoriesStruan Donald2014-07-01-5/+5
| |/ | | | | | | | | | | | | | | Add a type parameter to the /reports/body page to restrict list by problem category. Only link to report categories that have entries. Fixes #798
* / Make external links HTTPS where possible.Matthew Somerville2014-07-03-5/+5
|/ | | | And fix a couple that have redirected.
* Add change password link to Your reports page.Matthew Somerville2014-05-20-0/+2
|
* Add MAPIT_GENERATION variable, to pin whitelist.Matthew Somerville2014-05-16-0/+1
| | | | | | Otherwise, when MapIt Global is updated, the 'point' lookup, as it only returns the current generation by default, might no longer return the areas present in the whitelist.
* Merge branch 'improve-contact-form'Struan Donald2014-04-17-0/+2
|\
| * Add a who are you trying to contact option to contact formStruan Donald2014-04-15-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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
* | alter pave url sent to analytics on report completionStruan Donald2014-04-16-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to allow us to do funnel analysis in google analytics we need to send a differnt page url when a user completes a report. To do this we add a report_created=1 to the query string on either the report page or the report confirmation page for logged in and confirm by email users respectively. There's a bit of complication as we don't want to set a session cookie everywhere as that will break caching so we set a stash variable, although if the user is logged in this is controlled by a variable in the flash as there is already a session cookie at this point. also, removes the code that sends an event upon report completion as this was no use for funnel analysis.
* | Merge branch 'zerotb'Struan Donald2014-04-11-4/+6
|\ \
| * | Use flags to indicate type of location errorStruan Donald2014-04-08-1/+2
| | | | | | | | | | | | | | | | | | | | | This makes it a bit easier to override the message in templates which makes it a bit easier for cobrands. Leaves the default error message in location_error stash key which should prevent any existing logic breaking.
| * | split out header logo to its own templateStruan Donald2014-04-08-0/+0
| | | | | | | | | | | | to make it easier to change how cobrands do headers
| * | extract opengraph meta tags out to a templateStruan Donald2014-04-08-0/+0
| | | | | | | | | | | | for ease of alteration/removal in cobrands
| * | split out RSS link tag to its own templateStruan Donald2014-04-08-3/+4
| |/ | | | | | | makes removing RSS from cobrands much easier
* / Fire a google analytics event on report completionStruan Donald2014-04-09-0/+1
|/ | | | | | | | At the moment it's hard to use google analytics to track when someone has completed a report due to the various redirects which can occur too quickly for the analytics javascript to fire. So now we fire an event if we've set a flash value. This also allows us to track how they created the report.
* If we only have one real category option, automatically select it.Matthew Somerville2014-04-07-1/+1
| | | | Fixes #690.
* Allow cobrands to set their own path to pin filesHakim Cassimally2014-03-25-1/+2
| | | | | | | | | New cobrand function of pin_path that sets the path to where the image files for pins are located. Defaults to /i This still means they need to use the same file names but they can at least put those in a cobrand directory rather than having to overwrite the files in /i or fudge it with pin_colour
* Update code.fixmystreet.com references to fixmystreet.org.Matthew Somerville2014-03-19-2/+2
|
* Change default email indentation to none.Matthew Somerville2014-03-17-1/+0
| | | | | This is very old, no-one seems to want/need it any more, and more than one reuser does not want it. Fixes #715.
* Add back missing OSM attribution.Matthew Somerville2014-03-12-0/+1
|
* Merge remote branch 'origin/sweden-rebase'Matthew Somerville2014-03-11-1/+24
|\ | | | | | | | | | | | | Conflicts: bin/update-schema locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po perllib/FixMyStreet/DB/Result/Body.pm
| * Add `external_url' column to `body' table.Jon Kristensen2014-03-11-1/+10
| |
| * Added MapQuest/OSM attribution.Jonas Oberg2014-03-11-0/+14
| |
* | Export reports as CSV on /dashboardHakim Cassimally2014-03-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a button to download the details and text of reports at the second "Look up" button on /dashboard. Provides acknowledged, fixed, closed dates by parsing updates. Fixes #692 (and mysociety/FixMyStreet-Commercial#399) Email is not shown, and name honours anonymous flag: as /dashboard is accessible to people who are from_body (who still do not see anon-users name and email in the FMS web app.) A basic test is provided as per Zurich's similar report.
* | [Hart] Guidance related to two_tier, e.g. HCCHakim Cassimally2014-03-05-0/+4
| | | | | | | | | | | | | | | | Guidance in prominent places (report, all reports, and message on confirming problem.) Should alleviate mysociety/FixMyStreet-Commercial#481 and mysociety/FixMyStreet-Commercial#485
* | Explanatory text/link on /my with no reportsHakim Cassimally2014-02-26-0/+5
| | | | | | | | | | | | | | | | | | | | | | Usually you won't get to "Your Reports" page without any content (reports or updates) but it's possible to do so, as we just discovered in a client meeting, logging into that page, and arriving on a screen of blank content with no guidance. This patch shows some text and a link to create a new report, if there aren't any problems/updates. Fixes #671
* | update FAQ textDave Whiteland2014-01-27-13/+12
| |
* | Remove cached photos if hidden in admin interface.Matthew Somerville2013-11-20-2/+12
| | | | | | | | | | Use the internal hash URL of the photo so that it can still be seen in the admin interface.
* | Include version number on admin config page.Matthew Somerville2013-11-12-1/+3
| |
* | Add body deletion to admin interface.Matthew Somerville2013-11-11-3/+11
| |
* | Reorganise admin update list to match report list.Matthew Somerville2013-11-07-9/+9
| |
* | Add more admin external link icons.Matthew Somerville2013-11-07-8/+8
| | | | | | | | Use a relative URL in the CSS in case it's proxied.
* | Show a graphic on links to non-admin pagesAndy Lulham2013-11-07-10/+10
| | | | | | | | Graphic and css from FMT. Fixes #579.
* | Make sure admin start is specified for all the static files.Matthew Somerville2013-11-07-9/+9
| |
* | fix typo and localise placeholdersDave Whiteland2013-11-07-2/+2
| |
* | use local jquery ui, not CDN, for admin datepickerDave Whiteland2013-11-07-2/+2
| |
* | Add placeholder textAndrew Black2013-11-07-2/+4
| |
* | Create a single date fields and parse as DD/MM/YYYYAndrew Black2013-11-07-2/+4
| |
* | Add Jquery-ui files, and fixmystreet-admin.jsAndrew Black2013-11-07-1/+3
| |
* | Create a single fieldAndrew Black2013-11-07-6/+2
| |
* | More accurate config overriding for Zurich.Matthew Somerville2013-10-24-1/+2
| |
* | Merge branch 'master' into oxfordshire-usability-recommendationsChris Mytton2013-10-16-170/+190
|\ \
| * | [Zurich] Add missing translation stringChris Mytton2013-10-15-1/+1
| | | | | | | | | | | | Part of mysociety/FixMyStreet-Commercial#423
| * | [Zurich] Add user email address validation to the adminChris Mytton2013-10-15-0/+4
| | | | | | | | | | | | Closes mysociety/FixMyStreet-Commercial#426