aboutsummaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeLines
* Merge remote-tracking branch 'mhalden/fiksgatami-js-fiks'Matthew Somerville2015-01-13-3/+3
|\
| * Fixed show/hide pins and show/hide old for norwegian cobrand.fiksgatami-js-fiksMarius Halden2014-12-30-3/+3
| |
* | Add some bottom padding to .content.Matthew Somerville2015-01-13-1/+2
| | | | | | | | | | And remove it in footer if present (so that a different background doesn't potentially show through).
* | Use HTTPS OpenStreetMap tiles.Matthew Somerville2015-01-09-4/+4
| |
* | Revert most of "Experiment, no pins by default."Matthew Somerville2015-01-09-26/+2
| | | | | | | | | | | | This reverts most of commit 71b400a1f5991b9a693095c417aa61e274a5215d, leaving the skip-this-step CSS changes and the tweaks to the /ajax JSON output.
* | [Harrogate] wordings and stylesHakim Cassimally2015-01-08-14/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - auth and intro pages - wording of around page - Styling work with Mike - FAQ and footer tweaks https://github.com/mysociety/FixMyStreet-Commercial/issues/654 https://github.com/mysociety/FixMyStreet-Commercial/issues/655 - Extra spacing https://github.com/mysociety/FixMyStreet-Commercial/issues/656 - Width of footer (override auto -> 100%) - style and logo tweaks - Logo/header same height on all pages (inc mappage) - Content spacing tweaks - Correct "Harrogate district" wording https://github.com/mysociety/FixMyStreet-Commercial/issues/658 - Add extra disclaimer about reports fwd'd to NYCC - push fms_pan_zoom down with css!important (alternative is to use JS as Hart does, or possibly to fix this so doesn't require !important) - add privacy section (Copies part of text on main page, this should perhaps be factored out.) - Set bodyclass for change_password Sets a bodyclass that's unused outwith harrogate cobrand, so should be safe.
* | [Harrogate] custom form fieldsHakim Cassimally2015-01-08-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires previous (generic) commit to prevent information only categories (e.g. Dead animals message) from displaying a spurious textbox. Also support for sending these custom fields by email: Requires a hook in RS::Problem method, as by default, only a restricted number of hard-coded fields are send in the email. (And the template language is pseudo-PHP so we can't simply pass in the whole data-structure.)
* | [Harrogate] basic cobrandHakim Cassimally2015-01-08-0/+108
|/
* [fixmystreet.com] New posters page layout/content.Zarino Zappia2014-12-11-1001/+145
|
* [EastSussex] Fix layout without JSHakim Cassimally2014-12-02-1/+9
| | | | The non-js view positioned the map badly (over the issue text).
* [EastSussex] UI improvements to encourage good updatesHakim Cassimally2014-12-02-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | ESCC advised us of concerns that users: * were unaware of how much of their report/update would be visible on the site - make "public" text more visible. - label is presented as fairly flat, with the cursor suppressed (to avoid it looking like a button) but with an explanatory tooltip. The intent is for it to be highly visible, but not too startling. - https://github.com/mysociety/FixMyStreet-Commercial/issues/642 * often comment on an existing report when instead creating a new report would be more appropriate. - Present two buttons, one to create a new report in the same location, another to open the comment box. - (this functionality degrades without Javascript, by simply showing the comment box by default.) - https://github.com/mysociety/FixMyStreet-Commercial/issues/641 Most templates have been split into partials, to avoid long-term forking, however update-form.html is still forked from fixmystreet, which would ideally be fixed in a future commit.
* [Zurich] Move admin table CSS to base stylesheet.v1.5Matthew Somerville2014-11-19-48/+47
| | | | To match shift of styles in bb07940.
* Merge remote-tracking branch 'origin/fiksgatami-update'Matthew Somerville2014-11-19-41/+58
|\
| * [FiksGataMi] Update cobrand to current design.Matthew Somerville2014-11-19-41/+58
| |
* | Add encouraging message about help to admin front.Matthew Somerville2014-11-19-152/+159
|/ | | | Fixes #929. Also move admin hint CSS to base CSS, not just layout.
* Show logged in message as success, not error.Matthew Somerville2014-11-18-0/+7
| | | | | | Fixes #357. Also consolidate almost-identical fill_in_details.html template (for #344).
* Move some data: URIs to FixMyStreet style.Matthew Somerville2014-11-14-5/+13
| | | | | | Easier if the default shared styles stick with the sprite for everything, then you can just change that sprite rather than having to override CSS as well.
* Move footer styling to shared stylesheet.Matthew Somerville2014-11-14-46/+65
| | | | This look works well on the default styling also.
* Don't height fix any full width page.Matthew Somerville2014-11-14-1/+1
|
* Merge remote-tracking branch 'origin/remove-opacity-map-controls-mobile'Matthew Somerville2014-11-14-4/+13
|\
| * Remove opacity from map controls on mobile.Matthew Somerville2014-11-14-4/+13
| | | | | | | | | | This crashes at least one mobile browser; not sure why, but we can do without it.
* | Fix JS-disabled submission in Chrome/Firefox.Hakim Cassimally2014-11-14-0/+4
|/ | | | | | | | | | | Fixes #932, which is caused by HTML5 validation firing for hidden elements, by setting #mapForm to novalidate by default, and reverting this in fixmystreet.js. Note that the 'novalidate' attribute, which is honoured by the browsers' HTML5 validation, isn't to be confused with the class (class="validate") which is picked up by fixmystreet.js, and therefore not problematic for the no-js case.
* more inviting click target for reporting hintZarino Zappia2014-11-12-0/+5
|
* reporting hint at top of /council pageZarino Zappia2014-11-12-0/+21
|
* EastSussex. z-index fixes for IE7Hakim Cassimally2014-11-04-2/+13
| | | | | | | | | | | | The #map_box div wasn't clickable, so we had to reset its z-index from the broken -1 to 0. IE7 doesn't like setting z-index to 0 in javascript (as it's a falsy value) so instead we set the z-index of parent and sibling elements (body and site-header) to 1 to make sure they are visible. position:relative in base.scss is to make sure that the header is now shown (similar to @6296cb33) See https://github.com/mysociety/FixMyStreet-Commercial/issues/639
* [fixmystreet.com] Experiment, no pins by default.Matthew Somerville2014-10-17-2/+60
| | | | | | | | This changes the default flow to show no pins and a message about reporting, with the second tab displaying existing problems (and showing map pins). Those existing problems are the ones that would currently be on "problems on the map" followed by those currently on "problems nearby".
* [fixmystreet.com] Remove login content experiment.Matthew Somerville2014-10-17-4/+0
| | | | This gave no conclusive results, which was interesting.
* Move some fixmystreet.com-only stuff into cobrand.Matthew Somerville2014-10-17-5/+5
|
* [Warwickshire] raise z-index of map, working around chrome bugHakim Cassimally2014-10-16-1/+2
| | | | | | | | | | | | | works around https://github.com/mysociety/FixMyStreet-Commercial/issues/614 (This is a chrome bug, but as it doesn't happen with standard FMS, we investigated further with @stevenday and @zarino. For reasons I don't understand, the issue is fixed by: - removing negative z-index from map - this then makes the site-header not display, so we set position:relative -- not having done this before might be the reason for the previous negative index? )
* [Warwickshire] cobrand workDave Arter2014-10-16-0/+12037
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Copy changes, add new FMS deploysMartin Wright2014-10-13-0/+0
| | | | | Conflicts: templates/web/fixmystreet.com/static/council.html
* [FixMyStreet.com] Add information for councils.Matthew Somerville2014-10-09-1/+579
| | | | Fixes #765.
* Remove margin from fieldsets, tidy box sizes.Matthew Somerville2014-09-25-49/+5
|
* Move most 'change location' text to main column.Matthew Somerville2014-09-25-13/+11
|
* [Oxfordshire] Lower min-height offset to cover mapMatthew Somerville2014-09-25-0/+3
|
* Tweak reporting form i18n and style.Matthew Somerville2014-09-25-4/+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-72/+8
| | | | | This removes all "hanging on" sidebars apart from the main reporting a problem one, interspersing the text in the form instead.
* Fix map page content minimum height.Matthew Somerville2014-09-25-6/+3
| | | | | | Reduce the default by 3em to match the .content margin change. Include East Sussex in this calculation again, but set a .mappage padding-bottom so that there's no gap at the bottom of the page.
* Various fixes to cobrands post zero content marginMatthew Somerville2014-09-24-14/+9
|
* Avoid gap below header on medium width screensZarino Zappia2014-09-24-21/+6
|
* Fix display of user menu on map page.Zarino Zappia2014-09-24-0/+28
|
* On map page, indent logo and expand navigation to width.Matthew Somerville2014-09-24-0/+9
|
* Remove reporting sidebar from .com cobrand.Zarino Zappia2014-09-24-0/+77
|
* Make map page sidebar flush with edges of window.Matthew Somerville2014-09-24-2/+8
|
* Remove unasked for 'medium' header bottom border.Matthew Somerville2014-09-24-3/+4
| | | | | | Without a bottom border specified, using border-image causes an inherited 'medium' (c. 3px) border to appear. Also repeat header border image, rather than default stretch.
* Minor whitespace fixes.Zarino Zappia2014-09-24-7/+12
|
* [EastSussex] fix border button colourHakim Cassimally2014-09-18-0/+1
| | | | | change border from green to lightened version of background colour fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/543
* [EastSussex] tweaks after comments from ESCCHakim Cassimally2014-09-16-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-66/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-5/+6
| | | | | | | | | - 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