aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Remove Barnet-specific category lookup & checksDave Arter2014-04-25-14/+7
|
* Also remove cached file when photo removed.Matthew Somerville2014-04-17-5/+6
|
* tweak footer links to appsStruan Donald2014-04-17-8/+10
| | | | | | include logos and change the header text closes #751
* replace WTT cross sell with app advertStruan Donald2014-04-17-1/+25
|
* Merge branch 'improve-contact-form'Struan Donald2014-04-17-1/+246
|\
| * Add a who are you trying to contact option to contact formStruan Donald2014-04-15-1/+246
| | | | | | | | | | | | | | | | | | | | | | 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-13/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | create westminster council so report_new test can run standaloneStruan Donald2014-04-16-0/+1
| | | | | | | | | | | | | | The test relies on a body for westminster council existing which is crated in an earlier test if you run the whole test suite. However it's not present if you run only this test against an empty database so add it to the list of created bodies.
* | remove FMS UK content from trinidad and tobago footerStruan Donald2014-04-11-0/+38
| |
* | Merge branch 'zerotb'Struan Donald2014-04-11-34/+6218
|\ \
| * | Improve location out of area error for ZeroTBStruan Donald2014-04-08-0/+8
| | |
| * | Use flags to indicate type of location errorStruan Donald2014-04-08-2/+8
| | | | | | | | | | | | | | | | | | | | | 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.
| * | Remove unwanted detail from around pagesStruan Donald2014-04-08-0/+21
| | | | | | | | | | | | | | | Remove problem confirmed times as well as states Also problem -> clinic
| * | replace default pins with clinic logoStruan Donald2014-04-08-0/+8
| | | | | | | | | | | | add files and change config in cobrand
| * | script to import zerotb clinic dataStruan Donald2014-04-08-0/+115
| | | | | | | | | | | | Closes #703
| * | remove links to english and hindi translationsStruan Donald2014-04-08-5/+0
| | | | | | | | | | | | awaiting the hindi translation so don't have a link to it
| * | fix banner height and menu placement on map pagesStruan Donald2014-04-08-0/+17
| | | | | | | | | | | | | | | make links same height as on other pages increase height of banner to be the same as other pages
| * | text updatesStruan Donald2014-04-08-3/+127
| | | | | | | | | | | | front page and faq
| * | Changes to alert-update formatting for ZeroTBStruan Donald2014-04-08-0/+22
| | | | | | | | | | | | | | | Include date in alerts Remove everything apart from the update text as we don't need it
| * | Add Cobrand config to include update date in email alertsStruan Donald2014-04-08-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for sites where the updates aren't published on the site so you need a bit more context in the email alerts. Add inlude_time_in_update_alerts to default cobrand, off as default If this is set then the date is added after the name string in the email, passing in 'alert' as the type to dt_prettify in order to allow the cobrand to format it accordingly. This does require pulling out the alert confirmed time from the database in the send_alerts code where it wasn't before.
| * | Add a searchable dropdown of clinic names to postcode formStruan Donald2014-04-08-0/+5085
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses select2 for the dropdown and a cobrand call to fetch the list of report titles as the clinic names. Relies on a redirect in httpd.conf to make the non JS version work. Still leaves the postcode search in place as select2 won't accept custom terms if you base it on a select box, which we want to do so it works if JavaScript is disabled Fixes #723
| * | change ZeroTB button colour to orangeStruan Donald2014-04-08-0/+18
| | |
| * | Problem -> Clinic on around page for ZeroTBStruan Donald2014-04-08-0/+14
| | |
| * | update report page text for ZeroTBStruan Donald2014-04-08-9/+10
| | | | | | | | | | | | | | | | | | Change to use sites terminology update notes on what happens to information remove some unused template tags
| * | remove most of the detail from zerotb report pagesStruan Donald2014-04-08-0/+6
| | | | | | | | | | | | | | | only really want the title and the details as all the rest is not relevant
| * | turn on never_confirm_updates for ZeroTBStruan Donald2014-04-08-0/+7
| | | | | | | | | | | | | | | and display a message on the report page to indicate the update has been sent as it's never displayed
| * | Allow comments to be confirmed with no confirmationStruan Donald2014-04-08-1/+96
| | | | | | | | | | | | | | | | | | | | | | | | Add never_confirm_updates setting to cobrand that, when set to 0 means that comments are confirmed with no confirmation step. Essentially behaves as it would if the user was logged in. Also add a flag to the flash that indicates the comment was accepted to you can display a message on the report page if required
| * | enable generation of cobrand specific po filesStruan Donald2014-04-08-18/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to stop the main FixMyStreet .po file being filled up with strings that only apply to a single Cobrand that are not relevant to people running their own fairly vanilla version. Restrict the list of templates that we pull strings out of by generating a list of all the ones in currently translated cobrands for minimal impact. Use that to create the FixMyStreet.po file in gettext-extract. I've left the existing cobrands in but at some point we should split these out. Add a specific script for generating Cobrand .po files which extracts strings from the Cobrand's templates. This is then translated and the translated file place in the locale/$lang/LC_MESSAGES. The the merge_cobrand_po script is run which will create an autoCobrand.po file which has the Cobrand strings and the FixMyStreet strings. This is then the domain used by the Cobrand. Any cobrand specific strings from the Perl code are still in the main FixMyStreet .po file but there should be relatively few of them so it's less of an issue.
| * | update content and style for front page instructionsStruan Donald2014-04-08-0/+58
| | | | | | | | | | | | | | | | | | remove photos etc update step text change background colour and remove crop shadow
| * | Style front page location lookupStruan Donald2014-04-08-0/+52
| | | | | | | | | | | | | | | | | | | | | button -> orange set background colour for input boxes make everything a bit wider and left aligned update the what is this for text
| * | update nav bar textStruan Donald2014-04-08-3/+3
| | | | | | | | | | | | | | | Problem -> Stockout change mysoc nav to be language changer
| * | top nav bar should always be blackStruan Donald2014-04-08-0/+39
| | |
| * | change site logo and add css for thisStruan Donald2014-04-08-0/+60
| | |
| * | set default fonts and weightStruan Donald2014-04-08-0/+10
| | |
| * | import base styles with colour changesStruan Donald2014-04-08-0/+54
| | | | | | | | | | | | Change colour scheme to black and white
| * | split out header logo to its own templateStruan Donald2014-04-08-1/+2
| | | | | | | | | | | | to make it easier to change how cobrands do headers
| * | change text of location search instructionsStruan Donald2014-04-08-0/+2
| | |
| * | Add some overrides to zurich tests to stop failureStruan Donald2014-04-08-0/+4
| | | | | | | | | | | | Make sure mapit_id_whitelist set for tests that submit
| * | blank opengraph header template for ZeroTBStruan Donald2014-04-08-0/+0
| | |
| * | extract opengraph meta tags out to a templateStruan Donald2014-04-08-9/+10
| | | | | | | | | | | | for ease of alteration/removal in cobrands
| * | blank header_rss template for ZeroTBStruan Donald2014-04-08-0/+0
| | | | | | | | | | | | we don't want any RSS feeds for the site so disable
| * | split out RSS link tag to its own templateStruan Donald2014-04-08-3/+4
| | | | | | | | | | | | makes removing RSS from cobrands much easier
| * | Remove subscribe to updates link from around pageStruan Donald2014-04-08-0/+0
| | |
| * | add in report display templateStruan Donald2014-04-08-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing so much that we might as well copy the template, especially as we need to change the header include. Removed from default: most of shadow wrap RSS list of updates which are not public plus Report -> Clinic
| * | add template for updates with only required elementsStruan Donald2014-04-08-0/+66
| | | | | | | | | | | | remove login, name made public, photo upload, alert sign up
| * | remove unwanted items from navigationStruan Donald2014-04-08-0/+27
| | | | | | | | | | | | basically everything bar report and help
| * | cobrand file with geocoder etc configStruan Donald2014-04-08-0/+31
| |/ | | | | | | | | | | | | also, make readonly, disable photos, questionnaires, never hide old pins Fixes #701
* | Merge branch 'analytics-report-events'Struan Donald2014-04-11-0/+12
|\ \
| * | Fire a google analytics event on report completionStruan Donald2014-04-09-0/+12
| |/ | | | | | | | | | | | | | | 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.
* / bin/geocode script for testing geocodingHakim Cassimally2014-04-10-1/+82
|/ | | | | | | | | | | | | | | | | | | | | Run bin/geocode -h for options. Has: * configurable cobrand / config-file / geocoder * some diagnostics for missing cobrand Minor fixes rebased into this commit: * bin/geocode error if no --cobrand passed * bin/geocode docs and accept GEOCODER as string Notable TODOs remaining: * reverse geocoding, to double check that latitude actually maps somewhere useful (and is within Cobrand's boundaries) * diagnosis of relevant CONFIG settings * flag to disable caching