aboutsummaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeLines
* Merge branch 'issues/#805-name-check-cobrand'Matthew Somerville2015-07-31-104/+53
|\
| * [fixmystreet.com] Tidy up cobrand specific files.Matthew Somerville2015-07-31-34/+40
| | | | | | | | | | | | This moves files only used by fixmystreet.com under cobrands/fixmystreet.com (some files were already there), and puts fixmystreet.com's CSS there too, with a special case in the header.
| * Move Latin-char-specific name check to cobrand.Matthew Somerville2015-07-31-2/+13
| | | | | | | | | | Also move some UK-specific code in the same function. The specific code is still tested in report_new.t.
| * Revert "[fixmystreet.com] Homepage button step A/B test."Matthew Somerville2015-07-31-68/+0
| | | | | | | | | | | | | | | | This reverts commit 838708d3127bf5bd39375b19ad13b220637c851b. Conflicts: web/cobrands/fixmystreet/base.scss web/cobrands/fixmystreet/layout.scss
* | Merge branch 'admin-external-url'Matthew Somerville2015-07-31-27/+66
|\ \
| * | Mark users who have moderate permission.Matthew Somerville2015-07-30-2/+5
| | |
| * | List a report’s bodies more nicely in admin.Matthew Somerville2015-07-30-1/+10
| | |
| * | Show category extra data in admin.Matthew Somerville2015-07-30-0/+5
| | |
| * | Add MapIt links to admin from body/co-ordinates.Matthew Somerville2015-07-30-6/+18
| | |
| * | Add link to comment user ID from body form if present.Matthew Somerville2015-07-30-0/+3
| | |
| * | Add mark as sent button to admin.Matthew Somerville2015-07-30-1/+4
| | |
| * | Allow body external URL to be edited in admin.Matthew Somerville2015-07-30-17/+21
| |/
* / Fix sidebar running over the footer on alerts pageSteven Day2015-07-31-4/+4
|/ | | | | | | | | | | | | | This page used the .sticky-sidebar class that is used in the help section to present the in-page navigation of a lot of text. There, there's no danger of the sidebar being scrolled over the footer because it's very short. On this page though, there is. This commit removes that class, so that the recent photos are fixed in position with the top of the content. I don't think this is a great loss for usability or design. It also removes the alertindex class, which was only used to work around this issue. Closes #1168
* [fixmystreet.com] Tweak text.Matthew Somerville2015-07-30-1/+1
|
* [fixmystreet.com] Fix external URL display.Matthew Somerville2015-07-29-1/+1
|
* Drop show-admin-notes class and show notes everywhereSteven Day2015-07-29-1/+1
| | | | | | | | | | | | | | | | .show-admin-notes was a class that could be applied on a cobrand basis to turn on or off the showing of admin notes and error messages. This was introduced when the concept of admin notes was added, so that existing cobrands could opt-in to the functionality. Now, every cobrand uses it, so there's no need to make it optional. This commit removes the CSS styles based on it, so that errors and notes always display; removes the addition of the class to admin pages, and removes the conditional javascript that enabled admin tooltips based on the class. Closes #1161
* Add time tooltips to All Reports table headings.Matthew Somerville2015-07-28-5/+5
|
* Fix “All Reports” table headers on scroll.Zarino Zappia2015-07-28-0/+7
| | | | | This reuses some JavaScript I originally wrote for mySociety’s EveryPolitician project.
* Merge branch 'issues/968-refusing-councils'Matthew Somerville2015-07-28-93/+94
|\
| * [fixmystreet.com] Unresponsive bodies page/warningMatthew Somerville2015-07-28-90/+91
| | | | | | | | | | | | | | | | | | Add a special category email address used to show an unresponsive message and page when trying to report in that category. Add a "Refused" send method for setting a whole body to be unresponsive and show the message immediately, not on category selection. Factor out category template, and put at top where needed.
| * Remove unused JavaScript function call.Matthew Somerville2015-07-28-3/+3
| |
* | Allow cobrands to add sharing buttons to report pagesDave Arter2015-07-24-0/+1
| | | | | | | | | | Cobrands can optionally provide a `report/sharing.html` template to display extra content just above the updates on a report detail page.
* | [MakeMyIsland] Remove MakeMyIsland cobrandDave Arter2015-07-24-68/+2
| | | | | | | | | | | | | | | | | | The MakeMyIsland cobrand files now live in a separate repository: mysociety/fixmystreet-international The idea is that this repo will be checked out alongside the main fixmystreet one and cobrand-specific files symlinked into place. To this end, the commit also adds the MakeMyIsland symlinks to .gitignore.
* | [Oxfordshire] Override JavaScript no longer neededMatthew Somerville2015-07-23-40/+0
| | | | | | | | Fixes lack of "Permalink" string.
* | [Oxfordshire] Display message when reports list is emptyDave Arter2015-07-23-9/+11
| | | | | | | | | | | | If filters for reports list are too restrictive, shows a message to the user indicating that no reports match the query, on /my and /reports
* | [Oxfordshire] Refresh map as soon as filters are changed on empty /myDave Arter2015-07-23-0/+14
| | | | | | | | | | | | | | | | | | By default the map JS doesn't get included on /my if the map is empty, so there's some slight duplication of the JS from the previous commit to make the filters submit the form as soon as they're changed. This should be included in the base template if/when the filters make their way there.
* | [Oxfordshire] Add status/category filtering to map pagesDave Arter2015-07-23-21/+21
| |
* | [Oxfordshire] Move council info into own section of report pageZarino Zappia2015-07-23-17/+115
| | | | | | | | | | | | | | | | | | | | Oxfordshire reports have a council Reference Number, and an estimate of how long they'll take to be fixed. To make this information easier to parse, we've broken it out into its own section, between the problem description and updates. Conflicts: web/cobrands/oxfordshire/base.scss
* | [Oxfordshire] Full screen map designZarino Zappia2015-07-23-64/+115
| | | | | | | | | | | | | | | | | | - Replace .big-green-banner with .click-the-map Design follows similar change in Collideoscope. #skip-this-step link is hidden for normal users, shown when tabbed to, or when javascript is disabled. - Move RSS link to bottom of sidebar - Combine 'on the map' and 'nearby' tabs into a single list
* | [Oxfordshire] Add expected response time to report pageDave Arter2015-07-22-0/+8
| | | | | | | | | | This adds a new problem_response_days sub to the Oxfordshire cobrand that provides an expected response time based on a problem's category.
* | [fixmystreet.com] Add deleted NI councils.Matthew Somerville2015-07-22-26/+47
| | | | | | | | Factor out template to correct cobrand.
* | Merge commit 'refs/pull/github/1147'Matthew Somerville2015-07-17-4/+5
|\ \ | |/ |/|
| * Update council.htmlMyfanwyNixon2015-07-17-4/+5
| | | | | | Small copy change to emphasise the cost benefits of FMSfC.
* | Default the Google map view to Satellite.Matthew Somerville2015-07-10-1/+1
| | | | | | | | | | Using Map by default doesn't work for an unknown reason, but is okay if you switch to it. Fixes #1133.
* | Alter token logging in and timeout behaviour.Matthew Somerville2015-07-10-3/+3
|/ | | | | | | Restrict email_sign_in token to one day, unused confirmation tokens to one month. Used tokens will redirect to the created thing but not log in; don't log in with alert links (unsubscribe link never expires, reply link will still show "reopen" tickbox).
* [Greenwich] Add links to Greenwich FMS to pages on fixmystreet.comDave Arter2015-06-30-2/+3
|
* [Greenwich] Use templates from Oxfordshire cobrand to get map pin filter ↵Dave Arter2015-06-30-0/+108
| | | | controls
* [Greenwich] Royal Borough of Greenwich front endDave Arter2015-06-30-0/+245
|
* Display message when reports list is emptySteven Day2015-06-29-18/+20
| | | | | | If filters for reports list are too restrictive, shows a message to the user indicating that no reports match the query, on /my and /reports
* Combine all My Reports into a single list, allow filteringSteven Day2015-06-29-21/+28
|
* Simpler report meta information displayZarino Zappia2015-06-29-8/+9
| | | | | Removes the italics, and breaks the wording into two separate paragraphs, at the top of the report page.
* Add filter elements to top of /reports and /mySteven Day2015-06-29-0/+4
| | | | These are not yet wired up
* Fix typo in footer role="contentinfo".Matthew Somerville2015-05-13-10/+10
|
* [fixmystreet.com] Fix typo in footer navigation.Matthew Somerville2015-05-13-1/+1
|
* [fixmystreet.com] Tweak FAQ entry wording.Matthew Somerville2015-05-05-1/+2
|
* Update Bing Maps parameter ID.Matthew Somerville2015-05-05-1/+4
|
* Merge remote-tracking branch 'origin/issues/931-mobile-report-in-header'Matthew Somerville2015-04-24-0/+1
|\
| * "Report" button in default mobile header, fixes #931Zarino Zappia2015-04-07-0/+1
| | | | | | | | | | | | | | | | The new button will be inherited by any cobrand that extends fixmystreet/header_logo.html. Styling has been checked in all current cobrands. Also includes a minor fix to header logo margins on narrow screens.
* | [fixmystreet.com] Add alt attributes to images.Matthew Somerville2015-04-24-11/+11
| |
* | Merge branch 'issues/1028-poop-poster'Matthew Somerville2015-04-24-0/+4
|\ \