aboutsummaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeLines
* Version 1.8.v1.8Matthew Somerville2016-03-02-4/+4
| | | | | Add things missing from README, pull from Transifex, merge in new translations, bump version number.
* [fixmystret.com] Add separate house rules page.Matthew Somerville2016-02-26-9/+68
|
* Consolidate base/fixmystreet contact templates.Matthew Somerville2016-02-26-268/+135
| | | | Put FAQ/contact/privacy sidebar in its own template.
* Show remembered uploaded photos when Back used.Matthew Somerville2016-02-10-28/+0
| | | | | | | | | | The uploaded_files solution in cbdfcad6, to show already uploaded files stored in upload_fileid, worked if you submitted the form to the server and had it returned, but did not show remembered photos if you used the browser's Back button to return to the form from another page. Instead, always read the data from upload_fileid, which works whichever way you have come to the page. Fixes #1332.
* Merge remote-tracking branch 'mysociety/add-osm-link-to-email'Matthew Somerville2016-02-09-0/+6
|\
| * Add OpenStreetMap URL to report email.Matthew Somerville2016-02-09-0/+6
| |
* | Fix use of incorrect variable in summary stats.Matthew Somerville2016-02-09-1/+1
|/
* Consistent styling for updates on report page and /my pageZarino Zappia2016-02-04-5/+15
| | | | Fixes #1312.
* Blacklist Opera Mini on Windows Phone in uploader.Matthew Somerville2016-01-29-1/+1
| | | | | | | | | | | We had a report that our file uploader (dropzone) wasn't working in Opera on a Lumia Windows phone. It looks like this version of Opera is saying it has capability but doesn't. The file uploader already blacklists Opera 12 on a Macintosh, so do the same on Windows Phone (Opera Mini 9 has a version 12 identifier in its user agent string). The full User Agent string was Opera/9.80 (Windows Phone; Opera Mini/9.0.0/37.7751; U; en) Presto/2.12.423 Version/12.16
* Merge branch '1146-social-login'Matthew Somerville2016-01-27-398/+543
|\ | | | | | | | | | | Conflicts: templates/web/base/report/new/fill_in_details_form.html templates/web/base/report/update-form.html
| * Add login by Facebook on generic auth screen.Matthew Somerville2016-01-22-27/+59
| |
| * Add login by Facebook when updating.Matthew Somerville2016-01-22-12/+59
| | | | | | | | Makes the flow more like new reporting.
| * Add login by Facebook when reporting.Matthew Somerville2016-01-22-8/+75
| |
| * Create some subtemplates for future use.Matthew Somerville2016-01-22-360/+359
| |
| * Missing string for translation.Matthew Somerville2016-01-22-1/+1
| |
* | Improve some error pages.Matthew Somerville2016-01-26-23/+18
| | | | | | | | | | Use design of auth/token in generic error, 404, and token server error pages, and use the same error for too old/ token not found errors.
* | Make sure sentences are separated by a space.Matthew Somerville2016-01-20-0/+4
| |
* | Make sure data variable is defined before use.Matthew Somerville2016-01-20-0/+7
| | | | | | | | | | e.g. if you had skipped the map there is no fixmystreet variable on the resulting page, so we need to create it and check it.
* | Pad internal update links so they are in view.Matthew Somerville2016-01-19-1/+1
|/ | | | Fixes #1308.
* Merge branch '1300-multiple-update-photos'Matthew Somerville2016-01-15-638/+443
|\
| * Add ability to have multiple update photos.Matthew Somerville2016-01-12-57/+111
| | | | | | | | Also adds admin ability to rotate update photos.
| * Factor multiple photo details into nicer function.Matthew Somerville2016-01-12-63/+32
| | | | | | | | | | Remove get_photo_params, which only looked at the first photo, make explicit when we're doing that using `.first`.
| * Remove most passing of Catalyst to PhotoSet.Matthew Somerville2016-01-12-5/+5
| |
| * Combine base/fixmystreet report templates.Matthew Somerville2016-01-08-524/+300
| | | | | | | | Refactor some cobrand specific elements for clarity.
| * Handle multiple photo rotation/removal in admin.Matthew Somerville2016-01-08-13/+19
| |
* | Fix typo in admin body form checked status.Matthew Somerville2016-01-12-1/+1
| |
* | Label photo field as public.Matthew Somerville2016-01-08-1/+2
|/ | | | | This better matches the equivalent markings above and below for title and description.
* [fixmystreet.com] Don't show app step if used app.Matthew Somerville2016-01-06-1/+4
| | | | Fixes #1305.
* Merge branch '1299-banner'Matthew Somerville2016-01-06-6/+4
|\
| * [UK] Update unresponsive warning text.Matthew Somerville2016-01-05-1/+1
| | | | | | | | Fixes #1303.
| * Tidy up CSS of top banner.Matthew Somerville2016-01-05-5/+3
| | | | | | | | Include UK donations CSS used over Christmas 2015 for any future use.
* | Move alert page "recent photos" out of sidebarZarino Zappia2016-01-05-26/+28
|/
* Fix display of large numbers on HTML status page.Matthew Somerville2015-12-18-7/+7
| | | | | 6a70b829 prettified the numbers, so they were now strings, but mistakingly kept the printf tokens as "%d".
* Add multiple photo upload support.Zarino Zappia2015-12-16-72/+94
| | | | | | | | | | Three file inputs, progressively enhanced with dropzone. This moves the photo input higher up, so that photos can upload while you're filling out the form. It standardises and improves photo error handling. [fixmystreet.com] Guidance for what photos should and shouldn’t include.
* Combine base/fixmystreet report new templates.Matthew Somerville2015-12-15-278/+75
|
* Prettify admin/status page numbers.Matthew Somerville2015-12-09-16/+30
| | | | Consolidate the two displays of these stats. Fixes #1297.
* Switch template plugin for nice numbers.Matthew Somerville2015-12-09-11/+9
| | | | | Template::Plugin::Number::Format works internationally, whilst Template::Plugin::Comma does not.
* Default the Google map view to hybrid (again).Matthew Somerville2015-12-05-2/+2
| | | | | | | | | | | | | | A repeat of cc6a278; Google have now dropped version 3.20 of their Maps API, which we were using. Version 3.21 is the oldest available version, and only appears to work if you start off in hybrid view. According to https://developers.google.com/maps/documentation/javascript/versions, in three months 3.21 will be dropped; 3.22 does not currently work with our OpenLayers code at all. Looking at http://dev.openlayers.org/releases/OpenLayers-2.13.1/examples/google-v3.html the maps do still appear if you first switch to the Satellite layer. So investigation will be needed to find out why that happens and if it can be worked around.
* [Zurich] Remove unnecessary template overridesDave Arter2015-11-23-36/+0
|
* [fixmystreet.com] Update council list.Matthew Somerville2015-11-13-3/+3
|
* Changed from 'Highways Agency' to 'Highways England'Gemmamysoc2015-11-10-1/+1
|
* Add generic static route handler.Matthew Somerville2015-10-29-0/+0
| | | | | This puts all static pages under /about, and lets you add new static pages by placing new HTML in your about template directory.
* Merge branch '1251-json-status-page'Matthew Somerville2015-10-23-5/+26
|\
| * Add status page.Matthew Somerville2015-10-23-0/+19
| |
| * Speed up admin front page.Matthew Somerville2015-10-23-5/+7
| | | | | | | | | | | | | | | | * Don't show a categories summary unless asked via a link * Don't needlessly join in questionnaire/update summaries * Switch count(distinct()) to a subselect as it turns out select count(*) from (select distinct(user_id) from problem) temp; is a lot quicker than select count(distinct(user_id)) from problem;
* | Merge branch '1141-list-css-part-4'Matthew Somerville2015-10-09-35/+40
|\ \ | |/ |/|
| * Improve item list CSS.Matthew Somerville2015-10-09-35/+40
| | | | | | | | | | | | | | | | | | | | | | | | Generally, a rewrite of issue-list-a to item-list--reports or item-list--wards (two different uses) and issue-list to item-list--updates, with subsequent renames/changes to children. For those cobrands using a different list showing a pin icon, use item-list__item--with-pin to stop needing to override existing classes. Fix a variety of niggling issues e.e ward list display, or overloading of the .text class.
* | [Hart] Fix missing menu class, tidy remaining.Matthew Somerville2015-10-09-1/+1
| | | | | | | | | | The changes in 99610f1 missed out adding a class to the footer menu, and a few subsequent changes to the CSS.
* | Look for gone body template, not hard-code cobrandMatthew Somerville2015-10-08-2/+2
|/ | | | This means other cobrands could use the same mechanism.
* [Bromley/Greenwich/Oxfordshire] Tidy overrides.Matthew Somerville2015-10-08-106/+18
| | | | | | | | | | Have the around, my, and reports pages use the same low level template for individual list items, which can then be overridden for these cobrands, meaning they no longer need to override higher level templates. The logic in 2b9178d was incorrect; fix this so that the correct information is included in those templates.