diff options
| -rwxr-xr-x | templates/web/fixmystreet/faq/faq-en-gb.html | 208 | ||||
| -rw-r--r-- | templates/web/fixmystreet/footer.html | 5 | ||||
| -rw-r--r-- | templates/web/fixmystreet/index.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details_form.html | 22 | ||||
| -rwxr-xr-x | templates/web/fixmystreet/reports/index.html | 14 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 5 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 73 |
7 files changed, 304 insertions, 25 deletions
diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html new file mode 100755 index 000000000..4e1f0c874 --- /dev/null +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -0,0 +1,208 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] + +<h1>Frequently Asked Questions</h1> + <dl> + <dt>What is FixMyStreet?</dt> + <dd>FixMyStreet is a site to help people report, view, +or discuss local problems they’ve found to their local council by +simply locating them on a map. It launched in early February +2007.</dd> + <dt>What sort of problems should I report with FixMyStreet?</dt> + <dd>FixMyStreet is primarily for reporting things which are +<strong>broken or dirty or damaged or dumped, and need fixing, cleaning +or clearing</strong>, such as: + + <ul><li>Abandoned vehicles + <li>Dog Fouling + <li>Flyposting or graffiti + <li>Flytipping or litter + <li>Streetcleaning, such as broken glass in a cycle lane + [% IF c.cobrand.moniker != 'southampton' %] + <li>Unlit lamposts + [% END %] + <li>Potholes + </ul> + </dd> + + <dt>What isn’t FixMyStreet for?</dt> + <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council for all + issues – please use FixMyStreet only for problems such as the above. We + often route problem reports via cleansing services or highways and so using + FixMyStreet for other matters may result in a delay in your report getting + to the right department. <strong>You will need to contact [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council + directly for problems such as</strong>: + + <ul><li>Anti-social behaviour + <li>Any urgent or emergency problems + <li>Noise pollution or barking dogs + <li>Fires and smoke/smell pollution + <li>Missing wheelie bins or recycling boxes or missed rubbish collections + <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. + <li>Complaining about your neighbours + <li>Complaining about the council + <li>Joy riding, drug taking, animal cruelty, or other criminal activity + </ul> + <p>Councils often have direct hotlines for these sorts of issues.</p> + </dd> + + <dt>How do I use the site?</dt> + <dd>After entering a postcode or location, you are presented +with a map of that area. You can view problems already reported in that area, +or report ones of your own simply by clicking on the map at the location of +the problem.</dd> + <dt>How are the problems solved?</dt> + <dd>They are reported to the [% IF c.cobrand.moniker != 'southampton' %]relevant[% END %] council by email. The +council can then resolve the problem the way they normally would. +Alternatively, you can discuss the problem on the website with others[% IF c.cobrand.moniker != 'southampton' %], and +then together lobby the council to fix it, or fix it directly yourselves[% END %].</dd> + <dt>Is it free?</dt> + <dd>The site is free to use, yes. FixMyStreet is run +by a registered charity, though, so if you want to make a contribution, <a +href="https://secure.mysociety.org/donate/">please do</a>.</dd> + + <dt>Can I use FixMyStreet on my mobile?</dt> + <dd><ul> + <li><em>iPhone:</em> There are two apps for FixMyStreet, one written by us + in 2008 and another much more recently by a volunteer, Martin Stephenson. + Both are available for download on the App Store: + <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, + <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport</a>. + <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app + available from the + <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. + <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the + <a href="http://store.ovi.com/content/107557">Ovi Store</a>. + </ul> + <p>We also hope to make the website itself much more mobile friendly in the future.</p> + </dd> + + <dt>Why do you only cover the countries of Great Britain?</dt> + <dd>We would love to cover Northern Ireland, but as we were funded for + FixMyStreet by the Department for Constitutional Affairs (now the Ministry + of Justice), we were covered for Ordnance Survey data (but not OSNI data) + by the Pan-Governmental Agreement. The cost for these maps would be + prohibitively expensive for the small charity that we are – if you know of + any way we could get access to the Ordnance Survey for Northern Ireland's + maps so that we can add them to the site, that'd be great.</dd> + </dl> + + <h2>Practical Questions</h2> + <dl> + <dt>I’m from a council, where do you send the reports?</dt> + <dd>You can either leave a test report or <a href="/contact">contact us</a> +to find out where reports go at the moment. Also <a href="/contact">contact us</a> +to update the address or addresses we use.</dd> + <dt>I’m from a council, can we have FixMyStreet on our website?</dt> + <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Full details</a>.</dd> + <dt>Do you remove silly or illegal content?</dt> + <dd>FixMyStreet is not responsible for the content and accuracy +of material submitted by its users. We reserve the right to edit or remove any +problems or updates which we consider to be inappropriate upon being informed +by a user of the site.</dd> + <dt>Why does the site use kilometres for measurements?</dt> + <dd>Thanks for asking politely – we never quite understand why some of the rudest + emails we receive are on this topic. The British national + grid reference system, devised by Ordnance Survey (the British national + mapping agency) around the time of the second world war, uses eastings and + northings measured in metres and kilometres; the maps we use are from + Ordnance Survey and so this is what we use to display distances. + There you have it: not everything British is in miles!</dd> + + <dt>Why can’t I zoom out more on the reporting map?</dt> + <dd>We want to keep FixMyStreet locally focused, so restrict the ability to + move radically between areas. The map on Your Reports will let you see all + the reports you’ve made, wherever they are. If you’re from the + council then the emailed version of the problem report also contains the + closest road and postcode to the pin on the map.</dd> + + <dt>This site is great – why aren’t you better publicised?</dt> + <dd>As a tiny charity we simply don’t have a publicity budget, and we + rely on word of mouth to advertise the site. We have a whole <a + href="posters/">array of posters, flyers and badges</a> if you’d like + to publicise us on the web or in your local area, and why not write to your + local paper to let them know about us?</dd> </dl> + + <h2><a name="privacy"></a>Privacy Questions</h2> + <dl> + <dt>Who gets to see my email address?</dt> + <dd>If you submit a problem, we pass on your details, and details +of the problem, to the council contact or contacts responsible for the +area where you located the problem. Other than the council, who obviously get your +email address, only people we authorise to view the FixMyStreet administration interface +will be able to see your email address and they will never use it for anything other than +to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, +unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd> + <dt>Will you send nasty, brutish spam to my email address?</dt> + <dd>Never. We will email you if someone leaves an update on a +problem you’ve reported, and send you a questionnaire email four weeks +after you submit a problem, asking for a status update; we’ll only ever +send you emails in relation to your problem.</dd> + </dl> + <h2>Organisation Questions</h2> + <dl> + <dt>Who built FixMyStreet?</dt> + <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. +mySociety’s primary mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. Our first project +was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your +elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety +can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, +or by post at:<br> +mySociety<br> +483 Green Lanes<br> +London<br> +N13 4BS<br> +UK</dd> + <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> + <dd>FixMyStreet was paid for via the Department for +Constitutional Affairs Innovations Fund.</dd> + <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> + <dd>Yes, we changed the name mid June 2007. We decided +Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> + <dt>Do you need any help with the project?</dt> + <dd>Yes, we can use help in all sorts of ways, technical or +non-technical. Please see our <a +href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> + <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> + <dd> +The software behind this site is open source, and available +to you mainly under the GNU Affero GPL software license. You can <a +href="http://github.com/mysociety/fixmystreet">download the +source code</a> and help us develop it. +You’re welcome to use it in your own projects, although you must also +make available the source code to any such projects. +<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code +being used in a Norwegian version of this site. +</dd> +<dt>I’d prefer code in a different language?</dt> +<dd> +VisibleGovernment.ca wrote their own code for +<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is +written in GeoDjango and available under an MIT licence at <a +href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. +Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in +Drupal. +</p> +</dd> + <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> + <dd>Matthew Somerville and Francis Irving wrote the site, +Chris Lightfoot wrote the tileserver and map cutter, Richard Pope created +our pins, Deborah Kerr keeps things up-to-date and does user support, +Ayesha Garrett designed our posters, and Tom Steinberg managed it all. + +Thanks also to +<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, +UK postcodes, and UK addresses – data © Crown copyright, all +rights reserved, Ministry of Justice 100037819 2008), +Yahoo! for their BSD-licensed JavaScript libraries, the entire free software +community (this particular project was brought to you by Perl, PostgreSQL, +and the number 161.290) and <a +href="http://www.m247.com/">M247</a> (who kindly host all +our servers). + +Let us know if we’ve missed anyone.</dd> + </dl> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 6f323ed47..fa9439e09 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,3 +1,8 @@ + [% IF pagefooter %] + <footer id="page-footer" role="content-info"> + <p>Some footer text</p> + </footer> + [% END %] </div><!-- .content role=main --> </div><!-- .container --> diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index ddd1554d4..8fb0bbcb6 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title => '' , mainclass => 'fullwidthpage', bodyclass => 'frontpage' %] +[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %] [% IF error %] <p class="error">[% error %]</p> diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index dc81ba564..2a70a5e32 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -112,11 +112,29 @@ [% END %] [% IF c.user_exists %] + <div class="form-box"> + <label class="hidden-js" for="form_may_show_nameme">[% loc('Your name') %]</label> + [% IF field_errors.name %] + <p class='form-error'>[% field_errors.name %]</p> + [% END %] + <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - [% INCLUDE name_phone %] + [%# if there is nothing in the name field then set check box as default on form %] + <div class="checkbox-group"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> + <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> + </div> - <input class="green-btn final-submit" type="submit" value="[% loc('Submit') %]"> + <label class="hidden-js" for="form_phone">[% loc('Your phone number (optional)') %]</label> + <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]"> + + <label class="hidden-js" for="password_register">[% loc('Enter a new password (optional)') %]</label> + <div class="form-txt-submit-box"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a new password (optional)') %]"> + <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> + </div> + </div> [% ELSE %] <label for="form_email">[% loc('Your email') %]</label> diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html index 2dfdc6df2..8e7078e1f 100755 --- a/templates/web/fixmystreet/reports/index.html +++ b/templates/web/fixmystreet/reports/index.html @@ -1,9 +1,10 @@ -[% INCLUDE 'header.html', title = loc('Summary reports'), mainclass => 'fullwidthpage' %] +[% INCLUDE 'header.html', title = loc('Summary reports'), bodyclass => 'fullwidthpage' %] -<p> -[% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %] -[% loc('Greyed-out lines are councils that no longer exist.') %] -</p> +<h1>[% loc('All Reports') %]</h1> + +<div class="intro"> + <p>[% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there. Greyed-out lines are councils that no longer exist.') %]</p> +</div> <table cellpadding="3" cellspacing="1" border="0"> <tr> @@ -31,5 +32,4 @@ [% END %] </table> -[% INCLUDE 'footer.html' %] - +[% INCLUDE 'footer.html' pagefooter => 'yes' %]
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 43cf82617..68534f5fd 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -580,6 +580,11 @@ p.label-valid { } } +//hide page footer on mobile +.mobile #page-footer { + display:none; +} + /*BUTTONS*/ // Default style set for buttons, inputs and .btn class. Red and green class available. diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 1347c4482..1130cc61d 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -94,7 +94,7 @@ body { } //fix logo position as a result of fiddling the with position attributes //on the parent elements -.ie6, .ie7 { +.ie6, .ie7, .ie8 { #site-logo { position: absolute; top:-3.25em; @@ -184,8 +184,28 @@ body { margin-bottom: -1em; @include box-shadow(0px 0px 6px 1px #000); } -.fullwidthpage { - width: 57em; +// full width page +body.fullwidthpage { + background:#1a1a1a; + .content { + width: 57em; + } + .nav-wrapper-2{ + background: #1a1a1a; + position:absolute; + } + #site-logo{ + position: absolute; + } + .intro { + width:40em; + } +} +body.twothirdswidthpage { + @extend .fullwidthpage; + .content { + width:40em; + } } #map_box{ @@ -270,6 +290,16 @@ body { } } + +// page footer - style it full width +#page-footer { + border-top:3px solid $primary; + margin:1em -1em 0 -1em; + padding:1em; +} + + + .big-green-banner { right:-1.25em; margin-left:-2em; @@ -376,7 +406,6 @@ textarea{ /* Frontpage */ body.frontpage { - background:#1a1a1a; .wrapper { >.container { width:100%; @@ -387,15 +416,12 @@ body.frontpage { } } .nav-wrapper-2{ - background: #1a1a1a; height:6em; - position:absolute; } #site-header{ height:9em; } #site-logo{ - position: absolute; top:3em; width: 300px; height: 60px; @@ -410,20 +436,28 @@ body.frontpage { } //logo fix .ie6, .ie7, .ie8 { - body.frontpage #site-logo { - position:relative; - width:60em; - margin:0 auto; + body.frontpage { + #site-logo { + position:relative; + width:60em; + margin:0 auto; + } + .wrapper .content{ + padding-top:12em; + margin-top:1em; + } + #user-meta p { + top:-1em; + } } } .ie6, .ie7 { body.frontpage #site-logo { - top:-2em; + top:-1em; } } //weird margining thing for ie8 -.ie8, -.ie8 body.frontpage { +.ie8 { .wrapper .content { margin-top:7em; } @@ -431,6 +465,14 @@ body.frontpage { top:5em; } } +.ie8 body.frontpage { + .wrapper .content { + margin-top:5em; + } + #user-meta p { + top:3em; + } +} #front-main { @@ -486,6 +528,7 @@ body.frontpage { } .ie6, .ie7 { #front-main { + top:2em; padding-top:1em; } } @@ -714,7 +757,7 @@ body.frontpage { } //make fullpage auto width - .fullwidthpage { + body.fullwidthpage .content { width: auto; } |