aboutsummaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeLines
* Move some fixmystreet.com-only stuff into cobrand.Matthew Somerville2014-10-17-12/+12
|
* [Warwickshire] beta noticeHakim Cassimally2014-10-16-0/+3
| | | | | | | see https://github.com/mysociety/FixMyStreet-Commercial/issues/596 (in separate commit with inline style, to hopefully make easy to revert)
* [Warwickshire] cobrand workDave Arter2014-10-16-0/+422
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First Warwickshire styling - imported WCC's header and footer files - Use Warwickshire colours for page elements - Include FMS elements in header - Use correct Warwickshire colours on map - Use full-screen map on desktop. - Improve display of homepage elements - Ensure correct classes are added to body tag - Make sure site header has correct height on front page - Tidy-up of unused header content and wrappers - Improve display of map - Position map beneath other elements Improve map display - Take some CSS from Warwickshire styles to ensure its applied - Fix container widths on map page - Make sure map wrapper is the correct width - Add style overrides to match Warwickshire.gov.uk - Ensure map controls are visible Nav and mobile styling - Make sure sticky sidebar nav is usable - Improve mobile front page - Ensure map is full-screen on mobile - Improve front page display on mobile - Fix map display on desktop - Fix Warwickshire and FMS nav on mobile - Add viewport meta tag for mobile devices - Tighten up vertical spacing on front page - Fix header height on tablet size screens - Set pan/zoom position in CSS, not JS Styling tweaks - correct styling of nav for wider screens (previous hidden by media query) - Add draft Warwickshire FAQ - Fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/611 - Warwickshire. remove all reports link as requested. - see https://github.com/mysociety/FixMyStreet-Commercial/issues/609 - Update WCC footer - see https://github.com/mysociety/FixMyStreet-Commercial/issues/597 Bring WCC css locally, and override - Override for https://github.com/mysociety/FixMyStreet-Commercial/issues/612 - favicon https://github.com/mysociety/FixMyStreet-Commercial/issues/616 - update contact details - custom FAQ - fix padding on mobile https://github.com/mysociety/FixMyStreet-Commercial/issues/617
* Paginate admin search results.Matthew Somerville2014-10-13-2/+5
|
* Copy changes, add new FMS deploysMartin Wright2014-10-13-6/+8
| | | | | Conflicts: templates/web/fixmystreet.com/static/council.html
* [fixmystreet.com] correct pricing for back end scopingStruan Donald2014-10-13-1/+1
|
* Update links to point to new /council page.Matthew Somerville2014-10-09-23/+25
|
* [FixMyStreet.com] Add information for councils.Matthew Somerville2014-10-09-0/+263
| | | | Fixes #765.
* Merge remote-tracking branch 'origin/issues/739-move-diligency-table'Matthew Somerville2014-10-09-8/+3
|\
| * Move diligency table to bottom of page.Matthew Somerville2014-10-07-8/+3
| | | | | | | | | | Not that useful in most cases, only if you wanted some admin competition on category entering/checking. Fixes #739.
* | Merge remote-tracking branch 'origin/issues/516-body-warning'Matthew Somerville2014-10-09-8/+12
|\ \
| * | Tweak summary output on bodies page.Matthew Somerville2014-10-07-8/+12
| |/ | | | | | | | | Show more detail of unconfirmed/deleted categories; highlight and warn if no categories, or if all categories are deleted. Fixes #516.
* | Prevent overhang of admin body categories table.Matthew Somerville2014-10-08-14/+18
| | | | | | | | Group things together more simply. Fixes #738.
* | Validate category name/email/note in admin.Matthew Somerville2014-10-08-23/+40
|/ | | | This prevents the creation of a category with a blank name. Fixes #556.
* Move most 'change location' text to main column.Matthew Somerville2014-09-25-20/+18
|
* Tweak reporting form i18n and style.Matthew Somerville2014-09-25-2/+2
| | | | | | Factor out "(public)" to its own string, and only remove the label top margin if it's an immediate child (otherwise labels inside divs halfway down lose their margin).
* Remove .general-sidebar-notes, inline text insteadMatthew Somerville2014-09-25-87/+93
| | | | | This removes all "hanging on" sidebars apart from the main reporting a problem one, interspersing the text in the form instead.
* Various fixes to cobrands post zero content marginMatthew Somerville2014-09-24-12/+8
|
* Don't output footer navigation on map page.Matthew Somerville2014-09-24-14/+20
| | | | It's invisible anyway and pushes content bottom up a bit.
* Fix display of user menu on map page.Zarino Zappia2014-09-24-6/+4
|
* Remove reporting sidebar from .com cobrand.Zarino Zappia2014-09-24-101/+115
|
* [EastSussex] FAQ textHakim Cassimally2014-09-18-25/+25
|
* [EastSussex] faq text for East SussexHakim Cassimally2014-09-18-0/+135
| | | | fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/541
* [EastSussex] tweaks after comments from ESCCHakim Cassimally2014-09-16-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change front-page text - rename Category to Type By overriding report/new/category template snippet. This is hacked in (including substitution of the "-- Pick a category --" text, as not sure how to simply do this as a cobrand-specific translation. - hide footer on mobile view - pothole field input and display This is a temporary request, which we hope will be superseded by full integration in due course. A command is documented in the cobrand to set the "extra" on the contact info for the Potholes category. This is then displayed by the UI. The default process_extras places it in extra, for potential future processing. As this is a temporary fix, we are calling this field "detail_size", as this is automatically included in "Details" and therefore also sent in the email. (This means that we may need to update data later on to call this "pothole_size" or similar in future?) - contrast tweaks (Via request from Matt Tooke at ESCC.) Not all handled precisely as he suggests: * spacing of button nav -- more or less as suggested, but tweaks for the <span> selected button, and reduced padding on non-frontpage. * sign-in buttons: fixed using CSS for .green-btn instead of adding HTML class throughout. * mobile-footer: edited <footer> css, as suggested by Dave Arter. - revert problematic CSS (breaks map report page) - Remove spurious "FixMyStreet" button - frontpage subheading wording
* [East Sussex] map and nav cosmeticsDave Arter2014-09-16-22/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use East Sussex-specific position_map.js - Display map correctly on desktop - Increase default zoom level and use correct grammar for postcode box - Tidy up default font size and center elements on postcode form - Correctly position report form, allow links in sidebar to be seen - Make map guidance text visible on mobile - Fix display of site header across all pages - More sidebar/header fixes - Override some text on the report sidebar to be more friendly - Remove unused images - Use breadcrumb bar for main nav on desktop - Restore correct background colour to footer - Tighten up vertical spacing on all pages - Slacken vertical spacing on home page - Stop the sidebar clobbering the footer - Tidy up menu display - Ensure form errors are shown properly - Add greeting and 'sign out' link to appropriate place - Ensure correct width is used on IE8 - Make 'home' breadcrumb a span instead of a link - Hide top 4px border on mobile - Remove breadcrumb styling from FMS nav - Use ellipsis and correct capitalization on confirm page - Don't uppercase all button labels - Hide email icon in email fields - Don't italicise input placeholder text - Use correct font family, alignment and size for various elements - Correct box shadow, fix pin alignment, various UI fixes - Ensure font size isn't too small. Fix header on wide but small screens - Don't adjust .content height for East Sussex pages
* [East Sussex] Build templates from fragments published on eastsussex.gov.ukDave Arter2014-09-16-265/+172
| | | | | | | | | - Update styles to handle new templates - Ignore built templates - Ignore downloaded template fragments - Put East Sussex CSS before FMS overrides - Allow template build script to be run from outside its directory - Add file-watching capability to East Sussex template building script for local dev
* [East Sussex] Tidy up layoutDave Arter2014-09-16-2/+2
| | | | | | | | | | | | | | | | | | | | | - Tidy up layout of a few elements on front and map pages - ensure example places are within county - match council website body width - Remove 'size2' class from body This means we don't need lots of little CSS hacks to tweak things back into position - Restore 'contact us' underline - Ensure content extends down to footer - More UI layout tidying - Make sure error and confirmation pages don't have obscured content - Improve display of frontpage header on mobile - Better CSS selector for header display on mobile - Fix display of map on mobile - Tidy up display of footer buttons on mobile - Put mobile-specific styles back into base.scss - css separate margin-top for map/twothirds pages - Fix display of languages in footer on mobile - Removed unused CSS files - East Sussex doesn't have tracking_code.html, so remove reference to it
* [East Sussex] initial work on cobrand and templatesHakim Cassimally2014-09-16-0/+265
| | | | | | | - Get layout, including map working - Identified major clash point for CSS - Move eastsussex resources locally (in part to be able to override clashing names like .container)
* Simplify z-index of banners.Matthew Somerville2014-09-15-3/+3
| | | | | | Constrain the map in a position:relative to give it its own stacking context. This simplifies these z-indices and prevents the elements from floating above the main header. Fixes #673.
* [EmptyHomes] remove custom textHakim Cassimally2014-09-09-24/+0
| | | | | Link is broken, and a variant of the text has been added to the explanatory emails.
* [EmptyHomes] survey template tweaksHakim Cassimally2014-09-09-8/+23
|
* [EmptyHomes] decommissioning tweaksHakim Cassimally2014-09-08-0/+15
|
* Move bromley from report hiding to moderationHakim Cassimally2014-08-14-7/+1
| | | | | | | | | The feature to hide reports is still enabled, as it is used by other `users_can_hide` bodies. As we want to roll out moderation to Bromley, in this commit we hide the functionality *only* for Bromley. Of course if we migrate those other users to this moderation method, then we will need to make equivalent change to general template, and remove the functionality from Report.pm.
* Report moderationHakim Cassimally2014-08-13-6/+180
| | | | | | | | | | | - redaction marked with [...] - of report and comments - stores original data - uses a single form, on the report/_main view - requires additional permissions (user_body_permissions) - Hide report functionality - Moderation notification/contact form - Moderation writes to admin_log
* add site_title to the admin/config pageDave Whiteland2014-08-12-0/+1
|
* add explicit BASE_URL to URLs in nav and header, works in adminDave Whiteland2014-08-08-7/+7
|
* change UNDP logo to top right as per client's instructionsDave Whiteland2014-08-07-3/+2
|
* add UNDP logo to makemyisland cobrand, as per #863Dave Whiteland2014-08-07-0/+3
|
* add buttons for locations in Maldives (part of #863)Dave Whiteland2014-08-07-2/+32
| | | | | | | | | | | | | | | | The underlying problem here is the target area is currently too small for the geocoder to be useful: we're not really getting anything useful back from the OSM geocoder within Fonadhoo. So I've manually located the three villages on the island and added them as buttons... this is really for interface because although one button for the whole island is probably OK, basically it was just replicating the <h1> and wasn't obvious (or sensible) that the user needed to hit a button at all.. If the project expands to more areas of the Maldives we can either take those out or revert to the geocoder. The same too-small-area logic makes the "locate me automatically" a bit silly, so that's been dropped from the front page too.
* [MakeMyIsland] Initial simple cobrand.Matthew Somerville2014-07-31-0/+33
|
* [SeeSomething] fix and test for stats contentHakim Cassimally2014-07-31-1/+1
|
* Replace from_council with from_body in SeeSomething cobrandSteven Day2014-07-31-1/+1
| | | | | | | | | | | | | | | | | | | | | | 'from_council' was renamed to 'from_body' and turned into a relationship in b2aa34b Feb 2013, and the seesomething code was missed. Though the FMS::DB::Result::User object would (correctly) throw an error if an invalid method is called, *Catalyst* idea of a user object wraps this in a Catalyst::Authentication::Store::DBIx::Class which uses AUTOLOAD to delegate methods and swallows the error. e.g. this code always returns false, hence the code path is never run. (I think this is a bug and have opened: https://rt.cpan.org/Ticket/Display.html?id=97640 ) Added test case and (hopefully) corrected template, will need a check against site running copy with recent data to check that nothing looks squiffy. We also had to change the %council_details stash, which was based on the old code, not sure if suggested fix matches original intent, but looks plausible. (As discussed with @dracos @stevenday this is slightly repeated, and should arguably use ->{bodies} but that's a possible future FIXME)
* Fix links on 'council no longer exists' message.Matthew Somerville2014-07-30-10/+10
|
* Removal old Southampton/Reading/Lichfield cobrands.Matthew Somerville2014-07-29-610/+7
|
* Update Zurich email templatesDave Arter2014-07-15-17/+17
|
* UK. move report extras to fixmystreet.com templateHakim Cassimally2014-07-14-3/+1
| | | | | | | | UK specific template was missed in move in 8f2c5942e3a Also tidy up by removing Lichfield/Reading/Southampton and adding Hart. (Incidentally fixes commercial ticket mysociety/FixMyStreet-Commercial#525 )
* Merge branch 'issues/commercial/524-bromley-contact-footer-faq'Hakim Cassimally2014-07-14-12/+20
|\
| * Bromley. signature and FAQ tweaksHakim Cassimally2014-07-14-12/+20
| | | | | | | | | | | | | | | | | | | | | | As per mysociety/FixMyStreet-Commercial#524 to stem the flow of people responding to verification emails by clicking the support email at the bottom of Bromley's signature, we are instead redirecting to the FAQ -- which is also updated to contain the support email address, so the people can still find a contact if they need to. Also tweaking moderation FAQ line, in preparation for moderation trial.
* | Fix transparent background on disambiguation pageStruan Donald2014-07-14-0/+2
|/ | | | | | Wrap around page in a div.tablewrapper Fixes #831
* Make 'check your email' page two-thirds width.Matthew Somerville2014-07-11-1/+1
|