aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Open311. Remove extraneous 'jurisdiction' parameterHakim Cassimally2014-10-16-1/+0
| | | | | | | This parameter was added in 3eb93cea4acd5f9b76efdc0910466363a0b9b445 and is superfluous (as jurisdiction*_id* is the correct parameter, and is already sent.) That commit mentions only api_key so understand this wrong parameter is an artefact.
* Open311 Warwick (Exor) IntegrationHakim Cassimally2014-10-16-21/+906
| | | | | | | | | | | | | | | | | | | | | | | ::Integration::Warwick subclasses ::Integration::Exor refactor request_class and new_request Exor service Warwickshire updates retrieval, with datetimes stubbing out of Oracle constants, for local testing We also edit FMS's core PopulateServiceList routine to hide system fields from FMS: Bromley/Warwickshire send metadata in their services/FOO.xml advising that you can pass, e.g. attributes[easting]. FMS by default shows all of these to the user to fill in, however we don't *want* the user to supply these, rather they are added by the cobrand. Bromley had an exception for this (keyed by $body->areas->id). We write this more generally for Warwickshire too, keying instead by $body->name (as this is far less likely to be overridden for installs using global or custom Mapit's)
* Open311 Role for accepting default config fileHakim Cassimally2014-10-16-0/+54
| | | | | | | | See also MooX::ConfigFromFile, but that's underdocumented and seems overengineered -- may be worth implementing if requirements become more complex however. (See also Config::Any, which is well worth doing in future, using YAML only reflects current usage in FMS though.)
* Open311 Endpoint mySociety extensions roleHakim Cassimally2014-10-16-6/+478
| | | | | | | | | | | | | | * Get Service Request Updates This requires a new object ::Service::Request::Update, which of course is not part of standard spec. So, in order to make the core not too contaminated by : * the endpoint should instantiate ::Service::Request::mySociety objects which know about updates * have added a learn_additional_types callback from Schema to Endpoint, so that core doesn't need to know about /open311/service_request_update * (but ::Spark knows about the exception for updates... meh, but is 1-line)
* Open311 EndpointHakim Cassimally2014-10-16-9/+2273
| | | | | | | | | | | | | | | | | | | | | Subsystems include * ::Spark encoding conventions for xml/json * ::Schema using Rx to validate form of inputs and outputs, including validation for, e.g., dates and CSV as part of Open311 Handles following paths: * Open311 attributes for Service Definition http://wiki.open311.org/GeoReport_v2#GET_Service_Definition * POST service request * GET Service Requests * GET Service Request Objects: * ::Service * ::Service::Request
* [Warwickshire] cobrand workDave Arter2014-10-16-3/+12498
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'issues/commercial/603/generic-problems-clause-for-two-tier'Hakim Cassimally2014-10-16-21/+37
|\
| * UK. Generic problems_clause for two-tier councilsHakim Cassimally2014-10-10-21/+37
| | | | | | | | | | | | Replace copy-pasted problems_cause declarations in Hart, Oxfordshire, and East Sussex with a generic override in UKCouncils.pm (as a bonus also overrides Stevenage)
* | Paginate admin search results.Matthew Somerville2014-10-13-24/+27
| |
* | 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
|/
* ESCC. bodies_clause specialisationHakim Cassimally2014-10-10-0/+8
| | | | | patch for https://github.com/mysociety/FixMyStreet-Commercial/issues/603 more generic fix to follow
* EastSussex: set is_two_tierHakim Cassimally2014-10-09-1/+1
| | | | | | I appear to have left this commented out. Comments from both ESCC and a district council (Wealden) on same day seem to point to this as root of error.
* Update links to point to new /council page.Matthew Somerville2014-10-09-23/+25
|
* [FixMyStreet.com] Add information for councils.Matthew Somerville2014-10-09-3/+844
| | | | 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-21/+25
| | | | | | | | Group things together more simply. Fixes #738.
* | Validate category name/email/note in admin.Matthew Somerville2014-10-08-24/+51
| | | | | | | | This prevents the creation of a category with a blank name. Fixes #556.
* | replace Mailman cross-sell with Mailchimp signup formZarino Zappia2014-10-08-4/+7
| |
* | Couple of tests missing MapIt override.Matthew Somerville2014-10-08-2/+10
|/ | | | Looks like Travis doesn't like connections back to itself.
* 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-33/+29
|
* [Oxfordshire] Lower min-height offset to cover mapMatthew Somerville2014-09-25-0/+3
|
* Tweak reporting form i18n and style.Matthew Somerville2014-09-25-6/+4
| | | | | | 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-159/+101
| | | | | 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-26/+17
|
* 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.
* 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-6/+32
|
* 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-101/+192
|
* 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
|
* Merge branch 'east-sussex-candidate'Hakim Cassimally2014-09-18-25/+42
|\
| * [EastSussex] FAQ textHakim Cassimally2014-09-18-25/+25
| |
| * [EastSussex] pin coloursHakim Cassimally2014-09-18-0/+17
| | | | | | | | | | | | - yellow for open issues, green otherwise - pins > 3 months hidden from /around/ - reduced number of pins on /reports/ to 20 (as per Bromley/Hart)
* | Merge branch 'east-sussex-candidate'Hakim Cassimally2014-09-18-0/+136
|\|
| * [EastSussex] faq text for East SussexHakim Cassimally2014-09-18-0/+135
| | | | | | | | fixes https://github.com/mysociety/FixMyStreet-Commercial/issues/541
| * [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
* | Merge branch 'east-sussex-candidate'Hakim Cassimally2014-09-16-2/+956
|\|
| * Let cobrand override geocoderHakim Cassimally2014-09-16-1/+18
| | | | | | | | | | Fixing issues with Bing geocoding for East Sussex, for example "Church Street".
| * [EastSussex] tweaks after comments from ESCCHakim Cassimally2014-09-16-14/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-88/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-270/+178
| | | | | | | | | | | | | | | | | | - 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-3594/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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