aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | move survey advert beneath alert text to reduce user confusionStruan Donald2014-03-07-35/+47
| |
* | Merge branch 'cpanfile-fixes'Matthew Somerville2014-03-07-196/+445
|\ \
| * | Move SOAP::WSDL requirement into UK cpanfile feature.Matthew Somerville2014-02-26-8/+189
| | | | | | | | | | | | Note how we'd like to do the same with SOAP::Lite.
| * | Install Carton in its own local::lib.Matthew Somerville2014-02-26-188/+256
| | | | | | | | | | | | This keeps the dependencies of carton separate from those of FixMyStreet.
* | | [Southampton] CSS fix to menusHakim Cassimally2014-03-05-3/+3
| | | | | | | | | | | | | | | (and add style.css to [% version %] managed CSS includes, so that it updates on live.)
* | | [Hart] css push report sidebar comments downHakim Cassimally2014-03-05-1/+1
| | | | | | | | | | | | Fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/488
* | | [Hart] footer links correctedHakim Cassimally2014-03-05-7/+7
| | |
* | | [Hart] correct links for FAQHakim Cassimally2014-03-05-2/+2
| | | | | | | | | | | | From https://github.com/mysociety/FixMyStreet-Commercial/issues/487
* | | [Hart] avoid the word "problems" on front pageHakim Cassimally2014-03-05-8/+12
| | | | | | | | | | | | From https://github.com/mysociety/FixMyStreet-Commercial/issues/487
* | | [Hart] CSS fixesHakim Cassimally2014-03-05-27/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove box shadow * header and footer CSS tweaks * white background colour on menu *wrapper* e.g. to have solid white menu bar for full width, not just the centered menu portion. * 10em top-margin on map-page * revert main nav font size * Show menu items on mobile map-page * Move the map-page menu item position:fixed into a media query * Swap hart & fms nav on mobile * big green banner zindex reset * header/footer spacing tweaks * header centered, even on mappage by taking out of .container and into .header-container * push .skipped-map downwards fixes mysociety/FixMyStreet-Commercial#486 on Safari and IE * header/footer width tweaks width (instead of max-width) was making page overflow, causing artefacts in footer. Also the mobile-nav was visible on desktop, to the far right. * remove link hover from images * fix inconsistent header height * more spacing on .mappage .content NB: Same fix for z-index for "fixed" .banner as per mysociety/FixMyStreet-Commercial#483 and #673
* | | Cobrand 'hidden_categories' methodHakim Cassimally2014-03-05-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | This deals with the issue of hiding a two_tier category for the Hart cobrand, without removing it for the whole of Hampshire, e.g. see https://github.com/mysociety/FixMyStreet-Commercial/issues/477 but is written as a generic extension to setup_categories_and_bodies as it may be generally useful.
* | | [Hart] Guidance related to two_tier, e.g. HCCHakim Cassimally2014-03-05-3/+75
| | | | | | | | | | | | | | | | | | | | | | | | Guidance in prominent places (report, all reports, and message on confirming problem.) Should alleviate mysociety/FixMyStreet-Commercial#481 and mysociety/FixMyStreet-Commercial#485
* | | [Hart] footer and header fixesHakim Cassimally2014-03-05-123/+205
| | | | | | | | | | | | with steve's help - fix header and footer on desktop and mobile
* | | [Hart] fix display of logo on desktopHakim Cassimally2014-03-05-1/+4
| | |
* | | [Hart] mobile header and imagesHakim Cassimally2014-03-05-32/+59
| | |
* | | [Hart] fix alerts page width on desktop viewHakim Cassimally2014-03-05-0/+1
| | |
* | | [Hart] footer work including social media iconsHakim Cassimally2014-03-05-43/+132
| | |
* | | [Hart] fix recent photos box in Local AlertsHakim Cassimally2014-03-05-1/+16
| | |
* | | [Hart] fix jagged green box on mobile viewHakim Cassimally2014-03-05-1/+23
| | | | | | | | | | | | | | | | | | On mobile, the default brand doesn't have the box extend to the "locate me automatically", so we use that same behaviour, setting the hart primary box only on media query.
* | | [Hart] header fixesHakim Cassimally2014-03-05-4/+4
| | |
* | | [Hart] basic Hart cobrandingHakim Cassimally2014-03-05-0/+837
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally copied from template of Bromley code, substituting logo, council ID, geolocation data, and renaming .scss variables etc. (NB: this was a bad idea. As per notes/cobranding.txt, should have started with less copying of files, as this required more cleanup. Bromley's code has some particularities, like smaller map, split First/Last name fields and so on. The current branch has been rebased to present a slightly idealised picture of the process.) (Includes contributions by @davea and @stevenday) * Some code cleanup and added is_two_tier * Add Hart-specific links to footer * Shift FMS nav out of the main header * Update styling to follow design more closely * Flip nav colours to better indicate links * Make header banner entire width of the page * Stretch footer bg to entire width of page * Add top-level nav links * Correct header height on mobile * Correct wording of top menu item * Remove FMS logo from top of page * Shift top level nav to correct position * Invert media query so IE8 displays header properly * hide folding triangle, as makes no sense on this cobrand * Some more renaming of Bromley to Hart * Treat Hart the same as Bromley in the JS * Whitespace/formatting fixes * Basic test for cobrand * Javascript #map_box fixes * Make sure #map_box is not in desk-only * ensure there is only single map (one .wrapper only) * colour tweaks * Fix example places (postcode, spelling) * Basic FAQ text * Set Zoom level 3 * CSS/HTML/JS tweaks removing Bromley customizations * Switch templates to put navigation in footer, as FMS.com does * remaining HTML/CSS changes for large map * replace favicon * move site-logo scss to one place * make small logo transparent
* | | [Southampton] fix path to css-referenced imagesHakim Cassimally2014-03-04-11/+11
| | | | | | | | | | | | | | | | | | | | | the css had not been updated to point correctly at the background resources after f9cfa8acb622a680d09b4d06f7ea8e038168e1f6 Fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/490
* | | [Zurich] revert "email templates point to surveys"Hakim Cassimally2014-03-04-4/+0
| | | | | | | | | | | | | | | | | | This reverts commit 5cd2ed3be27629842d7ae072c2b4c9a86c020d52. as per Tobias's instructions today.
* | | Add postgres 8.4 dev package as it can be present instead of 9.1Ian Chard2014-03-04-1/+1
| | |
* | | Merge branch 'issues/671-guidance-on-no-reports'Matthew Somerville2014-02-27-0/+13
|\ \ \
| * | | Explanatory text/link on /my with no reportsHakim Cassimally2014-02-26-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'issues/677-open311-errors-on-comment-processing'Matthew Somerville2014-02-27-14/+32
|\ \ \ \
| * | | | Fix uncommon Open311 errors on processing updates.Hakim Cassimally2014-02-27-14/+32
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #677. The query to fetch the related alert sometimes: * retrieves no result, causing an error on $alert->id * retrieves multiple results, causing deprecation warnings (e.g. which may at some point become future errors in DBIC) This commit turns the resultset('DB::Alert')->find(...) into a search(...) and loops over the results, to suppress them.
* | | | Pin compass gem versions.Matthew Somerville2014-02-27-1/+2
| | | |
* | | | Make sure language is set early enough in email alert loop.Matthew Somerville2014-02-26-11/+30
| |/ / |/| | | | | | | | | | | The call to set_lang_and_domain needs to happen before the first string is translated (the report state).
* | | Run Travis on all branches.Matthew Somerville2014-02-26-4/+0
| | |
* | | Update commonlib to get wheezy fixes.Matthew Somerville2014-02-26-0/+0
| | |
* | | Don't require postgres to be installed, as it might be on a different hostIan Chard2014-02-26-1/+0
| | |
* | | Use wheezy packages now that FMS's server has been upgradedIan Chard2014-02-26-1/+1
| | |
* | | Make sure bodies returned in consistent order.Matthew Somerville2014-02-25-3/+6
|/ /
* | Make alert_type.t test more robust.Matthew Somerville2014-02-24-4/+8
| | | | | | | | | | | | Put alerts in default cobrand, so changes to other cobrand email templates don't affect the test; and clean up at the end of the test so that it can be rerun without issue.
* | Add links to user survey to emails, front page and confirmation pagesStruan Donald2014-02-18-0/+145
| | | | | | | | | | | | | | | | Use the cross sell function to put an 'advert' for the survey on the various confirmation pages Create new alert email templates for fixmystreet co-brand so we can include the survey link on those alone All as one commit for ease of reverting when the survey is done.
* | Update graph creation to spot other fixed states.Matthew Somerville2014-02-06-4/+4
| |
* | Fix FAQ sidebar link clickability.Matthew Somerville2014-02-04-0/+6
| | | | | | | | | | Restoring the z-index:1 removed in 7c9e4b1a only on pages like the FAQ, so as to maintain the fix of that commit where needed.
* | Correct subtest variable name, fix uninitialized value warning.Matthew Somerville2014-01-30-3/+3
| |
* | Send staging reports to reporter, not contact address.Matthew Somerville2014-01-30-1/+1
| | | | | | | | Fixes #653.
* | Don't update problem state from service request if currently hidden.Matthew Somerville2014-01-30-19/+16
| |
* | [Bromley] Reduce update character limit to 1750.Matthew Somerville2014-01-30-4/+6
| | | | | | | | Following on from f117167 (and fixing comment from that commit).
* | update footer-mobileapps CSDave Whiteland2014-01-27-58/+14
| | | | | | | | | | | | Remove ul, li styling because we're not using it any more: replaced the li with a paragraph, because I believe it's simpler. Paragraph mimics existing footer styles (which use li p).
* | update FAQ textDave Whiteland2014-01-27-32/+27
| |
* | allow wide container in fixmindelo admin styleDave Whiteland2014-01-17-2/+8
| |
* | Default lastname of '-' if none found.Matthew Somerville2014-01-14-0/+1
| |
* | [Bromley] Reduce detail field character limit to 1750Chris Mytton2014-01-14-2/+3
| | | | | | | | | | | | | | | | "The length of 2000 characters is causing some issues in the underline back office application." Updated to include a comment making it (hopefully) clearer which council this is for - thanks @davewhiteland!
* | Merge branch 'issues/commercial/464-zurich-email-templates-for-evaluation'Hakim Cassimally2014-01-13-0/+4
|\ \
| * | [Zurich] email templates point to surveysHakim Cassimally2014-01-13-0/+4
|/ / | | | | | | | | | | Fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/464 Also requires mysociety-servers.git@45e3a5d3 for the /umfrage redirect.