[% error %]

[% loc('Report, view, or discuss local problems') %]

- -

[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]

- - [% - question - = c.cobrand.enter_postcode_text() - || loc("Enter a nearby GB postcode, or street name and area"); - %] - - +

[% loc('Report, view, or discuss local problems') %]

+ +

[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]

+ + [% + question + = c.cobrand.enter_postcode_text() + || loc("Enter a nearby GB postcode, or street name and area"); + %] + + +

Date: Thu, 16 Feb 2012 12:02:34 +0000 Subject: Desktop frontage pretty much finished tablet and small in-between sized screens to follow Signed-off-by: Josh Angell --- templates/web/fixmystreet/index.html | 144 ++++++++++++++--------------- web/cobrands/fixmystreet/images/sprite.png | Bin 122438 -> 135470 bytes web/cobrands/fixmystreet/layout.scss | 101 +++++++++++++++++++- 3 files changed, 172 insertions(+), 73 deletions(-) diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index 41067b26b..a63324d60 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -27,89 +27,89 @@

[% loc('How to report a problem') %]

+ +

[% question %]
[% loc('Locate the problem on a map of the area') %]
[% loc('Enter details of the problem') %]
[% loc('We send it to the council on your behalf') %]

+ +

+ [% INCLUDE "front/stats.html" %] + [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] +

[% loc('How to report a problem') %]

- -

[% question %]
[% loc('Locate the problem on a map of the area') %]
[% loc('Enter details of the problem') %]
[% loc('We send it to the council on your behalf') %]

- -

- [% INCLUDE "front/stats.html" %] - [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] -

- - - -[% - recent_photos = c.cobrand.recent_photos(3); - probs = c.cobrand.recent(); -%] -[% IF probs.size || recent_photos.size %] -

[% loc('Recently reported problems') %]

- [% IF recent_photos.size %] -

- [% FOREACH p IN recent_photos %] - + [% + recent_photos = c.cobrand.recent_photos(3); + probs = c.cobrand.recent(); + %] + + [% IF probs.size || recent_photos.size %] +

[% loc('Recently reported problems') %]

+ + + + [% IF probs.size %] +

+ +
+
[% p.title | html %]
+ [% prettify_epoch( p.confirmed_local.epoch, 1 ) %] +
+ +

[% END %] -

- [% END %] - - [% IF probs.size %] -

- -
-
[% p.title | html %]
- [% prettify_epoch( p.confirmed_local.epoch, 1 ) %] -
- -

[% END %]

-[% END %] - -

Mobile apps

- -

-
[% loc('Are you a developer?') %]
-
[% loc('Would you like to contribute to FixMyStreet? Our code is open source and available on GitHub.') %]
-
-
[% loc('Are you from a council?') %]
-
[% loc('Would you like better integration with FixMyStreet? Find out about FixMyStreet for councils.') %]
-

+
[% loc('Are you a developer?') %]
+
[% loc('Would you like to contribute to FixMyStreet? Our code is open source and available on GitHub.') %]
+
+
[% loc('Are you from a council?') %]
+
[% loc('Would you like better integration with FixMyStreet? Find out about FixMyStreet for councils.') %]
+

- diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index 3c2ce9ee8..04044d1e9 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index e013130f5..f53141135 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -274,7 +274,7 @@ body.frontpage { position:static; } .content { - padding-top:15em; + padding-top:12em; } } .nav-wrapper-2{ @@ -342,6 +342,105 @@ body.frontpage { } } +.front-tablewrapper { + display:table; + width:100%; + padding:1em 0; + >div { + display:table-cell; + width:50%; + } + #front-howto, + #front-mobileapps { + border-right:1em solid #fff; + } + #front-recently, + #front-ads { + border-left:1em solid #fff; + } + .full-width { + width:auto; + margin:0; + } +} +.bordered { + margin:0 -1em; + padding:0 1em; + width:auto; + border-top:0.25em solid $primary; +} + +#front-howto { + #front_stats { + background:none; + border-top:0.25em solid $primary; + padding-top:1em; + div { + big { + color:$primary; + font-size:3.2308em; + } + } + } +} + +#front-mobileapps { + background:none; + padding:0; + @include box-shadow(inset rgba(0, 0, 0, 0) 0 0 0); + h2 { + color:#222; + margin-top:0; + } + ul { + li { + border-bottom:none; + float:left; + margin:0 1em 1em 0; + a { + color:#222; + padding:0; + width: 96px; + height: 32px; + margin:0 auto; + text-indent: -999999px; + background: url(images/sprite.png) -12px -3610px no-repeat; + @include opacity(0.8); + &:hover { + @include opacity(1); + } + &.m-app-iphone { + background-position: -12px -3610px; + } + &.m-app-iphone-streetreport { + background-position: -12px -3678px; + height:50px; + } + &.m-app-droid { + background-position: -12px -3756px; + } + &.m-app-nokia { + background-position: -12px -3820px; + width:74px; + } + } + } + } +} + +#front-ads { + ul { + display:table; + li { + display:table-cell; + border-bottom:none; + &:last-child { + border-left:1.25em solid #fff; + } + } + } +} + -- cgit v1.2.3 From 1107f1e2b90acd017c44c499f975797e85e43b9e Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 16 Feb 2012 14:05:25 +0000 Subject: animate the skip to nave ;) Signed-off-by: Josh Angell --- web/js/fixmystreet.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 19f1f0402..7967e3d7d 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -282,4 +282,13 @@ $(function(){ e.preventDefault(); tabs($(this)); }); + + /* + * Skip to nav on mobile + */ + $('.mobile').on('click', '#nav-link', function(e){ + e.preventDefault(); + var foo = $('.wrapper').height() - $('main-nav').height(); + $('html, body').animate({scrollTop:foo}, 1000); + }); }); \ No newline at end of file -- cgit v1.2.3 From 03c3c5c4bbc9b1e906db09882b1a9d685ad59455 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 16 Feb 2012 14:06:00 +0000 Subject: Fix user meta, now at bottom on mobile, top on desk etc Signed-off-by: Josh Angell --- templates/web/fixmystreet/header.html | 21 ++++++++-------- templates/web/fixmystreet/index.html | 3 +++ web/cobrands/fixmystreet/base.scss | 22 ++++++++++------ web/cobrands/fixmystreet/layout.scss | 47 +++++++++++++++++------------------ 4 files changed, 51 insertions(+), 42 deletions(-) diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index e5a7ee7c2..8ee70bd36 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -38,17 +38,18 @@

+ [% IF c.user_exists %] + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] | + [% loc('sign out') %] + [% ELSE %] + [% loc('Sign in') %] + [% END %] +

[% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] -
[% loc('Sign out') %]
[% loc('Sign in') %]

diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index a63324d60..1099b6182 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -73,6 +73,9 @@

[% p.title | html %]

[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]

[% END %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 32b52e30e..02cfb4638 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -443,6 +443,20 @@ label{ } } +// this is the user's logged in details or the login link etc +.wrapper { + display:table; + caption-side:bottom; +} +#user-meta { + display:table-caption; + p { + background:$primary; + padding:1em; + } +} + + // #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic .shadow-wrap { @@ -670,14 +684,6 @@ a:hover.button-left { } -// this is the user's logged in details or the login link etc -#user-meta { - ul { - @include list-reset-soft; - } -} - - // only on mobile, this is a sidebar on desk (#report-a-poblem-sidebar) a.rap-notes-trigger, a:hover.rap-notes-trigger { diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index f53141135..068f6a378 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -153,20 +153,18 @@ body { } #user-meta{ - position: absolute; - top: -2em; - background:#fff; - height:3em; - z-index: -1; - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - ul { - display:block; + display:block; + position: relative; + max-width: 57em; + margin:0 auto; + p { + @include inline-block; + position:absolute; + top:1em; height:2em; - padding:0 0.5em; - li { - float:left; - padding:0.25em 0.25em; - } + background:#fff; + padding:0.25em 0.5em; + @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); } } @@ -271,10 +269,11 @@ body.frontpage { background:#1a1a1a; .wrapper { >.container { - position:static; + width:100%; } .content { - padding-top:12em; + padding-top:13em; + margin:0 auto; } } .nav-wrapper-2{ @@ -282,6 +281,7 @@ body.frontpage { height:6em; } #header{ + height:10em; #site-logo{ margin-top:2em; width: 300px; @@ -290,7 +290,10 @@ body.frontpage { } } #user-meta { - display:none; + top:-3em; + p { + right:0; + } } } @@ -299,7 +302,7 @@ body.frontpage { position:absolute; width:100%; left:0; - top:8em; + top:1em; #front-main-container { width: 57em; margin:0 auto; @@ -310,16 +313,13 @@ body.frontpage { color:#222; } #postcodeForm { - float:right; overflow:hidden; - width:47em; margin-right:0.5em; label { - float:left; - margin-top:0.25em; + margin:0.5em 0; } div { - float:right; + margin:0 auto; width:20em; input#pc { padding:0.25em 0.5em; @@ -333,8 +333,7 @@ body.frontpage { a#geolocate_link { background:none; color:#222; - float:right; - margin:-1em 7.5em 0.5em 0; + margin:-1em 0 0.5em 0; &:hover { text-decoration:underline; background:none; -- cgit v1.2.3 From 7762384c342a3927c7d7497c9ce7c22dafdfc696 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 16 Feb 2012 17:19:16 +0000 Subject: Bunch of layout-related bug fixes Signed-off-by: Josh Angell --- templates/web/fixmystreet/header.html | 1 + .../report/new/fill_in_details_form.html | 7 ++- web/cobrands/fixmystreet/base.scss | 5 +- web/cobrands/fixmystreet/layout.scss | 63 +++++++++++++++++----- web/js/fixmystreet.js | 4 +- 5 files changed, 64 insertions(+), 16 deletions(-) diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 8ee70bd36..e1066c7b5 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -5,6 +5,7 @@ + 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 a48e26893..5178ccb9e 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -1,8 +1,13 @@

[% loc('Reporting a problem') %]

+ +

[% loc('This report will be sent to Name of the Council.') %]

- +

[% IF report.used_map %] [% IF partial_token %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 02cfb4638..838d8cf38 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -445,6 +445,7 @@ label{ // this is the user's logged in details or the login link etc .wrapper { + width:100%; display:table; caption-side:bottom; } @@ -688,7 +689,9 @@ a:hover.button-left { a.rap-notes-trigger, a:hover.rap-notes-trigger { display:block; - margin:0 1.25em 0 0.5em; + width:90%; + padding-left:5%; + padding-right:5%; } .rap-notes { margin:1em 0; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 068f6a378..89761c712 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -38,7 +38,7 @@ body { display: table-caption; .nav-wrapper-2{ width: 100%; - height: 3.5em; + min-height: 3.5em; position: fixed; border-top: 0.25em solid $primary; z-index:2; @@ -290,8 +290,8 @@ body.frontpage { } } #user-meta { - top:-3em; p { + top:-2em; right:0; } } @@ -304,7 +304,7 @@ body.frontpage { left:0; top:1em; #front-main-container { - width: 57em; + max-width: 57em; margin:0 auto; } h2 { @@ -319,14 +319,21 @@ body.frontpage { margin:0.5em 0; } div { + display:block; margin:0 auto; width:20em; + overflow:hidden; input#pc { + display:block; + float:left; padding:0.25em 0.5em; width:16em; } input#submit { + display:block; + float:right; width:3em; + height:2em; } } } @@ -446,7 +453,7 @@ body.frontpage { /* MEDIA QUERIES */ -@media only screen and (min-width: 640px) and (max-width: 960px) { +@media only screen and (min-width: 48em) and (max-width: 64em) { .container { width: 100%; } @@ -466,19 +473,51 @@ body.frontpage { width: auto; float:right; padding-left: 180px; - background: #222; - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); + } + .nav-wrapper { + // width:auto; + .nav-wrapper-2 { + // width:auto; + } } //Main menu drops below logo and my-soc menu #main-menu{ margin-top: 3em; } + //therefore header needs to open up + #header { + height:6em; + } + + //fix the left margin on login bit + #user-meta { + p { + left:1em; + } + } + body.frontpage { + #user-meta { + p { + left:auto; + } + } + } //Map become percentage width #map_box{ - width: 40%; - margin-right: 5%; + width: 38%; + } + + //put the RAP notes into the main copy area + #report-a-poblem-sidebar { + position: static; + width: auto; + @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); + .sidebar-tips, + .sidebar-notes { + font-size:1em; + } } //Revert to mobile use of the .full-width class @@ -487,9 +526,9 @@ body.frontpage { margin: 0em -1em 0 -1em; } - //Remove all styling from the .content box - .content{ - width: 50%; - @include box-shadow(0px 0px 0px 0px #000); + //make fullpage auto width + .fullwidthpage { + width: auto; } + } \ No newline at end of file diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 7967e3d7d..d88d66db4 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -70,7 +70,7 @@ function tabs(elem) $(function(){ - if(Modernizr.mq('only screen and (max-width:48em)')) { + if(Modernizr.mq('only screen and (max-width:47em)')) { $('html').addClass('mobile'); } @@ -288,7 +288,7 @@ $(function(){ */ $('.mobile').on('click', '#nav-link', function(e){ e.preventDefault(); - var foo = $('.wrapper').height() - $('main-nav').height(); + var foo = $('.wrapper').height() - 500; $('html, body').animate({scrollTop:foo}, 1000); }); }); \ No newline at end of file -- cgit v1.2.3 From 3551545018c4c424cf84c3388df2c265d98615bc Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 20 Feb 2012 10:02:34 +0000 Subject: Add file input to css as it was breaking layoutx Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 17 ++++++++++------- web/cobrands/fixmystreet/layout.scss | 1 + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 838d8cf38..8613dad09 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -274,14 +274,12 @@ fieldset{ } } :-moz-placeholder { - color: #888888; font: { style:italic; size:0.9375em; } } :-ms-placeholder { - color: #888888; font: { style:italic; size:0.9375em; @@ -291,6 +289,7 @@ fieldset{ input[type=text], input[type=password], input[type=email], +input[type=file], textarea{ width: 100%; padding: 0.5em; @@ -309,7 +308,8 @@ textarea{ input[type=text], input[type=password], -input[type=email] { +input[type=email], +input[type=file] { border: 0.125em solid #888888; @include border-radius(0.25em); display: block; @@ -333,17 +333,17 @@ label{ margin: 0 -2em 0.25em -2em; background:#eeeeee; padding:1em 2em 1em 2em; - max-width:25em; + max-width:26em; .form-txt-submit-box { min-height:3em; input[type=password], input[type=text] { - width: 69%; + width: 65%; float:left; } input[type=submit] { float:right; - width:24%; + width:28%; margin-right:0.25em; padding-top:0.9em; padding-bottom:0.8em; @@ -377,6 +377,8 @@ label{ // Padding creates page margins on mobile .container{ padding: 0 1em; + // width:100%; + // box-sizing: border-box; } // Use full width to reverse .container margins @@ -443,12 +445,13 @@ label{ } } -// this is the user's logged in details or the login link etc +//defines where the table caption is (login stuff on mob, nav menu on desktop) .wrapper { width:100%; display:table; caption-side:bottom; } +// this is the user's logged in details or the login link etc #user-meta { display:table-caption; p { diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 89761c712..c02bd554e 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -26,6 +26,7 @@ body { padding: 0em; width: 60em; position: relative; + box-sizing: content-box; } .wrapper{ -- cgit v1.2.3 From 0286bfb552d0be4db25c1eec455a29c15ab6307a Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 20 Feb 2012 12:59:37 +0000 Subject: Bunch of IE fixes Signed-off-by: Josh Angell --- templates/web/fixmystreet/header.html | 2 +- web/cobrands/fixmystreet/base.scss | 128 ++++++++++++++++++++++-------- web/cobrands/fixmystreet/layout.scss | 143 ++++++++++++++++++++++++++++------ web/js/fixmystreet.js | 11 ++- 4 files changed, 225 insertions(+), 59 deletions(-) diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index e1066c7b5..97d7f525d 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -32,7 +32,7 @@

FixMyStreet Main Navigation diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 8613dad09..6136ad698 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -70,7 +70,7 @@ /* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the * table caption *at all* if the header is set to a font-face :( */ -noindex:-o-prefocus, #header { +noindex:-o-prefocus, #site-header { font-family: sans-serif; } @@ -201,9 +201,13 @@ pre { font-family: monospace; } -// huh? We're confused and it breaks our other stuff :S img { + // huh? We're confused and it breaks our other stuff :S // max-width: 100%; + + //do this otherwise IE will just not display + //any img without a height defined + height:auto; } select, input, textarea { @@ -377,48 +381,47 @@ label{ // Padding creates page margins on mobile .container{ padding: 0 1em; - // width:100%; - // box-sizing: border-box; } // Use full width to reverse .container margins -.full-width{ +.full-width { margin: 0 -1em; } -// #header creates grey bar in mobile, .nav-wrapper-2 is used on desktop -#header{ +// #site-header creates grey bar in mobile, .nav-wrapper-2 is used on desktop +#site-header{ border-top: 0.25em solid $primary; height: 4em; @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); .container { min-height:4em; } - #site-logo{ - width: 175px; - height: 40px; - margin-top: 0.75em; - background: url('images/sprite.png') -3px -3px no-repeat; - display: block; - text-indent: -999999px; - position: absolute; - z-index:2; - } - #nav-link { - width: 50px; - height: 48px; - background: url('images/sprite.png') -5px -916px no-repeat; - display: block; - text-indent: -999999px; - position: absolute; - right:2em; - top:-2px; - &:hover { - top:2px; - } +} +#site-logo{ + display: block; + width: 175px; + height: 40px; + top: 0; + background: url('images/sprite.png') -3px -3px no-repeat; + text-indent: -999999px; + position: absolute; + z-index:2; +} +#nav-link { + width: 50px; + height: 48px; + background: url('images/sprite.png') -5px -916px no-repeat; + display: block; + text-indent: -999999px; + position: absolute; + right:2em; + top:-2px; + &:hover { + top:2px; } } + #main-nav{ ul{ @include list-reset-soft; @@ -462,7 +465,6 @@ label{ // #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic - .shadow-wrap { @extend .full-width; ul#key-tools{ @@ -510,6 +512,21 @@ label{ } } +//because display:table doesn't work we float +.ie6, .ie7 { + .shadow-wrap { + ul#key-tools{ + background:#f5f5f5; + li{ + float:left; + a { + padding-left:1.5em; + padding-right:3em; + } + } + } + } +} /*BUTTONS*/ @@ -621,11 +638,24 @@ a:hover.button-left { text-align:right; img { margin:-0.5em -1em 0 0.5em; + height:auto; } } } } } +//display:table fixes +.ie7, .ie7 { + .issue-list li .update-wrap { + .update-text { + float:left; + width:19em; + } + .update-img { + float:right; + } + } +} .issue-list-a { margin: 0 0 1em 0; @@ -656,6 +686,7 @@ a:hover.button-left { text-align:right; img { margin:0 -1em 0 0.5em; + height:auto; } } .text { @@ -675,6 +706,30 @@ a:hover.button-left { } } } +//display:table fixes +.ie6, .ie7 { + .issue-list-a { + overflow:hidden; + li a { + clear:both; + width:auto; + display:block; + overflow:hidden; + .text { + float:left; + width:18em; + } + .img { + float:right; + } + } + } +} +.ie8 { + .issue-list-a li a { + width:25em; + } +} #map_box{ background: #333; @@ -737,6 +792,18 @@ a:hover.rap-notes-trigger { } } +//display:table fixes +.ie6, .ie7 { + #problems-nav { + clear:both; + margin:0; + padding:0; + ul li { + float:left; + } + } +} + .big-green-banner { position: relative; background: $contrast1; @@ -830,7 +897,6 @@ a:hover.rap-notes-trigger { } } - #front-howto { #front_stats { display:table; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index c02bd554e..453cede6f 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -14,8 +14,6 @@ body { // temp map background background:url(images/temp-map.jpg) center fixed; - z-index: -2; - position: relative; // temp map background } @@ -26,15 +24,32 @@ body { padding: 0em; width: 60em; position: relative; - box-sizing: content-box; } -.wrapper{ +//z-index stack order gets reset to 0 in ie6/7 if you position anything, +//so to fix things we give it a high value (don't ask me why) +//see: http://brenelz.com/blog/squish-the-internet-explorer-z-index-bug/ +//this affects #site-logo +.ie7, .ie7 { + .container { + z-index:100; + } +} + +.wrapper{ display: table; caption-side: top; width: 100%; } +//pad the top of the wrapper to allow space for the menu to fit in +//when its positioned absolute below +.ie6, .ie7 { + .wrapper{ + padding-top:4em; + } +} + .nav-wrapper{ display: table-caption; .nav-wrapper-2{ @@ -49,22 +64,42 @@ body { } -// Resets a lot of the mobile styling. #header only used to help position logo on desktop -#header{ +//position absolute the menu as ie doesn't like display:table +.ie6, .ie7 { + .nav-wrapper { + position: absolute; + top:0; + left:0; + .nav-wrapper-2 { + // position static as well so we fix lots of the z-index issues + // and revert to normal scrolling + position:static; + } + } +} + +// Resets a lot of the mobile styling. #site-header only used to help position logo on desktop +#site-header { height: auto; background: none; border-top: 0px; - #site-logo{ - margin-top: 0.75em; - position: fixed; - z-index: 3; - } - #nav-link { - left:-999999px; +} +#site-logo { + top: 0.75em; + position: fixed; + z-index: 3; +} +#nav-link { + left:-999999px; +} +//fix logo position as a result of fiddling the with position attributes +//on the parent elements +.ie6, .ie7 { + #site-logo { + position: absolute; + top:-3.25em; } } - - #main-nav{ margin: 0 auto; padding: 0em; @@ -240,7 +275,9 @@ input[type=email], textarea{ width: 25em; } - +.form-box { + max-width:25em; +} /* Report a problem page*/ @@ -281,14 +318,14 @@ body.frontpage { background: #1a1a1a; height:6em; } - #header{ + #site-header{ height:10em; - #site-logo{ - margin-top:2em; - width: 300px; - height: 60px; - background-position:-2px -108px; - } + } + #site-logo{ + top:2em; + width: 300px; + height: 60px; + background-position:-2px -108px; } #user-meta { p { @@ -297,6 +334,19 @@ body.frontpage { } } } +.ie6, .ie7 { + body.frontpage { + .wrapper{ + // padding-top:8em; + } + #site-logo{ + position:relative; + top:-2em; + width:60em; + margin:0 auto; + } + } +} #front-main { background:$primary; @@ -370,6 +420,26 @@ body.frontpage { margin:0; } } + +.ie6, .ie7 { + .front-tablewrapper { + display:block; + >div { + width:48%; + display:block; + float: left; + border:none !important; + } + #front-howto, + #front-mobileapps { + margin-right:2%; + } + #front-recently, + #front-ads { + margin-left:2%; + } + } +} .bordered { margin:0 -1em; padding:0 1em; @@ -391,6 +461,14 @@ body.frontpage { } } +.ie6, .ie7 { + #front_stats { + div { + float:left; + } + } +} + #front-mobileapps { background:none; padding:0; @@ -400,6 +478,7 @@ body.frontpage { margin-top:0; } ul { + @include list-reset; li { border-bottom:none; float:left; @@ -434,6 +513,11 @@ body.frontpage { } } } +.ie6, .ie7 { + #front-mobileapps { + margin:0 0.5em; + } +} #front-ads { ul { @@ -447,6 +531,17 @@ body.frontpage { } } } +.ie6, .ie7 { + #front-ads { + ul { + width:100%; + li { + float:left; + width:45% + } + } + } +} @@ -487,7 +582,7 @@ body.frontpage { margin-top: 3em; } //therefore header needs to open up - #header { + #site-header { height:6em; } diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index d88d66db4..10390f40e 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -56,15 +56,20 @@ function heightFix(elem1, elem2, offset){ */ function tabs(elem) { - var target = elem.attr('href'); + var href = elem.attr('href'); + //stupid IE sometimes adds the full uri into the href attr, so trim + var start = href.indexOf('#'), + target = href.slice(start, href.length); + if(!$(target).hasClass('open')) { //toggle class on nav $('.tab-nav .active').removeClass('active'); elem.addClass('active'); + //hide / show the right tab - $('.tab.open').removeClass('open').hide(); - $(target).addClass('open').show(); + $('.tab.open').hide().removeClass('open'); + $(target).show().addClass('open'); } } -- cgit v1.2.3 From 0e9335da477b3af6b20779a81d8b3cb508bcc000 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 20 Feb 2012 16:21:02 +0000 Subject: add ie9 comment to head Signed-off-by: Josh Angell --- templates/web/fixmystreet/header.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 97d7f525d..ae9cb55a7 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -2,7 +2,8 @@ - + + -- cgit v1.2.3 From 9fc694de42b53c371f1e215ed0afde19e19e344b Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 20 Feb 2012 16:21:27 +0000 Subject: mysoc logo Signed-off-by: Josh Angell --- templates/web/fixmystreet/footer.html | 2 +- web/cobrands/fixmystreet/base.scss | 12 ++++++++++-- web/cobrands/fixmystreet/layout.scss | 9 +++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index e9e6ba07c..6f323ed47 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -5,7 +5,7 @@

+ +

+ +[% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] +

This council no longer exists. +[% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] +Its area is now covered by Cornwall Council. +[% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] +Its area is now covered by Durham County Council. +[% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] +Its area is now covered by Northumberland County Council. +[% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] +Its area is now covered by Shropshire Council. +[% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] +Its area is now covered by Wiltshire Council. +[% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] +Its area is now covered by Cheshire West and Chester Council. +[% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] +Its area is now covered by Cheshire East Council. +[% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] +Its area is now covered by Central Bedfordshire Council. +[% ELSIF council.name.match('Cheshire') %] +Its area is now covered by Cheshire West and Chester Council or +Cheshire East Council. +[% ELSIF council.name.match('Bedfordshire') %] +Its area is now covered by Bedford Borough Council or +Central Bedfordshire Council. +[% END %] +

+[% ELSE %] +

+[% END %] + +[% IF c.cobrand.all_councils_report %] + [% tprintf( loc('This is a summary of all reports for one %s.'), thing ) %] +[% ELSE %] + [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] +[% END %] + +[% IF ward %] +[% tprintf( loc('You can view all reports for the council or show all councils.'), council_url ) %] +[% ELSE %] +[% loc('You can show all councils.') %] +[% END %] + +

[% name %]

+ +[% INCLUDE 'reports/cobrand_stats.html' %] + +[% IF c.cobrand.moniker == 'fixmystreet' %] + +[% END %] + + [% INCLUDE 'pagination.html', param = 'p' %] + + [% INCLUDE column + title = loc('Recently fixed') + problems = fixed.${council.id}.new + %] + + [% INCLUDE column + title = loc('New problems') + problems = open.${council.id}.new + %] + + [%# This doesn't really need a whole separate template %] + [% IF c.cobrand.moniker == 'emptyhomes' %] + [% + INCLUDE column + title = loc('Older problems') + problems = open.${council.id}.older.merge( open.${council.id}.unknown ) + %] + [% ELSE %] + [% INCLUDE column + title = loc('Older problems') + problems = open.${council.id}.older + %] + [% INCLUDE column + title = loc('Old problems, state unknown') + problems = open.${council.id}.unknown + %] + [% END %] + + [% INCLUDE column + title = loc('Old fixed') + problems = fixed.${council.id}.old + %] + + +[% IF children.size %] +

[% loc('Wards of this council') %]

[% loc('Follow a ward link to view only reports within that ward.') %]

[% child.name %]

+[% END %] + +

+[% INCLUDE 'footer.html' %] + +[% BLOCK column %] +[% IF problems %] + +

[% title %]

+ +

[% problem.title | html %] + [% IF problem.councils > 1 %] [% loc('(sent to both)') %] [% END %] + [% IF c.cobrand.moniker != 'emptyhomes' %] + [% IF problem.councils == 0 %] [% loc('(not sent to council)') %] [% END %] + [% END %] +

+ +[% END %] +[% END %] + diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html new file mode 100755 index 000000000..2dfdc6df2 --- /dev/null +++ b/templates/web/fixmystreet/reports/index.html @@ -0,0 +1,35 @@ +[% INCLUDE 'header.html', title = loc('Summary reports'), mainclass => 'fullwidthpage' %] + +

+[% 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.') %] +

+ + + + + + + + + + + +[% FOREACH area IN areas_info_sorted %] + + + + + + + + +[% END %] +

[% loc('Name') %]	[% loc('New problems') %]	[% loc('Older problems') %]	[% loc('Old problems, state unknown') %]	[% loc('Recently fixed') %]	[% loc('Older fixed') %]
[% area.name %]	[% open.${area.id}.new or 0 %]	[% open.${area.id}.older or 0 %]	[% open.${area.id}.unknown or 0 %]	[% fixed.${area.id}.new or 0 %]	[% fixed.${area.id}.old or 0 %]

+ +[% INCLUDE 'footer.html' %] + diff --git a/templates/web/fixmystreet/reports/ward.html b/templates/web/fixmystreet/reports/ward.html new file mode 100755 index 000000000..8b65ffb28 --- /dev/null +++ b/templates/web/fixmystreet/reports/ward.html @@ -0,0 +1 @@ +[% INCLUDE reports/council.html %] -- cgit v1.2.3 From c59fb683b0ad96cb7d7fd004e8781b49b9df96f5 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 20 Feb 2012 16:23:34 +0000 Subject: Few tweaks to new report form Signed-off-by: Josh Angell --- templates/web/fixmystreet/report/new/fill_in_details_form.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 5178ccb9e..d0d284f04 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -109,7 +109,7 @@ [% END %] [% END %] - [% loc('Photo') %] + [% loc('Photo') %] [% END %] @@ -128,7 +128,7 @@ [% END %] [% loc('Your email') %] - +

+ [% IF c.user_exists %]

- [% IF c.user_exists %] - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] | - [% loc('sign out') %] - [% ELSE %] - [% loc('Sign in') %] - [% END %] + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + [% loc('sign out') %]

+ [% ELSE %] + + [% END %]

diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html index 80721b5d6..b6a1e824c 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -47,7 +47,7 @@ END %] pager = updates_pager, param = 'u' %] -

“[% u.text | html %]” @@ -64,7 +64,7 @@ END %] [% INCLUDE 'footer.html' %] [% BLOCK problem %] - [% "

[% loc('No Let me confirm my update by email') %]

-- cgit v1.2.3 From d9c2e50005abea9d5b6d74cb8f2d0c6f59d883a6 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 21 Feb 2012 13:41:50 +0000 Subject: Sort notes and checkbox groups on /report/new Signed-off-by: Josh Angell --- .../fixmystreet/report/new/fill_in_details_form.html | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) 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 800f72223..313755ce7 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -145,8 +145,10 @@

- - [% loc('Keep me signed in on this computer') %] +

+ + [% loc('Keep me signed in on this computer') %] +

@@ -156,8 +158,6 @@ -

[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]

@@ -185,10 +185,16 @@ + + [%# if there is nothing in the name field then set check box as default on form %] - - [% loc('Show my name publicly') %] -

[% loc('We never show your email address or phone number') %]

+ + [% loc('Show my name publicly') %] +

-- cgit v1.2.3 From b715d591301d219ffd35a2e8b4680c235fe5e78a Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 21 Feb 2012 13:42:01 +0000 Subject: Remove old js for email alert box Signed-off-by: Josh Angell --- web/js/fixmystreet.js | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 10390f40e..005693fd3 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -181,32 +181,6 @@ $(function(){ $('#form_name').addClass('required').removeClass('valid'); } ); - $('#email_alert').click(function(e) { - if (!$('#email_alert_box').length) { - return true; - } - e.preventDefault(); - if ($('#email_alert_box').is(':visible')) { - email_alert_close(); - } else { - var pos = $(this).position(); - $('#email_alert_box').css( { 'left': ( pos.left - 20 ) + 'px', 'top': ( pos.top + 20 ) + 'px' } ); - $('#email_alert_box').show('fast'); - $('#alert_rznvy').focus(); - } - }).hover(function() { - window.clearTimeout(timer); - }, function() { - timer = window.setTimeout(email_alert_close, 2000); - }); - - $('#email_alert_box').hover(function() { - window.clearTimeout(timer); - }, function() { - timer = window.setTimeout(email_alert_close, 2000); - }); - - $('#form_category').change( form_category_onchange ); // Geolocation -- cgit v1.2.3 From 441f079ad3ebb22233540d7eb1c7b591c7c5fc98 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 21 Feb 2012 13:45:01 +0000 Subject: Move name_phone out of block so we can prep for hiding some and showing on focus Signed-off-by: Josh Angell --- .../report/new/fill_in_details_form.html | 45 ++++++++++------------ 1 file changed, 20 insertions(+), 25 deletions(-) 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 313755ce7..851f63332 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -154,7 +154,26 @@

[% loc('No Let me confirm my report by email') %]

- [% INCLUDE name_phone %] + [% IF field_errors.name %] +

[% field_errors.name %]

+ [% END %] + + + + + + + [%# if there is nothing in the name field then set check box as default on form %] +

+ + [% loc('Show my name publicly') %] +

+ + + @@ -175,28 +194,4 @@ [% END %] - - - [% BLOCK name_phone %] - [% IF field_errors.name %] -

[% field_errors.name %]

- [% END %] - - - - - - - [%# if there is nothing in the name field then set check box as default on form %] -

- - [% loc('Show my name publicly') %] -

- - - - [% END %]

\ No newline at end of file -- cgit v1.2.3 From 4fee075f5c077bcf65b9611f9f1719cab9f3615a Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 21 Feb 2012 14:00:28 +0000 Subject: Add js for on show on focus in forms, plus some other styling bits for form buttons Signed-off-by: Josh Angell --- templates/web/fixmystreet/report/new/fill_in_details_form.html | 10 +++++----- web/cobrands/fixmystreet/_mixins.scss | 10 +++++++--- web/cobrands/fixmystreet/base.scss | 1 - web/js/fixmystreet.js | 6 ++++++ 4 files changed, 18 insertions(+), 9 deletions(-) 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 851f63332..10662183f 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -159,13 +159,14 @@ [% END %] - + -

+ + [%# if there is nothing in the name field then set check box as default on form %]

@@ -173,16 +174,15 @@

- + -

[% END %] diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss index 29e7a7109..45bbd379d 100644 --- a/web/cobrands/fixmystreet/_mixins.scss +++ b/web/cobrands/fixmystreet/_mixins.scss @@ -1,9 +1,13 @@ // Button reset @mixin button-reset { cursor:pointer; - font-size: 1em; - font-family: 'Helvetica', 'Arial', sans-serif; - line-height: 1; + font:{ + size: 0.875em; + family: 'Helvetica', 'Arial', sans-serif; + weight:bold; + } + text-transform:uppercase; + line-height: 1.375em; padding:0.7em 0.5em 0.5em 0.5em; margin:0; width: auto; diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 9a950000e..838ca8c9b 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -611,7 +611,6 @@ input.red-btn{ input.final-submit { margin:1em 0.5em; float:right; - text-transform:uppercase; } .button-right, diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 005693fd3..75ccc3a9c 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -270,4 +270,10 @@ $(function(){ var foo = $('.wrapper').height() - 500; $('html, body').animate({scrollTop:foo}, 1000); }); + + + $('.form-focus-hidden').hide(); + $('.form-focus-trigger').on('focus', function(){ + $('.form-focus-hidden').fadeIn(500); + }); }); \ No newline at end of file -- cgit v1.2.3 From 94881249acb62461d6cb53a2247aee0727db814e Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 21 Feb 2012 14:32:40 +0000 Subject: hoevr states Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 3 +++ web/cobrands/fixmystreet/layout.scss | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 838ca8c9b..ac9552991 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -955,6 +955,9 @@ a:hover.rap-notes-trigger { color:#fff; text-transform:uppercase; @include border-radius(0); + &:hover { + background:#333; + } } } } diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index dbb0a9cb2..42330266c 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -469,7 +469,8 @@ body.frontpage { display:block; float:right; width:3em; - height:2em; + height:2.3em; + padding-top:0.2em; } } } -- cgit v1.2.3 From eb98881fbfb3cefdf7c6c6ac16983462671c9f36 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 21 Feb 2012 14:33:03 +0000 Subject: Desktop js heightfix and some comments Signed-off-by: Josh Angell --- web/js/fixmystreet.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 75ccc3a9c..6abec282c 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -75,9 +75,16 @@ function tabs(elem) $(function(){ + //add mobile class if small screen if(Modernizr.mq('only screen and (max-width:47em)')) { $('html').addClass('mobile'); } + //heightfix the desktop .content div + if(Modernizr.mq('only screen and (min-width:48em)')) { + if (!($('body').hasClass('frontpage'))){ + heightFix(window, '.content', -176); + } + } $('html').removeClass('no-js').addClass('js'); @@ -272,6 +279,9 @@ $(function(){ }); + /* + * Show stuff on input focus + */ $('.form-focus-hidden').hide(); $('.form-focus-trigger').on('focus', function(){ $('.form-focus-hidden').fadeIn(500); -- cgit v1.2.3 From 24e55fad95460bd0a90ee5d50d67bb31a8fe7c08 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 21 Feb 2012 16:45:57 +0000 Subject: Add new map pins, alter the js to match Signed-off-by: Josh Angell --- web/i/pin-big-shadow.png | Bin 0 -> 1202 bytes web/i/pin-big.png | Bin 0 -> 2364 bytes web/i/pin-shadow.png | Bin 1029 -> 720 bytes web/i/pinB.png | Bin 790 -> 0 bytes web/i/pinG.png | Bin 993 -> 1806 bytes web/i/pinP.png | Bin 1004 -> 0 bytes web/i/pinR.png | Bin 772 -> 1841 bytes web/i/pinY.png | Bin 0 -> 1475 bytes web/js/map-OpenLayers.js | 18 +++++++++--------- 9 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 web/i/pin-big-shadow.png create mode 100644 web/i/pin-big.png delete mode 100644 web/i/pinB.png delete mode 100644 web/i/pinP.png create mode 100644 web/i/pinY.png diff --git a/web/i/pin-big-shadow.png b/web/i/pin-big-shadow.png new file mode 100644 index 000000000..113184b94 Binary files /dev/null and b/web/i/pin-big-shadow.png differ diff --git a/web/i/pin-big.png b/web/i/pin-big.png new file mode 100644 index 000000000..59ed29dbd Binary files /dev/null and b/web/i/pin-big.png differ diff --git a/web/i/pin-shadow.png b/web/i/pin-shadow.png index 1b6d2380f..8b470592a 100644 Binary files a/web/i/pin-shadow.png and b/web/i/pin-shadow.png differ diff --git a/web/i/pinB.png b/web/i/pinB.png deleted file mode 100644 index 0d549dc8c..000000000 Binary files a/web/i/pinB.png and /dev/null differ diff --git a/web/i/pinG.png b/web/i/pinG.png index 388658fd9..8b64d5160 100644 Binary files a/web/i/pinG.png and b/web/i/pinG.png differ diff --git a/web/i/pinP.png b/web/i/pinP.png deleted file mode 100644 index 4e835234c..000000000 Binary files a/web/i/pinP.png and /dev/null differ diff --git a/web/i/pinR.png b/web/i/pinR.png index c16299fd2..9b754e42e 100644 Binary files a/web/i/pinR.png and b/web/i/pinR.png differ diff --git a/web/i/pinY.png b/web/i/pinY.png new file mode 100644 index 000000000..f9359b0b3 Binary files /dev/null and b/web/i/pinY.png differ diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index b121c6bfc..8fe2c56b4 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -20,7 +20,7 @@ function fixmystreet_activate_drag() { } function fms_markers_list(pins, transform) { - var cols = { 'red':'R', 'green':'G', 'blue':'B', 'purple':'P' }; + var cols = { 'red':'R', 'green':'G', 'yellow':'Y' }; var markers = []; for (var i=0; i Date: Tue, 21 Feb 2012 17:04:59 +0000 Subject: =?UTF-8?q?Tentative=20change=20to=20the=20map=20pins:=20change=20?= =?UTF-8?q?blue=20to=20big,=20can't=20work=20out=20how=20to=20get=20them?= =?UTF-8?q?=20a=20different=20size=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Josh Angell --- perllib/FixMyStreet/App/Controller/Report.pm | 2 +- web/js/map-OpenLayers.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 166f9d58e..f94e6c8ec 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -127,7 +127,7 @@ sub generate_map_tags : Private { ? [ { latitude => $problem->latitude, longitude => $problem->longitude, - colour => 'blue', + colour => 'big', } ] : [], ); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 8fe2c56b4..c72f2d5cf 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -20,7 +20,7 @@ function fixmystreet_activate_drag() { } function fms_markers_list(pins, transform) { - var cols = { 'red':'R', 'green':'G', 'yellow':'Y' }; + var cols = { 'red':'R', 'green':'G', 'yellow':'Y', 'big':'-big' }; var markers = []; for (var i=0; i Date: Tue, 21 Feb 2012 17:08:39 +0000 Subject: replace favicon Signed-off-by: Josh Angell --- web/favicon.ico | Bin 3638 -> 15086 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/favicon.ico b/web/favicon.ico index 4c3d992ab..ee7512592 100644 Binary files a/web/favicon.ico and b/web/favicon.ico differ -- cgit v1.2.3 From 36d74e41fb2045af5c929869843540424b58ec2c Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 22 Feb 2012 09:17:12 +0000 Subject: Caught a html entity Signed-off-by: Josh Angell --- templates/web/default/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 06f3ef771..0a0ee7170 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -63,7 +63,7 @@

[% FOREACH p IN recent_photos %] + src="/photo?tn=1&id=[% p.id %]" alt="[% p.title | html %]" title="[% p.title | html %]"> [% END %]

[% END %] -- cgit v1.2.3 From 3233dd7316acd6eb5be8b5102ac9c0077565a382 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 22 Feb 2012 09:34:02 +0000 Subject: Add new a colour Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index ac9552991..1b30aefb5 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -220,11 +220,11 @@ select, input, textarea { a, a:visited { text-decoration:none; - color:$contrast1; + color:#0BA7D1; &:hover, &:active { text-decoration:underline; - color:$contrast2; + color:#0D7CCE; } } -- cgit v1.2.3 From 1ef100973c6f371768f36a16793ff5ab9eb9e362 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 22 Feb 2012 14:07:05 +0000 Subject: Separate colour and size using StyleMap and Rules, to enable differently sized map pins (fixes #228). --- data/openlayers.fixmystreet.cfg | 1 + perllib/FixMyStreet/App/Controller/Report.pm | 3 +- templates/web/default/maps/pins_js.html | 2 +- web/i/pin-big-shadow.png | Bin 1202 -> 0 bytes web/i/pin-big.png | Bin 2364 -> 0 bytes web/i/pin-green.png | Bin 0 -> 1806 bytes web/i/pin-red.png | Bin 0 -> 1841 bytes web/i/pin-shadow-big.png | Bin 0 -> 1202 bytes web/i/pin-yellow-big.png | Bin 0 -> 2364 bytes web/i/pin-yellow.png | Bin 0 -> 1475 bytes web/i/pinG.png | Bin 1806 -> 0 bytes web/i/pinR.png | Bin 1841 -> 0 bytes web/i/pinY.png | Bin 1475 -> 0 bytes web/js/OpenLayers.fixmystreet.js | 27 ++++++++----- web/js/map-OpenLayers.js | 57 +++++++++++++++++---------- 15 files changed, 59 insertions(+), 31 deletions(-) delete mode 100644 web/i/pin-big-shadow.png delete mode 100644 web/i/pin-big.png create mode 100644 web/i/pin-green.png create mode 100644 web/i/pin-red.png create mode 100644 web/i/pin-shadow-big.png create mode 100644 web/i/pin-yellow-big.png create mode 100644 web/i/pin-yellow.png delete mode 100644 web/i/pinG.png delete mode 100644 web/i/pinR.png delete mode 100644 web/i/pinY.png diff --git a/data/openlayers.fixmystreet.cfg b/data/openlayers.fixmystreet.cfg index faeb3ed50..a3549a4ac 100644 --- a/data/openlayers.fixmystreet.cfg +++ b/data/openlayers.fixmystreet.cfg @@ -23,6 +23,7 @@ OpenLayers/Format/JSON.js OpenLayers/Format/KML.js OpenLayers/Handler/Click.js OpenLayers/Feature/Vector.js +OpenLayers/Rule.js OpenLayers/Style.js OpenLayers/StyleMap.js OpenLayers/Geometry/Point.js diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index f94e6c8ec..59e3a4410 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -127,7 +127,8 @@ sub generate_map_tags : Private { ? [ { latitude => $problem->latitude, longitude => $problem->longitude, - colour => 'big', + colour => 'yellow', + type => 'big', } ] : [], ); diff --git a/templates/web/default/maps/pins_js.html b/templates/web/default/maps/pins_js.html index 355fffaba..d9c6b3531 100644 --- a/templates/web/default/maps/pins_js.html +++ b/templates/web/default/maps/pins_js.html @@ -1,4 +1,4 @@ [ [% FOR pin IN map.pins -%] - [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', "[% pin.title | escape_js %]" ] + [ [% pin.latitude %], [% pin.longitude %], '[% pin.colour %]', '[% pin.id %]', "[% pin.title | escape_js %]", '[% pin.type %]' ] [%- IF !loop.last %],[% END %] [% END %] ] diff --git a/web/i/pin-big-shadow.png b/web/i/pin-big-shadow.png deleted file mode 100644 index 113184b94..000000000 Binary files a/web/i/pin-big-shadow.png and /dev/null differ diff --git a/web/i/pin-big.png b/web/i/pin-big.png deleted file mode 100644 index 59ed29dbd..000000000 Binary files a/web/i/pin-big.png and /dev/null differ diff --git a/web/i/pin-green.png b/web/i/pin-green.png new file mode 100644 index 000000000..8b64d5160 Binary files /dev/null and b/web/i/pin-green.png differ diff --git a/web/i/pin-red.png b/web/i/pin-red.png new file mode 100644 index 000000000..9b754e42e Binary files /dev/null and b/web/i/pin-red.png differ diff --git a/web/i/pin-shadow-big.png b/web/i/pin-shadow-big.png new file mode 100644 index 000000000..113184b94 Binary files /dev/null and b/web/i/pin-shadow-big.png differ diff --git a/web/i/pin-yellow-big.png b/web/i/pin-yellow-big.png new file mode 100644 index 000000000..59ed29dbd Binary files /dev/null and b/web/i/pin-yellow-big.png differ diff --git a/web/i/pin-yellow.png b/web/i/pin-yellow.png new file mode 100644 index 000000000..f9359b0b3 Binary files /dev/null and b/web/i/pin-yellow.png differ diff --git a/web/i/pinG.png b/web/i/pinG.png deleted file mode 100644 index 8b64d5160..000000000 Binary files a/web/i/pinG.png and /dev/null differ diff --git a/web/i/pinR.png b/web/i/pinR.png deleted file mode 100644 index 9b754e42e..000000000 Binary files a/web/i/pinR.png and /dev/null differ diff --git a/web/i/pinY.png b/web/i/pinY.png deleted file mode 100644 index f9359b0b3..000000000 Binary files a/web/i/pinY.png and /dev/null differ diff --git a/web/js/OpenLayers.fixmystreet.js b/web/js/OpenLayers.fixmystreet.js index eab691def..2b716edc4 100644 --- a/web/js/OpenLayers.fixmystreet.js +++ b/web/js/OpenLayers.fixmystreet.js @@ -748,7 +748,16 @@ return sibling||null;},lookupNamespaceURI:function(node,prefix){var uri=null;if( var len=node.attributes.length;if(len){var attr;for(var i=0;i=OpenLayers.Style.createLiteral(this.minScaleDenominator,context);} +if(applies&&this.maxScaleDenominator){applies=scale=0;--i){this._removeButton(this.buttons[i]);}},doubleClick:function(evt){OpenLayers.Event.stop(evt);return false;},buttonDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;} +switch(this.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;} +OpenLayers.Event.stop(evt);},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:true,lowerBoundary:null,upperBoundary:null,initialize:function(options){OpenLayers.Filter.prototype.initialize.apply(this,[options]);if(this.type===OpenLayers.Filter.Comparison.LIKE&&options.matchCase===undefined){this.matchCase=null;}},evaluate:function(context){if(context instanceof OpenLayers.Feature.Vector){context=context.attributes;} var result=false;var got=context[this.property];var exp;switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()==exp.toUpperCase());}else{result=(got==exp);} break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()!=exp.toUpperCase());}else{result=(got!=exp);} break;case OpenLayers.Filter.Comparison.LESS_THAN:result=gotthis.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:result=got<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:result=got>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:result=(got>=this.lowerBoundary)&&(got<=this.upperBoundary);break;case OpenLayers.Filter.Comparison.LIKE:var regexp=new RegExp(this.value,"gi");result=regexp.test(got);break;} @@ -998,12 +1010,7 @@ break;case"Comparison":var op=cmpToStr[filter.type];if(op!==undefined){var value params[filter.property+"__"+op]=value;params.queryable=params.queryable||[];params.queryable.push(filter.property);}else{OpenLayers.Console.warn("Unknown comparison filter type "+filter.type);} break;case"Logical":if(filter.type===OpenLayers.Filter.Logical.AND){for(var i=0,len=filter.filters.length;i=0;--i){this._removeButton(this.buttons[i]);}},doubleClick:function(evt){OpenLayers.Event.stop(evt);return false;},buttonDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;} -switch(this.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;} -OpenLayers.Event.stop(evt);},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:true,autoDestroy:true,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;this.active=false;},destroy:function(){this.deactivate();this.layer=null;this.options=null;},setLayer:function(layer){this.layer=layer;},activate:function(){if(!this.active){this.active=true;return true;} -return false;},deactivate:function(){if(this.active){this.active=false;return true;} -return false;},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Request={DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:true,user:undefined,password:undefined,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this,null,["complete","success","failure"]),issue:function(config){var defaultConfig=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});config=OpenLayers.Util.applyDefaults(config,defaultConfig);var request=new OpenLayers.Request.XMLHttpRequest();var url=OpenLayers.Util.urlAppend(config.url,OpenLayers.Util.getParameterString(config.params||{}));var sameOrigin=!(url.indexOf("http")==0);var urlParts=!sameOrigin&&url.match(this.URL_SPLIT_REGEX);if(urlParts){var location=window.location;sameOrigin=urlParts[1]==location.protocol&&urlParts[3]==location.hostname;var uPort=urlParts[4],lPort=location.port;if(uPort!=80&&uPort!=""||lPort!="80"&&lPort!=""){sameOrigin=sameOrigin&&uPort==lPort;}} +return params;},CLASS_NAME:"OpenLayers.Format.QueryStringFilter"});})();OpenLayers.Request={DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:true,user:undefined,password:undefined,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this,null,["complete","success","failure"]),issue:function(config){var defaultConfig=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});config=OpenLayers.Util.applyDefaults(config,defaultConfig);var request=new OpenLayers.Request.XMLHttpRequest();var url=OpenLayers.Util.urlAppend(config.url,OpenLayers.Util.getParameterString(config.params||{}));var sameOrigin=!(url.indexOf("http")==0);var urlParts=!sameOrigin&&url.match(this.URL_SPLIT_REGEX);if(urlParts){var location=window.location;sameOrigin=urlParts[1]==location.protocol&&urlParts[3]==location.hostname;var uPort=urlParts[4],lPort=location.port;if(uPort!=80&&uPort!=""||lPort!="80"&&lPort!=""){sameOrigin=sameOrigin&&uPort==lPort;}} if(!sameOrigin){if(config.proxy){if(typeof config.proxy=="function"){url=config.proxy(url);}else{url=config.proxy+encodeURIComponent(url);}}else{OpenLayers.Console.warn(OpenLayers.i18n("proxyNeeded"),{url:url});}} request.open(config.method,url,config.async,config.user,config.password);for(var header in config.headers){request.setRequestHeader(header,config.headers[header]);} var events=this.events;var self=this;request.onreadystatechange=function(){if(request.readyState==OpenLayers.Request.XMLHttpRequest.DONE){var proceed=events.triggerEvent("complete",{request:request,config:config,requestUrl:url});if(proceed!==false){self.runCallbacks({request:request,config:config,requestUrl:url});}}};if(config.async===false){request.send(config.data);}else{window.setTimeout(function(){if(request.readyState!==0){request.send(config.data);}},0);} @@ -1095,7 +1102,9 @@ var prevMultiple=this.multiple;this.multiple=true;var layers=this.layers||[this. if(this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1){if(bounds.toGeometry().intersects(feature.geometry)){if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}}}} this.multiple=prevMultiple;}},setMap:function(map){this.handlers.feature.setMap(map);if(this.box){this.handlers.box.setMap(map);} OpenLayers.Control.prototype.setMap.apply(this,arguments);},setLayer:function(layers){var isActive=this.active;this.unselectAll();this.deactivate();if(this.layers){this.layer.destroy();this.layers=null;} -this.initLayer(layers);this.handlers.feature.layer=this.layer;if(isActive){this.activate();}},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:false,activate:function(){if(OpenLayers.Strategy.prototype.activate.apply(this,arguments)){this.layer.events.on({"refresh":this.load,scope:this});if(this.layer.visibility==true||this.preload){this.load();}else{this.layer.events.on({"visibilitychanged":this.load,scope:this});} +this.initLayer(layers);this.handlers.feature.layer=this.layer;if(isActive){this.activate();}},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:true,autoDestroy:true,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;this.active=false;},destroy:function(){this.deactivate();this.layer=null;this.options=null;},setLayer:function(layer){this.layer=layer;},activate:function(){if(!this.active){this.active=true;return true;} +return false;},deactivate:function(){if(this.active){this.active=false;return true;} +return false;},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:false,activate:function(){if(OpenLayers.Strategy.prototype.activate.apply(this,arguments)){this.layer.events.on({"refresh":this.load,scope:this});if(this.layer.visibility==true||this.preload){this.load();}else{this.layer.events.on({"visibilitychanged":this.load,scope:this});} return true;} return false;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.layer.events.un({"refresh":this.load,"visibilitychanged":this.load,scope:this});} return deactivated;},load:function(options){var layer=this.layer;layer.events.triggerEvent("loadstart");layer.protocol.read(OpenLayers.Util.applyDefaults({callback:OpenLayers.Function.bind(this.merge,this,layer.map.getProjectionObject()),filter:layer.filter},options));layer.events.un({"visibilitychanged":this.load,scope:this});},merge:function(mapProjection,resp){var layer=this.layer;layer.destroyFeatures();var features=resp.features;if(features&&features.length>0){if(!mapProjection.equals(layer.projection)){var geom;for(var i=0,len=features.length;i Date: Wed, 22 Feb 2012 14:30:25 +0000 Subject: Add fp argument to image script for front page thumbnails, for #226. --- perllib/FixMyStreet/App/Controller/Photo.pm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index b4fa3a457..8f71a5c2e 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -57,9 +57,11 @@ sub index :Path :Args(0) { my $photo = $photo[0]->photo; if ( $c->req->param('tn' ) ) { - $photo = _resize( $photo, 'x100' ); + $photo = _shrink( $photo, 'x100' ); + } elsif ( $c->req->param('fp' ) ) { + $photo = _crop( $photo ); } elsif ( $c->cobrand->default_photo_resize ) { - $photo = _resize( $photo, $c->cobrand->default_photo_resize ); + $photo = _shrink( $photo, $c->cobrand->default_photo_resize ); } my $dt = DateTime->now(); @@ -75,7 +77,8 @@ sub no_photo : Private { $c->detach( '/page_error_404_not_found', [ 'No photo' ] ); } -sub _resize { +# Shrinks a picture to the specified size, but keeping in proportion. +sub _shrink { my ($photo, $size) = @_; use Image::Magick; my $image = Image::Magick->new; @@ -87,6 +90,21 @@ sub _resize { return $blobs[0]; } +# Shrinks a picture to 90x60, cropping so that it is exactly that. +sub _crop { + my ($photo) = @_; + use Image::Magick; + my $image = Image::Magick->new; + $image->BlobToImage($photo); + my $err = $image->Resize( geometry => "90x60^" ); + throw Error::Simple("resize failed: $err") if "$err"; + my $err = $image->Extent( geometry => '90x60', gravity => 'Center' ); + throw Error::Simple("resize failed: $err") if "$err"; + my @blobs = $image->ImageToBlob(); + undef $image; + return $blobs[0]; +} + =head1 AUTHOR Struan Donald -- cgit v1.2.3 From e2882fa4558c0ff341749dce7a0faeca562a46c2 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 22 Feb 2012 14:58:06 +0000 Subject: Fix pin display when JS is disabled. --- perllib/FixMyStreet/App/Controller/Report/New.pm | 2 +- templates/web/default/maps/openlayers.html | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 1e5825460..ee471499c 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -1031,7 +1031,7 @@ sub generate_map : Private { pins => [ { latitude => $latitude, longitude => $longitude, - colour => 'purple', + colour => 'yellow', } ], ); } diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html index 1c0a32278..24b23d55e 100644 --- a/templates/web/default/maps/openlayers.html +++ b/templates/web/default/maps/openlayers.html @@ -78,15 +78,11 @@ var fixmystreet = { [% BLOCK pin %] -[% cols = { - red = 'R', green = 'G', blue = 'B', purple = 'P', - } -%] [% IF pin.id %] [%- END -%] - [% loc('Problem') %]

[%- IF pin.id -%] [% END %] -- cgit v1.2.3 From 56c8c3f424ea9dd71ea251a31795145edd124bf1 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 22 Feb 2012 15:28:11 +0000 Subject: Make sure error divs go white when valid (fixes #222). --- web/cobrands/fixmystreet/base.scss | 7 ++++++- web/js/fixmystreet.js | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 1b30aefb5..03ae1af65 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -401,6 +401,11 @@ textarea.form-error { background-color:#ffeeee; } +// XXX This is a repeat from core +div.label-valid { + background-color: white; +} + /* LAYOUT */ // Padding creates page margins on mobile @@ -1051,4 +1056,4 @@ a:hover.rap-notes-trigger { } } } -} \ No newline at end of file +} diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 6abec282c..513d6da29 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -144,7 +144,8 @@ $(function(){ // we do this to stop things jumping around on blur success: function (err) { if ( form_submitted ) { err.addClass('label-valid').removeClass('label-valid-hidden').html( ' ' ); } else { err.addClass('label-valid-hidden'); } }, errorPlacement: function( error, element ) { - element.parent('div').before( error ); + var l = element.prev('label') || element; + l.before( error ); }, submitHandler: function(form) { if (form.submit_problem) { @@ -286,4 +287,4 @@ $(function(){ $('.form-focus-trigger').on('focus', function(){ $('.form-focus-hidden').fadeIn(500); }); -}); \ No newline at end of file +}); -- cgit v1.2.3 From 85909349b017e386b17fb91e5dc8228b24c5d07d Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 22 Feb 2012 15:27:51 +0000 Subject: Spelling error Signed-off-by: Josh Angell --- templates/web/fixmystreet/report/new/fill_in_details_form.html | 4 ++-- web/cobrands/fixmystreet/base.scss | 2 +- web/cobrands/fixmystreet/layout.scss | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) 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 10662183f..4f98c6089 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -1,10 +1,10 @@ -

[% loc('Reporting a problem') %]

[% loc('This report will be sent to Name of the Council.') %]

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 1b30aefb5..635e5fa8c 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -844,7 +844,7 @@ a:hover.button-left { } -// only on mobile, this is a sidebar on desk (#report-a-poblem-sidebar) +// only on mobile, this is a sidebar on desk (#report-a-problem-sidebar) a.rap-notes-trigger, a:hover.rap-notes-trigger { display:block; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 42330266c..1347c4482 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -325,7 +325,7 @@ textarea{ } /* Report a problem sidebar notes */ -#report-a-poblem-sidebar { +#report-a-problem-sidebar { position:absolute; left:29.5em; top:2em; @@ -345,7 +345,7 @@ textarea{ } } .ie6, .ie7 { - #report-a-poblem-sidebar { + #report-a-problem-sidebar { top:5em; } } @@ -697,7 +697,7 @@ body.frontpage { } //put the RAP notes into the main copy area - #report-a-poblem-sidebar { + #report-a-problem-sidebar { position: static; width: auto; @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); -- cgit v1.2.3 From 6a1d490257fd9e7948ae94ff1217c118eda3fb9d Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 22 Feb 2012 16:31:20 +0000 Subject: From errors now appear in-between label and field. See issue #222 Signed-off-by: Josh Angell --- templates/web/fixmystreet/auth/general.html | 20 +++++++-------- templates/web/fixmystreet/contact/index.html | 16 +++--------- templates/web/fixmystreet/report/display.html | 25 ++++++++---------- .../fixmystreet/report/new/category_extras.html | 4 +-- .../report/new/fill_in_details_form.html | 30 ++++++++++------------ web/cobrands/fixmystreet/base.scss | 19 +++++++++----- web/js/fixmystreet.js | 4 +-- 7 files changed, 51 insertions(+), 67 deletions(-) diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html index 8b7b5639a..2058ac60e 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -17,14 +17,12 @@ loc_email_error = errors.$email_error || errors.other; END %] - - [% IF loc_email_error %] -

[% loc_email_error %]

- [% ELSIF sign_in_error %] -

[% loc('There was a problem with your email/password combination. Passwords and user accounts are a brand new service, so you probably do not have one yet – please fill in the right hand side of this form to get one.') %]

- [% END %] - - + [% loc('Your email address') %] + [% IF loc_email_error %] +

[% loc_email_error %]

+ [% ELSIF sign_in_error %] +

+ [% END %]

@@ -33,7 +31,7 @@

[% loc('Yes I have a password') %]

- + [% loc('Yes, I have a password') %]

@@ -51,10 +49,10 @@

Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.

- + [% loc('Your name') %] - + [% loc('Enter a new password (optional)') %]

diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html index 78cff82af..87096bd8a 100644 --- a/templates/web/fixmystreet/contact/index.html +++ b/templates/web/fixmystreet/contact/index.html @@ -61,39 +61,31 @@ [% END %] + [% loc('Your name') %] [% IF field_errors.name %]

[% field_errors.name %]

[% END %] - - - [% loc('Your name') %] + [% loc('Your email') %] [% IF field_errors.em %]

[% field_errors.em %]

[% END %] - - - [% loc('Your email') %] + [% loc('Subject') %] [% IF field_errors.subject %]

[% field_errors.subject %]

[% END %] - - - [% loc('Subject') %] + [% loc('Message') %] [% IF field_errors.message %]

[% field_errors.message %]

[% END %] - - - [% loc('Message') %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 630a34cae..5a7ccfd2f 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -70,11 +70,10 @@ + [% loc( 'Update' ) %] [% IF field_errors.update %]

[% field_errors.update %]

[% END %] - - [% loc( 'Update' ) %] [% IF c.user && c.user.belongs_to_council( problem.council ) %] @@ -103,16 +102,15 @@ [% END %] [% IF c.cobrand.allow_photo_upload %] - [% IF field_errors.photo %] -

[% field_errors.photo %]

- [% END %] -

[% IF upload_fileid %]

[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]

[% END %] [% loc('Photo') %] + [% IF field_errors.photo %] +

[% field_errors.photo %]

+ [% END %]

[% END %] @@ -126,11 +124,10 @@ [% ELSE %] + [% loc('Your email address' ) %] [% IF field_errors.email %]

[% field_errors.email %]

[% END %] - - [% loc('Your email address' ) %]

@@ -138,13 +135,12 @@

[% loc("Do you have a FixMyStreet password?") %]

[% loc('Yes I have a password') %]

+ + [% loc('Yes I have a password') %] [% IF field_errors.password %]

[% field_errors.password %]

[% END %] - -

[% loc('Yes I have a password') %]

- -

@@ -160,7 +156,7 @@ [% INCLUDE name %] - + [% loc('Enter a new password (optional)') %]

@@ -179,11 +175,10 @@ [% INCLUDE 'footer.html' %] [% BLOCK name %] + [% loc('Your name') %] [% IF field_errors.name %]

[% field_errors.name %]

[% END %] - -

diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html index 8cb169522..c2a213225 100644 --- a/templates/web/fixmystreet/report/new/category_extras.html +++ b/templates/web/fixmystreet/report/new/category_extras.html @@ -5,12 +5,10 @@ [%- FOR meta IN category_extras.$category %] [%- meta_name = meta.code -%] + [% meta.description _ ':' %] [% IF field_errors.$meta_name %]

[% field_errors.$meta_name %]

[% END -%] - - [% meta.description _ ':' %] - [% IF meta.exists('values') %] + [% loc('Details') %] [% IF field_errors.detail %]

[% field_errors.detail %]

[% END %] - - - [% loc('Details') %] [% IF js %] @@ -121,26 +119,25 @@ [% ELSE %] + [% loc('Your email') %] [% IF field_errors.email %]

[% field_errors.email %]

[% END %] - - [% loc('Your email') %] - +

[% loc("Now to submit your report…") %]

[% loc("Do you have a FixMyStreet password?") %]

- [% IF field_errors.password %] -

[% field_errors.password %]

- [% END %]

[% loc('Yes I have a password') %]

- + [% loc('Yes I have a password') %]

+ [% IF field_errors.password %] +

[% field_errors.password %]

+ [% END %]

@@ -154,11 +151,10 @@

[% loc('No Let me confirm my report by email') %]

+ [% loc('Your name') %] [% IF field_errors.name %]

[% field_errors.name %]

[% END %] - - - + [% loc('Your phone number (optional)') %] - + [% loc('Enter a new password (optional)') %]

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 58b79b66d..38273ac7a 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -388,22 +388,22 @@ div.form-error, p.form-error { background:#ff0000; color:#fff; - padding:0.5em; - margin:0 1em 0 0; + padding:0 0.5em; + margin:0 0.6em 0 -0.5em; width:auto; - margin-bottom:0.5em; - @include border-radius(0.25em); + @include border-radius(0.25em 0.25em 0 0); } input.form-error, textarea.form-error { border-color:#ff0000; - background-color:#ffeeee; + @include border-radius(0 0 0.25em 0.25em); } // XXX This is a repeat from core -div.label-valid { - background-color: white; +div.label-valid, +p.label-valid { + background: #fff; } /* LAYOUT */ @@ -915,6 +915,11 @@ a:hover.rap-notes-trigger { display:none !important; } +// hide anything with this class if js is working +.js .hidden-js { + display: none !important; + visibility: hidden; +} /* Front page */ diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 513d6da29..47ca6efb7 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -139,13 +139,13 @@ $(function(){ }, messages: validation_strings, onkeyup: false, + onfocusout: false, errorElement: 'div', errorClass: 'form-error', // we do this to stop things jumping around on blur success: function (err) { if ( form_submitted ) { err.addClass('label-valid').removeClass('label-valid-hidden').html( ' ' ); } else { err.addClass('label-valid-hidden'); } }, errorPlacement: function( error, element ) { - var l = element.prev('label') || element; - l.before( error ); + element.before( error ); }, submitHandler: function(form) { if (form.submit_problem) { -- cgit v1.2.3 From e26d62519ecb26e851b3513a76e2c6b1007f2fc2 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 22 Feb 2012 16:36:08 +0000 Subject: Don't display valid error boxes as now the jump won't be until the user submits, which is fine (see issue #222) Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 38273ac7a..43cf82617 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -400,10 +400,12 @@ textarea.form-error { @include border-radius(0 0 0.25em 0.25em); } -// XXX This is a repeat from core +// don't display valid error boxes as now the jump won't be +// until the user submits, which is fine div.label-valid, p.label-valid { - background: #fff; + display:none !important; + visibility: hidden; } /* LAYOUT */ -- cgit v1.2.3 From 3b73b22a8c129e2598b11b7c61bd621103fd384e Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 22 Feb 2012 16:56:43 +0000 Subject: Add button classes Signed-off-by: Josh Angell --- templates/web/fixmystreet/around/around_index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html index 53deec871..a465eae63 100644 --- a/templates/web/fixmystreet/around/around_index.html +++ b/templates/web/fixmystreet/around/around_index.html @@ -17,7 +17,7 @@

[% question %]: - + [% IF partial_token %] -- cgit v1.2.3 From 83979f8206e2041f19bed5c6a04d8ebf650ae030 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 22 Feb 2012 16:57:04 +0000 Subject: Photo resizing (fixes #226) Signed-off-by: Josh Angell --- templates/web/fixmystreet/around/around_map_list_items.html | 2 +- templates/web/fixmystreet/around/on_map_list_items.html | 2 +- templates/web/fixmystreet/index.html | 2 +- templates/web/fixmystreet/report/photo.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html index e1c81b943..fed53d279 100644 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ b/templates/web/fixmystreet/around/around_map_list_items.html @@ -13,7 +13,7 @@ [% END %]

diff --git a/templates/web/fixmystreet/around/on_map_list_items.html b/templates/web/fixmystreet/around/on_map_list_items.html index 724cb0e17..ce5639665 100644 --- a/templates/web/fixmystreet/around/on_map_list_items.html +++ b/templates/web/fixmystreet/around/on_map_list_items.html @@ -10,7 +10,7 @@ [% END %]

diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index c6e3e69c6..96f4dddb5 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -74,7 +74,7 @@ [% prettify_epoch( p.confirmed_local.epoch, 1 ) %]

diff --git a/templates/web/fixmystreet/report/photo.html b/templates/web/fixmystreet/report/photo.html index f266792b2..e74f0bbfe 100644 --- a/templates/web/fixmystreet/report/photo.html +++ b/templates/web/fixmystreet/report/photo.html @@ -1,6 +1,6 @@ [% IF c.cobrand.allow_photo_display && object.photo %] [% photo = object.get_photo_params %]

[% END %] -- cgit v1.2.3 From fac2c390953543be188b92f05777fb707410e078 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 22 Feb 2012 18:19:35 +0000 Subject: Allow photo checking in lists on around page, have five items, for #227. --- perllib/FixMyStreet/DB/ResultSet/Problem.pm | 3 ++- .../fixmystreet/around/around_map_list_items.html | 6 ++++-- .../web/fixmystreet/around/on_map_list_items.html | 4 +++- templates/web/fixmystreet/index.html | 23 ++++++---------------- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index 59227fce8..95d6a02d4 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -122,7 +122,8 @@ sub around_map { my $attr = { order_by => { -desc => 'created' }, columns => [ - 'id', 'title' ,'latitude', 'longitude', 'state', 'confirmed' + 'id', 'title', 'latitude', 'longitude', 'state', 'confirmed', + { photo => 'photo is not null' }, ], }; $attr->{rows} = $limit if $limit; diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html index e1c81b943..65cfd783b 100644 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ b/templates/web/fixmystreet/around/around_map_list_items.html @@ -12,12 +12,14 @@ [% loc('(fixed)') %] [% END %]

+ [% IF p.photo %]

+ [% END %] [% END %] [% ELSE %]

[% loc('No problems found.') %]

-[% END %] \ No newline at end of file +[% END %] diff --git a/templates/web/fixmystreet/around/on_map_list_items.html b/templates/web/fixmystreet/around/on_map_list_items.html index 724cb0e17..11aa5dedd 100644 --- a/templates/web/fixmystreet/around/on_map_list_items.html +++ b/templates/web/fixmystreet/around/on_map_list_items.html @@ -9,9 +9,11 @@ [% loc('(fixed)') %] [% END %]

+ [% IF p.photo %]

+ [% END %] [% END %] diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index c6e3e69c6..ddd1554d4 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -46,27 +46,16 @@ [% - recent_photos = c.cobrand.recent_photos(3); - probs = c.cobrand.recent(); + recent_photos = c.cobrand.recent_photos(5); %] - [% IF probs.size || recent_photos.size %] + [% IF recent_photos.size %]

[% loc('Recently reported problems') %]

- - - [% IF probs.size %]

@@ -74,14 +63,14 @@ [% prettify_epoch( p.confirmed_local.epoch, 1 ) %]

- +

- [% END %] +

[% END %]

@@ -116,4 +105,4 @@ -[% INCLUDE 'footer.html' %] \ No newline at end of file +[% INCLUDE 'footer.html' %] -- cgit v1.2.3 From 2bcc42fcdc96caa22e8ab2af6155bfff7e2d875b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 22 Feb 2012 18:23:55 +0000 Subject: Typo. --- templates/web/fixmystreet/around/display_location.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index f5538cfb9..8f3ebb49b 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -82,7 +82,7 @@

@@ -120,4 +120,4 @@

-[% INCLUDE 'footer.html' %] \ No newline at end of file +[% INCLUDE 'footer.html' %] -- cgit v1.2.3 From 63f4c86f68d9be39275c3081306736c77da4cb40 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 23 Feb 2012 10:24:02 +0000 Subject: Nearby list needs photo too, and via nearby object (for #227). --- perllib/FixMyStreet/DB/ResultSet/Nearby.pm | 2 +- templates/web/fixmystreet/around/around_map_list_items.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm index 04089096e..4b37e7731 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm @@ -24,7 +24,7 @@ sub nearby { columns => [ 'problem.id', 'problem.title', 'problem.latitude', 'problem.longitude', 'distance', 'problem.state', - 'problem.confirmed' + 'problem.confirmed', { photo => 'photo is not null' }, ], bind => [ $mid_lat, $mid_lon, $dist ], order_by => [ 'distance', { -desc => 'created' } ], diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html index edf8dcbf1..49a7798c3 100644 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ b/templates/web/fixmystreet/around/around_map_list_items.html @@ -12,7 +12,7 @@ [% loc('(fixed)') %] [% END %]

- [% IF p.photo %] + [% IF p.problem.photo %]

-- cgit v1.2.3 From 3f3ec1e1d2dc18b94248121d4f7d4e2b39718978 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 23 Feb 2012 10:44:04 +0000 Subject: Fix nearby photo handling for #227. --- perllib/FixMyStreet/DB/ResultSet/Nearby.pm | 2 +- templates/web/fixmystreet/around/around_map_list_items.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm index 4b37e7731..83fc85a88 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm @@ -24,7 +24,7 @@ sub nearby { columns => [ 'problem.id', 'problem.title', 'problem.latitude', 'problem.longitude', 'distance', 'problem.state', - 'problem.confirmed', { photo => 'photo is not null' }, + 'problem.confirmed', { 'problem.photo' => 'problem.photo is not null' }, ], bind => [ $mid_lat, $mid_lon, $dist ], order_by => [ 'distance', { -desc => 'created' } ], diff --git a/templates/web/fixmystreet/around/around_map_list_items.html b/templates/web/fixmystreet/around/around_map_list_items.html index 49a7798c3..86370017f 100644 --- a/templates/web/fixmystreet/around/around_map_list_items.html +++ b/templates/web/fixmystreet/around/around_map_list_items.html @@ -14,7 +14,7 @@

[% IF p.problem.photo %]

[% END %] -- cgit v1.2.3 From a20baf15cabeaf50b6d9e5632e59cd44f18976bc Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 11:24:43 +0000 Subject: Fix auto update of around view byte adding in the right ids again Signed-off-by: Josh Angell --- templates/web/fixmystreet/around/display_location.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index 8f3ebb49b..caa56ae57 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -97,16 +97,16 @@

[% INCLUDE "around/on_map_list_items.html" %]

[% INCLUDE "around/around_map_list_items.html" %]

-- cgit v1.2.3 From a3b774254a987c767dae890ed076e685dff4c561 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 23 Feb 2012 11:56:37 +0000 Subject: Factor out fragment rendering, as additional template paths needs to be passed. --- perllib/FixMyStreet/App.pm | 16 ++++++++++++++++ perllib/FixMyStreet/App/Controller/Around.pm | 11 +++++------ perllib/FixMyStreet/App/Controller/Photo.pm | 2 +- perllib/FixMyStreet/App/Controller/Report/New.pm | 6 +++--- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 21552a066..d39ae1415 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -402,6 +402,22 @@ sub finalize { delete $c->stash->{cobrand}; } +=head2 render_fragment + +If a page needs to render a template fragment internally (e.g. for an Ajax +call), use this method. + +=cut + +sub render_fragment { + my ($c, $template, $vars) = @_; + $vars ||= {}; + $vars->{additional_template_paths} = [ $c->cobrand->path_to_web_templates->stringify ] + unless $c->cobrand->is_default; + $c->view('Web')->render($c, $template, $vars); +} + + =head1 SEE ALSO L, L diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index 148a22368..ac8e0e719 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -258,12 +258,11 @@ sub ajax : Path('/ajax') { FixMyStreet::Map::map_pins( $c, $interval ); # render templates to get the html - my $on_map_list_html = - $c->view('Web') - ->render( $c, 'around/on_map_list_items.html', { on_map => $on_map } ); - - my $around_map_list_html = $c->view('Web')->render( - $c, + my $on_map_list_html = $c->render_fragment( + 'around/on_map_list_items.html', + { on_map => $on_map } + ); + my $around_map_list_html = $c->render_fragment( 'around/around_map_list_items.html', { around_map => $around_map, dist => $dist } ); diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index 8f71a5c2e..3f55e4692 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -98,7 +98,7 @@ sub _crop { $image->BlobToImage($photo); my $err = $image->Resize( geometry => "90x60^" ); throw Error::Simple("resize failed: $err") if "$err"; - my $err = $image->Extent( geometry => '90x60', gravity => 'Center' ); + $err = $image->Extent( geometry => '90x60', gravity => 'Center' ); throw Error::Simple("resize failed: $err") if "$err"; my @blobs = $image->ImageToBlob(); undef $image; diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index ee471499c..9eefc9396 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -112,8 +112,8 @@ sub report_form_ajax : Path('ajax') : Args(0) { $c->forward('setup_categories_and_councils'); # render templates to get the html - my $category = $c->view('Web')->render( $c, 'report/new/category.html'); - my $councils_text = $c->view('Web')->render( $c, 'report/new/councils_text.html'); + my $category = $c->render_fragment( 'report/new/category.html'); + my $councils_text = $c->render_fragment( 'report/new/councils_text.html'); my $has_open311 = keys %{ $c->stash->{category_extras} }; my $body = JSON->new->utf8(1)->encode( @@ -150,7 +150,7 @@ sub category_extras_ajax : Path('category_extras') : Args(0) { $c->stash->{report} = { category => $c->req->param('category') }; $c->stash->{category_extras} = { $c->req->param('category' ) => $c->stash->{category_extras}->{ $c->req->param('category') } }; - $category_extra= $c->view('Web')->render( $c, 'report/new/category_extras.html'); + $category_extra= $c->render_fragment( 'report/new/category_extras.html'); } my $body = JSON->new->utf8(1)->encode( -- cgit v1.2.3 From 368bd0470995d72de2822ca24db3b9b61293fe73 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 12:30:10 +0000 Subject: Add back in some missing bits for logged in users Signed-off-by: Josh Angell --- .../report/new/fill_in_details_form.html | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) 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 %] +

+ [% loc('Your name') %] + [% IF field_errors.name %] +

[% field_errors.name %]

+ [% END %] + - [% INCLUDE name_phone %] + [%# if there is nothing in the name field then set check box as default on form %] +

+ + [% loc('Show my name publicly') %] +

- + [% loc('Your phone number (optional)') %] + + + [% loc('Enter a new password (optional)') %] +

+ + +

[% ELSE %] [% loc('Your email') %] -- cgit v1.2.3 From baaa3e949ad045029465d7c6a0381f98c9cc7e5e Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 12:45:25 +0000 Subject: Change how fullpage class works Signed-off-by: Josh Angell --- templates/web/fixmystreet/index.html | 2 +- templates/web/fixmystreet/reports/index.html | 11 +++--- web/cobrands/fixmystreet/layout.scss | 57 ++++++++++++++++++++-------- 3 files changed, 49 insertions(+), 21 deletions(-) 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 %]

[% error %]

diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html index 2dfdc6df2..57b9dfe33 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' %] -

-[% 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.') %] -

[% loc('All Reports') %]

+ +

[% 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.') %]

diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 1347c4482..5536cc340 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,22 @@ 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:43em; + } } #map_box{ @@ -376,7 +390,6 @@ textarea{ /* Frontpage */ body.frontpage { - background:#1a1a1a; .wrapper { >.container { width:100%; @@ -387,15 +400,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 +420,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 +449,14 @@ body.frontpage { top:5em; } } +.ie8 body.frontpage { + .wrapper .content { + margin-top:5em; + } + #user-meta p { + top:3em; + } +} #front-main { @@ -486,6 +512,7 @@ body.frontpage { } .ie6, .ie7 { #front-main { + top:2em; padding-top:1em; } } @@ -714,7 +741,7 @@ body.frontpage { } //make fullpage auto width - .fullwidthpage { + body.fullwidthpage .content { width: auto; } -- cgit v1.2.3 From 3b3bde31a1f812b6720bbd61e8523aade56eb67d Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 12:45:53 +0000 Subject: Add a page footer that you can call as a parameter of the footer include Signed-off-by: Josh Angell --- templates/web/fixmystreet/footer.html | 5 +++++ templates/web/fixmystreet/reports/index.html | 3 +-- web/cobrands/fixmystreet/base.scss | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 6f323ed47..a2fdda105 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,3 +1,8 @@ + [% IF pagefooter %] + + [% END %] diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html index 57b9dfe33..180b651ea 100755 --- a/templates/web/fixmystreet/reports/index.html +++ b/templates/web/fixmystreet/reports/index.html @@ -32,5 +32,4 @@ [% END %]

-[% 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..c64bb1588 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -580,6 +580,13 @@ p.label-valid { } } + +#site-footer { + border-top:3px solid $primary; + margin:1em -1em 0 -1em; + padding:1em; +} + /*BUTTONS*/ // Default style set for buttons, inputs and .btn class. Red and green class available. -- cgit v1.2.3 From 4b95359d4ed253288c8c2507f45409661314b302 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 13:19:44 +0000 Subject: Add faq templates Signed-off-by: Josh Angell --- templates/web/fixmystreet/faq/faq-en-gb.html | 208 +++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100755 templates/web/fixmystreet/faq/faq-en-gb.html 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' %] + +

Frequently Asked Questions

What is FixMyStreet?

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.

What sort of problems should I report with FixMyStreet?

FixMyStreet is primarily for reporting things which are +broken or dirty or damaged or dumped, and need fixing, cleaning +or clearing, such as: + +

Abandoned vehicles +
Dog Fouling +
Flyposting or graffiti +
Flytipping or litter +
Streetcleaning, such as broken glass in a cycle lane + [% IF c.cobrand.moniker != 'southampton' %] +
Unlit lamposts + [% END %] +
Potholes +

What isn’t FixMyStreet for?

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. You will need to contact [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council + directly for problems such as: + +

Anti-social behaviour +
Any urgent or emergency problems +
Noise pollution or barking dogs +
Fires and smoke/smell pollution +
Missing wheelie bins or recycling boxes or missed rubbish collections +
Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. +
Complaining about your neighbours +
Complaining about the council +
Joy riding, drug taking, animal cruelty, or other criminal activity +

Councils often have direct hotlines for these sorts of issues.

How do I use the site?

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.

How are the problems solved?

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 %].

Is it free?

The site is free to use, yes. FixMyStreet is run +by a registered charity, though, so if you want to make a contribution, please do.

Can I use FixMyStreet on my mobile?

iPhone: 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: + FixMyStreet, + StreetReport. +
Android: A volunteer, Anna Powell-Smith, has written an app + available from the + Android Market. +
Nokia: A volunteer, Thomas Forth, has written an app available from the + Ovi Store. +

We also hope to make the website itself much more mobile friendly in the future.

Why do you only cover the countries of Great Britain?

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.

+ +

Practical Questions

I’m from a council, where do you send the reports?: You can either leave a test report or contact us +to find out where reports go at the moment. Also contact us +to update the address or addresses we use.
I’m from a council, can we have FixMyStreet on our website?: Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. Full details.
Do you remove silly or illegal content?: 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.
Why does the site use kilometres for measurements?: 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!
Why can’t I zoom out more on the reporting map?: 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.
This site is great – why aren’t you better publicised?: 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 array of posters, flyers and badges 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?

+ +

Privacy Questions

Who gets to see my email address?: 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.
Will you send nasty, brutish spam to my email address?: 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.

Organisation Questions

Who built FixMyStreet?: This site was built by mySociety, in conjunction with the Young Foundation. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like TheyWorkForYou.com. +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 WriteToThem, 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 hello@mysociety.org, +or by post at:
+mySociety
+483 Green Lanes
+London
+N13 4BS
+UK
Who pays for it?: FixMyStreet was paid for via the Department for +Constitutional Affairs Innovations Fund.
Wasn’t this site called Neighbourhood Fix-It?: 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.
Do you need any help with the project?: Yes, we can use help in all sorts of ways, technical or +non-technical. Please see our Get Involved page.
I’d like a site like this for my own location/ where’s the "source code" to this site?: +The software behind this site is open source, and available +to you mainly under the GNU Affero GPL software license. You can download the +source code 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. +Fiksgatami is an example of our code +being used in a Norwegian version of this site. +
I’d prefer code in a different language?: +VisibleGovernment.ca wrote their own code for +http://www.fixmystreet.ca/, which is +written in GeoDjango and available under an MIT licence at github. +Or FixMyStreet.org.nz is written in +Drupal. +
+
People build things, not organisations. Who actually built it?: 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 +Ordnance Survey (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 M247 (who kindly host all +our servers). + +Let us know if we’ve missed anyone.

+ +[% INCLUDE 'footer.html' pagefooter = 'yes' %] -- cgit v1.2.3 From 5d13b15e091e28698bcb11c0f67ab3530cb981c8 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 13:24:51 +0000 Subject: Added a two thirds width view Signed-off-by: Josh Angell --- templates/web/fixmystreet/footer.html | 2 +- templates/web/fixmystreet/reports/index.html | 2 +- web/cobrands/fixmystreet/base.scss | 8 +++----- web/cobrands/fixmystreet/layout.scss | 18 +++++++++++++++++- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index a2fdda105..fa9439e09 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] -

+ [% END %] diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html index 180b651ea..8e7078e1f 100755 --- a/templates/web/fixmystreet/reports/index.html +++ b/templates/web/fixmystreet/reports/index.html @@ -32,4 +32,4 @@ [% END %] -[% INCLUDE 'footer.html' pagefooter = 'yes' %] \ No newline at end of file +[% 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 c64bb1588..68534f5fd 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -580,11 +580,9 @@ p.label-valid { } } - -#site-footer { - border-top:3px solid $primary; - margin:1em -1em 0 -1em; - padding:1em; +//hide page footer on mobile +.mobile #page-footer { + display:none; } /*BUTTONS*/ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 5536cc340..1130cc61d 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -198,7 +198,13 @@ body.fullwidthpage { position: absolute; } .intro { - width:43em; + width:40em; + } +} +body.twothirdswidthpage { + @extend .fullwidthpage; + .content { + width:40em; } } @@ -284,6 +290,16 @@ body.fullwidthpage { } } + +// 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; -- cgit v1.2.3 From 2853ca4a6290ad46e9ae283d2d85f0ef958dbcac Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 23 Feb 2012 13:26:51 +0000 Subject: Only need to set additional_template_paths if other variables are being set, otherwise it comes in automatically from the stash. --- perllib/FixMyStreet/App.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index d39ae1415..18cad6b89 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -411,9 +411,8 @@ call), use this method. sub render_fragment { my ($c, $template, $vars) = @_; - $vars ||= {}; $vars->{additional_template_paths} = [ $c->cobrand->path_to_web_templates->stringify ] - unless $c->cobrand->is_default; + if $vars && !$c->cobrand->is_default; $c->view('Web')->render($c, $template, $vars); } -- cgit v1.2.3 From 22eb2c8af5238ba07c0e7163a0a7f6516bc231d9 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 13:52:33 +0000 Subject: Add styles for a sidebar on .twothirdswidth pages Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/layout.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 1130cc61d..c59e02c3d 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -205,6 +205,16 @@ body.twothirdswidthpage { @extend .fullwidthpage; .content { width:40em; + position: relative; + aside { + background:#fff; + position:absolute; + left:44em; + top:0; + width:13.5em; + padding:1em; + @include box-shadow(0px 0px 6px 1px #000); + } } } -- cgit v1.2.3 From d0a6787231711aaee7bd44b1e52e74a7ba799060 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 14:02:39 +0000 Subject: Fix error styles for mobile Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 6 +++--- web/cobrands/fixmystreet/layout.scss | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 68534f5fd..e2a1b7a3d 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -386,18 +386,18 @@ label{ /* form errors */ div.form-error, p.form-error { + @include inline-block; background:#ff0000; color:#fff; padding:0 0.5em; - margin:0 0.6em 0 -0.5em; - width:auto; + margin:0 0 0 -0.5em; @include border-radius(0.25em 0.25em 0 0); } input.form-error, textarea.form-error { border-color:#ff0000; - @include border-radius(0 0 0.25em 0.25em); + @include border-radius(0 0.25em 0.25em 0.25em); } // don't display valid error boxes as now the jump won't be diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index c59e02c3d..32de2af43 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -364,6 +364,20 @@ textarea{ max-width:25em; } + +/* form errors */ +div.form-error, +p.form-error { + display:block; + width:25.25em; +} + +input.form-error, +textarea.form-error { + @include border-radius(0 0 0.25em 0.25em); +} + + /* Report a problem sidebar notes */ #report-a-problem-sidebar { position:absolute; -- cgit v1.2.3 From 03a68ce5c9887e29dd64c6235c6ed9a3aea205bc Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 14:03:39 +0000 Subject: Split intro text back again for translation purposes Signed-off-by: Josh Angell --- templates/web/fixmystreet/reports/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html index 8e7078e1f..633e96022 100755 --- a/templates/web/fixmystreet/reports/index.html +++ b/templates/web/fixmystreet/reports/index.html @@ -3,7 +3,7 @@

[% loc('All Reports') %]

[% 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.') %]

[% 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.') %]

-- cgit v1.2.3 From d5fe13a0e62d7abacbbddcabd0bd221de9aeb88b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 23 Feb 2012 14:31:05 +0000 Subject: Create fork of FMS JS file for its cobrand, as many changes. --- templates/web/fixmystreet/common_header_tags.html | 2 +- web/cobrands/fixmystreet/fixmystreet.js | 290 ++++++++++++++++++++++ web/js/fixmystreet.js | 165 +++--------- 3 files changed, 325 insertions(+), 132 deletions(-) create mode 100644 web/cobrands/fixmystreet/fixmystreet.js diff --git a/templates/web/fixmystreet/common_header_tags.html b/templates/web/fixmystreet/common_header_tags.html index 8cbd13d2f..ce8b95a93 100644 --- a/templates/web/fixmystreet/common_header_tags.html +++ b/templates/web/fixmystreet/common_header_tags.html @@ -9,7 +9,7 @@ - + [% map_js %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js new file mode 100644 index 000000000..001334a2a --- /dev/null +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -0,0 +1,290 @@ +/* + * fixmystreet.js + * FixMyStreet JavaScript + */ + +function form_category_onchange() { + var cat = $('#form_category'); + var args = { + category: cat.val() + }; + + if ( typeof fixmystreet !== 'undefined' ) { + args.latitude = fixmystreet.latitude; + args.longitude = fixmystreet.longitude; + } else { + args.latitude = $('input[name="latitude"]').val(); + args.longitude = $('input[name="longitude"]').val(); + } + + $.getJSON('/report/new/category_extras', args, function(data) { + if ( data.category_extra ) { + if ( $('#category_meta').size() ) { + $('#category_meta').html( data.category_extra); + } else { + $('#form_category_row').after( data.category_extra ); + } + } else { + $('#category_meta').empty(); + } + }); +} + +/* + * general height fixing function + * + * elem1: element to check against + * elem2: target element + * offest: this will be added (if present) to the final value, useful for height errors + */ +function heightFix(elem1, elem2, offset){ + var h1 = $(elem1).height(), + h2 = $(elem2).height(); + if(offset === undefined){ + offset = 0; + } + if(h1 > h2){ + $(elem2).css({'min-height':h1+offset}); + } +} + + +/* + * very simple tab function + * + * elem: trigger element, must have an href attribute (so probably needs to be an ) + */ +function tabs(elem) +{ + var href = elem.attr('href'); + //stupid IE sometimes adds the full uri into the href attr, so trim + var start = href.indexOf('#'), + target = href.slice(start, href.length); + + if(!$(target).hasClass('open')) + { + //toggle class on nav + $('.tab-nav .active').removeClass('active'); + elem.addClass('active'); + + //hide / show the right tab + $('.tab.open').hide().removeClass('open'); + $(target).show().addClass('open'); + } +} + + +$(function(){ + //add mobile class if small screen + if(Modernizr.mq('only screen and (max-width:47em)')) { + $('html').addClass('mobile'); + } + //heightfix the desktop .content div + if(Modernizr.mq('only screen and (min-width:48em)')) { + if (!($('body').hasClass('frontpage'))){ + heightFix(window, '.content', -176); + } + } + + $('html').removeClass('no-js').addClass('js'); + + $('#pc').focus(); + + $('input[type=submit]').removeAttr('disabled'); + /* + $('#mapForm').submit(function() { + if (this.submit_problem) { + $('input[type=submit]', this).prop("disabled", true); + } + return true; + }); + */ + + if (!$('#been_fixed_no').prop('checked') && !$('#been_fixed_unknown').prop('checked')) { + $('#another_qn').hide(); + } + $('#been_fixed_no').click(function() { + $('#another_qn').show('fast'); + }); + $('#been_fixed_unknown').click(function() { + $('#another_qn').show('fast'); + }); + $('#been_fixed_yes').click(function() { + $('#another_qn').hide('fast'); + }); + + var timer; + function email_alert_close() { + $('#email_alert_box').hide('fast'); + } + + // FIXME - needs to use translated string + jQuery.validator.addMethod('validCategory', function(value, element) { + return this.optional(element) || value != '-- Pick a category --'; }, validation_strings.category ); + + jQuery.validator.addMethod('validName', function(value, element) { + var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i; + return this.optional(element) || value.length > 5 && value.match( /\S/ ) && !value.match( validNamePat ); }, validation_strings.category ); + + var form_submitted = 0; + var submitted = false; + + $("form.validate").validate({ + rules: { + title: { required: true }, + detail: { required: true }, + email: { required: true }, + update: { required: true }, + rznvy: { required: true } + }, + messages: validation_strings, + onkeyup: false, + onfocusout: false, + errorElement: 'div', + errorClass: 'form-error', + // we do this to stop things jumping around on blur + success: function (err) { if ( form_submitted ) { err.addClass('label-valid').removeClass('label-valid-hidden').html( ' ' ); } else { err.addClass('label-valid-hidden'); } }, + errorPlacement: function( error, element ) { + element.before( error ); + }, + submitHandler: function(form) { + if (form.submit_problem) { + $('input[type=submit]', form).prop("disabled", true); + } + + form.submit(); + }, + // make sure we can see the error message when we focus on invalid elements + showErrors: function( errorMap, errorList ) { + if ( submitted && errorList.length ) { + $(window).scrollTop( $(errorList[0].element).offset().top - 120 ); + } + this.defaultShowErrors(); + submitted = false; + }, + invalidHandler: function(form, validator) { submitted = true; } + }); + + $('input[type=submit]').click( function(e) { form_submitted = 1; } ); + + /* set correct required status depending on what we submit + * NB: need to add things to form_category as the JS updating + * of this we do after a map click removes them */ + $('#submit_sign_in').click( function(e) { + $('#form_category').addClass('required validCategory').removeClass('valid'); + $('#form_name').removeClass(); + } ); + + $('#submit_register').click( function(e) { + $('#form_category').addClass('required validCategory').removeClass('valid'); + $('#form_name').addClass('required validName'); + } ); + + $('#problem_submit > input[type="submit"]').click( function(e) { + $('#form_category').addClass('required validCategory').removeClass('valid'); + $('#form_name').addClass('required validName'); + } ); + + $('#update_post').click( function(e) { + $('#form_name').addClass('required').removeClass('valid'); + } ); + + $('#form_category').change( form_category_onchange ); + + // Geolocation + if (geo_position_js.init()) { + $('#postcodeForm').after('… or locate me automatically'); + $('#geolocate_link').click(function(e) { + e.preventDefault(); + // Spinny thing! + $(this).append('

'); + geo_position_js.getCurrentPosition(function(pos) { + $('img', this).remove(); + var latitude = pos.coords.latitude; + var longitude = pos.coords.longitude; + location.href = '/around?latitude=' + latitude + ';longitude=' + longitude; + }, function(err) { + $('img', this).remove(); + if (err.code == 1) { // User said no + } else if (err.code == 2) { // No position + $(this).html("Could not look up location"); + } else if (err.code == 3) { // Too long + $('this').html("No result returned"); + } else { // Unknown + $('this').html("Unknown error"); + } + }, { + timeout: 10000 + }); + }); + } + + /* + * Report a problem page + */ + //desktop + if($('#report-a-poblem-sidebar:visible').length > 0){ + heightFix('#report-a-poblem-sidebar:visible', '.content', 26); + } + + //show/hide notes on mobile + $('.mobile #report-a-poblem-sidebar').after('How to send successful reports').hide(); + $('.mobile').on('click', '.rap-notes-trigger', function(e){ + e.preventDefault(); + //check if we've already moved the notes + if($('.rap-notes').length > 0){ + //if we have, show and hide .content + $('.mobile .content').hide(); + $('.rap-notes').show(); + }else{ + //if not, move them and show, hiding .content + $('.mobile .content').after('

').hide(); + $('#report-a-poblem-sidebar').appendTo('.rap-notes').show().after('BACK'); + } + }); + $('.mobile').on('click', '.rap-notes-close', function(e){ + e.preventDefault(); + //hide notes, show .content + $('.mobile .content').show(); + $('.rap-notes').hide(); + $('html, body').animate({scrollTop:0}, 1000); + }); + + //move 'skip this step' link on mobile + $('.mobile #skip-this-step').hide(); + $('.mobile #skip-this-step a').appendTo('#key-tools').addClass('chevron').wrap('

'); + + /* + * Tabs + */ + //make initial tab active + $('.tab-nav a:first').addClass('active'); + $('.tab:first').addClass('open'); + + //hide other tabs + $('.tab').not('.open').hide(); + + //set up click event + $(".tab-nav").on('click', 'a', function(e){ + e.preventDefault(); + tabs($(this)); + }); + + /* + * Skip to nav on mobile + */ + $('.mobile').on('click', '#nav-link', function(e){ + e.preventDefault(); + var foo = $('.wrapper').height() - 500; + $('html, body').animate({scrollTop:foo}, 1000); + }); + + + /* + * Show stuff on input focus + */ + $('.form-focus-hidden').hide(); + $('.form-focus-trigger').on('focus', function(){ + $('.form-focus-hidden').fadeIn(500); + }); +}); diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 47ca6efb7..b1a8f1889 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -30,61 +30,7 @@ function form_category_onchange() { }); } -/* - * general height fixing function - * - * elem1: element to check against - * elem2: target element - * offest: this will be added (if present) to the final value, useful for height errors - */ -function heightFix(elem1, elem2, offset){ - var h1 = $(elem1).height(), - h2 = $(elem2).height(); - if(offset === undefined){ - offset = 0; - } - if(h1 > h2){ - $(elem2).css({'min-height':h1+offset}); - } -} - - -/* - * very simple tab function - * - * elem: trigger element, must have an href attribute (so probably needs to be an ) - */ -function tabs(elem) -{ - var href = elem.attr('href'); - //stupid IE sometimes adds the full uri into the href attr, so trim - var start = href.indexOf('#'), - target = href.slice(start, href.length); - - if(!$(target).hasClass('open')) - { - //toggle class on nav - $('.tab-nav .active').removeClass('active'); - elem.addClass('active'); - - //hide / show the right tab - $('.tab.open').hide().removeClass('open'); - $(target).show().addClass('open'); - } -} - - $(function(){ - //add mobile class if small screen - if(Modernizr.mq('only screen and (max-width:47em)')) { - $('html').addClass('mobile'); - } - //heightfix the desktop .content div - if(Modernizr.mq('only screen and (min-width:48em)')) { - if (!($('body').hasClass('frontpage'))){ - heightFix(window, '.content', -176); - } - } $('html').removeClass('no-js').addClass('js'); @@ -139,13 +85,12 @@ $(function(){ }, messages: validation_strings, onkeyup: false, - onfocusout: false, errorElement: 'div', errorClass: 'form-error', // we do this to stop things jumping around on blur success: function (err) { if ( form_submitted ) { err.addClass('label-valid').removeClass('label-valid-hidden').html( ' ' ); } else { err.addClass('label-valid-hidden'); } }, errorPlacement: function( error, element ) { - element.before( error ); + element.parent('div').before( error ); }, submitHandler: function(form) { if (form.submit_problem) { @@ -189,29 +134,55 @@ $(function(){ $('#form_name').addClass('required').removeClass('valid'); } ); + $('#email_alert').click(function(e) { + if (!$('#email_alert_box').length) { + return true; + } + e.preventDefault(); + if ($('#email_alert_box').is(':visible')) { + email_alert_close(); + } else { + var pos = $(this).position(); + $('#email_alert_box').css( { 'left': ( pos.left - 20 ) + 'px', 'top': ( pos.top + 20 ) + 'px' } ); + $('#email_alert_box').show('fast'); + $('#alert_rznvy').focus(); + } + }).hover(function() { + window.clearTimeout(timer); + }, function() { + timer = window.setTimeout(email_alert_close, 2000); + }); + + $('#email_alert_box').hover(function() { + window.clearTimeout(timer); + }, function() { + timer = window.setTimeout(email_alert_close, 2000); + }); + + $('#form_category').change( form_category_onchange ); // Geolocation if (geo_position_js.init()) { - $('#postcodeForm').after('… or locate me automatically'); + $('#postcodeForm').append('

Or locate me automatically').css({ "padding-bottom": "0.5em" }); $('#geolocate_link').click(function(e) { e.preventDefault(); // Spinny thing! - $(this).append(' '); + $('#geolocate_para').append(' '); geo_position_js.getCurrentPosition(function(pos) { - $('img', this).remove(); + $('#geolocate_para img').remove(); var latitude = pos.coords.latitude; var longitude = pos.coords.longitude; location.href = '/around?latitude=' + latitude + ';longitude=' + longitude; }, function(err) { - $('img', this).remove(); + $('#geolocate_para img').remove(); if (err.code == 1) { // User said no } else if (err.code == 2) { // No position - $(this).html("Could not look up location"); + $('#geolocate_para').html("Could not look up location"); } else if (err.code == 3) { // Too long - $('this').html("No result returned"); + $('#geolocate_para').html("No result returned"); } else { // Unknown - $('this').html("Unknown error"); + $('#geolocate_para').html("Unknown error"); } }, { timeout: 10000 @@ -219,72 +190,4 @@ $(function(){ }); } - /* - * Report a problem page - */ - //desktop - if($('#report-a-poblem-sidebar:visible').length > 0){ - heightFix('#report-a-poblem-sidebar:visible', '.content', 26); - } - - //show/hide notes on mobile - $('.mobile #report-a-poblem-sidebar').after('How to send successful reports').hide(); - $('.mobile').on('click', '.rap-notes-trigger', function(e){ - e.preventDefault(); - //check if we've already moved the notes - if($('.rap-notes').length > 0){ - //if we have, show and hide .content - $('.mobile .content').hide(); - $('.rap-notes').show(); - }else{ - //if not, move them and show, hiding .content - $('.mobile .content').after('

').hide(); - $('#report-a-poblem-sidebar').appendTo('.rap-notes').show().after('BACK'); - } - }); - $('.mobile').on('click', '.rap-notes-close', function(e){ - e.preventDefault(); - //hide notes, show .content - $('.mobile .content').show(); - $('.rap-notes').hide(); - $('html, body').animate({scrollTop:0}, 1000); - }); - - //move 'skip this step' link on mobile - $('.mobile #skip-this-step').hide(); - $('.mobile #skip-this-step a').appendTo('#key-tools').addClass('chevron').wrap('

'); - - /* - * Tabs - */ - //make initial tab active - $('.tab-nav a:first').addClass('active'); - $('.tab:first').addClass('open'); - - //hide other tabs - $('.tab').not('.open').hide(); - - //set up click event - $(".tab-nav").on('click', 'a', function(e){ - e.preventDefault(); - tabs($(this)); - }); - - /* - * Skip to nav on mobile - */ - $('.mobile').on('click', '#nav-link', function(e){ - e.preventDefault(); - var foo = $('.wrapper').height() - 500; - $('html, body').animate({scrollTop:foo}, 1000); - }); - - - /* - * Show stuff on input focus - */ - $('.form-focus-hidden').hide(); - $('.form-focus-trigger').on('focus', function(){ - $('.form-focus-hidden').fadeIn(500); - }); }); -- cgit v1.2.3 From 084074e9568a89c31d923977cde6a94443886256 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 23 Feb 2012 14:50:16 +0000 Subject: Put footer from front page into page footer slot of footer.html, refactor styles accordingly Signed-off-by: Josh Angell --- templates/web/fixmystreet/contact/index.html | 3 +- templates/web/fixmystreet/footer.html | 28 ++- templates/web/fixmystreet/index.html | 30 +-- web/cobrands/fixmystreet/base.scss | 89 ++++----- web/cobrands/fixmystreet/layout.scss | 279 +++++++++++++-------------- 5 files changed, 211 insertions(+), 218 deletions(-) diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html index 87096bd8a..368fb0628 100644 --- a/templates/web/fixmystreet/contact/index.html +++ b/templates/web/fixmystreet/contact/index.html @@ -1,6 +1,7 @@ [% INCLUDE 'header.html', title = loc('Contact Us') robots = 'noindex,nofollow' + bodyclass => 'twothirdswidthpage' %]

[% loc('Contact the team') %]

@@ -96,4 +97,4 @@ [% TRY %][% INCLUDE 'contact/address.html' %][% CATCH file %][% END %] -[% INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index fa9439e09..8a594c1b8 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,6 +1,30 @@ [% IF pagefooter %] - + [% END %] + + +

diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index d66f0fab4..3bd42b1b2 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -32,26 +32,26 @@

+ + +

+ [% IF c.user_exists %] +

+ [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + [% loc('sign out') %] +

+ [% ELSE %] + + [% END %] +

- - -

- [% IF c.user_exists %] -

- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - [% loc('sign out') %] -

- [% ELSE %] - - [% END %] -

- -

- - +

+ + diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 5bf5d4dce..125ef2cae 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -99,10 +99,6 @@ $(function(){ } } - if ($.browser.opera) { - $('html').addClass('opera'); - } - $('html').removeClass('no-js').addClass('js'); $('#pc').focus(); diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 7fa9b13a3..32aa63df0 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -45,6 +45,9 @@ body { display: table; caption-side: top; width: 100%; + .table-cell { + display:table-cell; + } } //pad the top of the wrapper to allow space for the menu to fit in @@ -67,7 +70,7 @@ body { } //position absolute the menu as ie doesn't like display:table -.ie6, .ie7, .opera { +.ie6, .ie7 { .nav-wrapper { position: absolute; top:0; @@ -626,8 +629,9 @@ textarea.form-error { } // Frontpage + body.frontpage { - .wrapper { + .table-cell { // we do this so we can have full screen width elements >.container { width:100%; -- cgit v1.2.3 From 1032116623200d6dda3ed9010750835b4c5d3d30 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 27 Feb 2012 15:34:59 +0000 Subject: Added missing bodyclass to /my Signed-off-by: Josh Angell --- templates/web/fixmystreet/my/my.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html index b6a1e824c..687c5686e 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -1,6 +1,6 @@ [% PROCESS "maps/${map.type}.html" IF problems.size; - INCLUDE 'header.html', title = loc('Your Reports') + INCLUDE 'header.html', title = loc('Your Reports'), bodyclass = 'mappage' %] [% IF problems.size %] -- cgit v1.2.3 From bff1a3e8a0c4a730bf2da235b99c01357ae5a84a Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 27 Feb 2012 15:45:03 +0000 Subject: Move back to top on 'show notes' at /report/new on mobile Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 125ef2cae..c035fe32a 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -254,6 +254,7 @@ $(function(){ $('.mobile .content').after('

').hide(); $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('BACK'); } + $('html, body').animate({scrollTop:0}, 1000); }); $('.mobile').on('click', '.rap-notes-close', function(e){ e.preventDefault(); -- cgit v1.2.3 From b082e09491d0edbfba09582d7c184f6f672e01e3 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 27 Feb 2012 15:48:34 +0000 Subject: Take of a width in ie8 Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 1bedff52e..8d294a1ee 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -874,11 +874,6 @@ a:hover.button-left { } } } -.ie8 { - .issue-list-a li a { - width:25em; - } -} #map_box{ background: #333; -- cgit v1.2.3 From 7b492694b8aca724817b50bf6210b5c0b24cde94 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 27 Feb 2012 16:16:17 +0000 Subject: Png fixing for ie6 Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 7 +++++- web/cobrands/fixmystreet/images/ie_front_logo.gif | Bin 0 -> 5364 bytes .../fixmystreet/images/ie_green_chevron.gif | Bin 0 -> 237 bytes web/cobrands/fixmystreet/images/ie_logo.gif | Bin 0 -> 3043 bytes web/cobrands/fixmystreet/images/ie_mobileapps.gif | Bin 0 -> 2668 bytes web/cobrands/fixmystreet/images/ie_mysoc_logo.gif | Bin 0 -> 599 bytes web/cobrands/fixmystreet/layout.scss | 26 +++++++++++++++++++-- 7 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 web/cobrands/fixmystreet/images/ie_front_logo.gif create mode 100644 web/cobrands/fixmystreet/images/ie_green_chevron.gif create mode 100644 web/cobrands/fixmystreet/images/ie_logo.gif create mode 100644 web/cobrands/fixmystreet/images/ie_mobileapps.gif create mode 100644 web/cobrands/fixmystreet/images/ie_mysoc_logo.gif diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 8d294a1ee..75bc851b2 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -439,6 +439,9 @@ p.label-valid { position: absolute; z-index:2; } +.ie6 #site-logo { + background: url('images/ie_logo.gif') 0 -5px no-repeat; +} #nav-link { width: 50px; height: 48px; @@ -487,7 +490,9 @@ p.label-valid { } } } - +.ie6 #main-nav ul#mysoc-menu li a#mysoc-logo { + background: url('images/ie_mysoc_logo.gif') center no-repeat; +} //defines where the table caption is (login stuff on mob, nav menu on desktop) .wrapper { width:100%; diff --git a/web/cobrands/fixmystreet/images/ie_front_logo.gif b/web/cobrands/fixmystreet/images/ie_front_logo.gif new file mode 100644 index 000000000..093408570 Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_front_logo.gif differ diff --git a/web/cobrands/fixmystreet/images/ie_green_chevron.gif b/web/cobrands/fixmystreet/images/ie_green_chevron.gif new file mode 100644 index 000000000..341ac1eeb Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_green_chevron.gif differ diff --git a/web/cobrands/fixmystreet/images/ie_logo.gif b/web/cobrands/fixmystreet/images/ie_logo.gif new file mode 100644 index 000000000..bce71595f Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_logo.gif differ diff --git a/web/cobrands/fixmystreet/images/ie_mobileapps.gif b/web/cobrands/fixmystreet/images/ie_mobileapps.gif new file mode 100644 index 000000000..604efc101 Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_mobileapps.gif differ diff --git a/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif b/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif new file mode 100644 index 000000000..8df76b210 Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 32aa63df0..46f88be92 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -231,7 +231,10 @@ body.mappage { } } } - +//colour background the same as that of the ie_logo.gif +.ie6 body.mappage .nav-wrapper .nav-wrapper-2 { + background: #1a1a1a; +} //ie8 needs different stuff on .nav-wrapper so we //have to define all the rest of it again as this resets //the z-index base yet again :S @@ -377,6 +380,20 @@ body.twothirdswidthpage { margin-right:2%; } } +.ie6 #footer-mobileapps ul li a { + background:url(images/ie_mobileapps.gif) -1px -1px no-repeat; + &.m-app-iphone-streetreport { + background-position: -1px -69px; + height:50px; + } + &.m-app-droid { + background-position: -1px -148px; + } + &.m-app-nokia { + background-position: -1px -212px; + width:74px; + } +} #footer-ads { border-left:1em solid #fff; @@ -516,7 +533,9 @@ body.twothirdswidthpage { border-bottom:none; } } - +.ie6 .big-green-banner { + background: $contrast1 url(images/ie_green_chevron.gif) right center no-repeat; +} .banner { // fixed banner image @@ -682,6 +701,9 @@ body.frontpage { top:-1em; } } +.ie6 body.frontpage #site-logo { + background:url(images/ie_front_logo.gif) 0 0 no-repeat; +} //weird margining thing for ie8 .ie8 body.frontpage { .wrapper .content { -- cgit v1.2.3 From 450925ec58be918e56b2f52b4f2fad653fb01f44 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 27 Feb 2012 16:46:13 +0000 Subject: Ie 6 fix for .issue-list-a Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 75bc851b2..6b3a66233 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -874,11 +874,18 @@ a:hover.button-left { width:18em; } .img { + width:6.25em; float:right; } } } } +.ie6 .issue-list-a li a { + height:5.5em; + .img img { + height:60px; + } +} #map_box{ background: #333; -- cgit v1.2.3 From 179aaa5852127e7d26b246816b69984b4ecf3468 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 27 Feb 2012 17:28:39 +0000 Subject: Added a table style for /reports (some initial work for issue #235) Signed-off-by: Josh Angell --- templates/web/fixmystreet/reports/index.html | 46 ++++++++++++++-------------- web/cobrands/fixmystreet/base.scss | 39 +++++++++++++++++++++++ 2 files changed, 62 insertions(+), 23 deletions(-) diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html index 633e96022..eb0c9d412 100755 --- a/templates/web/fixmystreet/reports/index.html +++ b/templates/web/fixmystreet/reports/index.html @@ -6,30 +6,30 @@

[% 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.') %]

- - - - - - - - +

[% loc('Name') %]	[% loc('New problems') %]	[% loc('Older problems') %]	[% loc('Old problems, state unknown') %]	[% loc('Recently fixed') %]	[% loc('Older fixed') %]

+ + + + + + + + -[% FOREACH area IN areas_info_sorted %] - - - - - - - - -[% END %] + [% FOREACH area IN areas_info_sorted %] + + + + + + + + + [% END %]

[% loc('Name') %]	[% loc('New problems') %]	[% loc('Older problems') %]	[% loc('Old / unknown problems') %]	[% loc('Recently fixed') %]	[% loc('Older fixed') %]
[% area.name %]	[% open.${area.id}.new or 0 %]	[% open.${area.id}.older or 0 %]	[% open.${area.id}.unknown or 0 %]	[% fixed.${area.id}.new or 0 %]	[% fixed.${area.id}.old or 0 %]
[% area.name %]	[% open.${area.id}.new or 0 %]	[% open.${area.id}.older or 0 %]	[% open.${area.id}.unknown or 0 %]	[% fixed.${area.id}.new or 0 %]	[% fixed.${area.id}.old or 0 %]

[% 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 6b3a66233..e846cfe1b 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -984,6 +984,45 @@ a:hover.rap-notes-trigger { } } + +table.nicetable { + width:100%; + margin-bottom:2em; + thead { + border-bottom:0.25em solid #ccc; + th { + font-size:0.75em; + } + } + tr { + &:nth-child(even) { + background:#f6f6f6; + } + &:hover { + background:#FFF5CC; + cursor:pointer; + } + td { + padding:0.25em; + a { + color:#333; + &:hover { + text-decoration:none; + } + } + } + } + .title { + text-align:left; + } + .data { + width:12%; + } +} + + + + // this is a bit of a hack to get some differentation between desk and mobile .desk-only { display:none !important; -- cgit v1.2.3 From 0377425491bdcf9425607fa45bf59b4de710177f Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 28 Feb 2012 10:28:34 +0000 Subject: Refactor js a bit so that the html no-js class is removed before the general heightfix Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index c035fe32a..490f7f134 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -75,23 +75,24 @@ function tabs(elem) $(function(){ + $('html').removeClass('no-js').addClass('js'); + //add mobile class if small screen if(Modernizr.mq('only screen and (max-width:48em)')) { $('html').addClass('mobile'); } else { - - // Make map full screen on non-mobile sizes. - // temp: exclude ie6 as it doesn't like the height part of this - if(!$('html').hasClass('ie6')){ - $('#map_box').prependTo('.wrapper').css({ - zIndex: 0, position: 'fixed', - top: 0, left: 0, right: 0, bottom: 0, - width: '100%', height: '100%', - margin: 0 - }).data('size', 'full'); - } - + // Make map full screen on non-mobile sizes. + // temp: exclude ie6 as it doesn't like the height part of this + if(!$('html').hasClass('ie6')){ + $('#map_box').prependTo('.wrapper').css({ + zIndex: 0, position: 'fixed', + top: 0, left: 0, right: 0, bottom: 0, + width: '100%', height: '100%', + margin: 0 + }).data('size', 'full'); + } } + //heightfix the desktop .content div if(Modernizr.mq('only screen and (min-width:48em)')) { if (!($('body').hasClass('frontpage'))){ @@ -99,8 +100,6 @@ $(function(){ } } - $('html').removeClass('no-js').addClass('js'); - $('#pc').focus(); $('input[type=submit]').removeAttr('disabled'); -- cgit v1.2.3 From f6a273de86aec80ea689c3b26a7be03165885ce6 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 28 Feb 2012 10:35:57 +0000 Subject: Add show on click to the 'Wards' on the council reports page Signed-off-by: Josh Angell --- templates/web/fixmystreet/reports/council.html | 29 ++++++++++++++++---------- web/cobrands/fixmystreet/base.scss | 6 ++++++ web/cobrands/fixmystreet/fixmystreet.js | 17 ++++++++++++++- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 7af9201cd..092b2588b 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -75,8 +75,25 @@ Its area is now covered by Bedford Borough Council [% END %] - [% INCLUDE 'pagination.html', param = 'p' %] +[% IF children.size %] + +[% loc('Wards of this council') %] + +

[% loc('Wards of this council') %]

[% loc('Follow a ward link to view only reports within that ward.') %]

[% child.name %]

+[% END %] + + + +[% INCLUDE 'pagination.html', param = 'p' %] [% INCLUDE column title = loc('Recently fixed') problems = fixed.${council.id}.new @@ -111,16 +128,6 @@ Its area is now covered by Bedford Borough Council[% loc('Wards of this council') %] -

[% loc('Follow a ward link to view only reports within that ward.') %]

[% child.name %]

-[% END %] -

[% INCLUDE 'footer.html' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index e846cfe1b..6b0c1850a 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1034,6 +1034,12 @@ table.nicetable { visibility: hidden; } +// hide anything with this class if js is NOT working +.no-js .hidden-nojs { + display: none !important; + visibility: hidden; +} + /* Front page */ #front-main { diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 490f7f134..a6ae9be21 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -92,7 +92,7 @@ $(function(){ }).data('size', 'full'); } } - + //heightfix the desktop .content div if(Modernizr.mq('only screen and (min-width:48em)')) { if (!($('body').hasClass('frontpage'))){ @@ -300,4 +300,19 @@ $(function(){ $('.form-focus-trigger').on('focus', function(){ $('.form-focus-hidden').fadeIn(500); }); + + /* + * Show on click - pretty generic + */ + $('.hideshow-trigger').on('click', function(e){ + e.preventDefault(); + var href = $(this).attr('href'), + //stupid IE sometimes adds the full uri into the href attr, so trim + start = href.indexOf('#'), + target = href.slice(start, href.length); + + $(target).removeClass('hidden-js'); + + $(this).hide(); + }); }); -- cgit v1.2.3 From f3b817bef7c55a1c601c6ce5a67f146dd855240c Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 28 Feb 2012 10:41:03 +0000 Subject: Reports page wants to know if photo exists. --- perllib/FixMyStreet/App/Controller/Reports.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 0587a627a..5305b23b4 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -343,6 +343,7 @@ sub load_and_group_problems : Private { 'id', 'council', 'state', 'areas', 'latitude', 'longitude', 'title', 'cobrand', { duration => { extract => "epoch from current_timestamp-lastupdate" } }, { age => { extract => "epoch from current_timestamp-confirmed" } }, + { photo => 'photo is not null' }, ], order_by => { -desc => 'lastupdate' }, rows => 100, -- cgit v1.2.3 From 42b3535a00bfd0f8fd1e43207c63aa74c399b82b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 28 Feb 2012 10:42:05 +0000 Subject: Improve error wording on failed sign in. --- templates/web/default/auth/general.html | 2 +- templates/web/fixmystreet/auth/general.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 5407e56e1..c2249fa46 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -20,7 +20,7 @@ [% IF loc_email_error %]

[% loc_email_error %]

[% ELSIF sign_in_error %] -

[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]

[% END %]

diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html index 2058ac60e..a0cb80726 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -21,7 +21,7 @@ [% IF loc_email_error %]

[% loc_email_error %]

[% ELSIF sign_in_error %] -

[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]

[% END %] -- cgit v1.2.3 From b5fe45327561dbad2f83c0522b3df0830730c7de Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 28 Feb 2012 10:46:01 +0000 Subject: Make the council reports page pretty Signed-off-by: Josh Angell --- templates/web/fixmystreet/reports/council.html | 71 ++++++++++++++++---------- web/cobrands/fixmystreet/base.scss | 18 ++++++- 2 files changed, 61 insertions(+), 28 deletions(-) diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 092b2588b..17ed2c37f 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -59,9 +59,9 @@ Its area is now covered by Bedford Borough Councilview all reports for the council or show all councils.'), council_url ) %] + [% tprintf( loc('You can view all reports for the council or show all councils.'), council_url ) %] [% ELSE %] -[% loc('You can show all councils.') %] + [% loc('You can show all councils.') %] [% END %]

[% name %]

@@ -94,38 +94,47 @@ Its area is now covered by Bedford Borough Council + +

[% loc('Recently fixed') %]
[% loc( 'New problems' ) %]
[% loc( 'Older problems' ) %]
[% loc( 'Old / unknown problems' ) %]
[% loc( 'Old fixed' ) %]

+ [% INCLUDE column title = loc('Recently fixed') + tab_id = 'recently_fixed' problems = fixed.${council.id}.new %] [% INCLUDE column title = loc('New problems') + tab_id = 'new_problems' problems = open.${council.id}.new %] - [%# This doesn't really need a whole separate template %] - [% IF c.cobrand.moniker == 'emptyhomes' %] - [% - INCLUDE column - title = loc('Older problems') - problems = open.${council.id}.older.merge( open.${council.id}.unknown ) - %] - [% ELSE %] - [% INCLUDE column - title = loc('Older problems') - problems = open.${council.id}.older - %] - [% INCLUDE column - title = loc('Old problems, state unknown') - problems = open.${council.id}.unknown - %] - [% END %] + [% INCLUDE column + title = loc('Older problems') + tab_id = 'older_problems' + problems = open.${council.id}.older + %] + + [% INCLUDE column + title = loc('Old / unknown problems') + tab_id = 'old_unknown_problems' + problems = open.${council.id}.unknown + %] [% INCLUDE column title = loc('Old fixed') + tab_id = 'old_fixed' problems = fixed.${council.id}.old %] +

@@ -134,15 +143,25 @@ Its area is now covered by Bedford Borough Council[% title %] +

[% title %]

[% problem.title | html %] - [% IF problem.councils > 1 %] [% loc('(sent to both)') %] [% END %] - [% IF c.cobrand.moniker != 'emptyhomes' %] - [% IF problem.councils == 0 %] [% loc('(not sent to council)') %] [% END %] - [% END %] +
+ +
+
[% problem.title | html %]
+ [% IF problem.councils > 1 %] [% loc('(sent to both)') %] [% END %] + [% IF c.cobrand.moniker != 'emptyhomes' %] + [% IF problem.councils == 0 %] [% loc('(not sent to council)') %] [% END %] + [% END %] +
+ [% IF problem.photo %] +
+ +
+ [% END %] +

Date: Tue, 28 Feb 2012 10:51:47 +0000 Subject: Make reports' photos use the problem.id Signed-off-by: Josh Angell --- templates/web/fixmystreet/reports/council.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 17ed2c37f..649dcf0b0 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -158,7 +158,7 @@ Its area is now covered by Bedford Borough Council [% IF problem.photo %]

[% END %] -- cgit v1.2.3 From e9cd92ad75f2a1a61fa0a8a6af63241494c15136 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 28 Feb 2012 11:30:40 +0000 Subject: Take out display:inline from list-reset mixing - really not necessary! Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/_mixins.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss index 45bbd379d..793c9090b 100644 --- a/web/cobrands/fixmystreet/_mixins.scss +++ b/web/cobrands/fixmystreet/_mixins.scss @@ -64,7 +64,6 @@ margin: 0; border: 0; float:left; - display:inline; a { float:left; display:block; -- cgit v1.2.3 From 3fce49668564d6d849161995fa13bbd28b3fe2b8 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 28 Feb 2012 12:28:38 +0000 Subject: For /reports table, an example of how we could move the heading cells to be above the data cells Signed-off-by: Josh Angell --- templates/web/fixmystreet/reports/council.html | 76 +++++++++++++++----------- web/cobrands/fixmystreet/base.scss | 33 ++++++++++- web/cobrands/fixmystreet/fixmystreet.js | 10 ++++ 3 files changed, 85 insertions(+), 34 deletions(-) diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 649dcf0b0..00126d326 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -21,48 +21,60 @@

- [% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] -

This council no longer exists. -[% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] -Its area is now covered by Cornwall Council. -[% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] -Its area is now covered by Durham County Council. -[% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] -Its area is now covered by Northumberland County Council. -[% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] -Its area is now covered by Shropshire Council. -[% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] -Its area is now covered by Wiltshire Council. -[% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] -Its area is now covered by Cheshire West and Chester Council. -[% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] -Its area is now covered by Cheshire East Council. -[% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] -Its area is now covered by Central Bedfordshire Council. -[% ELSIF council.name.match('Cheshire') %] -Its area is now covered by Cheshire West and Chester Council or -Cheshire East Council. -[% ELSIF council.name.match('Bedfordshire') %] -Its area is now covered by Bedford Borough Council or -Central Bedfordshire Council. -[% END %] -

This council no longer exists. + [% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] + Its area is now covered by Cornwall Council. + [% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] + Its area is now covered by Durham County Council. + [% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] + Its area is now covered by Northumberland County Council. + [% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] + Its area is now covered by Shropshire Council. + [% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] + Its area is now covered by Wiltshire Council. + [% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] + Its area is now covered by Cheshire West and Chester Council. + [% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] + Its area is now covered by Cheshire East Council. + [% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] + Its area is now covered by Central Bedfordshire Council. + [% ELSIF council.name.match('Cheshire') %] + Its area is now covered by Cheshire West and Chester Council or + Cheshire East Council. + [% ELSIF council.name.match('Bedfordshire') %] + Its area is now covered by Bedford Borough Council or + Central Bedfordshire Council. + [% END %] +

[% ELSE %] -

[% tprintf(loc('Receive updates of problems in this %s'), thing) %]

[% END %] + + + + +

[% IF c.cobrand.all_councils_report %] [% tprintf( loc('This is a summary of all reports for one %s.'), thing ) %] [% ELSE %] [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] [% END %] +

-[% IF ward %] - [% tprintf( loc('You can view all reports for the council or show all councils.'), council_url ) %] -[% ELSE %] - [% loc('You can show all councils.') %] -[% END %]

[% name %]

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 1bcfd58df..314fc2710 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1029,11 +1029,40 @@ table.nicetable { .promo { @extend .full-width; - background:$contrast1; + background:$primary; padding:1em; margin-bottom:1em; +} + +.alert { + @extend .full-width; + background:#ff0000; + padding:1em; + margin-bottom:1em; + color:#fff; a, a:hover { - color:#fff; + color:$primary; + } +} + +ul.breadcrumb { + @include list-reset; + margin:-1em -1em 1em -1em; + overflow:hidden; + li { + span { + display:block; + padding:0.5em 1em 0.5em 0; + } + a { + background:url(images/sprite.png) right -3220px no-repeat; + padding:0.5em 2.5em 0.5em 1em; + color:#333; + &:hover { + color:#000; + text-decoration:none; + } + } } } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index a6ae9be21..3634160ff 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -315,4 +315,14 @@ $(function(){ $(this).hide(); }); + + /* + * nicetable - on mobile shift 'name' col to be a row + */ + $('.mobile .nicetable th.title').remove(); + $('.mobile .nicetable td.title').each(function(i){ + $(this).insertBefore($(this).parent('tr')).wrap(''); + }); + // $('.mobile .nicetable tr.heading > td.title').css({'min-width':'300px'}); + // $('.mobile .nicetable tr > td.data').css({'max-width':'12%'}); }); -- cgit v1.2.3 From 5a5868bd9ea94dd48dd8cd84b91d3e534ccb27b4 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 28 Feb 2012 12:36:09 +0000 Subject: Disable scroll wheel zooming on the map, as it causes confusion with a full screen map. --- web/js/map-bing-ol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 94b777134..0211050c6 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -2,7 +2,7 @@ function set_map_config(perm) { fixmystreet.controls = [ new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), - new OpenLayers.Control.Navigation(), + new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), perm, //new OpenLayers.Control.ZoomPanel() new OpenLayers.Control.PanZoomFMS() -- cgit v1.2.3 From da7a1a6ec8f65b6fa669d8f2b3f89dce9851cbd6 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 28 Feb 2012 12:36:41 +0000 Subject: Add class and sample style to report-a-problem link Signed-off-by: Josh Angell --- templates/web/fixmystreet/footer.html | 2 +- web/cobrands/fixmystreet/layout.scss | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index a35f475ae..93e88dcc2 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -41,7 +41,7 @@

<[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END +
<[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/" class="report-a-problem-btn"[% END %]>[% loc("Report a problem") %]
<[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END %]>[% loc("Your reports") %]

Date: Tue, 28 Feb 2012 12:37:23 +0000 Subject: Get a full screen map working in IE6. --- web/cobrands/fixmystreet/fixmystreet.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index a6ae9be21..b577b0298 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -82,15 +82,17 @@ $(function(){ $('html').addClass('mobile'); } else { // Make map full screen on non-mobile sizes. - // temp: exclude ie6 as it doesn't like the height part of this - if(!$('html').hasClass('ie6')){ - $('#map_box').prependTo('.wrapper').css({ - zIndex: 0, position: 'fixed', - top: 0, left: 0, right: 0, bottom: 0, - width: '100%', height: '100%', - margin: 0 - }).data('size', 'full'); + var map_pos = 'fixed', map_height = '100%'; + if ($('html').hasClass('ie6')) { + map_pos = 'absolute'; + map_height = $(window).height(); } + $('#map_box').prependTo('.wrapper').css({ + zIndex: 0, position: map_pos, + top: 0, left: 0, right: 0, bottom: 0, + width: '100%', height: map_height, + margin: 0 + }).data('size', 'full'); } //heightfix the desktop .content div -- cgit v1.2.3 From 37e9d4bcf5793c821f743189c3bf691f2ea3de57 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 28 Feb 2012 12:41:52 +0000 Subject: First time jslint fixings. --- web/js/map-bing-ol.js | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 0211050c6..588f8d45b 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -33,10 +33,12 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { logo: logo, copyrights: copyrights }); - this.map && this.map.events.triggerEvent("changelayer", { - layer: this, - property: "attribution" - }); + if (this.map) { + this.map.events.triggerEvent("changelayer", { + layer: this, + property: "attribution" + }); + } }, initialize: function(name, options) { @@ -59,10 +61,10 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { for (var i = level; i > 0; i--) { var digit = 0; var mask = 1 << (i - 1); - if ((x & mask) != 0) { + if ((x & mask) !== 0) { digit++; } - if ((y & mask) != 0) { + if ((y & mask) !== 0) { digit += 2; } key += digit; @@ -72,16 +74,17 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { getURL: function (bounds) { var res = this.map.getResolution(); - var x = Math.round((bounds.left - this.maxExtent.left) - / (res * this.tileSize.w)); - var y = Math.round((this.maxExtent.top - bounds.top) - / (res * this.tileSize.h)); - var z = this.serverResolutions != null ? + var x = Math.round((bounds.left - this.maxExtent.left) / + (res * this.tileSize.w)); + var y = Math.round((this.maxExtent.top - bounds.top) / + (res * this.tileSize.h)); + var z = this.serverResolutions !== null ? OpenLayers.Util.indexOf(this.serverResolutions, res) : this.map.getZoom() + this.zoomOffset; + var url; if (z >= 16) { - var url = [ + url = [ "http://tilma.mysociety.org/sv/${z}/${x}/${y}.png", "http://a.tilma.mysociety.org/sv/${z}/${x}/${y}.png", "http://b.tilma.mysociety.org/sv/${z}/${x}/${y}.png", @@ -89,8 +92,8 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { ]; } else { var type = ''; - if (z > 10) type = '&productSet=mmOS'; - var url = [ + if (z > 10) { type = '&productSet=mmOS'; } + url = [ "http://ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=701" + type, "http://ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=701" + type, "http://ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=701" + type, -- cgit v1.2.3 From a71e84d2e0cf9a6251eca7567605fb38baca9cad Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 28 Feb 2012 14:57:48 +0000 Subject: Add pretty map controls Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 51 +++++++++++++++++++++++++++++ web/cobrands/fixmystreet/images/sprite.png | Bin 139196 -> 138226 bytes web/cobrands/fixmystreet/layout.scss | 7 ++-- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 314fc2710..a581ea8b2 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1182,3 +1182,54 @@ ul.breadcrumb { margin-bottom:0; } } + + +// openlayers overrides +#OpenLayers\.Control\.PanZoom_6_panup, +#OpenLayers\.Control\.PanZoom_6_pandown, +#OpenLayers\.Control\.PanZoom_6_panleft, +#OpenLayers\.Control\.PanZoom_6_panright, +#OpenLayers\.Control\.PanZoom_6_zoomin, +#OpenLayers\.Control\.PanZoom_6_zoomout { + text-indent:-999999px; + background:url(images/sprite.png) no-repeat; +} +#OpenLayers\.Control\.PanZoom_6_zoomworld { + display:none !important; + visibility:none !important; +} + +#OpenLayers\.Control\.PanZoom_6_panup { + background-position:-25px -218px; + left:15px !important; + top:0 !important; +} +#OpenLayers\.Control\.PanZoom_6_pandown { + background-position:-25px -248px; + left:15px !important; + top:36px !important; +} +#OpenLayers\.Control\.PanZoom_6_panleft { + background-position:-10px -233px; + width:24px !important; + left:0px !important; + top:18px !important; +} +#OpenLayers\.Control\.PanZoom_6_panright { + background-position:-34px -233px; + width:24px !important; + left:24px !important; + top:18px !important; +} +#OpenLayers\.Control\.PanZoom_6_zoomin { + background-position:-25px -280px; + height:22px !important; + left:15px !important; + top:70px !important; +} +#OpenLayers\.Control\.PanZoom_6_zoomout { + background-position:-25px -298px; + height:22px !important; + left:15px !important; + top:92px !important; +} \ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index a27fc9d84..2abfa1279 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 5b3d96bd1..1e6fce779 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -4,9 +4,10 @@ // OpenLayers fix for navigation being top right .olControlPanZoom { - right: 44px !important; - top: 4em !important; - left: auto !important; + width:48px; + right: 1em !important; + top: 5em !important; + left: auto !important; } //hacks for desk/mob only stuff -- cgit v1.2.3 From cecb11c2a73f7f86fc27914bcaee80e0454802c2 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 28 Feb 2012 17:08:09 +0000 Subject: Lots of map tools/controls styling Signed-off-by: Josh Angell --- .../web/fixmystreet/around/display_location.html | 5 +- web/cobrands/fixmystreet/base.scss | 145 +++++++++++++-------- web/cobrands/fixmystreet/fixmystreet.js | 16 ++- web/cobrands/fixmystreet/images/sprite.png | Bin 138226 -> 138129 bytes web/cobrands/fixmystreet/layout.scss | 28 ++-- web/js/map-OpenLayers.js | 2 +- 6 files changed, 131 insertions(+), 65 deletions(-) diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index db0a2d4c0..f955386e2 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -54,11 +54,10 @@ [% loc('Hide pins') %] [% END %] [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] - | [% IF c.req.params.all_pins %] - [% loc('Hide stale reports') %] + [% loc('Hide old reports') %] [% ELSE %] - [% loc('Include stale reports') %] + [% loc('Include old reports') %] [% END %] [% END %]

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index a581ea8b2..dbba6e69e 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -894,18 +894,110 @@ a:hover.button-left { } } +// map stuff #map_box{ + @extend .full-width; background: #333; height: 10em; - @extend .full-width; margin-bottom: 1em; overflow: hidden; + position: relative; #map { width:100%; height:100%; } } +// OpenLayers fix for navigation being top right +.olControlPanZoom { + width:48px; + right: 1em !important; + top: 1em !important; + left: auto !important; +} + +// Openlayers map controls (overrides) +#OpenLayers\.Control\.PanZoom_6_panup, +#OpenLayers\.Control\.PanZoom_6_pandown, +#OpenLayers\.Control\.PanZoom_6_panleft, +#OpenLayers\.Control\.PanZoom_6_panright, +#OpenLayers\.Control\.PanZoom_6_zoomin, +#OpenLayers\.Control\.PanZoom_6_zoomout { + text-indent:-999999px; + background:url(images/sprite.png) no-repeat; +} +#OpenLayers\.Control\.PanZoom_6_zoomworld { + display:none !important; + visibility:none !important; +} + +#OpenLayers\.Control\.PanZoom_6_panup { + background-position:-25px -218px; + left:15px !important; + top:0 !important; +} +#OpenLayers\.Control\.PanZoom_6_pandown { + background-position:-25px -248px; + left:15px !important; + top:36px !important; +} +#OpenLayers\.Control\.PanZoom_6_panleft { + background-position:-10px -233px; + width:24px !important; + left:0px !important; + top:18px !important; +} +#OpenLayers\.Control\.PanZoom_6_panright { + background-position:-34px -233px; + width:24px !important; + left:24px !important; + top:18px !important; +} +#OpenLayers\.Control\.PanZoom_6_zoomin { + background-position:-25px -280px; + height:22px !important; + left:15px !important; + top:70px !important; +} +#OpenLayers\.Control\.PanZoom_6_zoomout { + background-position:-25px -298px; + height:22px !important; + left:15px !important; + top:92px !important; +} + +//hide pins, show old reports etc +#sub_map_links { + position: absolute; + left: 0; + right:0; + bottom: 0; + z-index: 1000; + background:#333; + margin:0; + a { + @include inline-block; + font-size:0.6875em; + color:#fff; + padding:0.6em 3em 0.5em 1em; + background:url(images/sprite.png) right -4066px no-repeat; + &#hide_pins_link { + background-position:right -3976px; + } + &#all_pins_link { + background-position:right -4022px; + } + &#map_permalink { + background-position:right -4070px; + } + } +} + +//copyright attribution +#OpenLayers\.Control\.Attribution_3 { + bottom:2em !important; +} + /* Drag is only present in noscript form. XXX Copy from core. */ #drag { input, img { @@ -1181,55 +1273,4 @@ ul.breadcrumb { border-bottom:none; margin-bottom:0; } -} - - -// openlayers overrides -#OpenLayers\.Control\.PanZoom_6_panup, -#OpenLayers\.Control\.PanZoom_6_pandown, -#OpenLayers\.Control\.PanZoom_6_panleft, -#OpenLayers\.Control\.PanZoom_6_panright, -#OpenLayers\.Control\.PanZoom_6_zoomin, -#OpenLayers\.Control\.PanZoom_6_zoomout { - text-indent:-999999px; - background:url(images/sprite.png) no-repeat; -} -#OpenLayers\.Control\.PanZoom_6_zoomworld { - display:none !important; - visibility:none !important; -} - -#OpenLayers\.Control\.PanZoom_6_panup { - background-position:-25px -218px; - left:15px !important; - top:0 !important; -} -#OpenLayers\.Control\.PanZoom_6_pandown { - background-position:-25px -248px; - left:15px !important; - top:36px !important; -} -#OpenLayers\.Control\.PanZoom_6_panleft { - background-position:-10px -233px; - width:24px !important; - left:0px !important; - top:18px !important; -} -#OpenLayers\.Control\.PanZoom_6_panright { - background-position:-34px -233px; - width:24px !important; - left:24px !important; - top:18px !important; -} -#OpenLayers\.Control\.PanZoom_6_zoomin { - background-position:-25px -280px; - height:22px !important; - left:15px !important; - top:70px !important; -} -#OpenLayers\.Control\.PanZoom_6_zoomout { - background-position:-25px -298px; - height:22px !important; - left:15px !important; - top:92px !important; } \ No newline at end of file diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index fa46656e9..9c390b1da 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -327,4 +327,18 @@ $(function(){ }); // $('.mobile .nicetable tr.heading > td.title').css({'min-width':'300px'}); // $('.mobile .nicetable tr > td.data').css({'max-width':'12%'}); -}); + + /* + * Map controls prettiness + */ + //add links container (if its not there) + if($('#sub_map_links').length === 0){ + $('

').insertAfter($('#map')); + } + + //add permalink + $('#sub_map_links').append('Permalink'); + + //open/close toggle button on desk + $('#sub_map_links').prepend(' '); +}); \ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index 2abfa1279..aff028314 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 1e6fce779..139540ac7 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -2,14 +2,6 @@ @import "_colours"; @import "_mixins"; -// OpenLayers fix for navigation being top right -.olControlPanZoom { - width:48px; - right: 1em !important; - top: 5em !important; - left: auto !important; -} - //hacks for desk/mob only stuff .desk-only { display:block !important; @@ -448,6 +440,26 @@ body.twothirdswidthpage { z-index:1; } +// Pull OpenLayers navigation down a bit +.olControlPanZoom { + top: 5em !important; +} + +#sub_map_links { + left:auto; + bottom:auto; + top:14em; + #map_links_toggle { + display:block; + position:absolute; + left:-1em; + background:#000; + width:1em; + height:100%; + @include border-radius(0.25em 0 0 0.25em); + } +} + // log in bit, pokes above the .content div #user-meta{ display:block; diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 4a5e8ed54..74b44c314 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -183,7 +183,7 @@ function fixmystreet_onload() { $(function(){ - var perm = new OpenLayers.Control.Permalink(); + var perm = new OpenLayers.Control.Permalink('map_permalink'); set_map_config(perm); fixmystreet.map = new OpenLayers.Map("map", { -- cgit v1.2.3 From 108e3c53e8fc6a9e2a9d9c1151647f049225ed96 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 29 Feb 2012 09:22:42 +0000 Subject: Main part of mobile site full screen map for reporting a problem. --- web/cobrands/fixmystreet/base.scss | 9 +++++ web/cobrands/fixmystreet/layout.scss | 7 ---- web/js/map-OpenLayers.js | 65 +++++++++++++++++++++++++++++------- web/js/map-OpenStreetMap.js | 2 +- web/js/map-bing-ol.js | 22 +++++++----- web/js/map-streetview.js | 2 +- 6 files changed, 78 insertions(+), 29 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 314fc2710..3ef5b4546 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1182,3 +1182,12 @@ ul.breadcrumb { margin-bottom:0; } } + +// OpenLayers fix for navigation being top right +.olControlPanZoom { + right: 44px !important; + top: 4em !important; + left: auto !important; +} + + diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 5b3d96bd1..685ced34f 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -2,13 +2,6 @@ @import "_colours"; @import "_mixins"; -// OpenLayers fix for navigation being top right -.olControlPanZoom { - right: 44px !important; - top: 4em !important; - left: auto !important; -} - //hacks for desk/mob only stuff .desk-only { display:block !important; diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 4a5e8ed54..769facdc7 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -183,8 +183,7 @@ function fixmystreet_onload() { $(function(){ - var perm = new OpenLayers.Control.Permalink(); - set_map_config(perm); + set_map_config(); fixmystreet.map = new OpenLayers.Map("map", { controls: fixmystreet.controls, @@ -207,6 +206,7 @@ $(function(){ ); fixmystreet.map.setCenter(centre, fixmystreet.zoom || 3); } + if ($('#map_box').data('size')=='full') { // TODO Work better with window resizing, this is pretty 'set up' only at present var q = $(window).width() / 4; @@ -238,16 +238,6 @@ $(function(){ click.activate(); } - /* To let permalink not be caught by the Click layer, answer found - * at http://www.mail-archive.com/users@openlayers.org/msg12958.html - * Not sure why you can't use eventListeners or events.register... - */ - OpenLayers.Event.observe( perm.element, "click", function(e) { - OpenLayers.Event.stop(e); - location.href = OpenLayers.Event.element(e).href; - return false; - }); - $(window).hashchange(function(){ if (location.hash) { return; } // Okay, back to around view. @@ -370,6 +360,48 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }, trigger: function(e) { + if ($('html').hasClass('mobile') && fixmystreet.page != 'new') { + if (fixmystreet.page == 'mobile-full-map') { + this.locate_report(e); + $('#map_box').css({ + zIndex: 'auto', position: 'static', + width: 'auto', height: '10em', + margin: '0 -1em' + }); + fixmystreet.map.updateSize(); + // Also remove panzoom and permalink? + } else { + this.mobile_full_screen_map(e); + } + } else { + this.locate_report(e); + } + }, + + mobile_full_screen_map: function(e) { + if ( fixmystreet.markers.getVisibility() ) { + $('#hide_pins_link').click(); + } + fixmystreet.map.addControls([ + new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), + new OpenLayers.Control.Permalink(), + new OpenLayers.Control.PanZoomFMS() + ]); + $('#map_box').css({ + zIndex: 0, position: 'fixed', + top: 0, left: 0, right: 0, bottom: 0, + width: '100%', height: '100%', + margin: 0 + }); + // Also need to move green banner, add close button, etc. + fixmystreet.map.updateSize(); + fixmystreet.page = 'mobile-full-map'; + // To make sure the click control is on top + this.deactivate(); + this.activate(); + }, + + locate_report: function(e) { var lonlat = fixmystreet.map.getLonLatFromViewPortPx(e.xy); if (fixmystreet.page == 'new') { /* Already have a pin */ @@ -431,6 +463,15 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { fixmystreet.map.pan(-w, 0, { animate: false }); } } + + if (fixmystreet.page == 'mobile-full-map') { + lonlat.transform( + new OpenLayers.Projection("EPSG:4326"), + fixmystreet.map.getProjectionObject() + ); + fixmystreet.map.setCenter(lonlat); + } + fixmystreet.page = 'new'; location.hash = 'report'; } diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 9d226f6a7..92d98ea4c 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -3,7 +3,7 @@ function set_map_config(perm) { new OpenLayers.Control.ArgParser(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - perm, + new OpenLayers.Control.Permalink(), new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'), new OpenLayers.Control.PanZoomFMS() ]; diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 588f8d45b..4d01563a3 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -1,12 +1,18 @@ function set_map_config(perm) { - fixmystreet.controls = [ - new OpenLayers.Control.Attribution(), - new OpenLayers.Control.ArgParser(), - new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), - perm, - //new OpenLayers.Control.ZoomPanel() - new OpenLayers.Control.PanZoomFMS() - ]; + if ($('html').hasClass('mobile')) { + fixmystreet.controls = [ + new OpenLayers.Control.Attribution(), + new OpenLayers.Control.ArgParser() + ]; + } else { + fixmystreet.controls = [ + new OpenLayers.Control.Attribution(), + new OpenLayers.Control.ArgParser(), + new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), + new OpenLayers.Control.Permalink(), + new OpenLayers.Control.PanZoomFMS() + ]; + } fixmystreet.map_type = OpenLayers.Layer.Bing; } diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js index 99fdca983..9cdd82072 100644 --- a/web/js/map-streetview.js +++ b/web/js/map-streetview.js @@ -3,7 +3,7 @@ function set_map_config(perm) { new OpenLayers.Control.ArgParser(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - perm, + new OpenLayers.Control.Permalink(), new OpenLayers.Control.PanZoomFMS() ]; fixmystreet.map_type = OpenLayers.Layer.StreetView; -- cgit v1.2.3 From 355603aa8523ea76eff82ce58e962311a186a939 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 29 Feb 2012 09:26:16 +0000 Subject: Explicity function calls. --- web/js/map-OpenStreetMap.js | 2 +- web/js/map-streetview.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 92d98ea4c..58117aabf 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -37,7 +37,7 @@ OpenLayers.Util.onImageLoadError = function() { } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) { // do nothing - this layer is transparent } else { - OpenLayers.Util.OSM.originalOnImageLoadError; + OpenLayers.Util.OSM.originalOnImageLoadError(); } }; diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js index 9cdd82072..b1ba3664d 100644 --- a/web/js/map-streetview.js +++ b/web/js/map-streetview.js @@ -32,7 +32,7 @@ OpenLayers.Util.OS.originalOnImageLoadError = OpenLayers.Util.onImageLoadError; * Function: onImageLoadError */ OpenLayers.Util.onImageLoadError = function() { - OpenLayers.Util.OS.originalOnImageLoadError; + OpenLayers.Util.OS.originalOnImageLoadError(); }; /** -- cgit v1.2.3 From b25fecb70f59e81fb72a4b884d9ebb9dbf52dc9d Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 09:51:31 +0000 Subject: Manipulate permalink only if container for it is there Signed-off-by: Josh Angell --- web/js/map-OpenStreetMap.js | 5 ++++- web/js/map-bing-ol.js | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 58117aabf..7b44d8569 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -1,9 +1,12 @@ function set_map_config(perm) { + if ($('#map_permalink').length) { + permalink_id = 'map_permalink'; + } fixmystreet.controls = [ new OpenLayers.Control.ArgParser(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.Permalink(), + new OpenLayers.Control.Permalink(permalink_id), new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'), new OpenLayers.Control.PanZoomFMS() ]; diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 2786f63cf..3eecf7ce0 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -1,4 +1,7 @@ function set_map_config(perm) { + if ($('#map_permalink').length) { + permalink_id = 'map_permalink'; + } if ($('html').hasClass('mobile')) { fixmystreet.controls = [ new OpenLayers.Control.Attribution(), @@ -9,7 +12,7 @@ function set_map_config(perm) { new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), - new OpenLayers.Control.Permalink('map_permalink'), + new OpenLayers.Control.Permalink(permalink_id), new OpenLayers.Control.PanZoomFMS() ]; } -- cgit v1.2.3 From 60c0c4f6bcb9c450b20fa8722284696f8d4c3a1c Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 09:55:55 +0000 Subject: Change word 'stale' to 'old' Signed-off-by: Josh Angell --- templates/web/default/around/display_location.html | 4 ++-- web/js/map-OpenLayers.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index b5705a77b..329f74441 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -55,9 +55,9 @@ [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] | [% IF c.req.params.all_pins %] - [% loc('Hide stale reports') %] + [% loc('Hide old reports') %] [% ELSE %] - [% loc('Include stale reports') %] + [% loc('Include old reports') %] [% END %] [% END %]

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 769facdc7..b753d8615 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -153,7 +153,7 @@ function fixmystreet_onload() { e.preventDefault(); fixmystreet.markers.setVisibility(true); var texts = [ - 'en', 'Include stale reports', 'Hide stale reports', + 'en', 'Include old reports', 'Hide old reports', 'nb', 'Inkluder utdaterte problemer', 'Skjul utdaterte rapporter', 'cy', 'Cynnwys hen adroddiadau', 'Cuddio hen adroddiadau' ]; -- cgit v1.2.3 From 469dc03ec8ec63c5d924e629f2b4a0268bd626e4 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 09:56:10 +0000 Subject: Make permalink_id not global Signed-off-by: Josh Angell --- web/js/map-OpenStreetMap.js | 1 + web/js/map-bing-ol.js | 1 + 2 files changed, 2 insertions(+) diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 7b44d8569..48d753fa7 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -1,4 +1,5 @@ function set_map_config(perm) { + var permalink_id; if ($('#map_permalink').length) { permalink_id = 'map_permalink'; } diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 3eecf7ce0..b95eb84fb 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -1,4 +1,5 @@ function set_map_config(perm) { + var permalink_id; if ($('#map_permalink').length) { permalink_id = 'map_permalink'; } -- cgit v1.2.3 From ee7168d35e11f64ecefb7093c04e323dace9722b Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 10:19:34 +0000 Subject: Map ui pretty much done for desktop Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 23 +++++++++++------------ web/cobrands/fixmystreet/fixmystreet.js | 14 +++++++++++++- web/cobrands/fixmystreet/images/sprite.png | Bin 138129 -> 138171 bytes web/cobrands/fixmystreet/layout.scss | 11 ++++++++++- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 46f5dfa4f..d44c3f1eb 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -924,7 +924,11 @@ a:hover.button-left { #OpenLayers\.Control\.PanZoom_6_zoomin, #OpenLayers\.Control\.PanZoom_6_zoomout { text-indent:-999999px; + opacity:0.85; background:url(images/sprite.png) no-repeat; + &:hover { + opacity:1; + } } #OpenLayers\.Control\.PanZoom_6_zoomworld { display:none !important; @@ -973,14 +977,14 @@ a:hover.button-left { right:0; bottom: 0; z-index: 1000; - background:#333; + background:rgba(0, 0, 0, 0.7); margin:0; a { @include inline-block; font-size:0.6875em; color:#fff; padding:0.6em 3em 0.5em 1em; - background:url(images/sprite.png) right -4066px no-repeat; + background:url(images/sprite.png) right -3976px no-repeat; &#hide_pins_link { background-position:right -3976px; } @@ -990,6 +994,10 @@ a:hover.button-left { &#map_permalink { background-position:right -4070px; } + &:hover { + background-color:#000; + text-decoration:none; + } } } @@ -1273,13 +1281,4 @@ ul.breadcrumb { border-bottom:none; margin-bottom:0; } -} - -// OpenLayers fix for navigation being top right -.olControlPanZoom { - right: 44px !important; - top: 4em !important; - left: auto !important; -} - - +} \ No newline at end of file diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 9c390b1da..273e389c4 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -339,6 +339,18 @@ $(function(){ //add permalink $('#sub_map_links').append('Permalink'); - //open/close toggle button on desk + //add open/close toggle button on desk $('#sub_map_links').prepend(' '); + + //set up map_links_toggle click event + var maplinks_width = $('#sub_map_links').width()+16; + $('#map_links_toggle').on('click', function(){ + if($(this).hasClass('closed')){ + $(this).removeClass('closed'); + $('#sub_map_links').animate({'right':'0'}, 1200); + }else{ + $(this).addClass('closed'); + $('#sub_map_links').animate({'right':-maplinks_width}, 1200); + } + }); }); \ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index aff028314..d0f05adef 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 139540ac7..41b746621 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -451,12 +451,21 @@ body.twothirdswidthpage { top:14em; #map_links_toggle { display:block; + cursor: pointer; position:absolute; left:-1em; - background:#000; width:1em; height:100%; + background:#000 url(images/sprite.png) right -4119px no-repeat; @include border-radius(0.25em 0 0 0.25em); + &:hover { + left:-1.5em; + //use border so we don't have to redefine the background-position + border-right:0.5em solid #000; + } + &.closed { + background-position: right -4159px; + } } } -- cgit v1.2.3 From e771a1e5e04ae6f14928b1a328cca06c37f9af78 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 29 Feb 2012 12:31:45 +0000 Subject: Reduce JS pin fetching to only exactly the map that is shown. --- perllib/FixMyStreet/Map.pm | 4 +++- web/js/map-OpenLayers.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm index 2bccf1584..08bba3285 100644 --- a/perllib/FixMyStreet/Map.pm +++ b/perllib/FixMyStreet/Map.pm @@ -95,8 +95,10 @@ sub _map_features { my $around_limit = $c->cobrand->on_map_list_limit || undef; my @around_args = ( $min_lat, $max_lat, $min_lon, $max_lon, $interval ); - my $around_map_list = $c->cobrand->problems->around_map( @around_args, $around_limit ); my $around_map = $c->cobrand->problems->around_map( @around_args, undef ); + my $around_map_list = $around_limit + ? $c->cobrand->problems->around_map( @around_args, $around_limit ) + : $around_map; my $dist; mySociety::Locale::in_gb_locale { diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index b753d8615..c6bdfb68e 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -99,7 +99,7 @@ function fixmystreet_onload() { styleMap: pin_layer_style_map }; if (fixmystreet.page == 'around') { - fixmystreet.bbox_strategy = new OpenLayers.Strategy.BBOX(); + fixmystreet.bbox_strategy = new OpenLayers.Strategy.BBOX({ ratio: 1 }); pin_layer_options.strategies = [ fixmystreet.bbox_strategy ]; pin_layer_options.protocol = new OpenLayers.Protocol.HTTP({ url: '/ajax', -- cgit v1.2.3 From 3ffef58745c4ce245953d32aeb618d9323fa6077 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 12:58:09 +0000 Subject: Finished style and interaction for mobile map Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 61 ++++++++++++++++++++++++++---------- web/cobrands/fixmystreet/layout.scss | 3 +- web/js/map-OpenLayers.js | 30 +++++++++++++----- web/js/map-OpenStreetMap.js | 2 +- web/js/map-bing-ol.js | 3 +- 5 files changed, 72 insertions(+), 27 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index d44c3f1eb..f443131db 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -710,6 +710,8 @@ a:hover.button-left { .big-green-banner { position: relative; + z-index:1000; + top:-1.75em; background: $contrast1; color: #fff; padding:1em; @@ -909,7 +911,7 @@ a:hover.button-left { } // OpenLayers fix for navigation being top right -.olControlPanZoom { +#fms_pan_zoom { width:48px; right: 1em !important; top: 1em !important; @@ -917,12 +919,12 @@ a:hover.button-left { } // Openlayers map controls (overrides) -#OpenLayers\.Control\.PanZoom_6_panup, -#OpenLayers\.Control\.PanZoom_6_pandown, -#OpenLayers\.Control\.PanZoom_6_panleft, -#OpenLayers\.Control\.PanZoom_6_panright, -#OpenLayers\.Control\.PanZoom_6_zoomin, -#OpenLayers\.Control\.PanZoom_6_zoomout { +#fms_pan_zoom_panup, +#fms_pan_zoom_pandown, +#fms_pan_zoom_panleft, +#fms_pan_zoom_panright, +#fms_pan_zoom_zoomin, +#fms_pan_zoom_zoomout { text-indent:-999999px; opacity:0.85; background:url(images/sprite.png) no-repeat; @@ -930,40 +932,40 @@ a:hover.button-left { opacity:1; } } -#OpenLayers\.Control\.PanZoom_6_zoomworld { +#fms_pan_zoom_zoomworld { display:none !important; visibility:none !important; } -#OpenLayers\.Control\.PanZoom_6_panup { +#fms_pan_zoom_panup { background-position:-25px -218px; left:15px !important; top:0 !important; } -#OpenLayers\.Control\.PanZoom_6_pandown { +#fms_pan_zoom_pandown { background-position:-25px -248px; left:15px !important; top:36px !important; } -#OpenLayers\.Control\.PanZoom_6_panleft { +#fms_pan_zoom_panleft { background-position:-10px -233px; width:24px !important; left:0px !important; top:18px !important; } -#OpenLayers\.Control\.PanZoom_6_panright { +#fms_pan_zoom_panright { background-position:-34px -233px; width:24px !important; left:24px !important; top:18px !important; } -#OpenLayers\.Control\.PanZoom_6_zoomin { +#fms_pan_zoom_zoomin { background-position:-25px -280px; height:22px !important; left:15px !important; top:70px !important; } -#OpenLayers\.Control\.PanZoom_6_zoomout { +#fms_pan_zoom_zoomout { background-position:-25px -298px; height:22px !important; left:15px !important; @@ -976,7 +978,7 @@ a:hover.button-left { left: 0; right:0; bottom: 0; - z-index: 1000; + z-index: 1100; background:rgba(0, 0, 0, 0.7); margin:0; a { @@ -1000,10 +1002,35 @@ a:hover.button-left { } } } +//close the mobile map span +#close-mobile-map { + cursor:pointer ; + position:absolute; + top:3.5em; + left:1em; + z-index:1000; + display:block; + width:30px; + height:30px; + text-indent:-999999px; + opacity: 0.85; + background:url(images/sprite.png) -105px -284px no-repeat; + &:hover { + opacity:1; + } +} + +.mobile-map-banner { + position: fixed; + top:-0.65em; + left:0; + right:0; + background:rgba(0, 0, 0, 0.7); +} //copyright attribution -#OpenLayers\.Control\.Attribution_3 { - bottom:2em !important; +.olControlAttribution { + bottom:0.5em !important; } /* Drag is only present in noscript form. XXX Copy from core. */ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 41b746621..69ef21ef6 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -441,7 +441,7 @@ body.twothirdswidthpage { } // Pull OpenLayers navigation down a bit -.olControlPanZoom { +#fms_pan_zoom { top: 5em !important; } @@ -554,6 +554,7 @@ body.twothirdswidthpage { // pokes over the RHS with a little triangle .big-green-banner { + top:auto; right:-1.25em; margin-left:-2em; font-size:1.375em; diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index b753d8615..0e45fac77 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -369,7 +369,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { margin: '0 -1em' }); fixmystreet.map.updateSize(); - // Also remove panzoom and permalink? } else { this.mobile_full_screen_map(e); } @@ -380,12 +379,17 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { mobile_full_screen_map: function(e) { if ( fixmystreet.markers.getVisibility() ) { - $('#hide_pins_link').click(); + //hide pins and update text + $('#hide_pins_link').click().text('Show pins'); + } + var permalink_id; + if ($('#map_permalink').length) { + permalink_id = 'map_permalink'; } fixmystreet.map.addControls([ new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), - new OpenLayers.Control.Permalink(), - new OpenLayers.Control.PanZoomFMS() + new OpenLayers.Control.Permalink(permalink_id), + new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]); $('#map_box').css({ zIndex: 0, position: 'fixed', @@ -393,7 +397,18 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { width: '100%', height: '100%', margin: 0 }); - // Also need to move green banner, add close button, etc. + + // move and alter green banner, add close button + $('#map_box').append('Close'); + $('.big-green-banner').addClass('mobile-map-banner'); + // hide site-logo (z-index madness), show sub_map_links + // and push map zoom down a notch + $('#site-logo').hide(); + $('#sub_map_links').show(); + $('#fms_pan_zoom').css({'top':'3.5em !important'}); + + // need to set up a click for #close-mobile-map somehow + fixmystreet.map.updateSize(); fixmystreet.page = 'mobile-full-map'; // To make sure the click control is on top @@ -435,7 +450,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#form_category').change( form_category_onchange ); } }); - $('#side-form').show(); + $('#side-form, #site-logo').show(); /* For some reason on IOS5 if you use the jQuery show method it * doesn't display the JS validation error messages unless you do this * or you cause a screen redraw by changing the phone orientation. @@ -444,7 +459,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { document.getElementById('side-form').style.display = 'block'; } $('#side').hide(); - $('#sub_map_links').hide(); + //hide lots of the map ui on mobile + $('#sub_map_links, #fms_pan_zoom, #close-mobile-map', '.mobile').hide(); heightFix('#report-a-problem-sidebar:visible', '.content', 26); // If we clicked the map somewhere inconvenient diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 48d753fa7..50f159635 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -9,7 +9,7 @@ function set_map_config(perm) { new OpenLayers.Control.Navigation(), new OpenLayers.Control.Permalink(permalink_id), new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'), - new OpenLayers.Control.PanZoomFMS() + new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; } diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index b95eb84fb..478bf6527 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -8,13 +8,14 @@ function set_map_config(perm) { new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser() ]; + $('#sub_map_links').hide(); } else { fixmystreet.controls = [ new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), new OpenLayers.Control.Permalink(permalink_id), - new OpenLayers.Control.PanZoomFMS() + new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; } fixmystreet.map_type = OpenLayers.Layer.Bing; -- cgit v1.2.3 From f9e99b0d6b5b9be5ba2709910b450aa20c02ccbe Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 17:27:19 +0000 Subject: Add background Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/images/tile.jpg | Bin 0 -> 21980 bytes web/cobrands/fixmystreet/layout.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 web/cobrands/fixmystreet/images/tile.jpg diff --git a/web/cobrands/fixmystreet/images/tile.jpg b/web/cobrands/fixmystreet/images/tile.jpg new file mode 100644 index 000000000..b412774e4 Binary files /dev/null and b/web/cobrands/fixmystreet/images/tile.jpg differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 69ef21ef6..086d3d954 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -11,7 +11,7 @@ } body { - background: #1A1A1A; + background: #1A1A1A url(images/tile.jpg) 0 0 repeat; } // Page wrapper and header bits follow -- cgit v1.2.3 From 9d26e831430b6ed5ec06574483bc2e4ed7dd2da2 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 17:28:14 +0000 Subject: Remove some extraneous stuff Signed-off-by: Josh Angell --- web/js/map-OpenLayers.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 120bbf144..a772cad97 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -379,8 +379,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { mobile_full_screen_map: function(e) { if ( fixmystreet.markers.getVisibility() ) { - //hide pins and update text - $('#hide_pins_link').click().text('Show pins'); + $('#hide_pins_link').click(); } var permalink_id; if ($('#map_permalink').length) { @@ -405,7 +404,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { // and push map zoom down a notch $('#site-logo').hide(); $('#sub_map_links').show(); - $('#fms_pan_zoom').css({'top':'3.5em !important'}); // need to set up a click for #close-mobile-map somehow -- cgit v1.2.3 From ce8b99ac973bc0bb11f49d3c1abc8bd5b2a112a0 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 17:28:33 +0000 Subject: Fix map page if you skip Signed-off-by: Josh Angell --- templates/web/fixmystreet/report/new/fill_in_details.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/report/new/fill_in_details.html b/templates/web/fixmystreet/report/new/fill_in_details.html index 0c293d744..d4351143c 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details.html +++ b/templates/web/fixmystreet/report/new/fill_in_details.html @@ -1,6 +1,8 @@ [% + SET c = ''; + SET c = 'mappage' IF report.used_map; PROCESS "maps/${map.type}.html" IF report.used_map; - INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass => 'mappage' + INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass => c %] [% IF report.used_map %] -- cgit v1.2.3 From 350b058b0b98049b913fa4c3fe9a964aad72ba91 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 17:28:45 +0000 Subject: Some documentation in the css Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 70 +++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index f443131db..5f8f9c1bd 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -128,6 +128,7 @@ h4 { margin-bottom: 1em; } +// default list styles ul, ol { font-size: 1em; margin-bottom: 2em; @@ -147,18 +148,20 @@ ol li { list-style:decimal; } +// lets you have a traditional ol but with nicely styled numbers +// for older browsers it just falls back to the normal ol ol.big-numbers { padding: 0; margin: 0; - counter-reset: li; + counter-reset: li; // reset counter to be 'li' instead of a number > li { position: relative; list-style: none; padding:0 0 0 2.5em; margin-bottom:2em; &:before { - content: counter(li); - counter-increment: li; + content: counter(li); // set the content to be whatever the 'li' var is + counter-increment: li; // add to the counter var position: absolute; left: 0; top:-0.2em; @@ -202,9 +205,6 @@ pre { } img { - // huh? We're confused and it breaks our other stuff :S - // max-width: 100%; - //do this otherwise IE will just not display //any img without a height defined height:auto; @@ -216,7 +216,7 @@ select, input, textarea { } -/* LINKS */ +// links a, a:visited { text-decoration:none; @@ -228,8 +228,7 @@ a:visited { } } -/*CUSTOM TYPE*/ - +// custom type .small-print { @extend small; margin-bottom: 1.2307em; @@ -263,10 +262,7 @@ h4.static-with-rule{ padding: 0.5em 1em; } -/*FORM*/ -fieldset{ - margin: 1em; -} +/* FORMS */ // input placeholders, these need to be on separate lines as if the browser // can't understand a selector it will invalidate the whole line. @@ -290,23 +286,30 @@ fieldset{ } } +// wrap anything inside the form in a fieldset to give +// us the right spacing +fieldset { + margin: 1em; +} + input[type=text], input[type=password], input[type=email], input[type=file], -textarea{ +textarea { width: 100%; + // adjust so the sides line up padding: 0.5em; margin: 0 0 0 -0.5em; } -textarea{ +textarea { border: 0.125em solid #888888; @include border-radius(0.25em); display: block; font-size: 1em; line-height: 1.5em; - font-family: 'helvetica', 'arial',sans-serif; + font-family: 'helvetica', 'arial', sans-serif; min-height:8em; } @@ -336,6 +339,7 @@ label{ } } +// grey background, full width box .form-box { margin: 0 -2em 0.25em -2em; background:#eeeeee; @@ -383,7 +387,7 @@ label{ } -/* form errors */ +// form errors div.form-error, p.form-error { @include inline-block; @@ -400,15 +404,17 @@ textarea.form-error { @include border-radius(0 0.25em 0.25em 0.25em); } -// don't display valid error boxes as now the jump won't be -// until the user submits, which is fine +// don't display valid error boxes as now the page jump +// won't be until the user submits, which is fine div.label-valid, p.label-valid { display:none !important; visibility: hidden; } -/* LAYOUT */ + + +/*** LAYOUT ***/ // Padding creates page margins on mobile .container{ @@ -420,7 +426,8 @@ p.label-valid { margin: 0 -1em; } -// #site-header creates grey bar in mobile, .nav-wrapper-2 is used on desktop +// #site-header creates grey bar in mobile +// .nav-wrapper-2 is used on desktop #site-header{ border-top: 0.25em solid $primary; height: 3em; @@ -442,6 +449,7 @@ p.label-valid { .ie6 #site-logo { background: url('images/ie_logo.gif') 0 -5px no-repeat; } +// this is a skip to nav for mobile users only #nav-link { width: 50px; height: 48px; @@ -480,7 +488,7 @@ p.label-valid { a { background:$primary; &#mysoc-logo { - background-image:url(images/sprite.png); + background-image:url('images/sprite.png'); background-repeat:no-repeat; background-position:-240px -38px; text-indent:-999999px; @@ -553,15 +561,15 @@ p.label-valid { color:#fff; } &.abuse { - background-image:url(images/sprite.png); + background-image:url('images/sprite.png'); background-position:center -2424px; } &.feed { - background-image:url(images/sprite.png); + background-image:url('images/sprite.png'); background-position:center -2563px; } &.chevron { - background-image:url(images/sprite.png); + background-image:url('images/sprite.png'); background-position:center -2716px; } } @@ -693,7 +701,7 @@ a.button-right, :hover.button-right, a:hover.button-right { padding:1em 3em 1em 1em; - background-image: url(images/sprite.png); + background-image: url('images/sprite.png'); background-repeat:no-repeat; background-position:right -686px; } @@ -703,7 +711,7 @@ a.button-left, :hover.button-left, a:hover.button-left { padding:1em 1em 1em 3em; - background-image: url(images/sprite.png); + background-image: url('images/sprite.png'); background-repeat:no-repeat; background-position:-18px -802px; } @@ -927,7 +935,7 @@ a:hover.button-left { #fms_pan_zoom_zoomout { text-indent:-999999px; opacity:0.85; - background:url(images/sprite.png) no-repeat; + background:url('images/sprite.png') no-repeat; &:hover { opacity:1; } @@ -986,7 +994,7 @@ a:hover.button-left { font-size:0.6875em; color:#fff; padding:0.6em 3em 0.5em 1em; - background:url(images/sprite.png) right -3976px no-repeat; + background:url('images/sprite.png') right -3976px no-repeat; &#hide_pins_link { background-position:right -3976px; } @@ -1014,7 +1022,7 @@ a:hover.button-left { height:30px; text-indent:-999999px; opacity: 0.85; - background:url(images/sprite.png) -105px -284px no-repeat; + background:url('images/sprite.png') -105px -284px no-repeat; &:hover { opacity:1; } @@ -1182,7 +1190,7 @@ ul.breadcrumb { padding:0.5em 1em 0.5em 0; } a { - background:url(images/sprite.png) right -3220px no-repeat; + background:url('images/sprite.png') right -3220px no-repeat; padding:0.5em 2.5em 0.5em 1em; color:#333; &:hover { -- cgit v1.2.3 From 0ebd9c37bd8c637342c0236af1404cfd07c37a11 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 03:58:41 +0000 Subject: Initial pass of pin popups. --- data/openlayers.fixmystreet.cfg | 1 + web/js/OpenLayers.fixmystreet.js | 1377 ++++++++++++++++++++------------------ web/js/map-OpenLayers.js | 29 +- 3 files changed, 739 insertions(+), 668 deletions(-) diff --git a/data/openlayers.fixmystreet.cfg b/data/openlayers.fixmystreet.cfg index a3549a4ac..9e23ef7ce 100644 --- a/data/openlayers.fixmystreet.cfg +++ b/data/openlayers.fixmystreet.cfg @@ -31,6 +31,7 @@ OpenLayers/Protocol/HTTP.js OpenLayers/Layer/SphericalMercator.js # For 4326 OpenLayers/Layer/Vector.js OpenLayers/Layer/XYZ.js +OpenLayers/Popup/FramedCloud.js [exclude] diff --git a/web/js/OpenLayers.fixmystreet.js b/web/js/OpenLayers.fixmystreet.js index 2b716edc4..ba874e424 100644 --- a/web/js/OpenLayers.fixmystreet.js +++ b/web/js/OpenLayers.fixmystreet.js @@ -198,7 +198,7 @@ var str=coordinatedegrees+"\u00B0";if(dmsOption.indexOf('dm')>=0){if(coordinatem str+=coordinateminutes+"'";if(dmsOption.indexOf('dms')>=0){if(coordinateseconds<10){coordinateseconds="0"+coordinateseconds;} str+=coordinateseconds+'"';}} if(axis=="lon"){str+=coordinate<0?OpenLayers.i18n("W"):OpenLayers.i18n("E");}else{str+=coordinate<0?OpenLayers.i18n("S"):OpenLayers.i18n("N");} -return str;};OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(layer,lonlat,data){this.layer=layer;this.lonlat=lonlat;this.data=(data!=null)?data:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup);}} +return str;};OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:false,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;},destroy:function(){},read:function(data){OpenLayers.Console.userError(OpenLayers.i18n("readNotImplemented"));},write:function(object){OpenLayers.Console.userError(OpenLayers.i18n("writeNotImplemented"));},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(layer,lonlat,data){this.layer=layer;this.lonlat=lonlat;this.data=(data!=null)?data:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){if((this.layer!=null)&&(this.layer.map!=null)){if(this.popup!=null){this.layer.map.removePopup(this.popup);}} if(this.layer!=null&&this.marker!=null){this.layer.removeMarker(this.marker);} this.layer=null;this.id=null;this.lonlat=null;this.data=null;if(this.marker!=null){this.destroyMarker(this.marker);this.marker=null;} if(this.popup!=null){this.destroyPopup(this.popup);this.popup=null;}},onScreen:function(){var onScreen=false;if((this.layer!=null)&&(this.layer.map!=null)){var screenBounds=this.layer.map.getExtent();onScreen=screenBounds.containsLonLat(this.lonlat);} @@ -212,106 +212,7 @@ this.geometry=null;this.modified=null;OpenLayers.Feature.prototype.destroy.apply return onScreen;},getVisibility:function(){return!(this.style&&this.style.display=='none'||!this.layer||this.layer&&this.layer.styleMap&&this.layer.styleMap.createSymbolizer(this,this.renderIntent).display=='none'||this.layer&&!this.layer.getVisibility());},createMarker:function(){return null;},destroyMarker:function(){},createPopup:function(){return null;},atPoint:function(lonlat,toleranceLon,toleranceLat){var atPoint=false;if(this.geometry){atPoint=this.geometry.atPoint(lonlat,toleranceLon,toleranceLat);} return atPoint;},destroyPopup:function(){},move:function(location){if(!this.layer||!this.geometry.move){return undefined;} var pixel;if(location.CLASS_NAME=="OpenLayers.LonLat"){pixel=this.layer.getViewPortPxFromLonLat(location);}else{pixel=location;} -var lastPixel=this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat());var res=this.layer.map.getResolution();this.geometry.move(res*(pixel.x-lastPixel.x),res*(lastPixel.y-pixel.y));this.layer.drawFeature(this);return lastPixel;},toState:function(state){if(state==OpenLayers.State.UPDATE){switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=state;break;case OpenLayers.State.UPDATE:case OpenLayers.State.INSERT:break;}}else if(state==OpenLayers.State.INSERT){switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=state;break;}}else if(state==OpenLayers.State.DELETE){switch(this.state){case OpenLayers.State.INSERT:break;case OpenLayers.State.DELETE:break;case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=state;break;}}else if(state==OpenLayers.State.UNKNOWN){this.state=state;}},CLASS_NAME:"OpenLayers.Feature.Vector"});OpenLayers.Feature.Vector.style={'default':{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit"},'select':{fillColor:"blue",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer"},'temporary':{fillColor:"#66cccc",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#66cccc",strokeOpacity:1,strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit"},'delete':{display:"none"}};OpenLayers.Style=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:false,rules:null,context:null,defaultStyle:null,defaultsPerSymbolizer:false,propertyStyles:null,initialize:function(style,options){OpenLayers.Util.extend(this,options);this.rules=[];if(options&&options.rules){this.addRules(options.rules);} -this.setDefaultStyle(style||OpenLayers.Feature.Vector.style["default"]);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},destroy:function(){for(var i=0,len=this.rules.length;i0){appliedRules=true;for(var i=0,len=elseRules.length;i0&&appliedRules==false){style.display="none";} -if(style.label&&typeof style.label!=="string"){style.label=String(style.label);} -return style;},applySymbolizer:function(rule,style,feature){var symbolizerPrefix=feature.geometry?this.getSymbolizerPrefix(feature.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];var symbolizer=rule.symbolizer[symbolizerPrefix]||rule.symbolizer;if(this.defaultsPerSymbolizer===true){var defaults=this.defaultStyle;OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:defaults.pointRadius});if(symbolizer.stroke===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{strokeWidth:defaults.strokeWidth,strokeColor:defaults.strokeColor,strokeOpacity:defaults.strokeOpacity,strokeDashstyle:defaults.strokeDashstyle,strokeLinecap:defaults.strokeLinecap});} -if(symbolizer.fill===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{fillColor:defaults.fillColor,fillOpacity:defaults.fillOpacity});} -if(symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:this.defaultStyle.pointRadius,externalGraphic:this.defaultStyle.externalGraphic,graphicName:this.defaultStyle.graphicName,graphicOpacity:this.defaultStyle.graphicOpacity,graphicWidth:this.defaultStyle.graphicWidth,graphicHeight:this.defaultStyle.graphicHeight,graphicXOffset:this.defaultStyle.graphicXOffset,graphicYOffset:this.defaultStyle.graphicYOffset});}} -return this.createLiterals(OpenLayers.Util.extend(style,symbolizer),feature);},createLiterals:function(style,feature){var context=OpenLayers.Util.extend({},feature.attributes||feature.data);OpenLayers.Util.extend(context,this.context);for(var i in this.propertyStyles){style[i]=OpenLayers.Style.createLiteral(style[i],context,feature,i);} -return style;},findPropertyStyles:function(){var propertyStyles={};var style=this.defaultStyle;this.addPropertyStyles(propertyStyles,style);var rules=this.rules;var symbolizer,value;for(var i=0,len=rules.length;i1){middle=parseInt((leftIndex+rightIndex)/2);var placement=this.compare(this,newNode,OpenLayers.Util.getElement(this.order[middle]));if(placement>0){leftIndex=middle;}else{rightIndex=middle;}} -this.order.splice(rightIndex,0,nodeId);this.indices[nodeId]=this.getZIndex(newNode);return this.getNextElement(rightIndex);},remove:function(node){var nodeId=node.id;var arrayIndex=OpenLayers.Util.indexOf(this.order,nodeId);if(arrayIndex>=0){this.order.splice(arrayIndex,1);delete this.indices[nodeId];if(this.order.length>0){var lastId=this.order[this.order.length-1];this.maxZIndex=this.indices[lastId];}else{this.maxZIndex=0;}}},clear:function(){this.order=[];this.indices={};this.maxZIndex=0;},exists:function(node){return(this.indices[node.id]!=null);},getZIndex:function(node){return node._style.graphicZIndex;},determineZIndex:function(node){var zIndex=node._style.graphicZIndex;if(zIndex==null){zIndex=this.maxZIndex;node._style.graphicZIndex=zIndex;}else if(zIndex>this.maxZIndex){this.maxZIndex=zIndex;}},getNextElement:function(index){var nextIndex=index+1;if(nextIndex=2*parts[1]){return"longdash";} -return(parts[0]==1||parts[1]==1)?"dot":"dash";}else if(parts.length==4){return(1*parts[0]>=2*parts[1])?"longdashdot":"dashdot";} -return"solid";}},createNode:function(type,id){var node=document.createElement(type);if(id){node.id=id;} -node.unselectable='on';node.onselectstart=OpenLayers.Function.False;return node;},nodeTypeCompare:function(node,type){var subType=type;var splitIndex=subType.indexOf(":");if(splitIndex!=-1){subType=subType.substr(splitIndex+1);} -var nodeName=node.nodeName;splitIndex=nodeName.indexOf(":");if(splitIndex!=-1){nodeName=nodeName.substr(splitIndex+1);} -return(subType==nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_vmlRoot","div");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"olv:group");},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){if(!isNaN(geometry.x)&&!isNaN(geometry.y)){var resolution=this.getResolution();node.style.left=(((geometry.x/resolution-this.offset.x)|0)-radius)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)|0)-radius)+"px";var diameter=radius*2;node.style.width=diameter+"px";node.style.height=diameter+"px";return node;} -return false;},drawLineString:function(node,geometry){return this.drawLine(node,geometry,false);},drawLinearRing:function(node,geometry){return this.drawLine(node,geometry,true);},drawLine:function(node,geometry,closeLine){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var numComponents=geometry.components.length;var parts=new Array(numComponents);var comp,x,y;for(var i=0;i0){symbolExtent.bottom=symbolExtent.bottom-diff;symbolExtent.top=symbolExtent.top+diff;}else{symbolExtent.left=symbolExtent.left+diff;symbolExtent.right=symbolExtent.right-diff;} -cache={path:path,size:symbolExtent.getWidth(),left:symbolExtent.left,bottom:symbolExtent.bottom};this.symbolCache[id]=cache;return cache;},CLASS_NAME:"OpenLayers.Renderer.VML"});OpenLayers.Renderer.VML.LABEL_SHIFT={"l":0,"c":.5,"r":1,"t":0,"m":.5,"b":1};OpenLayers.Tween=OpenLayers.Class({INTERVAL:10,easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,interval:null,playing:false,initialize:function(easing){this.easing=(easing)?easing:OpenLayers.Easing.Expo.easeOut;},start:function(begin,finish,duration,options){this.playing=true;this.begin=begin;this.finish=finish;this.duration=duration;this.callbacks=options.callbacks;this.time=0;if(this.interval){window.clearInterval(this.interval);this.interval=null;} -if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin);} -this.interval=window.setInterval(OpenLayers.Function.bind(this.play,this),this.INTERVAL);},stop:function(){if(!this.playing){return;} -if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish);} -window.clearInterval(this.interval);this.interval=null;this.playing=false;},play:function(){var value={};for(var i in this.begin){var b=this.begin[i];var f=this.finish[i];if(b==null||f==null||isNaN(b)||isNaN(f)){OpenLayers.Console.error('invalid value for Tween');} -var c=f-b;value[i]=this.easing.apply(this,[this.time,b,c,this.duration]);} -this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,value);} -if(this.time>this.duration){this.stop();}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(t,b,c,d){return c*t/d+b;},easeOut:function(t,b,c,d){return c*t/d+b;},easeInOut:function(t,b,c,d){return c*t/d+b;},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(t,b,c,d){return(t==0)?b:c*Math.pow(2,10*(t/d-1))+b;},easeOut:function(t,b,c,d){return(t==d)?b+c:c*(-Math.pow(2,-10*t/d)+1)+b;},easeInOut:function(t,b,c,d){if(t==0)return b;if(t==d)return b+c;if((t/=d/2)<1)return c/2*Math.pow(2,10*(t-1))+b;return c/2*(-Math.pow(2,-10*--t)+2)+b;},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(t,b,c,d){return c*(t/=d)*t+b;},easeOut:function(t,b,c,d){return-c*(t/=d)*(t-2)+b;},easeInOut:function(t,b,c,d){if((t/=d/2)<1)return c/2*t*t+b;return-c/2*((--t)*(t-2)-1)+b;},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:false,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;},destroy:function(){},read:function(data){OpenLayers.Console.userError(OpenLayers.i18n("readNotImplemented"));},write:function(object){OpenLayers.Console.userError(OpenLayers.i18n("writeNotImplemented"));},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Format.WKT=OpenLayers.Class(OpenLayers.Format,{initialize:function(options){this.regExes={'typeStr':/^\s*(\w+)\s*$\s*(.*)\s*$\s*$/,'spaces':/\s+/,'parenComma':/\)\s*,\s*$/,'doubleParenComma':/$\s*\)\s*,\s*$\s*\(/,'trimParens':/^\s*\(?(.*?)$?\s*$/};OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(wkt){var features,type,str;wkt=wkt.replace(/[\n\r]/g," ");var matches=this.regExes.typeStr.exec(wkt);if(matches){type=matches[1].toLowerCase();str=matches[2];if(this.parse[type]){features=this.parse[type].apply(this,[str]);} +var lastPixel=this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat());var res=this.layer.map.getResolution();this.geometry.move(res*(pixel.x-lastPixel.x),res*(lastPixel.y-pixel.y));this.layer.drawFeature(this);return lastPixel;},toState:function(state){if(state==OpenLayers.State.UPDATE){switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=state;break;case OpenLayers.State.UPDATE:case OpenLayers.State.INSERT:break;}}else if(state==OpenLayers.State.INSERT){switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=state;break;}}else if(state==OpenLayers.State.DELETE){switch(this.state){case OpenLayers.State.INSERT:break;case OpenLayers.State.DELETE:break;case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=state;break;}}else if(state==OpenLayers.State.UNKNOWN){this.state=state;}},CLASS_NAME:"OpenLayers.Feature.Vector"});OpenLayers.Feature.Vector.style={'default':{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit"},'select':{fillColor:"blue",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer"},'temporary':{fillColor:"#66cccc",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#66cccc",strokeOpacity:1,strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit"},'delete':{display:"none"}};OpenLayers.Format.WKT=OpenLayers.Class(OpenLayers.Format,{initialize:function(options){this.regExes={'typeStr':/^\s*(\w+)\s*$\s*(.*)\s*$\s*$/,'spaces':/\s+/,'parenComma':/\)\s*,\s*$/,'doubleParenComma':/$\s*\)\s*,\s*$\s*\(/,'trimParens':/^\s*\(?(.*?)$?\s*$/};OpenLayers.Format.prototype.initialize.apply(this,[options]);},read:function(wkt){var features,type,str;wkt=wkt.replace(/[\n\r]/g," ");var matches=this.regExes.typeStr.exec(wkt);if(matches){type=matches[1].toLowerCase();str=matches[2];if(this.parse[type]){features=this.parse[type].apply(this,[str]);} if(this.internalProjection&&this.externalProjection){if(features&&features.CLASS_NAME=="OpenLayers.Feature.Vector"){features.geometry.transform(this.externalProjection,this.internalProjection);}else if(features&&type!="geometrycollection"&&typeof features=="object"){for(var i=0,len=features.length;iMath.max(x1,x2))){continue;} if(y1=y1&&pyy2&&(py=y2)){++crosses;}} var contained=(crosses==-1)?1:!!(crosses&1);return contained;},intersects:function(geometry){var intersect=false;if(geometry.CLASS_NAME=="OpenLayers.Geometry.Point"){intersect=this.containsPoint(geometry);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LineString"){intersect=geometry.intersects(this);}else if(geometry.CLASS_NAME=="OpenLayers.Geometry.LinearRing"){intersect=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[geometry]);}else{for(var i=0,len=geometry.components.length;i0)){area+=Math.abs(this.components[0].getArea());for(var i=1,len=this.components.length;i0)){area+=Math.abs(this.components[0].getGeodesicArea(projection));for(var i=1,len=this.components.length;i0){contained=this.components[0].containsPoint(point);if(contained!==1){if(contained&&numRings>1){var hole;for(var i=1;i1;},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)));},isRightClick:function(event){return(((event.which)&&(event.which==3))||((event.button)&&(event.button==2)));},stop:function(event,allowDefault){if(!allowDefault){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}} +return intersect;},getVertices:function(nodes){return(nodes===true)?[]:this.components.slice(0,this.components.length-1);},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Renderer=OpenLayers.Class({container:null,root:null,extent:null,locked:false,size:null,resolution:null,map:null,initialize:function(containerID,options){this.container=OpenLayers.Util.getElement(containerID);OpenLayers.Util.extend(this,options);},destroy:function(){this.container=null;this.extent=null;this.size=null;this.resolution=null;this.map=null;},supported:function(){return false;},setExtent:function(extent,resolutionChanged){this.extent=extent.clone();if(resolutionChanged){this.resolution=null;}},setSize:function(size){this.size=size.clone();this.resolution=null;},getResolution:function(){this.resolution=this.resolution||this.map.getResolution();return this.resolution;},drawFeature:function(feature,style){if(style==null){style=feature.style;} +if(feature.geometry){var bounds=feature.geometry.getBounds();if(bounds){if(!bounds.intersectsBounds(this.extent)){style={display:"none"};} +var rendered=this.drawGeometry(feature.geometry,style,feature.id);if(style.display!="none"&&style.label&&rendered!==false){var location=feature.geometry.getCentroid();if(style.labelXOffset||style.labelYOffset){var xOffset=isNaN(style.labelXOffset)?0:style.labelXOffset;var yOffset=isNaN(style.labelYOffset)?0:style.labelYOffset;var res=this.getResolution();location.move(xOffset*res,yOffset*res);} +this.drawText(feature.id,style,location);}else{this.removeText(feature.id);} +return rendered;}}},drawGeometry:function(geometry,style,featureId){},drawText:function(featureId,style,location){},removeText:function(featureId){},clear:function(){},getFeatureIdFromEvent:function(evt){},eraseFeatures:function(features){if(!(OpenLayers.Util.isArray(features))){features=[features];} +for(var i=0,len=features.length;i=16777216){this.hitOverflow=id-16777215;id=id%16777216+1;} +var hex="000000"+id.toString(16);var len=hex.length;hex="#"+hex.substring(len-6,len);return hex;},setHitContextStyle:function(type,featureId,symbolizer){var hex=this.featureIdToHex(featureId);if(type=="fill"){this.hitContext.globalAlpha=1.0;this.hitContext.fillStyle=hex;}else if(type=="stroke"){this.hitContext.globalAlpha=1.0;this.hitContext.strokeStyle=hex;this.hitContext.lineWidth=symbolizer.strokeWidth+2;}else{this.hitContext.globalAlpha=0;this.hitContext.lineWidth=1;}},drawPoint:function(geometry,style,featureId){if(style.graphic!==false){if(style.externalGraphic){this.drawExternalGraphic(geometry,style,featureId);}else{var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var twoPi=Math.PI*2;var radius=style.pointRadius;if(style.fill!==false){this.setCanvasStyle("fill",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.fill();}} +if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.stroke();} +this.setCanvasStyle("reset");}}}}},drawLineString:function(geometry,style,featureId){style=OpenLayers.Util.applyDefaults({fill:false},style);this.drawLinearRing(geometry,style,featureId);},drawLinearRing:function(geometry,style,featureId){if(style.fill!==false){this.setCanvasStyle("fill",style);this.renderPath(this.canvas,geometry,style,featureId,"fill");if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"fill");}} +if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.renderPath(this.canvas,geometry,style,featureId,"stroke");if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"stroke");}} +this.setCanvasStyle("reset");},renderPath:function(context,geometry,style,featureId,type){var components=geometry.components;var len=components.length;context.beginPath();var start=this.getLocalXY(components[0]);var x=start[0];var y=start[1];if(!isNaN(x)&&!isNaN(y)){context.moveTo(start[0],start[1]);for(var i=1;i1;},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)));},isRightClick:function(event){return(((event.which)&&(event.which==3))||((event.button)&&(event.button==2)));},stop:function(event,allowDefault){if(!allowDefault){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}} if(event.stopPropagation){event.stopPropagation();}else{event.cancelBubble=true;}},findElement:function(event,tagName){var element=OpenLayers.Event.element(event);while(element.parentNode&&(!element.tagName||(element.tagName.toUpperCase()!=tagName.toUpperCase()))){element=element.parentNode;} return element;},observe:function(elementParam,name,observer,useCapture){var element=OpenLayers.Util.getElement(elementParam);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.attachEvent)){name='keydown';} if(!this.observers){this.observers={};} @@ -481,194 +405,71 @@ if(!this.element.lefttop){this.element.lefttop=[(document.documentElement.client if(!this.element.offsets){this.element.offsets=OpenLayers.Util.pagePosition(this.element);} return new OpenLayers.Pixel((evt.clientX+this.element.scrolls[0])-this.element.offsets[0] -this.element.lefttop[0],(evt.clientY+this.element.scrolls[1])-this.element.offsets[1] --this.element.lefttop[1]);},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1000},EVENT_TYPES:["preaddlayer","addlayer","preremovelayer","removelayer","changelayer","movestart","move","moveend","zoomend","popupopen","popupclose","addmarker","removemarker","clearmarkers","mouseover","mouseout","mousemove","dragstart","drag","dragend","changebaselayer"],id:null,fractionalZoom:false,events:null,allOverlays:false,div:null,dragging:false,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,viewRequestID:0,tileSize:null,projection:"EPSG:4326",units:'degrees',resolutions:null,maxResolution:1.40625,minResolution:null,maxScale:null,minScale:null,maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:true,panTween:null,eventListeners:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,paddingForPopups:null,minPx:null,maxPx:null,initialize:function(div,options){if(arguments.length===1&&typeof div==="object"){options=div;div=options&&options.div;} -this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,OpenLayers.Map.TILE_HEIGHT);this.maxExtent=new OpenLayers.Bounds(-180,-90,180,90);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+'theme/default/style.css';OpenLayers.Util.extend(this,options);this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(div);if(!this.div){this.div=document.createElement("div");this.div.style.height="1px";this.div.style.width="1px";} -OpenLayers.Element.addClass(this.div,'olMap');var id=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(id,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);var eventsDiv=document.createElement("div");eventsDiv.id=this.id+"_events";eventsDiv.style.position="absolute";eventsDiv.style.width="100%";eventsDiv.style.height="100%";eventsDiv.style.zIndex=this.Z_INDEX_BASE.Control-1;this.viewPortDiv.appendChild(eventsDiv);this.eventsDiv=eventsDiv;this.events=new OpenLayers.Events(this,this.eventsDiv,this.EVENT_TYPES,this.fallThrough,{includeXY:true});id=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(id);this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;this.eventsDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} -this.events.register("movestart",this,this.updateSize);if(OpenLayers.String.contains(navigator.appName,"Microsoft")){this.events.register("resize",this,this.updateSize);}else{this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this);OpenLayers.Event.observe(window,'resize',this.updateSizeDestroy);} -if(this.theme){var addNode=true;var nodes=document.getElementsByTagName('link');for(var i=0,len=nodes.length;i=0;--i){this.controls[i].destroy();} -this.controls=null;} -if(this.layers!=null){for(var i=this.layers.length-1;i>=0;--i){this.layers[i].destroy(false);} -this.layers=null;} -if(this.viewPortDiv){this.div.removeChild(this.viewPortDiv);} -this.viewPortDiv=null;if(this.eventListeners){this.events.un(this.eventListeners);this.eventListeners=null;} -this.events.destroy();this.events=null;},setOptions:function(options){var updatePxExtent=this.minPx&&options.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,options);updatePxExtent&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:true});},getTileSize:function(){return this.tileSize;},getBy:function(array,property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this[array],function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getLayersBy:function(property,match){return this.getBy("layers",property,match);},getLayersByName:function(match){return this.getLayersBy("name",match);},getLayersByClass:function(match){return this.getLayersBy("CLASS_NAME",match);},getControlsBy:function(property,match){return this.getBy("controls",property,match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},getLayer:function(id){var foundLayer=null;for(var i=0,len=this.layers.length;ithis.layers.length){idx=this.layers.length;} -if(base!=idx){this.layers.splice(base,1);this.layers.splice(idx,0,layer);for(var i=0,len=this.layers.length;i=0;--i){this.removePopup(this.popups[i]);}} -popup.map=this;this.popups.push(popup);var popupDiv=popup.draw();if(popupDiv){popupDiv.style.zIndex=this.Z_INDEX_BASE['Popup']+ -this.popups.length;this.layerContainerDiv.appendChild(popupDiv);}},removePopup:function(popup){OpenLayers.Util.removeItem(this.popups,popup);if(popup.div){try{this.layerContainerDiv.removeChild(popup.div);} -catch(e){}} -popup.map=null;},getSize:function(){var size=null;if(this.size!=null){size=this.size.clone();} -return size;},updateSize:function(){var newSize=this.getCurrentSize();if(newSize&&!isNaN(newSize.h)&&!isNaN(newSize.w)){this.events.clearMouseCache();var oldSize=this.getSize();if(oldSize==null){this.size=oldSize=newSize;} -if(!newSize.equals(oldSize)){this.size=newSize;for(var i=0,len=this.layers.length;i=this.minPx.x+xRestriction?Math.round(dx):0;dy=y<=this.maxPx.y-yRestriction&&y>=this.minPx.y+yRestriction?Math.round(dy):0;var minX=this.minPx.x,maxX=this.maxPx.x;if(dx||dy){if(!this.dragging){this.dragging=true;this.events.triggerEvent("movestart");} -this.center=null;if(dx){this.layerContainerDiv.style.left=parseInt(this.layerContainerDiv.style.left)-dx+"px";this.minPx.x-=dx;this.maxPx.x-=dx;if(wrapDateLine){if(this.maxPx.x>maxX){this.maxPx.x-=(maxX-minX);} -if(this.minPx.xthis.restrictedExtent.getWidth()){lonlat=new OpenLayers.LonLat(maxCenter.lon,lonlat.lat);}else if(extent.leftthis.restrictedExtent.right){lonlat=lonlat.add(this.restrictedExtent.right- -extent.right,0);} -if(extent.getHeight()>this.restrictedExtent.getHeight()){lonlat=new OpenLayers.LonLat(lonlat.lon,maxCenter.lat);}else if(extent.bottomthis.restrictedExtent.top){lonlat=lonlat.add(0,this.restrictedExtent.top- -extent.top);}}} -var zoomChanged=forceZoomChange||((this.isValidZoomLevel(zoom))&&(zoom!=this.getZoom()));var centerChanged=(this.isValidLonLat(lonlat))&&(!lonlat.equals(this.center));if(zoomChanged||centerChanged||dragging){dragging||this.events.triggerEvent("movestart");if(centerChanged){if(!zoomChanged&&this.center){this.centerLayerContainer(lonlat);} -this.center=lonlat.clone();} -var res=zoomChanged?this.getResolutionForZoom(zoom):this.getResolution();if(zoomChanged||this.layerContainerOrigin==null){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px";var maxExtent=this.getMaxExtent({restricted:true});var maxExtentCenter=maxExtent.getCenterLonLat();var lonDelta=this.center.lon-maxExtentCenter.lon;var latDelta=maxExtentCenter.lat-this.center.lat;var extentWidth=Math.round(maxExtent.getWidth()/res);var extentHeight=Math.round(maxExtent.getHeight()/res);var left=(this.size.w-extentWidth)/2-lonDelta/res;var top=(this.size.h-extentHeight)/2-latDelta/res;this.minPx=new OpenLayers.Pixel(left,top);this.maxPx=new OpenLayers.Pixel(left+extentWidth,top+extentHeight);} -if(zoomChanged){this.zoom=zoom;this.resolution=res;this.viewRequestID++;} -var bounds=this.getExtent();if(this.baseLayer.visibility){this.baseLayer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});} -bounds=this.baseLayer.getExtent();for(var i=this.layers.length-1;i>=0;--i){var layer=this.layers[i];if(layer!==this.baseLayer&&!layer.isBaseLayer){var inRange=layer.calculateInRange();if(layer.inRange!=inRange){layer.inRange=inRange;if(!inRange){layer.display(false);} -this.events.triggerEvent("changelayer",{layer:layer,property:"visibility"});} -if(inRange&&layer.visibility){layer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||layer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});}}} -this.events.triggerEvent("move");dragging||this.events.triggerEvent("moveend");if(zoomChanged){for(var i=0,len=this.popups.length;i=0)&&(zoomLevel0){resolution=this.layers[0].getResolution();} -return resolution;},getUnits:function(){var units=null;if(this.baseLayer!=null){units=this.baseLayer.units;} -return units;},getScale:function(){var scale=null;if(this.baseLayer!=null){var res=this.getResolution();var units=this.baseLayer.units;scale=OpenLayers.Util.getScaleFromResolution(res,units);} -return scale;},getZoomForExtent:function(bounds,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForExtent(bounds,closest);} -return zoom;},getResolutionForZoom:function(zoom){var resolution=null;if(this.baseLayer){resolution=this.baseLayer.getResolutionForZoom(zoom);} -return resolution;},getZoomForResolution:function(resolution,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForResolution(resolution,closest);} -return zoom;},zoomTo:function(zoom){if(this.isValidZoomLevel(zoom)){this.setCenter(null,zoom);}},zoomIn:function(){this.zoomTo(this.getZoom()+1);},zoomOut:function(){this.zoomTo(this.getZoom()-1);},zoomToExtent:function(bounds,closest){var center=bounds.getCenterLonLat();if(this.baseLayer.wrapDateLine){var maxExtent=this.getMaxExtent();bounds=bounds.clone();while(bounds.right=0){this.initResolutions();if(reinitialize&&this.map.baseLayer===this){this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(resolution),false,true);this.map.events.triggerEvent("changebaselayer",{layer:this});} -break;}}}},onMapResize:function(){},redraw:function(){var redrawn=false;if(this.map){this.inRange=this.calculateInRange();var extent=this.getExtent();if(extent&&this.inRange&&this.visibility){var zoomChanged=true;this.moveTo(extent,zoomChanged,false);this.events.triggerEvent("moveend",{"zoomChanged":zoomChanged});redrawn=true;}} -return redrawn;},moveTo:function(bounds,zoomChanged,dragging){var display=this.visibility;if(!this.isBaseLayer){display=display&&this.inRange;} -this.display(display);},moveByPx:function(dx,dy){},setMap:function(map){if(this.map==null){this.map=map;this.maxExtent=this.maxExtent||this.map.maxExtent;this.minExtent=this.minExtent||this.map.minExtent;this.projection=this.projection||this.map.projection;if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);} -this.units=this.projection.getUnits()||this.units||this.map.units;this.initResolutions();if(!this.isBaseLayer){this.inRange=this.calculateInRange();var show=((this.visibility)&&(this.inRange));this.div.style.display=show?"":"none";} -this.setTileSize();}},afterAdd:function(){},removeMap:function(map){},getImageSize:function(bounds){return(this.imageSize||this.tileSize);},setTileSize:function(size){var tileSize=(size)?size:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=tileSize;if(this.gutter){this.imageOffset=new OpenLayers.Pixel(-this.gutter,-this.gutter);this.imageSize=new OpenLayers.Size(tileSize.w+(2*this.gutter),tileSize.h+(2*this.gutter));}},getVisibility:function(){return this.visibility;},setVisibility:function(visibility){if(visibility!=this.visibility){this.visibility=visibility;this.display(visibility);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"});} -this.events.triggerEvent("visibilitychanged");}},display:function(display){if(display!=(this.div.style.display!="none")){this.div.style.display=(display&&this.calculateInRange())?"block":"none";}},calculateInRange:function(){var inRange=false;if(this.alwaysInRange){inRange=true;}else{if(this.map){var resolution=this.map.getResolution();inRange=((resolution>=this.minResolution)&&(resolution<=this.maxResolution));}} -return inRange;},setIsBaseLayer:function(isBaseLayer){if(isBaseLayer!=this.isBaseLayer){this.isBaseLayer=isBaseLayer;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this});}}},initResolutions:function(){var i,len,p;var props={},alwaysInRange=true;for(i=0,len=this.RESOLUTION_PROPERTIES.length;i=resolution){highRes=res;lowZoom=i;} -if(res<=resolution){lowRes=res;highZoom=i;break;}} -var dRes=highRes-lowRes;if(dRes>0){zoom=lowZoom+((highRes-resolution)/dRes);}else{zoom=lowZoom;}}else{var diff;var minDiff=Number.POSITIVE_INFINITY;for(i=0,len=this.resolutions.length;iminDiff){break;} -minDiff=diff;}else{if(this.resolutions[i]=bounds.bottom-tilelat*this.buffer)||rowidx=0)&&(testCell=0)){tile=this.grid[testRow][testCell];} -if((tile!=null)&&(!tile.queued)){tileQueue.unshift(tile);tile.queued=true;directionsTried=0;iRow=testRow;iCell=testCell;}else{direction=(direction+1)%4;directionsTried++;}} -for(var i=0,len=tileQueue.length;i-this.tileSize.w*(buffer-1)){this.shiftColumn(true);}else if(tlViewPort.x<-this.tileSize.w*buffer){this.shiftColumn(false);}else if(tlViewPort.y>-this.tileSize.h*(buffer-1)){this.shiftRow(true);}else if(tlViewPort.y<-this.tileSize.h*buffer){this.shiftRow(false);}else{shifted=false;} -if(shifted){this.timerId=window.setTimeout(this._moveGriddedTiles,0);}},shiftRow:function(prepend){var modelRowIndex=(prepend)?0:(this.grid.length-1);var grid=this.grid;var modelRow=grid[modelRowIndex];var resolution=this.map.getResolution();var deltaY=(prepend)?-this.tileSize.h:this.tileSize.h;var deltaLat=resolution*-deltaY;var row=(prepend)?grid.pop():grid.shift();for(var i=0,len=modelRow.length;irows){var row=this.grid.pop();for(var i=0,l=row.length;icolumns){for(var i=0,l=this.grid.length;i0;},CLASS_NAME:"OpenLayers.Protocol.Response"});OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:false,displayClass:"",title:"",autoActivate:false,active:null,handler:null,eventListeners:null,events:null,EVENT_TYPES:["activate","deactivate"],initialize:function(options){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,options);this.events=new OpenLayers.Events(this,null,this.EVENT_TYPES);if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} +-this.element.lefttop[1]);},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:false,evt:null,initialize:function(control,callbacks,options){OpenLayers.Util.extend(this,options);this.control=control;this.callbacks=callbacks;var map=this.map||control.map;if(map){this.setMap(map);} +this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");},setMap:function(map){this.map=map;},checkModifiers:function(evt){if(this.keyMask==null){return true;} +var keyModifiers=(evt.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(evt.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(evt.altKey?OpenLayers.Handler.MOD_ALT:0);return(keyModifiers==this.keyMask);},activate:function(){if(this.active){return false;} +var events=OpenLayers.Events.prototype.BROWSER_EVENTS;for(var i=0,len=events.length;ibottomRight.lon){if(topLeft.lon<0){topLeft.lon=-180-(topLeft.lon+180);}else{bottomRight.lon=180+bottomRight.lon+180;}} +var bounds=new OpenLayers.Bounds(topLeft.lon,bottomRight.lat,bottomRight.lon,topLeft.lat);return bounds;},showTile:function(){if(this.shouldDraw){this.show();}},show:function(){},hide:function(){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,layerAlphaHack:null,isBackBuffer:false,isFirstDraw:true,backBufferTile:null,maxGetUrlLength:null,initialize:function(layer,position,bounds,url,size,options){OpenLayers.Tile.prototype.initialize.apply(this,arguments);if(this.maxGetUrlLength!=null){OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame);} +this.url=url;this.frame=document.createElement('div');this.frame.style.overflow='hidden';this.frame.style.position='absolute';this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();},destroy:function(){if(this.imgDiv!=null){this.removeImgDiv();} +this.imgDiv=null;if((this.frame!=null)&&(this.frame.parentNode==this.layer.div)){this.layer.div.removeChild(this.frame);} +this.frame=null;if(this.backBufferTile){this.backBufferTile.destroy();this.backBufferTile=null;} +this.layer.events.unregister("loadend",this,this.resetBackBuffer);OpenLayers.Tile.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Tile.Image(this.layer,this.position,this.bounds,this.url,this.size);} +obj=OpenLayers.Tile.prototype.clone.apply(this,[obj]);obj.imgDiv=null;return obj;},draw:function(){if(this.layer!=this.layer.map.baseLayer&&this.layer.reproject){this.bounds=this.getBoundsFromBaseLayer(this.position);} +var drawTile=OpenLayers.Tile.prototype.draw.apply(this,arguments);if((OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1)||this.layer.singleTile){if(drawTile){if(!this.backBufferTile){this.backBufferTile=this.clone();this.backBufferTile.hide();this.backBufferTile.isBackBuffer=true;this.events.register('loadend',this,this.resetBackBuffer);this.layer.events.register("loadend",this,this.resetBackBuffer);} +this.startTransition();}else{if(this.backBufferTile){this.backBufferTile.clear();}}}else{if(drawTile&&this.isFirstDraw){this.events.register('loadend',this,this.showTile);this.isFirstDraw=false;}} +if(!drawTile){return false;} +if(this.isLoading){this.events.triggerEvent("reload");}else{this.isLoading=true;this.events.triggerEvent("loadstart");} +return this.renderTile();},resetBackBuffer:function(){this.showTile();if(this.backBufferTile&&(this.isFirstDraw||!this.layer.numLoadingTiles)){this.isFirstDraw=false;var maxExtent=this.layer.maxExtent;var withinMaxExtent=(maxExtent&&this.bounds.intersectsBounds(maxExtent,false));if(withinMaxExtent){this.backBufferTile.position=this.position;this.backBufferTile.bounds=this.bounds;this.backBufferTile.size=this.size;this.backBufferTile.imageSize=this.layer.getImageSize(this.bounds)||this.size;this.backBufferTile.imageOffset=this.layer.imageOffset;this.backBufferTile.resolution=this.layer.getResolution();this.backBufferTile.renderTile();} +this.backBufferTile.hide();}},renderTile:function(){if(this.layer.async){this.initImgDiv();this.layer.getURLasync(this.bounds,this,"url",this.positionImage);}else{this.url=this.layer.getURL(this.bounds);this.initImgDiv();this.positionImage();} +return true;},positionImage:function(){if(this.layer===null){return;} +OpenLayers.Util.modifyDOMElement(this.frame,null,this.position,this.size);var imageSize=this.layer.getImageSize(this.bounds);if(this.layerAlphaHack){OpenLayers.Util.modifyAlphaImageDiv(this.imgDiv,null,null,imageSize,this.url);}else{OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,imageSize);this.imgDiv.src=this.url;}},clear:function(){if(this.imgDiv){this.hide();if(OpenLayers.Tile.Image.useBlankTile){this.imgDiv.src=OpenLayers.Util.getImagesLocation()+"blank.gif";}}},initImgDiv:function(){if(this.imgDiv==null){var offset=this.layer.imageOffset;var size=this.layer.getImageSize(this.bounds);if(this.layerAlphaHack){this.imgDiv=OpenLayers.Util.createAlphaImageDiv(null,offset,size,null,"relative",null,null,null,true);}else{this.imgDiv=OpenLayers.Util.createImage(null,offset,size,null,"relative",null,null,true);} +if(OpenLayers.Util.isArray(this.layer.url)){this.imgDiv.urls=this.layer.url.slice();} +this.imgDiv.className='olTileImage';this.frame.style.zIndex=this.isBackBuffer?0:1;this.frame.appendChild(this.imgDiv);this.layer.div.appendChild(this.frame);if(this.layer.opacity!=null){OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,null,null,null,null,this.layer.opacity);} +this.imgDiv.map=this.layer.map;var onload=function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("loadend");}};if(this.layerAlphaHack){OpenLayers.Event.observe(this.imgDiv.childNodes[0],'load',OpenLayers.Function.bind(onload,this));}else{OpenLayers.Event.observe(this.imgDiv,'load',OpenLayers.Function.bind(onload,this));} +var onerror=function(){if(this.imgDiv._attempts>OpenLayers.IMAGE_RELOAD_ATTEMPTS){onload.call(this);}};OpenLayers.Event.observe(this.imgDiv,"error",OpenLayers.Function.bind(onerror,this));} +this.imgDiv.viewRequestID=this.layer.map.viewRequestID;},removeImgDiv:function(){OpenLayers.Event.stopObservingElement(this.imgDiv);if(this.imgDiv.parentNode==this.frame){this.frame.removeChild(this.imgDiv);this.imgDiv.map=null;} +this.imgDiv.urls=null;var child=this.imgDiv.firstChild;if(child){OpenLayers.Event.stopObservingElement(child);this.imgDiv.removeChild(child);delete child;}else{this.imgDiv.src=OpenLayers.Util.getImagesLocation()+"blank.gif";}},checkImgURL:function(){if(this.layer){var loaded=this.layerAlphaHack?this.imgDiv.firstChild.src:this.imgDiv.src;if(!OpenLayers.Util.isEquivalentUrl(loaded,this.url)){this.hide();}}},startTransition:function(){if(!this.backBufferTile||!this.backBufferTile.imgDiv){return;} +var ratio=1;if(this.backBufferTile.resolution){ratio=this.backBufferTile.resolution/this.layer.getResolution();} +if(ratio!=1){if(this.layer.transitionEffect=='resize'){var upperLeft=new OpenLayers.LonLat(this.backBufferTile.bounds.left,this.backBufferTile.bounds.top);var size=new OpenLayers.Size(this.backBufferTile.size.w*ratio,this.backBufferTile.size.h*ratio);var px=this.layer.map.getLayerPxFromLonLat(upperLeft);OpenLayers.Util.modifyDOMElement(this.backBufferTile.frame,null,px,size);var imageSize=this.backBufferTile.imageSize;imageSize=new OpenLayers.Size(imageSize.w*ratio,imageSize.h*ratio);var imageOffset=this.backBufferTile.imageOffset;if(imageOffset){imageOffset=new OpenLayers.Pixel(imageOffset.x*ratio,imageOffset.y*ratio);} +OpenLayers.Util.modifyDOMElement(this.backBufferTile.imgDiv,null,imageOffset,imageSize);this.backBufferTile.show();}}else{if(this.layer.singleTile){this.backBufferTile.show();}else{this.backBufferTile.hide();}}},show:function(){this.frame.style.display='';if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){if(OpenLayers.IS_GECKO===true){this.frame.scrollLeft=this.frame.scrollLeft;}}},hide:function(){this.frame.style.display='none';},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Tile.Image.useBlankTile=(OpenLayers.BROWSER_NAME=="safari"||OpenLayers.BROWSER_NAME=="opera");OpenLayers.ElementsIndexer=OpenLayers.Class({maxZIndex:null,order:null,indices:null,compare:null,initialize:function(yOrdering){this.compare=yOrdering?OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER:OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;this.clear();},insert:function(newNode){if(this.exists(newNode)){this.remove(newNode);} +var nodeId=newNode.id;this.determineZIndex(newNode);var leftIndex=-1;var rightIndex=this.order.length;var middle;while(rightIndex-leftIndex>1){middle=parseInt((leftIndex+rightIndex)/2);var placement=this.compare(this,newNode,OpenLayers.Util.getElement(this.order[middle]));if(placement>0){leftIndex=middle;}else{rightIndex=middle;}} +this.order.splice(rightIndex,0,nodeId);this.indices[nodeId]=this.getZIndex(newNode);return this.getNextElement(rightIndex);},remove:function(node){var nodeId=node.id;var arrayIndex=OpenLayers.Util.indexOf(this.order,nodeId);if(arrayIndex>=0){this.order.splice(arrayIndex,1);delete this.indices[nodeId];if(this.order.length>0){var lastId=this.order[this.order.length-1];this.maxZIndex=this.indices[lastId];}else{this.maxZIndex=0;}}},clear:function(){this.order=[];this.indices={};this.maxZIndex=0;},exists:function(node){return(this.indices[node.id]!=null);},getZIndex:function(node){return node._style.graphicZIndex;},determineZIndex:function(node){var zIndex=node._style.graphicZIndex;if(zIndex==null){zIndex=this.maxZIndex;node._style.graphicZIndex=zIndex;}else if(zIndex>this.maxZIndex){this.maxZIndex=zIndex;}},getNextElement:function(index){var nextIndex=index+1;if(nextIndex0){pieces.push(',');} -pieces.push(this.writeNewline(),this.writeIndent(),json);}} -this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),']');return pieces.join('');},'string':function(string){var m={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};if(/["\\\x00-\x1f]/.test(string)){return'"'+string.replace(/([\x00-\x1f\\"])/g,function(a,b){var c=m[b];if(c){return c;} -c=b.charCodeAt();return'\\u00'+ -Math.floor(c/16).toString(16)+ -(c%16).toString(16);})+'"';} -return'"'+string+'"';},'number':function(number){return isFinite(number)?String(number):"null";},'boolean':function(bool){return String(bool);},'date':function(date){function format(number){return(number<10)?'0'+number:number;} -return'"'+date.getFullYear()+'-'+ -format(date.getMonth()+1)+'-'+ -format(date.getDate())+'T'+ -format(date.getHours())+':'+ -format(date.getMinutes())+':'+ -format(date.getSeconds())+'"';}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{namespaces:null,namespaceAlias:null,defaultPrefix:null,readers:{},writers:{},xmldom:null,initialize:function(options){if(window.ActiveXObject){this.xmldom=new ActiveXObject("Microsoft.XMLDOM");} +return false;},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(url){url=url||window.location.href;var parameters=OpenLayers.Util.getParameters(url);var index=url.indexOf('#');if(index>0){url='?'+url.substring(index+1,url.length);OpenLayers.Util.extend(parameters,OpenLayers.Util.getParameters(url));} +return parameters;},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0,len=this.map.controls.length;i0){if(!mapProjection.equals(layer.projection)){var geom;for(var i=0,len=features.length;i0){text=text.substring(index);} var node=OpenLayers.Util.Try(OpenLayers.Function.bind((function(){var xmldom;if(window.ActiveXObject&&!this.xmldom){xmldom=new ActiveXObject("Microsoft.XMLDOM");}else{xmldom=this.xmldom;} xmldom.loadXML(text);return xmldom;}),this),function(){return new DOMParser().parseFromString(text,'text/xml');},function(){var req=new XMLHttpRequest();req.open("GET","data:"+"text/xml"+";charset=utf-8,"+encodeURIComponent(text),false);if(req.overrideMimeType){req.overrideMimeType("text/xml");} @@ -748,269 +557,17 @@ return sibling||null;},lookupNamespaceURI:function(node,prefix){var uri=null;if( var len=node.attributes.length;if(len){var attr;for(var i=0;i=OpenLayers.Style.createLiteral(this.minScaleDenominator,context);} -if(applies&&this.maxScaleDenominator){applies=scale0){this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval);} -this.dragging=true;this.move(evt);this.callback("move",[evt.xy]);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart;document.onselectstart=OpenLayers.Function.False;} -this.last=evt.xy;} -return true;},dragend:function(evt){if(this.started){if(this.documentDrag===true&&this.documentEvents){this.adjustXY(evt);this.removeDocumentEvents();} -var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(evt);this.callback("up",[evt.xy]);if(dragged){this.callback("done",[evt.xy]);} -document.onselectstart=this.oldOnselectstart;} -return true;},down:function(evt){},move:function(evt){},up:function(evt){},out:function(evt){},mousedown:function(evt){return this.dragstart(evt);},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,scope:this});} -return this.dragstart(evt);},mousemove:function(evt){return this.dragmove(evt);},touchmove:function(evt){return this.dragmove(evt);},removeTimeout:function(){this.timeoutId=null;if(this.dragging){this.mousemove(this.lastMoveEvt);}},mouseup:function(evt){return this.dragend(evt);},touchend:function(evt){evt.xy=this.last;return this.dragend(evt);},mouseout:function(evt){if(this.started&&OpenLayers.Util.mouseLeft(evt,this.map.eventsDiv)){if(this.documentDrag===true){this.addDocumentEvents();}else{var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(evt);this.callback("out",[]);if(dragged){this.callback("done",[evt.xy]);} -if(document.onselectstart){document.onselectstart=this.oldOnselectstart;}}} -return true;},click:function(evt){return(this.start==this.last);},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragging=false;activated=true;} -return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.touch=false;this.started=false;this.dragging=false;this.start=null;this.last=null;deactivated=true;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");} -return deactivated;},adjustXY:function(evt){var pos=OpenLayers.Util.pagePosition(this.map.viewPortDiv);evt.xy.x-=pos[0];evt.xy.y-=pos[1];},addDocumentEvents:function(){OpenLayers.Element.addClass(document.body,"olDragDown");this.documentEvents=true;OpenLayers.Event.observe(document,"mousemove",this._docMove);OpenLayers.Event.observe(document,"mouseup",this._docUp);},removeDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents=false;OpenLayers.Event.stopObserving(document,"mousemove",this._docMove);OpenLayers.Event.stopObserving(document,"mouseup",this._docUp);},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Handler.Feature=OpenLayers.Class(OpenLayers.Handler,{EVENTMAP:{'click':{'in':'click','out':'clickout'},'mousemove':{'in':'over','out':'out'},'dblclick':{'in':'dblclick','out':null},'mousedown':{'in':null,'out':null},'mouseup':{'in':null,'out':null},'touchstart':{'in':'click','out':'clickout'}},feature:null,lastFeature:null,down:null,up:null,touch:false,clickTolerance:4,geometryTypes:null,stopClick:true,stopDown:true,stopUp:false,initialize:function(control,layer,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,[control,callbacks,options]);this.layer=layer;},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,dblclick:this.dblclick,scope:this});} -return OpenLayers.Event.isMultiTouch(evt)?true:this.mousedown(evt);},touchmove:function(evt){OpenLayers.Event.stop(evt);},mousedown:function(evt){this.down=evt.xy;return this.handle(evt)?!this.stopDown:true;},mouseup:function(evt){this.up=evt.xy;return this.handle(evt)?!this.stopUp:true;},click:function(evt){return this.handle(evt)?!this.stopClick:true;},mousemove:function(evt){if(!this.callbacks['over']&&!this.callbacks['out']){return true;} -this.handle(evt);return true;},dblclick:function(evt){return!this.handle(evt);},geometryTypeMatches:function(feature){return this.geometryTypes==null||OpenLayers.Util.indexOf(this.geometryTypes,feature.geometry.CLASS_NAME)>-1;},handle:function(evt){if(this.feature&&!this.feature.layer){this.feature=null;} -var type=evt.type;var handled=false;var previouslyIn=!!(this.feature);var click=(type=="click"||type=="dblclick"||type=="touchstart");this.feature=this.layer.getFeatureFromEvent(evt);if(this.feature&&!this.feature.layer){this.feature=null;} -if(this.lastFeature&&!this.lastFeature.layer){this.lastFeature=null;} -if(this.feature){if(type==="touchstart"){OpenLayers.Event.stop(evt);} -var inNew=(this.feature!=this.lastFeature);if(this.geometryTypeMatches(this.feature)){if(previouslyIn&&inNew){if(this.lastFeature){this.triggerCallback(type,'out',[this.lastFeature]);} -this.triggerCallback(type,'in',[this.feature]);}else if(!previouslyIn||click){this.triggerCallback(type,'in',[this.feature]);} -this.lastFeature=this.feature;handled=true;}else{if(this.lastFeature&&(previouslyIn&&inNew||click)){this.triggerCallback(type,'out',[this.lastFeature]);} -this.feature=null;}}else{if(this.lastFeature&&(previouslyIn||click)){this.triggerCallback(type,'out',[this.lastFeature]);}} -return handled;},triggerCallback:function(type,mode,args){var key=this.EVENTMAP[type][mode];if(key){if(type=='click'&&this.up&&this.down){var dpx=Math.sqrt(Math.pow(this.up.x-this.down.x,2)+ -Math.pow(this.up.y-this.down.y,2));if(dpx<=this.clickTolerance){this.callback(key,args);}}else{this.callback(key,args);}}},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.moveLayerToTop();this.map.events.on({"removelayer":this.handleMapEvents,"changelayer":this.handleMapEvents,scope:this});activated=true;} -return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.moveLayerBack();this.feature=null;this.lastFeature=null;this.down=null;this.up=null;this.touch=false;this.map.events.un({"removelayer":this.handleMapEvents,"changelayer":this.handleMapEvents,scope:this});deactivated=true;} -return deactivated;},handleMapEvents:function(evt){if(evt.type=="removelayer"||evt.property=="order"){this.moveLayerToTop();}},moveLayerToTop:function(){var index=Math.max(this.map.Z_INDEX_BASE['Feature']-1,this.layer.getZIndex())+1;this.layer.setZIndex(index);},moveLayerBack:function(){var index=this.layer.getZIndex()-1;if(index>=this.map.Z_INDEX_BASE['Feature']){this.layer.setZIndex(index);}else{this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer));}},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(feature,pixel){},onDrag:function(feature,pixel){},onComplete:function(feature,pixel){},onEnter:function(feature){},onLeave:function(feature){},documentDrag:false,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature,up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks),{documentDrag:this.documentDrag}),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})};},clickFeature:function(feature){if(this.handlers.feature.touch&&!this.over&&this.overFeature(feature)){this.handlers.drag.dragstart(this.handlers.feature.evt);this.handlers.drag.stopDown=false;}},clickoutFeature:function(feature){if(this.handlers.feature.touch&&this.over){this.outFeature(feature);this.handlers.drag.stopDown=true;}},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[]);},activate:function(){return(this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments));},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=false;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},overFeature:function(feature){var activated=false;if(!this.handlers.drag.dragging){this.feature=feature;this.handlers.drag.activate();activated=true;this.over=true;OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over");this.onEnter(feature);}else{if(this.feature.id==feature.id){this.over=true;}else{this.over=false;}} -return activated;},downFeature:function(pixel){this.lastPixel=pixel;this.onStart(this.feature,pixel);},moveFeature:function(pixel){var res=this.map.getResolution();this.feature.geometry.move(res*(pixel.x-this.lastPixel.x),res*(this.lastPixel.y-pixel.y));this.layer.drawFeature(this.feature);this.lastPixel=pixel;this.onDrag(this.feature,pixel);},upFeature:function(pixel){if(!this.over){this.handlers.drag.deactivate();}},doneDragging:function(pixel){this.onComplete(this.feature,pixel);},outFeature:function(feature){if(!this.handlers.drag.dragging){this.over=false;this.handlers.drag.deactivate();OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");this.onLeave(feature);this.feature=null;}else{if(this.feature.id==feature.id){this.over=false;}}},cancel:function(){this.handlers.drag.deactivate();this.over=false;},setMap:function(map){this.handlers.drag.setMap(map);this.handlers.feature.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:'olHandlerBoxZoomBox',boxOffsets:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask});},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);if(this.dragHandler){this.dragHandler.destroy();this.dragHandler=null;}},setMap:function(map){OpenLayers.Handler.prototype.setMap.apply(this,arguments);if(this.dragHandler){this.dragHandler.setMap(map);}},startBox:function(xy){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv('zoomBox',new OpenLayers.Pixel(-9999,-9999));this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.eventsDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.eventsDiv,"olDrawBox");},moveBox:function(xy){var startX=this.dragHandler.start.x;var startY=this.dragHandler.start.y;var deltaX=Math.abs(startX-xy.x);var deltaY=Math.abs(startY-xy.y);var offset=this.getBoxOffsets();this.zoomBox.style.width=(deltaX+offset.width+1)+"px";this.zoomBox.style.height=(deltaY+offset.height+1)+"px";this.zoomBox.style.left=(xy.x5||Math.abs(this.dragHandler.start.y-end.y)>5){var start=this.dragHandler.start;var top=Math.min(start.y,end.y);var bottom=Math.max(start.y,end.y);var left=Math.min(start.x,end.x);var right=Math.max(start.x,end.x);result=new OpenLayers.Bounds(left,bottom,right,top);}else{result=this.dragHandler.start.clone();} -this.removeBox();this.callback("done",[result]);},removeBox:function(){this.map.eventsDiv.removeChild(this.zoomBox);this.zoomBox=null;this.boxOffsets=null;OpenLayers.Element.removeClass(this.map.eventsDiv,"olDrawBox");},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){if(this.dragHandler.deactivate()){if(this.zoomBox){this.removeBox();}} -return true;}else{return false;}},getBoxOffsets:function(){if(!this.boxOffsets){var testDiv=document.createElement("div");testDiv.style.position="absolute";testDiv.style.border="1px solid black";testDiv.style.width="3px";document.body.appendChild(testDiv);var w3cBoxModel=testDiv.clientWidth==3;document.body.removeChild(testDiv);var left=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width"));var right=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width"));var top=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-top-width"));var bottom=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"));this.boxOffsets={left:left,right:right,top:top,bottom:bottom,width:w3cBoxModel===false?left+right:0,height:w3cBoxModel===false?top+bottom:0};} -return this.boxOffsets;},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:false,alwaysZoom:false,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask});},zoomBox:function(position){if(position instanceof OpenLayers.Bounds){var bounds;if(!this.out){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);}else{var pixWidth=Math.abs(position.right-position.left);var pixHeight=Math.abs(position.top-position.bottom);var zoomFactor=Math.min((this.map.size.h/pixHeight),(this.map.size.w/pixWidth));var extent=this.map.getExtent();var center=this.map.getLonLatFromPixel(position.getCenterPixel());var xmin=center.lon-(extent.getWidth()/2)*zoomFactor;var xmax=center.lon+(extent.getWidth()/2)*zoomFactor;var ymin=center.lat-(extent.getHeight()/2)*zoomFactor;var ymax=center.lat+(extent.getHeight()/2)*zoomFactor;bounds=new OpenLayers.Bounds(xmin,ymin,xmax,ymax);} -var lastZoom=this.map.getZoom();this.map.zoomToExtent(bounds);if(lastZoom==this.map.getZoom()&&this.alwaysZoom==true){this.map.zoomTo(lastZoom+(this.out?-1:1));}}else{if(!this.out){this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()+1);}else{this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()-1);}}},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:false,interval:1,documentDrag:false,kinetic:null,enableKinetic:false,kineticInterval:10,draw:function(){if(this.enableKinetic){var config={interval:this.kineticInterval};if(typeof this.enableKinetic==="object"){config=OpenLayers.Util.extend(config,this.enableKinetic);} -this.kinetic=new OpenLayers.Kinetic(config);} -this.handler=new OpenLayers.Handler.Drag(this,{"move":this.panMap,"done":this.panMapDone,"down":this.panMapStart},{interval:this.interval,documentDrag:this.documentDrag});},panMapStart:function(){if(this.kinetic){this.kinetic.begin();}},panMap:function(xy){if(this.kinetic){this.kinetic.update(xy);} -this.panned=true;this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:true,animate:false});},panMapDone:function(xy){if(this.panned){var res=null;if(this.kinetic){res=this.kinetic.end(xy);} -this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:!!res,animate:false});if(res){var self=this;this.kinetic.move(res,function(x,y,end){self.map.pan(x,y,{dragging:!end,animate:false});});} -this.panned=false;}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,mousePosition:null,interval:0,delta:0,cumulative:true,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this);},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null;},onWheelEvent:function(e){if(!this.map||!this.checkModifiers(e)){return;} -var overScrollableDiv=false;var overLayerDiv=false;var overMapDiv=false;var elem=OpenLayers.Event.element(e);while((elem!=null)&&!overMapDiv&&!overScrollableDiv){if(!overScrollableDiv){try{if(elem.currentStyle){overflow=elem.currentStyle["overflow"];}else{var style=document.defaultView.getComputedStyle(elem,null);var overflow=style.getPropertyValue("overflow");} -overScrollableDiv=(overflow&&(overflow=="auto")||(overflow=="scroll"));}catch(err){}} -if(!overLayerDiv){for(var i=0,len=this.map.layers.length;i=this.down.xy.distanceTo(evt.xy);if(passes&&this.touch&&this.down.touches.length===this.last.touches.length){for(var i=0,ii=this.down.touches.length;ithis.pixelTolerance){passes=false;break;}}}} -return passes;},getTouchDistance:function(from,to){return Math.sqrt(Math.pow(from.clientX-to.clientX,2)+ -Math.pow(from.clientY-to.clientY,2));},passesDblclickTolerance:function(evt){var passes=true;if(this.down&&this.first){passes=this.down.xy.distanceTo(this.first.xy)<=this.dblclickTolerance;} -return passes;},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;} -if(this.rightclickTimerId!=null){window.clearTimeout(this.rightclickTimerId);this.rightclickTimerId=null;}},delayedCall:function(evt){this.timerId=null;if(evt){this.callback("click",[evt]);}},getEventInfo:function(evt){var touches;if(evt.touches){var len=evt.touches.length;touches=new Array(len);var touch;for(var i=0;i=0;i--){if(i!=0&&features[i-1].geometry){this.renderer.locked=true;}else{this.renderer.locked=false;} -var feature=features[i];delete this.unrenderedFeatures[feature.id];if(notify){this.events.triggerEvent("beforefeatureremoved",{feature:feature});} -this.features=OpenLayers.Util.removeItem(this.features,feature);feature.layer=null;if(feature.geometry){this.renderer.eraseFeatures(feature);} -if(OpenLayers.Util.indexOf(this.selectedFeatures,feature)!=-1){OpenLayers.Util.removeItem(this.selectedFeatures,feature);} -if(notify){this.events.triggerEvent("featureremoved",{feature:feature});}} -if(notify){this.events.triggerEvent("featuresremoved",{features:features});}},removeAllFeatures:function(options){var notify=!options||!options.silent;var features=this.features;if(notify){this.events.triggerEvent("beforefeaturesremoved",{features:features});} -var feature;for(var i=features.length-1;i>=0;i--){feature=features[i];if(notify){this.events.triggerEvent("beforefeatureremoved",{feature:feature});} -feature.layer=null;if(notify){this.events.triggerEvent("featureremoved",{feature:feature});}} -this.renderer.clear();this.features=[];this.unrenderedFeatures={};this.selectedFeatures=[];if(notify){this.events.triggerEvent("featuresremoved",{features:features});}},destroyFeatures:function(features,options){var all=(features==undefined);if(all){features=this.features;} -if(features){this.removeFeatures(features,options);for(var i=features.length-1;i>=0;i--){features[i].destroy();}}},drawFeature:function(feature,style){if(!this.drawn){return;} -if(typeof style!="object"){if(!style&&feature.state===OpenLayers.State.DELETE){style="delete";} -var renderIntent=style||feature.renderIntent;style=feature.style||this.style;if(!style){style=this.styleMap.createSymbolizer(feature,renderIntent);}} -var drawn=this.renderer.drawFeature(feature,style);if(drawn===false||drawn===null){this.unrenderedFeatures[feature.id]=feature;}else{delete this.unrenderedFeatures[feature.id];}},eraseFeatures:function(features){this.renderer.eraseFeatures(features);},getFeatureFromEvent:function(evt){if(!this.renderer){OpenLayers.Console.error(OpenLayers.i18n("getFeatureError"));return null;} -var feature=null;var featureId=this.renderer.getFeatureIdFromEvent(evt);if(featureId){if(typeof featureId==="string"){feature=this.getFeatureById(featureId);}else{feature=featureId;}} -return feature;},getFeatureBy:function(property,value){var feature=null;for(var i=0,len=this.features.length;i0)){var geometry=null;for(var i=0,len=features.length;ibottomRight.lon){if(topLeft.lon<0){topLeft.lon=-180-(topLeft.lon+180);}else{bottomRight.lon=180+bottomRight.lon+180;}} -var bounds=new OpenLayers.Bounds(topLeft.lon,bottomRight.lat,bottomRight.lon,topLeft.lat);return bounds;},showTile:function(){if(this.shouldDraw){this.show();}},show:function(){},hide:function(){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,layerAlphaHack:null,isBackBuffer:false,isFirstDraw:true,backBufferTile:null,maxGetUrlLength:null,initialize:function(layer,position,bounds,url,size,options){OpenLayers.Tile.prototype.initialize.apply(this,arguments);if(this.maxGetUrlLength!=null){OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame);} -this.url=url;this.frame=document.createElement('div');this.frame.style.overflow='hidden';this.frame.style.position='absolute';this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();},destroy:function(){if(this.imgDiv!=null){this.removeImgDiv();} -this.imgDiv=null;if((this.frame!=null)&&(this.frame.parentNode==this.layer.div)){this.layer.div.removeChild(this.frame);} -this.frame=null;if(this.backBufferTile){this.backBufferTile.destroy();this.backBufferTile=null;} -this.layer.events.unregister("loadend",this,this.resetBackBuffer);OpenLayers.Tile.prototype.destroy.apply(this,arguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Tile.Image(this.layer,this.position,this.bounds,this.url,this.size);} -obj=OpenLayers.Tile.prototype.clone.apply(this,[obj]);obj.imgDiv=null;return obj;},draw:function(){if(this.layer!=this.layer.map.baseLayer&&this.layer.reproject){this.bounds=this.getBoundsFromBaseLayer(this.position);} -var drawTile=OpenLayers.Tile.prototype.draw.apply(this,arguments);if((OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1)||this.layer.singleTile){if(drawTile){if(!this.backBufferTile){this.backBufferTile=this.clone();this.backBufferTile.hide();this.backBufferTile.isBackBuffer=true;this.events.register('loadend',this,this.resetBackBuffer);this.layer.events.register("loadend",this,this.resetBackBuffer);} -this.startTransition();}else{if(this.backBufferTile){this.backBufferTile.clear();}}}else{if(drawTile&&this.isFirstDraw){this.events.register('loadend',this,this.showTile);this.isFirstDraw=false;}} -if(!drawTile){return false;} -if(this.isLoading){this.events.triggerEvent("reload");}else{this.isLoading=true;this.events.triggerEvent("loadstart");} -return this.renderTile();},resetBackBuffer:function(){this.showTile();if(this.backBufferTile&&(this.isFirstDraw||!this.layer.numLoadingTiles)){this.isFirstDraw=false;var maxExtent=this.layer.maxExtent;var withinMaxExtent=(maxExtent&&this.bounds.intersectsBounds(maxExtent,false));if(withinMaxExtent){this.backBufferTile.position=this.position;this.backBufferTile.bounds=this.bounds;this.backBufferTile.size=this.size;this.backBufferTile.imageSize=this.layer.getImageSize(this.bounds)||this.size;this.backBufferTile.imageOffset=this.layer.imageOffset;this.backBufferTile.resolution=this.layer.getResolution();this.backBufferTile.renderTile();} -this.backBufferTile.hide();}},renderTile:function(){if(this.layer.async){this.initImgDiv();this.layer.getURLasync(this.bounds,this,"url",this.positionImage);}else{this.url=this.layer.getURL(this.bounds);this.initImgDiv();this.positionImage();} -return true;},positionImage:function(){if(this.layer===null){return;} -OpenLayers.Util.modifyDOMElement(this.frame,null,this.position,this.size);var imageSize=this.layer.getImageSize(this.bounds);if(this.layerAlphaHack){OpenLayers.Util.modifyAlphaImageDiv(this.imgDiv,null,null,imageSize,this.url);}else{OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,imageSize);this.imgDiv.src=this.url;}},clear:function(){if(this.imgDiv){this.hide();if(OpenLayers.Tile.Image.useBlankTile){this.imgDiv.src=OpenLayers.Util.getImagesLocation()+"blank.gif";}}},initImgDiv:function(){if(this.imgDiv==null){var offset=this.layer.imageOffset;var size=this.layer.getImageSize(this.bounds);if(this.layerAlphaHack){this.imgDiv=OpenLayers.Util.createAlphaImageDiv(null,offset,size,null,"relative",null,null,null,true);}else{this.imgDiv=OpenLayers.Util.createImage(null,offset,size,null,"relative",null,null,true);} -if(OpenLayers.Util.isArray(this.layer.url)){this.imgDiv.urls=this.layer.url.slice();} -this.imgDiv.className='olTileImage';this.frame.style.zIndex=this.isBackBuffer?0:1;this.frame.appendChild(this.imgDiv);this.layer.div.appendChild(this.frame);if(this.layer.opacity!=null){OpenLayers.Util.modifyDOMElement(this.imgDiv,null,null,null,null,null,null,this.layer.opacity);} -this.imgDiv.map=this.layer.map;var onload=function(){if(this.isLoading){this.isLoading=false;this.events.triggerEvent("loadend");}};if(this.layerAlphaHack){OpenLayers.Event.observe(this.imgDiv.childNodes[0],'load',OpenLayers.Function.bind(onload,this));}else{OpenLayers.Event.observe(this.imgDiv,'load',OpenLayers.Function.bind(onload,this));} -var onerror=function(){if(this.imgDiv._attempts>OpenLayers.IMAGE_RELOAD_ATTEMPTS){onload.call(this);}};OpenLayers.Event.observe(this.imgDiv,"error",OpenLayers.Function.bind(onerror,this));} -this.imgDiv.viewRequestID=this.layer.map.viewRequestID;},removeImgDiv:function(){OpenLayers.Event.stopObservingElement(this.imgDiv);if(this.imgDiv.parentNode==this.frame){this.frame.removeChild(this.imgDiv);this.imgDiv.map=null;} -this.imgDiv.urls=null;var child=this.imgDiv.firstChild;if(child){OpenLayers.Event.stopObservingElement(child);this.imgDiv.removeChild(child);delete child;}else{this.imgDiv.src=OpenLayers.Util.getImagesLocation()+"blank.gif";}},checkImgURL:function(){if(this.layer){var loaded=this.layerAlphaHack?this.imgDiv.firstChild.src:this.imgDiv.src;if(!OpenLayers.Util.isEquivalentUrl(loaded,this.url)){this.hide();}}},startTransition:function(){if(!this.backBufferTile||!this.backBufferTile.imgDiv){return;} -var ratio=1;if(this.backBufferTile.resolution){ratio=this.backBufferTile.resolution/this.layer.getResolution();} -if(ratio!=1){if(this.layer.transitionEffect=='resize'){var upperLeft=new OpenLayers.LonLat(this.backBufferTile.bounds.left,this.backBufferTile.bounds.top);var size=new OpenLayers.Size(this.backBufferTile.size.w*ratio,this.backBufferTile.size.h*ratio);var px=this.layer.map.getLayerPxFromLonLat(upperLeft);OpenLayers.Util.modifyDOMElement(this.backBufferTile.frame,null,px,size);var imageSize=this.backBufferTile.imageSize;imageSize=new OpenLayers.Size(imageSize.w*ratio,imageSize.h*ratio);var imageOffset=this.backBufferTile.imageOffset;if(imageOffset){imageOffset=new OpenLayers.Pixel(imageOffset.x*ratio,imageOffset.y*ratio);} -OpenLayers.Util.modifyDOMElement(this.backBufferTile.imgDiv,null,imageOffset,imageSize);this.backBufferTile.show();}}else{if(this.layer.singleTile){this.backBufferTile.show();}else{this.backBufferTile.hide();}}},show:function(){this.frame.style.display='';if(OpenLayers.Util.indexOf(this.layer.SUPPORTED_TRANSITIONS,this.layer.transitionEffect)!=-1){if(OpenLayers.IS_GECKO===true){this.frame.scrollLeft=this.frame.scrollLeft;}}},hide:function(){this.frame.style.display='none';},CLASS_NAME:"OpenLayers.Tile.Image"});OpenLayers.Tile.Image.useBlankTile=(OpenLayers.BROWSER_NAME=="safari"||OpenLayers.BROWSER_NAME=="opera");OpenLayers.Layer.XYZ=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:true,sphericalMercator:false,zoomOffset:0,serverResolutions:null,initialize:function(name,url,options){if(options&&options.sphericalMercator||this.sphericalMercator){options=OpenLayers.Util.extend({maxExtent:new OpenLayers.Bounds(-128*156543.03390625,-128*156543.03390625,128*156543.03390625,128*156543.03390625),maxResolution:156543.03390625,numZoomLevels:19,units:"m",projection:"EPSG:900913"},options);} -url=url||this.url;name=name||this.name;var newArguments=[name,url,{},options];OpenLayers.Layer.Grid.prototype.initialize.apply(this,newArguments);},clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.XYZ(this.name,this.url,this.getOptions());} -obj=OpenLayers.Layer.Grid.prototype.clone.apply(this,[obj]);return obj;},getURL:function(bounds){var xyz=this.getXYZ(bounds);var url=this.url;if(OpenLayers.Util.isArray(url)){var s=''+xyz.x+xyz.y+xyz.z;url=this.selectUrl(s,url);} -return OpenLayers.String.format(url,xyz);},getXYZ:function(bounds){var res=this.map.getResolution();var x=Math.round((bounds.left-this.maxExtent.left)/(res*this.tileSize.w));var y=Math.round((this.maxExtent.top-bounds.top)/(res*this.tileSize.h));var z=this.serverResolutions!=null?OpenLayers.Util.indexOf(this.serverResolutions,res):this.map.getZoom()+this.zoomOffset;var limit=Math.pow(2,z);if(this.wrapDateLine) -{x=((x%limit)+limit)%limit;} -return{'x':x,'y':y,'z':z};},setMap:function(map){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);if(!this.tileOrigin){this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.bottom);}},CLASS_NAME:"OpenLayers.Layer.XYZ"});OpenLayers.Layer.OSM=OpenLayers.Class(OpenLayers.Layer.XYZ,{name:"OpenStreetMap",attribution:"Data CC-By-SA by OpenStreetMap",sphericalMercator:true,url:'http://tile.openstreetmap.org/${z}/${x}/${y}.png',clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions());} -obj=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[obj]);return obj;},wrapDateLine:true,CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Renderer.Canvas=OpenLayers.Class(OpenLayers.Renderer,{hitDetection:true,hitOverflow:0,canvas:null,features:null,pendingRedraw:false,initialize:function(containerID,options){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.root=document.createElement("canvas");this.container.appendChild(this.root);this.canvas=this.root.getContext("2d");this.features={};if(this.hitDetection){this.hitCanvas=document.createElement("canvas");this.hitContext=this.hitCanvas.getContext("2d");}},eraseGeometry:function(geometry,featureId){this.eraseFeatures(this.features[featureId][0]);},supported:function(){var canvas=document.createElement("canvas");return!!canvas.getContext;},setSize:function(size){this.size=size.clone();var root=this.root;root.style.width=size.w+"px";root.style.height=size.h+"px";root.width=size.w;root.height=size.h;this.resolution=null;if(this.hitDetection){var hitCanvas=this.hitCanvas;hitCanvas.style.width=size.w+"px";hitCanvas.style.height=size.h+"px";hitCanvas.width=size.w;hitCanvas.height=size.h;}},drawFeature:function(feature,style){var rendered;if(feature.geometry){style=this.applyDefaultSymbolizer(style||feature.style);var bounds=feature.geometry.getBounds();rendered=(style.display!=="none")&&!!bounds&&bounds.intersectsBounds(this.extent);if(rendered){this.features[feature.id]=[feature,style];} -else{delete(this.features[feature.id]);} -this.pendingRedraw=true;} -if(this.pendingRedraw&&!this.locked){this.redraw();this.pendingRedraw=false;} -return rendered;},drawGeometry:function(geometry,style,featureId){var className=geometry.CLASS_NAME;if((className=="OpenLayers.Geometry.Collection")||(className=="OpenLayers.Geometry.MultiPoint")||(className=="OpenLayers.Geometry.MultiLineString")||(className=="OpenLayers.Geometry.MultiPolygon")){for(var i=0;i=16777216){this.hitOverflow=id-16777215;id=id%16777216+1;} -var hex="000000"+id.toString(16);var len=hex.length;hex="#"+hex.substring(len-6,len);return hex;},setHitContextStyle:function(type,featureId,symbolizer){var hex=this.featureIdToHex(featureId);if(type=="fill"){this.hitContext.globalAlpha=1.0;this.hitContext.fillStyle=hex;}else if(type=="stroke"){this.hitContext.globalAlpha=1.0;this.hitContext.strokeStyle=hex;this.hitContext.lineWidth=symbolizer.strokeWidth+2;}else{this.hitContext.globalAlpha=0;this.hitContext.lineWidth=1;}},drawPoint:function(geometry,style,featureId){if(style.graphic!==false){if(style.externalGraphic){this.drawExternalGraphic(geometry,style,featureId);}else{var pt=this.getLocalXY(geometry);var p0=pt[0];var p1=pt[1];if(!isNaN(p0)&&!isNaN(p1)){var twoPi=Math.PI*2;var radius=style.pointRadius;if(style.fill!==false){this.setCanvasStyle("fill",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.fill();}} -if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.canvas.beginPath();this.canvas.arc(p0,p1,radius,0,twoPi,true);this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.hitContext.beginPath();this.hitContext.arc(p0,p1,radius,0,twoPi,true);this.hitContext.stroke();} -this.setCanvasStyle("reset");}}}}},drawLineString:function(geometry,style,featureId){style=OpenLayers.Util.applyDefaults({fill:false},style);this.drawLinearRing(geometry,style,featureId);},drawLinearRing:function(geometry,style,featureId){if(style.fill!==false){this.setCanvasStyle("fill",style);this.renderPath(this.canvas,geometry,style,featureId,"fill");if(this.hitDetection){this.setHitContextStyle("fill",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"fill");}} -if(style.stroke!==false){this.setCanvasStyle("stroke",style);this.renderPath(this.canvas,geometry,style,featureId,"stroke");if(this.hitDetection){this.setHitContextStyle("stroke",featureId,style);this.renderPath(this.hitContext,geometry,style,featureId,"stroke");}} -this.setCanvasStyle("reset");},renderPath:function(context,geometry,style,featureId,type){var components=geometry.components;var len=components.length;context.beginPath();var start=this.getLocalXY(components[0]);var x=start[0];var y=start[1];if(!isNaN(x)&&!isNaN(y)){context.moveTo(start[0],start[1]);for(var i=1;i=-this.MAX_PIXEL&&left<=this.MAX_PIXEL&&top>=-this.MAX_PIXEL&&top<=this.MAX_PIXEL);},setExtent:function(extent,resolutionChanged){OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var left=-extent.left/resolution;var top=extent.top/resolution;if(resolutionChanged){this.left=left;this.top=top;var extentString="0 0 "+this.size.w+" "+this.size.h;this.rendererRoot.setAttributeNS(null,"viewBox",extentString);this.translate(0,0);return true;}else{var inRange=this.translate(left-this.left,top-this.top);if(!inRange){this.setExtent(extent,true);} -return inRange;}},translate:function(x,y){if(!this.inValidRange(x,y,true)){return false;}else{var transformString="";if(x||y){transformString="translate("+x+","+y+")";} -this.root.setAttributeNS(null,"transform",transformString);this.translationParameters={x:x,y:y};return true;}},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w);this.rendererRoot.setAttributeNS(null,"height",this.size.h);},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="image";}else if(this.isComplexSymbol(style.graphicName)){nodeType="svg";}else{nodeType="circle";} -break;case"OpenLayers.Geometry.Rectangle":nodeType="rect";break;case"OpenLayers.Geometry.LineString":nodeType="polyline";break;case"OpenLayers.Geometry.LinearRing":nodeType="polygon";break;case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":case"OpenLayers.Geometry.Surface":nodeType="path";break;default:break;} -return nodeType;},setStyle:function(node,style,options){style=style||node._style;options=options||node._options;var r=parseFloat(node.getAttributeNS(null,"r"));var widthFactor=1;var pos;if(node._geometryClass=="OpenLayers.Geometry.Point"&&r){node.style.visibility="";if(style.graphic===false){node.style.visibility="hidden";}else if(style.externalGraphic){pos=this.getPosition(node);if(style.graphicTitle){node.setAttributeNS(null,"title",style.graphicTitle);var label=this.nodeFactory(null,"title");label.textContent=style.graphicTitle;node.appendChild(label);} -if(style.graphicWidth&&style.graphicHeight){node.setAttributeNS(null,"preserveAspectRatio","none");} -var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;node.setAttributeNS(null,"x",(pos.x+xOffset).toFixed());node.setAttributeNS(null,"y",(pos.y+yOffset).toFixed());node.setAttributeNS(null,"width",width);node.setAttributeNS(null,"height",height);node.setAttributeNS(this.xlinkns,"href",style.externalGraphic);node.setAttributeNS(null,"style","opacity: "+opacity);node.onclick=OpenLayers.Renderer.SVG.preventDefault;}else if(this.isComplexSymbol(style.graphicName)){var offset=style.pointRadius*3;var size=offset*2;var src=this.importSymbol(style.graphicName);pos=this.getPosition(node);widthFactor=this.symbolMetrics[src.id][0]*3/size;var parent=node.parentNode;var nextSibling=node.nextSibling;if(parent){parent.removeChild(node);} -node.firstChild&&node.removeChild(node.firstChild);node.appendChild(src.firstChild.cloneNode(true));node.setAttributeNS(null,"viewBox",src.getAttributeNS(null,"viewBox"));node.setAttributeNS(null,"width",size);node.setAttributeNS(null,"height",size);node.setAttributeNS(null,"x",pos.x-offset);node.setAttributeNS(null,"y",pos.y-offset);if(nextSibling){parent.insertBefore(node,nextSibling);}else if(parent){parent.appendChild(node);}}else{node.setAttributeNS(null,"r",style.pointRadius);} -var rotation=style.rotation;if((rotation!==undefined||node._rotation!==undefined)&&pos){node._rotation=rotation;rotation|=0;if(node.nodeName!=="svg"){node.setAttributeNS(null,"transform","rotate("+rotation+" "+pos.x+" "+ -pos.y+")");}else{var metrics=this.symbolMetrics[src.id];node.firstChild.setAttributeNS(null,"transform","rotate(" -+rotation+" " -+metrics[1]+" " -+metrics[2]+")");}}} -if(options.isFilled){node.setAttributeNS(null,"fill",style.fillColor);node.setAttributeNS(null,"fill-opacity",style.fillOpacity);}else{node.setAttributeNS(null,"fill","none");} -if(options.isStroked){node.setAttributeNS(null,"stroke",style.strokeColor);node.setAttributeNS(null,"stroke-opacity",style.strokeOpacity);node.setAttributeNS(null,"stroke-width",style.strokeWidth*widthFactor);node.setAttributeNS(null,"stroke-linecap",style.strokeLinecap||"round");node.setAttributeNS(null,"stroke-linejoin","round");style.strokeDashstyle&&node.setAttributeNS(null,"stroke-dasharray",this.dashStyle(style,widthFactor));}else{node.setAttributeNS(null,"stroke","none");} -if(style.pointerEvents){node.setAttributeNS(null,"pointer-events",style.pointerEvents);} -if(style.cursor!=null){node.setAttributeNS(null,"cursor",style.cursor);} -return node;},dashStyle:function(style,widthFactor){var w=style.strokeWidth*widthFactor;var str=style.strokeDashstyle;switch(str){case'solid':return'none';case'dot':return[1,4*w].join();case'dash':return[4*w,4*w].join();case'dashdot':return[4*w,4*w,1,4*w].join();case'longdash':return[8*w,4*w].join();case'longdashdot':return[8*w,4*w,1,4*w].join();default:return OpenLayers.String.trim(str).replace(/\s+/g,",");}},createNode:function(type,id){var node=document.createElementNS(this.xmlns,type);if(id){node.setAttributeNS(null,"id",id);} -return node;},nodeTypeCompare:function(node,type){return(type==node.nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_svgRoot","svg");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"g");},createDefs:function(){var defs=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(defs);return defs;},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){var resolution=this.getResolution();var x=(geometry.x/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"cx",x);node.setAttributeNS(null,"cy",y);node.setAttributeNS(null,"r",radius);return node;}else{return false;}},drawLineString:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawLinearRing:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawPolygon:function(node,geometry){var d="";var draw=true;var complete=true;var linearRingResult,path;for(var j=0,len=geometry.components.length;jnumRows){label.removeChild(label.lastChild);} -for(var i=0;i0){if(this.getShortString(components[i-1])){strings.push(this.clipLine(components[i],components[i-1]));}} -if(imaxX){k=(y2-y1)/(x2-x1);x2=x2<0?-maxX:maxX;y2=y1+(x2-x1)*k;} -if(y2<-maxY||y2>maxY){k=(x2-x1)/(y2-y1);y2=y2<0?-maxY:maxY;x2=x1+(y2-y1)*k;} -return x2+","+y2;},getShortString:function(point){var resolution=this.getResolution();var x=(point.x/resolution+this.left);var y=(this.top-point.y/resolution);if(this.inValidRange(x,y)){return x+","+y;}else{return false;}},getPosition:function(node){return({x:parseFloat(node.getAttributeNS(null,"cx")),y:parseFloat(node.getAttributeNS(null,"cy"))});},importSymbol:function(graphicName){if(!this.defs){this.defs=this.createDefs();} -var id=this.container.id+"-"+graphicName;var existing=document.getElementById(id) -if(existing!=null){return existing;} -var symbol=OpenLayers.Renderer.symbol[graphicName];if(!symbol){throw new Error(graphicName+' is not a valid symbol name');} -var symbolNode=this.nodeFactory(id,"symbol");var node=this.nodeFactory(null,"polygon");symbolNode.appendChild(node);var symbolExtent=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);var points=[];var x,y;for(var i=0;i=0;--i){this._removeButton(this.buttons[i]);}},doubleClick:function(evt){OpenLayers.Event.stop(evt);return false;},buttonDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;} -switch(this.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;} -OpenLayers.Event.stop(evt);},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:true,lowerBoundary:null,upperBoundary:null,initialize:function(options){OpenLayers.Filter.prototype.initialize.apply(this,[options]);if(this.type===OpenLayers.Filter.Comparison.LIKE&&options.matchCase===undefined){this.matchCase=null;}},evaluate:function(context){if(context instanceof OpenLayers.Feature.Vector){context=context.attributes;} -var result=false;var got=context[this.property];var exp;switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()==exp.toUpperCase());}else{result=(got==exp);} -break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:exp=this.value;if(!this.matchCase&&typeof got=="string"&&typeof exp=="string"){result=(got.toUpperCase()!=exp.toUpperCase());}else{result=(got!=exp);} -break;case OpenLayers.Filter.Comparison.LESS_THAN:result=gotthis.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:result=got<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:result=got>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:result=(got>=this.lowerBoundary)&&(got<=this.upperBoundary);break;case OpenLayers.Filter.Comparison.LIKE:var regexp=new RegExp(this.value,"gi");result=regexp.test(got);break;} -return result;},value2regex:function(wildCard,singleChar,escapeChar){if(wildCard=="."){var msg="'.' is an unsupported wildCard character for "+"OpenLayers.Filter.Comparison";OpenLayers.Console.error(msg);return null;} -wildCard=wildCard?wildCard:"*";singleChar=singleChar?singleChar:".";escapeChar=escapeChar?escapeChar:"!";this.value=this.value.replace(new RegExp("\\"+escapeChar+"(.|$)","g"),"\\$1");this.value=this.value.replace(new RegExp("\\"+singleChar,"g"),".");this.value=this.value.replace(new RegExp("\\"+wildCard,"g"),".*");this.value=this.value.replace(new RegExp("\\\\.\\*","g"),"\\"+wildCard);this.value=this.value.replace(new RegExp("\\\\\\.","g"),"\\"+singleChar);return this.value;},regex2value:function(){var value=this.value;value=value.replace(/!/g,"!!");value=value.replace(/(\\)?\\\./g,function($0,$1){return $1?$0:"!.";});value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"!*";});value=value.replace(/\\\\/g,"\\");value=value.replace(/\.\*/g,"*");return value;},clone:function(){return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison(),this);},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Format.QueryStringFilter=(function(){var cmpToStr={};cmpToStr[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";cmpToStr[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN]="lt";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";cmpToStr[OpenLayers.Filter.Comparison.LIKE]="ilike";function regex2value(value){value=value.replace(/%/g,"\\%");value=value.replace(/\\\\\.(\*)?/g,function($0,$1){return $1?$0:"\\\\_";});value=value.replace(/\\\\\.\*/g,"\\\\%");value=value.replace(/(\\)?\.(\*)?/g,function($0,$1,$2){return $1||$2?$0:"_";});value=value.replace(/(\\)?\.\*/g,function($0,$1){return $1?$0:"%";});value=value.replace(/\\\./g,".");value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"*";});return value;} -return OpenLayers.Class(OpenLayers.Format,{wildcarded:false,srsInBBOX:false,write:function(filter,params){params=params||{};var className=filter.CLASS_NAME;var filterType=className.substring(className.lastIndexOf(".")+1);switch(filterType){case"Spatial":switch(filter.type){case OpenLayers.Filter.Spatial.BBOX:params.bbox=filter.value.toArray();if(this.srsInBBOX&&filter.projection){params.bbox.push(filter.projection.getCode());} -break;case OpenLayers.Filter.Spatial.DWITHIN:params.tolerance=filter.distance;case OpenLayers.Filter.Spatial.WITHIN:params.lon=filter.value.x;params.lat=filter.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+filter.type);} -break;case"Comparison":var op=cmpToStr[filter.type];if(op!==undefined){var value=filter.value;if(filter.type==OpenLayers.Filter.Comparison.LIKE){value=regex2value(value);if(this.wildcarded){value="%"+value+"%";}} -params[filter.property+"__"+op]=value;params.queryable=params.queryable||[];params.queryable.push(filter.property);}else{OpenLayers.Console.warn("Unknown comparison filter type "+filter.type);} -break;case"Logical":if(filter.type===OpenLayers.Filter.Logical.AND){for(var i=0,len=filter.filters.length;i0)){area+=Math.abs(this.components[0].getArea());for(var i=1,len=this.components.length;i0)){area+=Math.abs(this.components[0].getGeodesicArea(projection));for(var i=1,len=this.components.length;i0){contained=this.components[0].containsPoint(point);if(contained!==1){if(contained&&numRings>1){var hole;for(var i=1;i=200&&request.status<300){if(resp.requestType!="delete"){resp.features=this.parseFeatures(request);} -resp.code=OpenLayers.Protocol.Response.SUCCESS;}else{resp.code=OpenLayers.Protocol.Response.FAILURE;} -options.callback.call(options.scope,resp);}},parseFeatures:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;} -if(!doc||doc.length<=0){return null;} -return this.format.read(doc);},commit:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=[],nResponses=0;var types={};types[OpenLayers.State.INSERT]=[];types[OpenLayers.State.UPDATE]=[];types[OpenLayers.State.DELETE]=[];var feature,list,requestFeatures=[];for(var i=0,len=features.length;i0?1:0)+ -types[OpenLayers.State.UPDATE].length+ -types[OpenLayers.State.DELETE].length;var success=true;var finalResponse=new OpenLayers.Protocol.Response({reqFeatures:requestFeatures});function insertCallback(response){var len=response.features?response.features.length:0;var fids=new Array(len);for(var i=0;i=nRequests){if(options.callback){finalResponse.code=success?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE;options.callback.apply(options.scope,[finalResponse]);}}} -var queue=types[OpenLayers.State.INSERT];if(queue.length>0){resp.push(this.create(queue,OpenLayers.Util.applyDefaults({callback:insertCallback,scope:this},options.create)));} -queue=types[OpenLayers.State.UPDATE];for(var i=queue.length-1;i>=0;--i){resp.push(this.update(queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options.update)));} -queue=types[OpenLayers.State.DELETE];for(var i=queue.length-1;i>=0;--i){resp.push(this["delete"](queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options["delete"])));} -return resp;},abort:function(response){if(response){response.priv.abort();}},callUserCallback:function(resp,options){var opt=options[resp.requestType];if(opt&&opt.callback){opt.callback.call(opt.scope,resp);}},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(url){url=url||window.location.href;var parameters=OpenLayers.Util.getParameters(url);var index=url.indexOf('#');if(index>0){url='?'+url.substring(index+1,url.length);OpenLayers.Util.extend(parameters,OpenLayers.Util.getParameters(url));} -return parameters;},setMap:function(map){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var i=0,len=this.map.controls.length;i=0;--i){feature=layer.selectedFeatures[i];if(!options||options.except!=feature){this.unselect(feature);}}}},clickFeature:function(feature){if(!this.hover){var selected=(OpenLayers.Util.indexOf(feature.layer.selectedFeatures,feature)>-1);if(selected){if(this.toggleSelect()){this.unselect(feature);}else if(!this.multipleSelect()){this.unselectAll({except:feature});}}else{if(!this.multipleSelect()){this.unselectAll({except:feature});} -this.select(feature);}}},multipleSelect:function(){return this.multiple||(this.handlers.feature.evt&&this.handlers.feature.evt[this.multipleKey]);},toggleSelect:function(){return this.toggle||(this.handlers.feature.evt&&this.handlers.feature.evt[this.toggleKey]);},clickoutFeature:function(feature){if(!this.hover&&this.clickout){this.unselectAll();}},overFeature:function(feature){var layer=feature.layer;if(this.hover){if(this.highlightOnly){this.highlight(feature);}else if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}},outFeature:function(feature){if(this.hover){if(this.highlightOnly){if(feature._lastHighlighter==this.id){if(feature._prevHighlighter&&feature._prevHighlighter!=this.id){delete feature._lastHighlighter;var control=this.map.getControl(feature._prevHighlighter);if(control){control.highlight(feature);}}else{this.unhighlight(feature);}}}else{this.unselect(feature);}}},highlight:function(feature){var layer=feature.layer;var cont=this.events.triggerEvent("beforefeaturehighlighted",{feature:feature});if(cont!==false){feature._prevHighlighter=feature._lastHighlighter;feature._lastHighlighter=this.id;var style=this.selectStyle||this.renderIntent;layer.drawFeature(feature,style);this.events.triggerEvent("featurehighlighted",{feature:feature});}},unhighlight:function(feature){var layer=feature.layer;if(feature._prevHighlighter==undefined){delete feature._lastHighlighter;}else if(feature._prevHighlighter==this.id){delete feature._prevHighlighter;}else{feature._lastHighlighter=feature._prevHighlighter;delete feature._prevHighlighter;} -layer.drawFeature(feature,feature.style||feature.layer.style||"default");this.events.triggerEvent("featureunhighlighted",{feature:feature});},select:function(feature){var cont=this.onBeforeSelect.call(this.scope,feature);var layer=feature.layer;if(cont!==false){cont=layer.events.triggerEvent("beforefeatureselected",{feature:feature});if(cont!==false){layer.selectedFeatures.push(feature);this.highlight(feature);if(!this.handlers.feature.lastFeature){this.handlers.feature.lastFeature=layer.selectedFeatures[0];} -layer.events.triggerEvent("featureselected",{feature:feature});this.onSelect.call(this.scope,feature);}}},unselect:function(feature){var layer=feature.layer;this.unhighlight(feature);OpenLayers.Util.removeItem(layer.selectedFeatures,feature);layer.events.triggerEvent("featureunselected",{feature:feature});this.onUnselect.call(this.scope,feature);},selectBox:function(position){if(position instanceof OpenLayers.Bounds){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));var bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);if(!this.multipleSelect()){this.unselectAll();} -var prevMultiple=this.multiple;this.multiple=true;var layers=this.layers||[this.layer];var layer;for(var l=0;l-1){if(bounds.toGeometry().intersects(feature.geometry)){if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}}}} -this.multiple=prevMultiple;}},setMap:function(map){this.handlers.feature.setMap(map);if(this.box){this.handlers.box.setMap(map);} -OpenLayers.Control.prototype.setMap.apply(this,arguments);},setLayer:function(layers){var isActive=this.active;this.unselectAll();this.deactivate();if(this.layers){this.layer.destroy();this.layers=null;} -this.initLayer(layers);this.handlers.feature.layer=this.layer;if(isActive){this.activate();}},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:true,autoDestroy:true,initialize:function(options){OpenLayers.Util.extend(this,options);this.options=options;this.active=false;},destroy:function(){this.deactivate();this.layer=null;this.options=null;},setLayer:function(layer){this.layer=layer;},activate:function(){if(!this.active){this.active=true;return true;} -return false;},deactivate:function(){if(this.active){this.active=false;return true;} -return false;},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:false,activate:function(){if(OpenLayers.Strategy.prototype.activate.apply(this,arguments)){this.layer.events.on({"refresh":this.load,scope:this});if(this.layer.visibility==true||this.preload){this.load();}else{this.layer.events.on({"visibilitychanged":this.load,scope:this});} -return true;} -return false;},deactivate:function(){var deactivated=OpenLayers.Strategy.prototype.deactivate.call(this);if(deactivated){this.layer.events.un({"refresh":this.load,"visibilitychanged":this.load,scope:this});} -return deactivated;},load:function(options){var layer=this.layer;layer.events.triggerEvent("loadstart");layer.protocol.read(OpenLayers.Util.applyDefaults({callback:OpenLayers.Function.bind(this.merge,this,layer.map.getProjectionObject()),filter:layer.filter},options));layer.events.un({"visibilitychanged":this.load,scope:this});},merge:function(mapProjection,resp){var layer=this.layer;layer.destroyFeatures();var features=resp.features;if(features&&features.length>0){if(!mapProjection.equals(layer.projection)){var geom;for(var i=0,len=features.length;i0){appliedRules=true;for(var i=0,len=elseRules.length;i0&&appliedRules==false){style.display="none";} +if(style.label&&typeof style.label!=="string"){style.label=String(style.label);} +return style;},applySymbolizer:function(rule,style,feature){var symbolizerPrefix=feature.geometry?this.getSymbolizerPrefix(feature.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];var symbolizer=rule.symbolizer[symbolizerPrefix]||rule.symbolizer;if(this.defaultsPerSymbolizer===true){var defaults=this.defaultStyle;OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:defaults.pointRadius});if(symbolizer.stroke===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{strokeWidth:defaults.strokeWidth,strokeColor:defaults.strokeColor,strokeOpacity:defaults.strokeOpacity,strokeDashstyle:defaults.strokeDashstyle,strokeLinecap:defaults.strokeLinecap});} +if(symbolizer.fill===true||symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{fillColor:defaults.fillColor,fillOpacity:defaults.fillOpacity});} +if(symbolizer.graphic===true){OpenLayers.Util.applyDefaults(symbolizer,{pointRadius:this.defaultStyle.pointRadius,externalGraphic:this.defaultStyle.externalGraphic,graphicName:this.defaultStyle.graphicName,graphicOpacity:this.defaultStyle.graphicOpacity,graphicWidth:this.defaultStyle.graphicWidth,graphicHeight:this.defaultStyle.graphicHeight,graphicXOffset:this.defaultStyle.graphicXOffset,graphicYOffset:this.defaultStyle.graphicYOffset});}} +return this.createLiterals(OpenLayers.Util.extend(style,symbolizer),feature);},createLiterals:function(style,feature){var context=OpenLayers.Util.extend({},feature.attributes||feature.data);OpenLayers.Util.extend(context,this.context);for(var i in this.propertyStyles){style[i]=OpenLayers.Style.createLiteral(style[i],context,feature,i);} +return style;},findPropertyStyles:function(){var propertyStyles={};var style=this.defaultStyle;this.addPropertyStyles(propertyStyles,style);var rules=this.rules;var symbolizer,value;for(var i=0,len=rules.length;i0){var remote=this.layer.projection;var local=this.layer.map.getProjectionObject();if(!local.equals(remote)){var geom;for(var i=0,len=features.length;i-1;},handle:function(evt){if(this.feature&&!this.feature.layer){this.feature=null;} +var type=evt.type;var handled=false;var previouslyIn=!!(this.feature);var click=(type=="click"||type=="dblclick"||type=="touchstart");this.feature=this.layer.getFeatureFromEvent(evt);if(this.feature&&!this.feature.layer){this.feature=null;} +if(this.lastFeature&&!this.lastFeature.layer){this.lastFeature=null;} +if(this.feature){if(type==="touchstart"){OpenLayers.Event.stop(evt);} +var inNew=(this.feature!=this.lastFeature);if(this.geometryTypeMatches(this.feature)){if(previouslyIn&&inNew){if(this.lastFeature){this.triggerCallback(type,'out',[this.lastFeature]);} +this.triggerCallback(type,'in',[this.feature]);}else if(!previouslyIn||click){this.triggerCallback(type,'in',[this.feature]);} +this.lastFeature=this.feature;handled=true;}else{if(this.lastFeature&&(previouslyIn&&inNew||click)){this.triggerCallback(type,'out',[this.lastFeature]);} +this.feature=null;}}else{if(this.lastFeature&&(previouslyIn||click)){this.triggerCallback(type,'out',[this.lastFeature]);}} +return handled;},triggerCallback:function(type,mode,args){var key=this.EVENTMAP[type][mode];if(key){if(type=='click'&&this.up&&this.down){var dpx=Math.sqrt(Math.pow(this.up.x-this.down.x,2)+ +Math.pow(this.up.y-this.down.y,2));if(dpx<=this.clickTolerance){this.callback(key,args);}}else{this.callback(key,args);}}},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.moveLayerToTop();this.map.events.on({"removelayer":this.handleMapEvents,"changelayer":this.handleMapEvents,scope:this});activated=true;} +return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.moveLayerBack();this.feature=null;this.lastFeature=null;this.down=null;this.up=null;this.touch=false;this.map.events.un({"removelayer":this.handleMapEvents,"changelayer":this.handleMapEvents,scope:this});deactivated=true;} +return deactivated;},handleMapEvents:function(evt){if(evt.type=="removelayer"||evt.property=="order"){this.moveLayerToTop();}},moveLayerToTop:function(){var index=Math.max(this.map.Z_INDEX_BASE['Feature']-1,this.layer.getZIndex())+1;this.layer.setZIndex(index);},moveLayerBack:function(){var index=this.layer.getZIndex()-1;if(index>=this.map.Z_INDEX_BASE['Feature']){this.layer.setZIndex(index);}else{this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer));}},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Tween=OpenLayers.Class({INTERVAL:10,easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,interval:null,playing:false,initialize:function(easing){this.easing=(easing)?easing:OpenLayers.Easing.Expo.easeOut;},start:function(begin,finish,duration,options){this.playing=true;this.begin=begin;this.finish=finish;this.duration=duration;this.callbacks=options.callbacks;this.time=0;if(this.interval){window.clearInterval(this.interval);this.interval=null;} +if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin);} +this.interval=window.setInterval(OpenLayers.Function.bind(this.play,this),this.INTERVAL);},stop:function(){if(!this.playing){return;} +if(this.callbacks&&this.callbacks.done){this.callbacks.done.call(this,this.finish);} +window.clearInterval(this.interval);this.interval=null;this.playing=false;},play:function(){var value={};for(var i in this.begin){var b=this.begin[i];var f=this.finish[i];if(b==null||f==null||isNaN(b)||isNaN(f)){OpenLayers.Console.error('invalid value for Tween');} +var c=f-b;value[i]=this.easing.apply(this,[this.time,b,c,this.duration]);} +this.time++;if(this.callbacks&&this.callbacks.eachStep){this.callbacks.eachStep.call(this,value);} +if(this.time>this.duration){this.stop();}},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(t,b,c,d){return c*t/d+b;},easeOut:function(t,b,c,d){return c*t/d+b;},easeInOut:function(t,b,c,d){return c*t/d+b;},CLASS_NAME:"OpenLayers.Easing.Linear"};OpenLayers.Easing.Expo={easeIn:function(t,b,c,d){return(t==0)?b:c*Math.pow(2,10*(t/d-1))+b;},easeOut:function(t,b,c,d){return(t==d)?b+c:c*(-Math.pow(2,-10*t/d)+1)+b;},easeInOut:function(t,b,c,d){if(t==0)return b;if(t==d)return b+c;if((t/=d/2)<1)return c/2*Math.pow(2,10*(t-1))+b;return c/2*(-Math.pow(2,-10*--t)+2)+b;},CLASS_NAME:"OpenLayers.Easing.Expo"};OpenLayers.Easing.Quad={easeIn:function(t,b,c,d){return c*(t/=d)*t+b;},easeOut:function(t,b,c,d){return-c*(t/=d)*(t-2)+b;},easeInOut:function(t,b,c,d){if((t/=d/2)<1)return c/2*t*t+b;return-c/2*((--t)*(t-2)-1)+b;},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1000},EVENT_TYPES:["preaddlayer","addlayer","preremovelayer","removelayer","changelayer","movestart","move","moveend","zoomend","popupopen","popupclose","addmarker","removemarker","clearmarkers","mouseover","mouseout","mousemove","dragstart","drag","dragend","changebaselayer"],id:null,fractionalZoom:false,events:null,allOverlays:false,div:null,dragging:false,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,viewRequestID:0,tileSize:null,projection:"EPSG:4326",units:'degrees',resolutions:null,maxResolution:1.40625,minResolution:null,maxScale:null,minScale:null,maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:true,panTween:null,eventListeners:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,paddingForPopups:null,minPx:null,maxPx:null,initialize:function(div,options){if(arguments.length===1&&typeof div==="object"){options=div;div=options&&options.div;} +this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,OpenLayers.Map.TILE_HEIGHT);this.maxExtent=new OpenLayers.Bounds(-180,-90,180,90);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+'theme/default/style.css';OpenLayers.Util.extend(this,options);this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(div);if(!this.div){this.div=document.createElement("div");this.div.style.height="1px";this.div.style.width="1px";} +OpenLayers.Element.addClass(this.div,'olMap');var id=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(id,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);var eventsDiv=document.createElement("div");eventsDiv.id=this.id+"_events";eventsDiv.style.position="absolute";eventsDiv.style.width="100%";eventsDiv.style.height="100%";eventsDiv.style.zIndex=this.Z_INDEX_BASE.Control-1;this.viewPortDiv.appendChild(eventsDiv);this.eventsDiv=eventsDiv;this.events=new OpenLayers.Events(this,this.eventsDiv,this.EVENT_TYPES,this.fallThrough,{includeXY:true});id=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(id);this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;this.eventsDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object){this.events.on(this.eventListeners);} +this.events.register("movestart",this,this.updateSize);if(OpenLayers.String.contains(navigator.appName,"Microsoft")){this.events.register("resize",this,this.updateSize);}else{this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this);OpenLayers.Event.observe(window,'resize',this.updateSizeDestroy);} +if(this.theme){var addNode=true;var nodes=document.getElementsByTagName('link');for(var i=0,len=nodes.length;i=0;--i){this.controls[i].destroy();} +this.controls=null;} +if(this.layers!=null){for(var i=this.layers.length-1;i>=0;--i){this.layers[i].destroy(false);} +this.layers=null;} +if(this.viewPortDiv){this.div.removeChild(this.viewPortDiv);} +this.viewPortDiv=null;if(this.eventListeners){this.events.un(this.eventListeners);this.eventListeners=null;} +this.events.destroy();this.events=null;},setOptions:function(options){var updatePxExtent=this.minPx&&options.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,options);updatePxExtent&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:true});},getTileSize:function(){return this.tileSize;},getBy:function(array,property,match){var test=(typeof match.test=="function");var found=OpenLayers.Array.filter(this[array],function(item){return item[property]==match||(test&&match.test(item[property]));});return found;},getLayersBy:function(property,match){return this.getBy("layers",property,match);},getLayersByName:function(match){return this.getLayersBy("name",match);},getLayersByClass:function(match){return this.getLayersBy("CLASS_NAME",match);},getControlsBy:function(property,match){return this.getBy("controls",property,match);},getControlsByClass:function(match){return this.getControlsBy("CLASS_NAME",match);},getLayer:function(id){var foundLayer=null;for(var i=0,len=this.layers.length;ithis.layers.length){idx=this.layers.length;} +if(base!=idx){this.layers.splice(base,1);this.layers.splice(idx,0,layer);for(var i=0,len=this.layers.length;i=0;--i){this.removePopup(this.popups[i]);}} +popup.map=this;this.popups.push(popup);var popupDiv=popup.draw();if(popupDiv){popupDiv.style.zIndex=this.Z_INDEX_BASE['Popup']+ +this.popups.length;this.layerContainerDiv.appendChild(popupDiv);}},removePopup:function(popup){OpenLayers.Util.removeItem(this.popups,popup);if(popup.div){try{this.layerContainerDiv.removeChild(popup.div);} +catch(e){}} +popup.map=null;},getSize:function(){var size=null;if(this.size!=null){size=this.size.clone();} +return size;},updateSize:function(){var newSize=this.getCurrentSize();if(newSize&&!isNaN(newSize.h)&&!isNaN(newSize.w)){this.events.clearMouseCache();var oldSize=this.getSize();if(oldSize==null){this.size=oldSize=newSize;} +if(!newSize.equals(oldSize)){this.size=newSize;for(var i=0,len=this.layers.length;i=this.minPx.x+xRestriction?Math.round(dx):0;dy=y<=this.maxPx.y-yRestriction&&y>=this.minPx.y+yRestriction?Math.round(dy):0;var minX=this.minPx.x,maxX=this.maxPx.x;if(dx||dy){if(!this.dragging){this.dragging=true;this.events.triggerEvent("movestart");} +this.center=null;if(dx){this.layerContainerDiv.style.left=parseInt(this.layerContainerDiv.style.left)-dx+"px";this.minPx.x-=dx;this.maxPx.x-=dx;if(wrapDateLine){if(this.maxPx.x>maxX){this.maxPx.x-=(maxX-minX);} +if(this.minPx.xthis.restrictedExtent.getWidth()){lonlat=new OpenLayers.LonLat(maxCenter.lon,lonlat.lat);}else if(extent.leftthis.restrictedExtent.right){lonlat=lonlat.add(this.restrictedExtent.right- +extent.right,0);} +if(extent.getHeight()>this.restrictedExtent.getHeight()){lonlat=new OpenLayers.LonLat(lonlat.lon,maxCenter.lat);}else if(extent.bottomthis.restrictedExtent.top){lonlat=lonlat.add(0,this.restrictedExtent.top- +extent.top);}}} +var zoomChanged=forceZoomChange||((this.isValidZoomLevel(zoom))&&(zoom!=this.getZoom()));var centerChanged=(this.isValidLonLat(lonlat))&&(!lonlat.equals(this.center));if(zoomChanged||centerChanged||dragging){dragging||this.events.triggerEvent("movestart");if(centerChanged){if(!zoomChanged&&this.center){this.centerLayerContainer(lonlat);} +this.center=lonlat.clone();} +var res=zoomChanged?this.getResolutionForZoom(zoom):this.getResolution();if(zoomChanged||this.layerContainerOrigin==null){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerDiv.style.left="0px";this.layerContainerDiv.style.top="0px";var maxExtent=this.getMaxExtent({restricted:true});var maxExtentCenter=maxExtent.getCenterLonLat();var lonDelta=this.center.lon-maxExtentCenter.lon;var latDelta=maxExtentCenter.lat-this.center.lat;var extentWidth=Math.round(maxExtent.getWidth()/res);var extentHeight=Math.round(maxExtent.getHeight()/res);var left=(this.size.w-extentWidth)/2-lonDelta/res;var top=(this.size.h-extentHeight)/2-latDelta/res;this.minPx=new OpenLayers.Pixel(left,top);this.maxPx=new OpenLayers.Pixel(left+extentWidth,top+extentHeight);} +if(zoomChanged){this.zoom=zoom;this.resolution=res;this.viewRequestID++;} +var bounds=this.getExtent();if(this.baseLayer.visibility){this.baseLayer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});} +bounds=this.baseLayer.getExtent();for(var i=this.layers.length-1;i>=0;--i){var layer=this.layers[i];if(layer!==this.baseLayer&&!layer.isBaseLayer){var inRange=layer.calculateInRange();if(layer.inRange!=inRange){layer.inRange=inRange;if(!inRange){layer.display(false);} +this.events.triggerEvent("changelayer",{layer:layer,property:"visibility"});} +if(inRange&&layer.visibility){layer.moveTo(bounds,zoomChanged,options.dragging);options.dragging||layer.events.triggerEvent("moveend",{zoomChanged:zoomChanged});}}} +this.events.triggerEvent("move");dragging||this.events.triggerEvent("moveend");if(zoomChanged){for(var i=0,len=this.popups.length;i=0)&&(zoomLevel0){resolution=this.layers[0].getResolution();} +return resolution;},getUnits:function(){var units=null;if(this.baseLayer!=null){units=this.baseLayer.units;} +return units;},getScale:function(){var scale=null;if(this.baseLayer!=null){var res=this.getResolution();var units=this.baseLayer.units;scale=OpenLayers.Util.getScaleFromResolution(res,units);} +return scale;},getZoomForExtent:function(bounds,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForExtent(bounds,closest);} +return zoom;},getResolutionForZoom:function(zoom){var resolution=null;if(this.baseLayer){resolution=this.baseLayer.getResolutionForZoom(zoom);} +return resolution;},getZoomForResolution:function(resolution,closest){var zoom=null;if(this.baseLayer!=null){zoom=this.baseLayer.getZoomForResolution(resolution,closest);} +return zoom;},zoomTo:function(zoom){if(this.isValidZoomLevel(zoom)){this.setCenter(null,zoom);}},zoomIn:function(){this.zoomTo(this.getZoom()+1);},zoomOut:function(){this.zoomTo(this.getZoom()-1);},zoomToExtent:function(bounds,closest){var center=bounds.getCenterLonLat();if(this.baseLayer.wrapDateLine){var maxExtent=this.getMaxExtent();bounds=bounds.clone();while(bounds.right=0){this.initResolutions();if(reinitialize&&this.map.baseLayer===this){this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(resolution),false,true);this.map.events.triggerEvent("changebaselayer",{layer:this});} +break;}}}},onMapResize:function(){},redraw:function(){var redrawn=false;if(this.map){this.inRange=this.calculateInRange();var extent=this.getExtent();if(extent&&this.inRange&&this.visibility){var zoomChanged=true;this.moveTo(extent,zoomChanged,false);this.events.triggerEvent("moveend",{"zoomChanged":zoomChanged});redrawn=true;}} +return redrawn;},moveTo:function(bounds,zoomChanged,dragging){var display=this.visibility;if(!this.isBaseLayer){display=display&&this.inRange;} +this.display(display);},moveByPx:function(dx,dy){},setMap:function(map){if(this.map==null){this.map=map;this.maxExtent=this.maxExtent||this.map.maxExtent;this.minExtent=this.minExtent||this.map.minExtent;this.projection=this.projection||this.map.projection;if(typeof this.projection=="string"){this.projection=new OpenLayers.Projection(this.projection);} +this.units=this.projection.getUnits()||this.units||this.map.units;this.initResolutions();if(!this.isBaseLayer){this.inRange=this.calculateInRange();var show=((this.visibility)&&(this.inRange));this.div.style.display=show?"":"none";} +this.setTileSize();}},afterAdd:function(){},removeMap:function(map){},getImageSize:function(bounds){return(this.imageSize||this.tileSize);},setTileSize:function(size){var tileSize=(size)?size:((this.tileSize)?this.tileSize:this.map.getTileSize());this.tileSize=tileSize;if(this.gutter){this.imageOffset=new OpenLayers.Pixel(-this.gutter,-this.gutter);this.imageSize=new OpenLayers.Size(tileSize.w+(2*this.gutter),tileSize.h+(2*this.gutter));}},getVisibility:function(){return this.visibility;},setVisibility:function(visibility){if(visibility!=this.visibility){this.visibility=visibility;this.display(visibility);this.redraw();if(this.map!=null){this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"});} +this.events.triggerEvent("visibilitychanged");}},display:function(display){if(display!=(this.div.style.display!="none")){this.div.style.display=(display&&this.calculateInRange())?"block":"none";}},calculateInRange:function(){var inRange=false;if(this.alwaysInRange){inRange=true;}else{if(this.map){var resolution=this.map.getResolution();inRange=((resolution>=this.minResolution)&&(resolution<=this.maxResolution));}} +return inRange;},setIsBaseLayer:function(isBaseLayer){if(isBaseLayer!=this.isBaseLayer){this.isBaseLayer=isBaseLayer;if(this.map!=null){this.map.events.triggerEvent("changebaselayer",{layer:this});}}},initResolutions:function(){var i,len,p;var props={},alwaysInRange=true;for(i=0,len=this.RESOLUTION_PROPERTIES.length;i=resolution){highRes=res;lowZoom=i;} +if(res<=resolution){lowRes=res;highZoom=i;break;}} +var dRes=highRes-lowRes;if(dRes>0){zoom=lowZoom+((highRes-resolution)/dRes);}else{zoom=lowZoom;}}else{var diff;var minDiff=Number.POSITIVE_INFINITY;for(i=0,len=this.resolutions.length;iminDiff){break;} +minDiff=diff;}else{if(this.resolutions[i]=0;i--){if(i!=0&&features[i-1].geometry){this.renderer.locked=true;}else{this.renderer.locked=false;} +var feature=features[i];delete this.unrenderedFeatures[feature.id];if(notify){this.events.triggerEvent("beforefeatureremoved",{feature:feature});} +this.features=OpenLayers.Util.removeItem(this.features,feature);feature.layer=null;if(feature.geometry){this.renderer.eraseFeatures(feature);} +if(OpenLayers.Util.indexOf(this.selectedFeatures,feature)!=-1){OpenLayers.Util.removeItem(this.selectedFeatures,feature);} +if(notify){this.events.triggerEvent("featureremoved",{feature:feature});}} +if(notify){this.events.triggerEvent("featuresremoved",{features:features});}},removeAllFeatures:function(options){var notify=!options||!options.silent;var features=this.features;if(notify){this.events.triggerEvent("beforefeaturesremoved",{features:features});} +var feature;for(var i=features.length-1;i>=0;i--){feature=features[i];if(notify){this.events.triggerEvent("beforefeatureremoved",{feature:feature});} +feature.layer=null;if(notify){this.events.triggerEvent("featureremoved",{feature:feature});}} +this.renderer.clear();this.features=[];this.unrenderedFeatures={};this.selectedFeatures=[];if(notify){this.events.triggerEvent("featuresremoved",{features:features});}},destroyFeatures:function(features,options){var all=(features==undefined);if(all){features=this.features;} +if(features){this.removeFeatures(features,options);for(var i=features.length-1;i>=0;i--){features[i].destroy();}}},drawFeature:function(feature,style){if(!this.drawn){return;} +if(typeof style!="object"){if(!style&&feature.state===OpenLayers.State.DELETE){style="delete";} +var renderIntent=style||feature.renderIntent;style=feature.style||this.style;if(!style){style=this.styleMap.createSymbolizer(feature,renderIntent);}} +var drawn=this.renderer.drawFeature(feature,style);if(drawn===false||drawn===null){this.unrenderedFeatures[feature.id]=feature;}else{delete this.unrenderedFeatures[feature.id];}},eraseFeatures:function(features){this.renderer.eraseFeatures(features);},getFeatureFromEvent:function(evt){if(!this.renderer){OpenLayers.Console.error(OpenLayers.i18n("getFeatureError"));return null;} +var feature=null;var featureId=this.renderer.getFeatureIdFromEvent(evt);if(featureId){if(typeof featureId==="string"){feature=this.getFeatureById(featureId);}else{feature=featureId;}} +return feature;},getFeatureBy:function(property,value){var feature=null;for(var i=0,len=this.features.length;i0)){var geometry=null;for(var i=0,len=features.length;i=0;--i){feature=layer.selectedFeatures[i];if(!options||options.except!=feature){this.unselect(feature);}}}},clickFeature:function(feature){if(!this.hover){var selected=(OpenLayers.Util.indexOf(feature.layer.selectedFeatures,feature)>-1);if(selected){if(this.toggleSelect()){this.unselect(feature);}else if(!this.multipleSelect()){this.unselectAll({except:feature});}}else{if(!this.multipleSelect()){this.unselectAll({except:feature});} +this.select(feature);}}},multipleSelect:function(){return this.multiple||(this.handlers.feature.evt&&this.handlers.feature.evt[this.multipleKey]);},toggleSelect:function(){return this.toggle||(this.handlers.feature.evt&&this.handlers.feature.evt[this.toggleKey]);},clickoutFeature:function(feature){if(!this.hover&&this.clickout){this.unselectAll();}},overFeature:function(feature){var layer=feature.layer;if(this.hover){if(this.highlightOnly){this.highlight(feature);}else if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}},outFeature:function(feature){if(this.hover){if(this.highlightOnly){if(feature._lastHighlighter==this.id){if(feature._prevHighlighter&&feature._prevHighlighter!=this.id){delete feature._lastHighlighter;var control=this.map.getControl(feature._prevHighlighter);if(control){control.highlight(feature);}}else{this.unhighlight(feature);}}}else{this.unselect(feature);}}},highlight:function(feature){var layer=feature.layer;var cont=this.events.triggerEvent("beforefeaturehighlighted",{feature:feature});if(cont!==false){feature._prevHighlighter=feature._lastHighlighter;feature._lastHighlighter=this.id;var style=this.selectStyle||this.renderIntent;layer.drawFeature(feature,style);this.events.triggerEvent("featurehighlighted",{feature:feature});}},unhighlight:function(feature){var layer=feature.layer;if(feature._prevHighlighter==undefined){delete feature._lastHighlighter;}else if(feature._prevHighlighter==this.id){delete feature._prevHighlighter;}else{feature._lastHighlighter=feature._prevHighlighter;delete feature._prevHighlighter;} +layer.drawFeature(feature,feature.style||feature.layer.style||"default");this.events.triggerEvent("featureunhighlighted",{feature:feature});},select:function(feature){var cont=this.onBeforeSelect.call(this.scope,feature);var layer=feature.layer;if(cont!==false){cont=layer.events.triggerEvent("beforefeatureselected",{feature:feature});if(cont!==false){layer.selectedFeatures.push(feature);this.highlight(feature);if(!this.handlers.feature.lastFeature){this.handlers.feature.lastFeature=layer.selectedFeatures[0];} +layer.events.triggerEvent("featureselected",{feature:feature});this.onSelect.call(this.scope,feature);}}},unselect:function(feature){var layer=feature.layer;this.unhighlight(feature);OpenLayers.Util.removeItem(layer.selectedFeatures,feature);layer.events.triggerEvent("featureunselected",{feature:feature});this.onUnselect.call(this.scope,feature);},selectBox:function(position){if(position instanceof OpenLayers.Bounds){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));var bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);if(!this.multipleSelect()){this.unselectAll();} +var prevMultiple=this.multiple;this.multiple=true;var layers=this.layers||[this.layer];var layer;for(var l=0;l-1){if(bounds.toGeometry().intersects(feature.geometry)){if(OpenLayers.Util.indexOf(layer.selectedFeatures,feature)==-1){this.select(feature);}}}}} +this.multiple=prevMultiple;}},setMap:function(map){this.handlers.feature.setMap(map);if(this.box){this.handlers.box.setMap(map);} +OpenLayers.Control.prototype.setMap.apply(this,arguments);},setLayer:function(layers){var isActive=this.active;this.unselectAll();this.deactivate();if(this.layers){this.layer.destroy();this.layers=null;} +this.initLayer(layers);this.handlers.feature.layer=this.layer;if(isActive){this.activate();}},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",destroy:function(){this.map.events.un({"removelayer":this.updateAttribution,"addlayer":this.updateAttribution,"changelayer":this.updateAttribution,"changebaselayer":this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments);},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({'changebaselayer':this.updateAttribution,'changelayer':this.updateAttribution,'addlayer':this.updateAttribution,'removelayer':this.updateAttribution,scope:this});this.updateAttribution();return this.div;},updateAttribution:function(){var attributions=[];if(this.map&&this.map.layers){for(var i=0,len=this.map.layers.length;i0){this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval);} +this.dragging=true;this.move(evt);this.callback("move",[evt.xy]);if(!this.oldOnselectstart){this.oldOnselectstart=document.onselectstart;document.onselectstart=OpenLayers.Function.False;} +this.last=evt.xy;} +return true;},dragend:function(evt){if(this.started){if(this.documentDrag===true&&this.documentEvents){this.adjustXY(evt);this.removeDocumentEvents();} +var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(evt);this.callback("up",[evt.xy]);if(dragged){this.callback("done",[evt.xy]);} +document.onselectstart=this.oldOnselectstart;} +return true;},down:function(evt){},move:function(evt){},up:function(evt){},out:function(evt){},mousedown:function(evt){return this.dragstart(evt);},touchstart:function(evt){if(!this.touch){this.touch=true;this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,mousemove:this.mousemove,click:this.click,scope:this});} +return this.dragstart(evt);},mousemove:function(evt){return this.dragmove(evt);},touchmove:function(evt){return this.dragmove(evt);},removeTimeout:function(){this.timeoutId=null;if(this.dragging){this.mousemove(this.lastMoveEvt);}},mouseup:function(evt){return this.dragend(evt);},touchend:function(evt){evt.xy=this.last;return this.dragend(evt);},mouseout:function(evt){if(this.started&&OpenLayers.Util.mouseLeft(evt,this.map.eventsDiv)){if(this.documentDrag===true){this.addDocumentEvents();}else{var dragged=(this.start!=this.last);this.started=false;this.dragging=false;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(evt);this.callback("out",[]);if(dragged){this.callback("done",[evt.xy]);} +if(document.onselectstart){document.onselectstart=this.oldOnselectstart;}}} +return true;},click:function(evt){return(this.start==this.last);},activate:function(){var activated=false;if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragging=false;activated=true;} +return activated;},deactivate:function(){var deactivated=false;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){this.touch=false;this.started=false;this.dragging=false;this.start=null;this.last=null;deactivated=true;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");} +return deactivated;},adjustXY:function(evt){var pos=OpenLayers.Util.pagePosition(this.map.viewPortDiv);evt.xy.x-=pos[0];evt.xy.y-=pos[1];},addDocumentEvents:function(){OpenLayers.Element.addClass(document.body,"olDragDown");this.documentEvents=true;OpenLayers.Event.observe(document,"mousemove",this._docMove);OpenLayers.Event.observe(document,"mouseup",this._docUp);},removeDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents=false;OpenLayers.Event.stopObserving(document,"mousemove",this._docMove);OpenLayers.Event.stopObserving(document,"mouseup",this._docUp);},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:'olHandlerBoxZoomBox',boxOffsets:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask});},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);if(this.dragHandler){this.dragHandler.destroy();this.dragHandler=null;}},setMap:function(map){OpenLayers.Handler.prototype.setMap.apply(this,arguments);if(this.dragHandler){this.dragHandler.setMap(map);}},startBox:function(xy){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv('zoomBox',new OpenLayers.Pixel(-9999,-9999));this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE["Popup"]-1;this.map.eventsDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.eventsDiv,"olDrawBox");},moveBox:function(xy){var startX=this.dragHandler.start.x;var startY=this.dragHandler.start.y;var deltaX=Math.abs(startX-xy.x);var deltaY=Math.abs(startY-xy.y);var offset=this.getBoxOffsets();this.zoomBox.style.width=(deltaX+offset.width+1)+"px";this.zoomBox.style.height=(deltaY+offset.height+1)+"px";this.zoomBox.style.left=(xy.x5||Math.abs(this.dragHandler.start.y-end.y)>5){var start=this.dragHandler.start;var top=Math.min(start.y,end.y);var bottom=Math.max(start.y,end.y);var left=Math.min(start.x,end.x);var right=Math.max(start.x,end.x);result=new OpenLayers.Bounds(left,bottom,right,top);}else{result=this.dragHandler.start.clone();} +this.removeBox();this.callback("done",[result]);},removeBox:function(){this.map.eventsDiv.removeChild(this.zoomBox);this.zoomBox=null;this.boxOffsets=null;OpenLayers.Element.removeClass(this.map.eventsDiv,"olDrawBox");},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){this.dragHandler.activate();return true;}else{return false;}},deactivate:function(){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){if(this.dragHandler.deactivate()){if(this.zoomBox){this.removeBox();}} +return true;}else{return false;}},getBoxOffsets:function(){if(!this.boxOffsets){var testDiv=document.createElement("div");testDiv.style.position="absolute";testDiv.style.border="1px solid black";testDiv.style.width="3px";document.body.appendChild(testDiv);var w3cBoxModel=testDiv.clientWidth==3;document.body.removeChild(testDiv);var left=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width"));var right=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width"));var top=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-top-width"));var bottom=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"));this.boxOffsets={left:left,right:right,top:top,bottom:bottom,width:w3cBoxModel===false?left+right:0,height:w3cBoxModel===false?top+bottom:0};} +return this.boxOffsets;},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:false,alwaysZoom:false,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask});},zoomBox:function(position){if(position instanceof OpenLayers.Bounds){var bounds;if(!this.out){var minXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.left,position.bottom));var maxXY=this.map.getLonLatFromPixel(new OpenLayers.Pixel(position.right,position.top));bounds=new OpenLayers.Bounds(minXY.lon,minXY.lat,maxXY.lon,maxXY.lat);}else{var pixWidth=Math.abs(position.right-position.left);var pixHeight=Math.abs(position.top-position.bottom);var zoomFactor=Math.min((this.map.size.h/pixHeight),(this.map.size.w/pixWidth));var extent=this.map.getExtent();var center=this.map.getLonLatFromPixel(position.getCenterPixel());var xmin=center.lon-(extent.getWidth()/2)*zoomFactor;var xmax=center.lon+(extent.getWidth()/2)*zoomFactor;var ymin=center.lat-(extent.getHeight()/2)*zoomFactor;var ymax=center.lat+(extent.getHeight()/2)*zoomFactor;bounds=new OpenLayers.Bounds(xmin,ymin,xmax,ymax);} +var lastZoom=this.map.getZoom();this.map.zoomToExtent(bounds);if(lastZoom==this.map.getZoom()&&this.alwaysZoom==true){this.map.zoomTo(lastZoom+(this.out?-1:1));}}else{if(!this.out){this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()+1);}else{this.map.setCenter(this.map.getLonLatFromPixel(position),this.map.getZoom()-1);}}},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:false,interval:1,documentDrag:false,kinetic:null,enableKinetic:false,kineticInterval:10,draw:function(){if(this.enableKinetic){var config={interval:this.kineticInterval};if(typeof this.enableKinetic==="object"){config=OpenLayers.Util.extend(config,this.enableKinetic);} +this.kinetic=new OpenLayers.Kinetic(config);} +this.handler=new OpenLayers.Handler.Drag(this,{"move":this.panMap,"done":this.panMapDone,"down":this.panMapStart},{interval:this.interval,documentDrag:this.documentDrag});},panMapStart:function(){if(this.kinetic){this.kinetic.begin();}},panMap:function(xy){if(this.kinetic){this.kinetic.update(xy);} +this.panned=true;this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:true,animate:false});},panMapDone:function(xy){if(this.panned){var res=null;if(this.kinetic){res=this.kinetic.end(xy);} +this.map.pan(this.handler.last.x-xy.x,this.handler.last.y-xy.y,{dragging:!!res,animate:false});if(res){var self=this;this.kinetic.move(res,function(x,y,end){self.map.pan(x,y,{dragging:!end,animate:false});});} +this.panned=false;}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:true,'double':false,pixelTolerance:0,dblclickTolerance:13,stopSingle:false,stopDouble:false,timerId:null,touch:false,down:null,last:null,first:null,rightclickTimerId:null,initialize:function(control,callbacks,options){OpenLayers.Handler.prototype.initialize.apply(this,arguments);},touchstart:function(evt){if(!this.touch){this.unregisterMouseListeners();this.touch=true;} +this.down=this.getEventInfo(evt);this.last=this.getEventInfo(evt);return true;},touchmove:function(evt){this.last=this.getEventInfo(evt);return true;},touchend:function(evt){if(this.down){evt.xy=this.last.xy;evt.lastTouches=this.last.touches;this.handleSingle(evt);this.down=null;} +return true;},unregisterMouseListeners:function(){this.map.events.un({mousedown:this.mousedown,mouseup:this.mouseup,click:this.click,dblclick:this.dblclick,scope:this});},mousedown:function(evt){this.down=this.getEventInfo(evt);this.last=this.getEventInfo(evt);return true;},mouseup:function(evt){var propagate=true;if(this.checkModifiers(evt)&&this.control.handleRightClicks&&OpenLayers.Event.isRightClick(evt)){propagate=this.rightclick(evt);} +return propagate;},rightclick:function(evt){if(this.passesTolerance(evt)){if(this.rightclickTimerId!=null){this.clearTimer();this.callback('dblrightclick',[evt]);return!this.stopDouble;}else{var clickEvent=this['double']?OpenLayers.Util.extend({},evt):this.callback('rightclick',[evt]);var delayedRightCall=OpenLayers.Function.bind(this.delayedRightCall,this,clickEvent);this.rightclickTimerId=window.setTimeout(delayedRightCall,this.delay);}} +return!this.stopSingle;},delayedRightCall:function(evt){this.rightclickTimerId=null;if(evt){this.callback('rightclick',[evt]);}},click:function(evt){if(!this.last){this.last=this.getEventInfo(evt);} +this.handleSingle(evt);return!this.stopSingle;},dblclick:function(evt){this.handleDouble(evt);return!this.stopDouble;},handleDouble:function(evt){if(this["double"]&&this.passesDblclickTolerance(evt)){this.callback("dblclick",[evt]);}},handleSingle:function(evt){if(this.passesTolerance(evt)){if(this.timerId!=null){if(this.last.touches&&this.last.touches.length===1){if(this["double"]){OpenLayers.Event.stop(evt);} +this.handleDouble(evt);} +if(!this.last.touches||this.last.touches.length!==2){this.clearTimer();}}else{this.first=this.getEventInfo(evt);var clickEvent=this.single?OpenLayers.Util.extend({},evt):null;this.queuePotentialClick(clickEvent);}}},queuePotentialClick:function(evt){this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,evt),this.delay);},passesTolerance:function(evt){var passes=true;if(this.pixelTolerance!=null&&this.down&&this.down.xy){passes=this.pixelTolerance>=this.down.xy.distanceTo(evt.xy);if(passes&&this.touch&&this.down.touches.length===this.last.touches.length){for(var i=0,ii=this.down.touches.length;ithis.pixelTolerance){passes=false;break;}}}} +return passes;},getTouchDistance:function(from,to){return Math.sqrt(Math.pow(from.clientX-to.clientX,2)+ +Math.pow(from.clientY-to.clientY,2));},passesDblclickTolerance:function(evt){var passes=true;if(this.down&&this.first){passes=this.down.xy.distanceTo(this.first.xy)<=this.dblclickTolerance;} +return passes;},clearTimer:function(){if(this.timerId!=null){window.clearTimeout(this.timerId);this.timerId=null;} +if(this.rightclickTimerId!=null){window.clearTimeout(this.rightclickTimerId);this.rightclickTimerId=null;}},delayedCall:function(evt){this.timerId=null;if(evt){this.callback("click",[evt]);}},getEventInfo:function(evt){var touches;if(evt.touches){var len=evt.touches.length;touches=new Array(len);var touch;for(var i=0;i=bounds.bottom-tilelat*this.buffer)||rowidx=0)&&(testCell=0)){tile=this.grid[testRow][testCell];} +if((tile!=null)&&(!tile.queued)){tileQueue.unshift(tile);tile.queued=true;directionsTried=0;iRow=testRow;iCell=testCell;}else{direction=(direction+1)%4;directionsTried++;}} +for(var i=0,len=tileQueue.length;i-this.tileSize.w*(buffer-1)){this.shiftColumn(true);}else if(tlViewPort.x<-this.tileSize.w*buffer){this.shiftColumn(false);}else if(tlViewPort.y>-this.tileSize.h*(buffer-1)){this.shiftRow(true);}else if(tlViewPort.y<-this.tileSize.h*buffer){this.shiftRow(false);}else{shifted=false;} +if(shifted){this.timerId=window.setTimeout(this._moveGriddedTiles,0);}},shiftRow:function(prepend){var modelRowIndex=(prepend)?0:(this.grid.length-1);var grid=this.grid;var modelRow=grid[modelRowIndex];var resolution=this.map.getResolution();var deltaY=(prepend)?-this.tileSize.h:this.tileSize.h;var deltaLat=resolution*-deltaY;var row=(prepend)?grid.pop():grid.shift();for(var i=0,len=modelRow.length;irows){var row=this.grid.pop();for(var i=0,l=row.length;icolumns){for(var i=0,l=this.grid.length;iOpenStreetMap",sphericalMercator:true,url:'http://tile.openstreetmap.org/${z}/${x}/${y}.png',clone:function(obj){if(obj==null){obj=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions());} +obj=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[obj]);return obj;},wrapDateLine:true,CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",xlinkns:"http://www.w3.org/1999/xlink",MAX_PIXEL:15000,translationParameters:null,symbolMetrics:null,initialize:function(containerID){if(!this.supported()){return;} +OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments);this.translationParameters={x:0,y:0};this.symbolMetrics={};},supported:function(){var svgFeature="http://www.w3.org/TR/SVG11/feature#";return(document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature(svgFeature+"SVG","1.1")||document.implementation.hasFeature(svgFeature+"BasicStructure","1.1")));},inValidRange:function(x,y,xyOnly){var left=x+(xyOnly?0:this.translationParameters.x);var top=y+(xyOnly?0:this.translationParameters.y);return(left>=-this.MAX_PIXEL&&left<=this.MAX_PIXEL&&top>=-this.MAX_PIXEL&&top<=this.MAX_PIXEL);},setExtent:function(extent,resolutionChanged){OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments);var resolution=this.getResolution();var left=-extent.left/resolution;var top=extent.top/resolution;if(resolutionChanged){this.left=left;this.top=top;var extentString="0 0 "+this.size.w+" "+this.size.h;this.rendererRoot.setAttributeNS(null,"viewBox",extentString);this.translate(0,0);return true;}else{var inRange=this.translate(left-this.left,top-this.top);if(!inRange){this.setExtent(extent,true);} +return inRange;}},translate:function(x,y){if(!this.inValidRange(x,y,true)){return false;}else{var transformString="";if(x||y){transformString="translate("+x+","+y+")";} +this.root.setAttributeNS(null,"transform",transformString);this.translationParameters={x:x,y:y};return true;}},setSize:function(size){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w);this.rendererRoot.setAttributeNS(null,"height",this.size.h);},getNodeType:function(geometry,style){var nodeType=null;switch(geometry.CLASS_NAME){case"OpenLayers.Geometry.Point":if(style.externalGraphic){nodeType="image";}else if(this.isComplexSymbol(style.graphicName)){nodeType="svg";}else{nodeType="circle";} +break;case"OpenLayers.Geometry.Rectangle":nodeType="rect";break;case"OpenLayers.Geometry.LineString":nodeType="polyline";break;case"OpenLayers.Geometry.LinearRing":nodeType="polygon";break;case"OpenLayers.Geometry.Polygon":case"OpenLayers.Geometry.Curve":case"OpenLayers.Geometry.Surface":nodeType="path";break;default:break;} +return nodeType;},setStyle:function(node,style,options){style=style||node._style;options=options||node._options;var r=parseFloat(node.getAttributeNS(null,"r"));var widthFactor=1;var pos;if(node._geometryClass=="OpenLayers.Geometry.Point"&&r){node.style.visibility="";if(style.graphic===false){node.style.visibility="hidden";}else if(style.externalGraphic){pos=this.getPosition(node);if(style.graphicTitle){node.setAttributeNS(null,"title",style.graphicTitle);var label=this.nodeFactory(null,"title");label.textContent=style.graphicTitle;node.appendChild(label);} +if(style.graphicWidth&&style.graphicHeight){node.setAttributeNS(null,"preserveAspectRatio","none");} +var width=style.graphicWidth||style.graphicHeight;var height=style.graphicHeight||style.graphicWidth;width=width?width:style.pointRadius*2;height=height?height:style.pointRadius*2;var xOffset=(style.graphicXOffset!=undefined)?style.graphicXOffset:-(0.5*width);var yOffset=(style.graphicYOffset!=undefined)?style.graphicYOffset:-(0.5*height);var opacity=style.graphicOpacity||style.fillOpacity;node.setAttributeNS(null,"x",(pos.x+xOffset).toFixed());node.setAttributeNS(null,"y",(pos.y+yOffset).toFixed());node.setAttributeNS(null,"width",width);node.setAttributeNS(null,"height",height);node.setAttributeNS(this.xlinkns,"href",style.externalGraphic);node.setAttributeNS(null,"style","opacity: "+opacity);node.onclick=OpenLayers.Renderer.SVG.preventDefault;}else if(this.isComplexSymbol(style.graphicName)){var offset=style.pointRadius*3;var size=offset*2;var src=this.importSymbol(style.graphicName);pos=this.getPosition(node);widthFactor=this.symbolMetrics[src.id][0]*3/size;var parent=node.parentNode;var nextSibling=node.nextSibling;if(parent){parent.removeChild(node);} +node.firstChild&&node.removeChild(node.firstChild);node.appendChild(src.firstChild.cloneNode(true));node.setAttributeNS(null,"viewBox",src.getAttributeNS(null,"viewBox"));node.setAttributeNS(null,"width",size);node.setAttributeNS(null,"height",size);node.setAttributeNS(null,"x",pos.x-offset);node.setAttributeNS(null,"y",pos.y-offset);if(nextSibling){parent.insertBefore(node,nextSibling);}else if(parent){parent.appendChild(node);}}else{node.setAttributeNS(null,"r",style.pointRadius);} +var rotation=style.rotation;if((rotation!==undefined||node._rotation!==undefined)&&pos){node._rotation=rotation;rotation|=0;if(node.nodeName!=="svg"){node.setAttributeNS(null,"transform","rotate("+rotation+" "+pos.x+" "+ +pos.y+")");}else{var metrics=this.symbolMetrics[src.id];node.firstChild.setAttributeNS(null,"transform","rotate(" ++rotation+" " ++metrics[1]+" " ++metrics[2]+")");}}} +if(options.isFilled){node.setAttributeNS(null,"fill",style.fillColor);node.setAttributeNS(null,"fill-opacity",style.fillOpacity);}else{node.setAttributeNS(null,"fill","none");} +if(options.isStroked){node.setAttributeNS(null,"stroke",style.strokeColor);node.setAttributeNS(null,"stroke-opacity",style.strokeOpacity);node.setAttributeNS(null,"stroke-width",style.strokeWidth*widthFactor);node.setAttributeNS(null,"stroke-linecap",style.strokeLinecap||"round");node.setAttributeNS(null,"stroke-linejoin","round");style.strokeDashstyle&&node.setAttributeNS(null,"stroke-dasharray",this.dashStyle(style,widthFactor));}else{node.setAttributeNS(null,"stroke","none");} +if(style.pointerEvents){node.setAttributeNS(null,"pointer-events",style.pointerEvents);} +if(style.cursor!=null){node.setAttributeNS(null,"cursor",style.cursor);} +return node;},dashStyle:function(style,widthFactor){var w=style.strokeWidth*widthFactor;var str=style.strokeDashstyle;switch(str){case'solid':return'none';case'dot':return[1,4*w].join();case'dash':return[4*w,4*w].join();case'dashdot':return[4*w,4*w,1,4*w].join();case'longdash':return[8*w,4*w].join();case'longdashdot':return[8*w,4*w,1,4*w].join();default:return OpenLayers.String.trim(str).replace(/\s+/g,",");}},createNode:function(type,id){var node=document.createElementNS(this.xmlns,type);if(id){node.setAttributeNS(null,"id",id);} +return node;},nodeTypeCompare:function(node,type){return(type==node.nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_svgRoot","svg");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"g");},createDefs:function(){var defs=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(defs);return defs;},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){var resolution=this.getResolution();var x=(geometry.x/resolution+this.left);var y=(this.top-geometry.y/resolution);if(this.inValidRange(x,y)){node.setAttributeNS(null,"cx",x);node.setAttributeNS(null,"cy",y);node.setAttributeNS(null,"r",radius);return node;}else{return false;}},drawLineString:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawLinearRing:function(node,geometry){var componentsResult=this.getComponentsString(geometry.components);if(componentsResult.path){node.setAttributeNS(null,"points",componentsResult.path);return(componentsResult.complete?node:null);}else{return false;}},drawPolygon:function(node,geometry){var d="";var draw=true;var complete=true;var linearRingResult,path;for(var j=0,len=geometry.components.length;jnumRows){label.removeChild(label.lastChild);} +for(var i=0;i0){if(this.getShortString(components[i-1])){strings.push(this.clipLine(components[i],components[i-1]));}} +if(imaxX){k=(y2-y1)/(x2-x1);x2=x2<0?-maxX:maxX;y2=y1+(x2-x1)*k;} +if(y2<-maxY||y2>maxY){k=(x2-x1)/(y2-y1);y2=y2<0?-maxY:maxY;x2=x1+(y2-y1)*k;} +return x2+","+y2;},getShortString:function(point){var resolution=this.getResolution();var x=(point.x/resolution+this.left);var y=(this.top-point.y/resolution);if(this.inValidRange(x,y)){return x+","+y;}else{return false;}},getPosition:function(node){return({x:parseFloat(node.getAttributeNS(null,"cx")),y:parseFloat(node.getAttributeNS(null,"cy"))});},importSymbol:function(graphicName){if(!this.defs){this.defs=this.createDefs();} +var id=this.container.id+"-"+graphicName;var existing=document.getElementById(id) +if(existing!=null){return existing;} +var symbol=OpenLayers.Renderer.symbol[graphicName];if(!symbol){throw new Error(graphicName+' is not a valid symbol name');} +var symbolNode=this.nodeFactory(id,"symbol");var node=this.nodeFactory(null,"polygon");symbolNode.appendChild(node);var symbolExtent=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);var points=[];var x,y;for(var i=0;i=0;--i){this._removeButton(this.buttons[i]);}},doubleClick:function(evt){OpenLayers.Event.stop(evt);return false;},buttonDown:function(evt){if(!OpenLayers.Event.isLeftClick(evt)){return;} +switch(this.action){case"panup":this.map.pan(0,-this.getSlideFactor("h"));break;case"pandown":this.map.pan(0,this.getSlideFactor("h"));break;case"panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case"panright":this.map.pan(this.getSlideFactor("w"),0);break;case"zoomin":this.map.zoomIn();break;case"zoomout":this.map.zoomOut();break;case"zoomworld":this.map.zoomToMaxExtent();break;} +OpenLayers.Event.stop(evt);},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Popup=OpenLayers.Class({events:null,id:"",lonlat:null,div:null,contentSize:null,size:null,contentHTML:null,backgroundColor:"",opacity:"",border:"",contentDiv:null,groupDiv:null,closeDiv:null,autoSize:false,minSize:null,maxSize:null,displayClass:"olPopup",contentDisplayClass:"olPopupContent",padding:0,disableFirefoxOverflowHack:false,fixPadding:function(){if(typeof this.padding=="number"){this.padding=new OpenLayers.Bounds(this.padding,this.padding,this.padding,this.padding);}},panMapIfOutOfView:false,keepInMap:false,closeOnMove:false,map:null,initialize:function(id,lonlat,contentSize,contentHTML,closeBox,closeBoxCallback){if(id==null){id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_");} +this.id=id;this.lonlat=lonlat;this.contentSize=(contentSize!=null)?contentSize:new OpenLayers.Size(OpenLayers.Popup.WIDTH,OpenLayers.Popup.HEIGHT);if(contentHTML!=null){this.contentHTML=contentHTML;} +this.backgroundColor=OpenLayers.Popup.COLOR;this.opacity=OpenLayers.Popup.OPACITY;this.border=OpenLayers.Popup.BORDER;this.div=OpenLayers.Util.createDiv(this.id,null,null,null,null,null,"hidden");this.div.className=this.displayClass;var groupDivId=this.id+"_GroupDiv";this.groupDiv=OpenLayers.Util.createDiv(groupDivId,null,null,null,"relative",null,"hidden");var id=this.div.id+"_contentDiv";this.contentDiv=OpenLayers.Util.createDiv(id,null,this.contentSize.clone(),null,"relative");this.contentDiv.className=this.contentDisplayClass;this.groupDiv.appendChild(this.contentDiv);this.div.appendChild(this.groupDiv);if(closeBox){this.addCloseBox(closeBoxCallback);} +this.registerEvents();},destroy:function(){this.id=null;this.lonlat=null;this.size=null;this.contentHTML=null;this.backgroundColor=null;this.opacity=null;this.border=null;if(this.closeOnMove&&this.map){this.map.events.unregister("movestart",this,this.hide);} +this.events.destroy();this.events=null;if(this.closeDiv){OpenLayers.Event.stopObservingElement(this.closeDiv);this.groupDiv.removeChild(this.closeDiv);} +this.closeDiv=null;this.div.removeChild(this.groupDiv);this.groupDiv=null;if(this.map!=null){this.map.removePopup(this);} +this.map=null;this.div=null;this.autoSize=null;this.minSize=null;this.maxSize=null;this.padding=null;this.panMapIfOutOfView=null;},draw:function(px){if(px==null){if((this.lonlat!=null)&&(this.map!=null)){px=this.map.getLayerPxFromLonLat(this.lonlat);}} +if(this.closeOnMove){this.map.events.register("movestart",this,this.hide);} +if(!this.disableFirefoxOverflowHack&&OpenLayers.BROWSER_NAME=='firefox'){this.map.events.register("movestart",this,function(){var style=document.defaultView.getComputedStyle(this.contentDiv,null);var currentOverflow=style.getPropertyValue("overflow");if(currentOverflow!="hidden"){this.contentDiv._oldOverflow=currentOverflow;this.contentDiv.style.overflow="hidden";}});this.map.events.register("moveend",this,function(){var oldOverflow=this.contentDiv._oldOverflow;if(oldOverflow){this.contentDiv.style.overflow=oldOverflow;this.contentDiv._oldOverflow=null;}});} +this.moveTo(px);if(!this.autoSize&&!this.size){this.setSize(this.contentSize);} +this.setBackgroundColor();this.setOpacity();this.setBorder();this.setContentHTML();if(this.panMapIfOutOfView){this.panIntoView();} +return this.div;},updatePosition:function(){if((this.lonlat)&&(this.map)){var px=this.map.getLayerPxFromLonLat(this.lonlat);if(px){this.moveTo(px);}}},moveTo:function(px){if((px!=null)&&(this.div!=null)){this.div.style.left=px.x+"px";this.div.style.top=px.y+"px";}},visible:function(){return OpenLayers.Element.visible(this.div);},toggle:function(){if(this.visible()){this.hide();}else{this.show();}},show:function(){this.div.style.display='';if(this.panMapIfOutOfView){this.panIntoView();}},hide:function(){this.div.style.display='none';},setSize:function(contentSize){this.size=contentSize.clone();var contentDivPadding=this.getContentDivPadding();var wPadding=contentDivPadding.left+contentDivPadding.right;var hPadding=contentDivPadding.top+contentDivPadding.bottom;this.fixPadding();wPadding+=this.padding.left+this.padding.right;hPadding+=this.padding.top+this.padding.bottom;if(this.closeDiv){var closeDivWidth=parseInt(this.closeDiv.style.width);wPadding+=closeDivWidth+contentDivPadding.right;} +this.size.w+=wPadding;this.size.h+=hPadding;if(OpenLayers.BROWSER_NAME=="msie"){this.contentSize.w+=contentDivPadding.left+contentDivPadding.right;this.contentSize.h+=contentDivPadding.bottom+contentDivPadding.top;} +if(this.div!=null){this.div.style.width=this.size.w+"px";this.div.style.height=this.size.h+"px";} +if(this.contentDiv!=null){this.contentDiv.style.width=contentSize.w+"px";this.contentDiv.style.height=contentSize.h+"px";}},updateSize:function(){var preparedHTML="

"+ +this.contentDiv.innerHTML+"

";var containerElement=(this.map)?this.map.layerContainerDiv:document.body;var realSize=OpenLayers.Util.getRenderedDimensions(preparedHTML,null,{displayClass:this.displayClass,containerElement:containerElement});var safeSize=this.getSafeContentSize(realSize);var newSize=null;if(safeSize.equals(realSize)){newSize=realSize;}else{var fixedSize=new OpenLayers.Size();fixedSize.w=(safeSize.w(mapSize.w-this.map.paddingForPopups.right)){newTL.x=mapSize.w-this.map.paddingForPopups.right-this.size.w;} +if(origTL.y(mapSize.h-this.map.paddingForPopups.bottom)){newTL.y=mapSize.h-this.map.paddingForPopups.bottom-this.size.h;} +var dx=origTL.x-newTL.x;var dy=origTL.y-newTL.y;this.map.pan(dx,dy);},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,true);function onTouchstart(evt){OpenLayers.Event.stop(evt,true);} +this.events.on({"mousedown":this.onmousedown,"mousemove":this.onmousemove,"mouseup":this.onmouseup,"click":this.onclick,"mouseout":this.onmouseout,"dblclick":this.ondblclick,"touchstart":onTouchstart,scope:this});},onmousedown:function(evt){this.mousedown=true;OpenLayers.Event.stop(evt,true);},onmousemove:function(evt){if(this.mousedown){OpenLayers.Event.stop(evt,true);}},onmouseup:function(evt){if(this.mousedown){this.mousedown=false;OpenLayers.Event.stop(evt,true);}},onclick:function(evt){OpenLayers.Event.stop(evt,true);},onmouseout:function(evt){this.mousedown=false;},ondblclick:function(evt){OpenLayers.Event.stop(evt,true);},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white";OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:true,anchor:null,initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){var newArguments=[id,lonlat,contentSize,contentHTML,closeBox,closeBoxCallback];OpenLayers.Popup.prototype.initialize.apply(this,newArguments);this.anchor=(anchor!=null)?anchor:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)};},destroy:function(){this.anchor=null;this.relativePosition=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments);},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments);},moveTo:function(px){var oldRelativePosition=this.relativePosition;this.relativePosition=this.calculateRelativePosition(px);var newPx=this.calculateNewPx(px);var newArguments=new Array(newPx);OpenLayers.Popup.prototype.moveTo.apply(this,newArguments);if(this.relativePosition!=oldRelativePosition){this.updateRelativePosition();}},setSize:function(contentSize){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if((this.lonlat)&&(this.map)){var px=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(px);}},calculateRelativePosition:function(px){var lonlat=this.map.getLonLatFromLayerPx(px);var extent=this.map.getExtent();var quadrant=extent.determineQuadrant(lonlat);return OpenLayers.Bounds.oppositeQuadrant(quadrant);},updateRelativePosition:function(){},calculateNewPx:function(px){var newPx=px.offset(this.anchor.offset);var size=this.size||this.contentSize;var top=(this.relativePosition.charAt(0)=='t');newPx.y+=(top)?-size.h:this.anchor.size.h;var left=(this.relativePosition.charAt(1)=='l');newPx.x+=(left)?-size.w:this.anchor.size.w;return newPx;},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:false,positionBlocks:null,blocks:null,fixedRelativePosition:false,initialize:function(id,lonlat,contentSize,contentHTML,anchor,closeBox,closeBoxCallback){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);if(this.fixedRelativePosition){this.updateRelativePosition();this.calculateRelativePosition=function(px){return this.relativePosition;};} +this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;if(closeBox){this.closeDiv.style.zIndex=1;} +this.groupDiv.style.position="absolute";this.groupDiv.style.top="0px";this.groupDiv.style.left="0px";this.groupDiv.style.height="100%";this.groupDiv.style.width="100%";},destroy:function(){this.imageSrc=null;this.imageSize=null;this.isAlphaImage=null;this.fixedRelativePosition=false;this.positionBlocks=null;for(var i=0;i=OpenLayers.Style.createLiteral(this.minScaleDenominator,context);} +if(applies&&this.maxScaleDenominator){applies=scalethis.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:result=got<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:result=got>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:result=(got>=this.lowerBoundary)&&(got<=this.upperBoundary);break;case OpenLayers.Filter.Comparison.LIKE:var regexp=new RegExp(this.value,"gi");result=regexp.test(got);break;} +return result;},value2regex:function(wildCard,singleChar,escapeChar){if(wildCard=="."){var msg="'.' is an unsupported wildCard character for "+"OpenLayers.Filter.Comparison";OpenLayers.Console.error(msg);return null;} +wildCard=wildCard?wildCard:"*";singleChar=singleChar?singleChar:".";escapeChar=escapeChar?escapeChar:"!";this.value=this.value.replace(new RegExp("\\"+escapeChar+"(.|$)","g"),"\\$1");this.value=this.value.replace(new RegExp("\\"+singleChar,"g"),".");this.value=this.value.replace(new RegExp("\\"+wildCard,"g"),".*");this.value=this.value.replace(new RegExp("\\\\.\\*","g"),"\\"+wildCard);this.value=this.value.replace(new RegExp("\\\\\\.","g"),"\\"+singleChar);return this.value;},regex2value:function(){var value=this.value;value=value.replace(/!/g,"!!");value=value.replace(/(\\)?\\\./g,function($0,$1){return $1?$0:"!.";});value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"!*";});value=value.replace(/\\\\/g,"\\");value=value.replace(/\.\*/g,"*");return value;},clone:function(){return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison(),this);},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Format.QueryStringFilter=(function(){var cmpToStr={};cmpToStr[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";cmpToStr[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN]="lt";cmpToStr[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";cmpToStr[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";cmpToStr[OpenLayers.Filter.Comparison.LIKE]="ilike";function regex2value(value){value=value.replace(/%/g,"\\%");value=value.replace(/\\\\\.(\*)?/g,function($0,$1){return $1?$0:"\\\\_";});value=value.replace(/\\\\\.\*/g,"\\\\%");value=value.replace(/(\\)?\.(\*)?/g,function($0,$1,$2){return $1||$2?$0:"_";});value=value.replace(/(\\)?\.\*/g,function($0,$1){return $1?$0:"%";});value=value.replace(/\\\./g,".");value=value.replace(/(\\)?\\\*/g,function($0,$1){return $1?$0:"*";});return value;} +return OpenLayers.Class(OpenLayers.Format,{wildcarded:false,srsInBBOX:false,write:function(filter,params){params=params||{};var className=filter.CLASS_NAME;var filterType=className.substring(className.lastIndexOf(".")+1);switch(filterType){case"Spatial":switch(filter.type){case OpenLayers.Filter.Spatial.BBOX:params.bbox=filter.value.toArray();if(this.srsInBBOX&&filter.projection){params.bbox.push(filter.projection.getCode());} +break;case OpenLayers.Filter.Spatial.DWITHIN:params.tolerance=filter.distance;case OpenLayers.Filter.Spatial.WITHIN:params.lon=filter.value.x;params.lat=filter.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+filter.type);} +break;case"Comparison":var op=cmpToStr[filter.type];if(op!==undefined){var value=filter.value;if(filter.type==OpenLayers.Filter.Comparison.LIKE){value=regex2value(value);if(this.wildcarded){value="%"+value+"%";}} +params[filter.property+"__"+op]=value;params.queryable=params.queryable||[];params.queryable.push(filter.property);}else{OpenLayers.Console.warn("Unknown comparison filter type "+filter.type);} +break;case"Logical":if(filter.type===OpenLayers.Filter.Logical.AND){for(var i=0,len=filter.filters.length;i=2*parts[1]){return"longdash";} +return(parts[0]==1||parts[1]==1)?"dot":"dash";}else if(parts.length==4){return(1*parts[0]>=2*parts[1])?"longdashdot":"dashdot";} +return"solid";}},createNode:function(type,id){var node=document.createElement(type);if(id){node.id=id;} +node.unselectable='on';node.onselectstart=OpenLayers.Function.False;return node;},nodeTypeCompare:function(node,type){var subType=type;var splitIndex=subType.indexOf(":");if(splitIndex!=-1){subType=subType.substr(splitIndex+1);} +var nodeName=node.nodeName;splitIndex=nodeName.indexOf(":");if(splitIndex!=-1){nodeName=nodeName.substr(splitIndex+1);} +return(subType==nodeName);},createRenderRoot:function(){return this.nodeFactory(this.container.id+"_vmlRoot","div");},createRoot:function(suffix){return this.nodeFactory(this.container.id+suffix,"olv:group");},drawPoint:function(node,geometry){return this.drawCircle(node,geometry,1);},drawCircle:function(node,geometry,radius){if(!isNaN(geometry.x)&&!isNaN(geometry.y)){var resolution=this.getResolution();node.style.left=(((geometry.x/resolution-this.offset.x)|0)-radius)+"px";node.style.top=(((geometry.y/resolution-this.offset.y)|0)-radius)+"px";var diameter=radius*2;node.style.width=diameter+"px";node.style.height=diameter+"px";return node;} +return false;},drawLineString:function(node,geometry){return this.drawLine(node,geometry,false);},drawLinearRing:function(node,geometry){return this.drawLine(node,geometry,true);},drawLine:function(node,geometry,closeLine){this.setNodeDimension(node,geometry);var resolution=this.getResolution();var numComponents=geometry.components.length;var parts=new Array(numComponents);var comp,x,y;for(var i=0;i0){symbolExtent.bottom=symbolExtent.bottom-diff;symbolExtent.top=symbolExtent.top+diff;}else{symbolExtent.left=symbolExtent.left+diff;symbolExtent.right=symbolExtent.right-diff;} +cache={path:path,size:symbolExtent.getWidth(),left:symbolExtent.left,bottom:symbolExtent.bottom};this.symbolCache[id]=cache;return cache;},CLASS_NAME:"OpenLayers.Renderer.VML"});OpenLayers.Renderer.VML.LABEL_SHIFT={"l":0,"c":.5,"r":1,"t":0,"m":.5,"b":1};OpenLayers.Protocol=OpenLayers.Class({format:null,options:null,autoDestroy:true,defaultFilter:null,initialize:function(options){options=options||{};OpenLayers.Util.extend(this,options);this.options=options;},mergeWithDefaultFilter:function(filter){var merged;if(filter&&this.defaultFilter){merged=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.defaultFilter,filter]});}else{merged=filter||this.defaultFilter||undefined;} +return merged;},destroy:function(){this.options=null;this.format=null;},read:function(options){options=options||{};options.filter=this.mergeWithDefaultFilter(options.filter);},create:function(){},update:function(){},"delete":function(){},commit:function(){},abort:function(response){},createCallback:function(method,response,options){return OpenLayers.Function.bind(function(){method.apply(this,[response,options]);},this);},CLASS_NAME:"OpenLayers.Protocol"});OpenLayers.Protocol.Response=OpenLayers.Class({code:null,requestType:null,last:true,features:null,reqFeatures:null,priv:null,error:null,initialize:function(options){OpenLayers.Util.extend(this,options);},success:function(){return this.code>0;},CLASS_NAME:"OpenLayers.Protocol.Response"});OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:false,wildcarded:false,srsInBBOX:false,initialize:function(options){options=options||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var format=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams=function(filter,params){return format.write(filter,params);}}},destroy:function(){this.params=null;this.headers=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){OpenLayers.Protocol.prototype.read.apply(this,arguments);options=options||{};options.params=OpenLayers.Util.applyDefaults(options.params,this.options.params);options=OpenLayers.Util.applyDefaults(options,this.options);if(options.filter&&this.filterToParams){options.params=this.filterToParams(options.filter,options.params);} +var readWithPOST=(options.readWithPOST!==undefined)?options.readWithPOST:this.readWithPOST;var resp=new OpenLayers.Protocol.Response({requestType:"read"});if(readWithPOST){resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,resp,options),data:OpenLayers.Util.getParameterString(options.params),headers:{"Content-Type":"application/x-www-form-urlencoded"}});}else{resp.priv=OpenLayers.Request.GET({url:options.url,callback:this.createCallback(this.handleRead,resp,options),params:options.params,headers:options.headers});} +return resp;},handleRead:function(resp,options){this.handleResponse(resp,options);},create:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:features,requestType:"create"});resp.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleCreate,resp,options),headers:options.headers,data:this.format.write(features)});return resp;},handleCreate:function(resp,options){this.handleResponse(resp,options);},update:function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"update"});resp.priv=OpenLayers.Request.PUT({url:url,callback:this.createCallback(this.handleUpdate,resp,options),headers:options.headers,data:this.format.write(feature)});return resp;},handleUpdate:function(resp,options){this.handleResponse(resp,options);},"delete":function(feature,options){options=options||{};var url=options.url||feature.url||this.options.url+"/"+feature.fid;options=OpenLayers.Util.applyDefaults(options,this.options);var resp=new OpenLayers.Protocol.Response({reqFeatures:feature,requestType:"delete"});resp.priv=OpenLayers.Request.DELETE({url:url,callback:this.createCallback(this.handleDelete,resp,options),headers:options.headers});return resp;},handleDelete:function(resp,options){this.handleResponse(resp,options);},handleResponse:function(resp,options){var request=resp.priv;if(options.callback){if(request.status>=200&&request.status<300){if(resp.requestType!="delete"){resp.features=this.parseFeatures(request);} +resp.code=OpenLayers.Protocol.Response.SUCCESS;}else{resp.code=OpenLayers.Protocol.Response.FAILURE;} +options.callback.call(options.scope,resp);}},parseFeatures:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;} +if(!doc||doc.length<=0){return null;} +return this.format.read(doc);},commit:function(features,options){options=OpenLayers.Util.applyDefaults(options,this.options);var resp=[],nResponses=0;var types={};types[OpenLayers.State.INSERT]=[];types[OpenLayers.State.UPDATE]=[];types[OpenLayers.State.DELETE]=[];var feature,list,requestFeatures=[];for(var i=0,len=features.length;i0?1:0)+ +types[OpenLayers.State.UPDATE].length+ +types[OpenLayers.State.DELETE].length;var success=true;var finalResponse=new OpenLayers.Protocol.Response({reqFeatures:requestFeatures});function insertCallback(response){var len=response.features?response.features.length:0;var fids=new Array(len);for(var i=0;i=nRequests){if(options.callback){finalResponse.code=success?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE;options.callback.apply(options.scope,[finalResponse]);}}} +var queue=types[OpenLayers.State.INSERT];if(queue.length>0){resp.push(this.create(queue,OpenLayers.Util.applyDefaults({callback:insertCallback,scope:this},options.create)));} +queue=types[OpenLayers.State.UPDATE];for(var i=queue.length-1;i>=0;--i){resp.push(this.update(queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options.update)));} +queue=types[OpenLayers.State.DELETE];for(var i=queue.length-1;i>=0;--i){resp.push(this["delete"](queue[i],OpenLayers.Util.applyDefaults({callback:callback,scope:this},options["delete"])));} +return resp;},abort:function(response){if(response){response.priv.abort();}},callUserCallback:function(resp,options){var opt=options[resp.requestType];if(opt&&opt.callback){opt.callback.call(opt.scope,resp);}},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:" ",space:" ",newline:"\n",level:0,pretty:false,nativeJSON:(function(){return!!(window.JSON&&typeof JSON.parse=="function"&&typeof JSON.stringify=="function");})(),read:function(json,filter){var object;if(this.nativeJSON){object=JSON.parse(json,filter);}else try{if(/^[\],:{}\s]*$/.test(json.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){object=eval('('+json+')');if(typeof filter==='function'){function walk(k,v){if(v&&typeof v==='object'){for(var i in v){if(v.hasOwnProperty(i)){v[i]=walk(i,v[i]);}}} +return filter(k,v);} +object=walk('',object);}}}catch(e){} +if(this.keepData){this.data=object;} +return object;},write:function(value,pretty){this.pretty=!!pretty;var json=null;var type=typeof value;if(this.serialize[type]){try{json=(!this.pretty&&this.nativeJSON)?JSON.stringify(value):this.serialize[type].apply(this,[value]);}catch(err){OpenLayers.Console.error("Trouble serializing: "+err);}} +return json;},writeIndent:function(){var pieces=[];if(this.pretty){for(var i=0;i0){pieces.push(',');} +pieces.push(this.writeNewline(),this.writeIndent(),json);}} +this.level-=1;pieces.push(this.writeNewline(),this.writeIndent(),']');return pieces.join('');},'string':function(string){var m={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};if(/["\\\x00-\x1f]/.test(string)){return'"'+string.replace(/([\x00-\x1f\\"])/g,function(a,b){var c=m[b];if(c){return c;} +c=b.charCodeAt();return'\\u00'+ +Math.floor(c/16).toString(16)+ +(c%16).toString(16);})+'"';} +return'"'+string+'"';},'number':function(number){return isFinite(number)?String(number):"null";},'boolean':function(bool){return String(bool);},'date':function(date){function format(number){return(number<10)?'0'+number:number;} +return'"'+date.getFullYear()+'-'+ +format(date.getMonth()+1)+'-'+ +format(date.getDate())+'T'+ +format(date.getHours())+':'+ +format(date.getMinutes())+':'+ +format(date.getSeconds())+'"';}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(feature,pixel){},onDrag:function(feature,pixel){},onComplete:function(feature,pixel){},onEnter:function(feature){},onLeave:function(feature){},documentDrag:false,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(layer,options){OpenLayers.Control.prototype.initialize.apply(this,[options]);this.layer=layer;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature,up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks),{documentDrag:this.documentDrag}),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})};},clickFeature:function(feature){if(this.handlers.feature.touch&&!this.over&&this.overFeature(feature)){this.handlers.drag.dragstart(this.handlers.feature.evt);this.handlers.drag.stopDown=false;}},clickoutFeature:function(feature){if(this.handlers.feature.touch&&this.over){this.outFeature(feature);this.handlers.drag.stopDown=true;}},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[]);},activate:function(){return(this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments));},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=false;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments);},overFeature:function(feature){var activated=false;if(!this.handlers.drag.dragging){this.feature=feature;this.handlers.drag.activate();activated=true;this.over=true;OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over");this.onEnter(feature);}else{if(this.feature.id==feature.id){this.over=true;}else{this.over=false;}} +return activated;},downFeature:function(pixel){this.lastPixel=pixel;this.onStart(this.feature,pixel);},moveFeature:function(pixel){var res=this.map.getResolution();this.feature.geometry.move(res*(pixel.x-this.lastPixel.x),res*(this.lastPixel.y-pixel.y));this.layer.drawFeature(this.feature);this.lastPixel=pixel;this.onDrag(this.feature,pixel);},upFeature:function(pixel){if(!this.over){this.handlers.drag.deactivate();}},doneDragging:function(pixel){this.onComplete(this.feature,pixel);},outFeature:function(feature){if(!this.handlers.drag.dragging){this.over=false;this.handlers.drag.deactivate();OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over");this.onLeave(feature);this.feature=null;}else{if(this.feature.id==feature.id){this.over=false;}}},cancel:function(){this.handlers.drag.deactivate();this.over=false;},setMap:function(map){this.handlers.drag.setMap(map);this.handlers.feature.setMap(map);OpenLayers.Control.prototype.setMap.apply(this,arguments);},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Control.PinchZoom=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,containerOrigin:null,pinchOrigin:null,currentCenter:null,autoActivate:true,initialize:function(options){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.handler=new OpenLayers.Handler.Pinch(this,{start:this.pinchStart,move:this.pinchMove,done:this.pinchDone},this.handlerOptions);},activate:function(){var activated=OpenLayers.Control.prototype.activate.apply(this,arguments);if(activated){this.map.events.on({moveend:this.updateContainerOrigin,scope:this});this.updateContainerOrigin();} +return activated;},deactivate:function(){var deactivated=OpenLayers.Control.prototype.deactivate.apply(this,arguments);if(this.map&&this.map.events){this.map.events.un({moveend:this.updateContainerOrigin,scope:this});} +return deactivated;},updateContainerOrigin:function(){var container=this.map.layerContainerDiv;this.containerOrigin={x:parseInt(container.style.left,10),y:parseInt(container.style.top,10)};},pinchStart:function(evt,pinchData){this.pinchOrigin=evt.xy;this.currentCenter=evt.xy;},pinchMove:function(evt,pinchData){var scale=pinchData.scale;var containerOrigin=this.containerOrigin;var pinchOrigin=this.pinchOrigin;var current=evt.xy;var dx=Math.round((current.x-pinchOrigin.x)+(scale-1)*(containerOrigin.x-pinchOrigin.x));var dy=Math.round((current.y-pinchOrigin.y)+(scale-1)*(containerOrigin.y-pinchOrigin.y));this.applyTransform("translate("+dx+"px, "+dy+"px) scale("+scale+")");this.currentCenter=current;},applyTransform:function(transform){var style=this.map.layerContainerDiv.style;style['-webkit-transform']=transform;style['-moz-transform']=transform;},pinchDone:function(evt,start,last){this.applyTransform("");var zoom=this.map.getZoomForResolution(this.map.getResolution()/last.scale,true);if(zoom!==this.map.getZoom()||!this.currentCenter.equals(this.pinchOrigin)){var resolution=this.map.getResolutionForZoom(zoom);var location=this.map.getLonLatFromPixel(this.pinchOrigin);var zoomPixel=this.currentCenter;var size=this.map.getSize();location.lon+=resolution*((size.w/2)-zoomPixel.x);location.lat-=resolution*((size.h/2)-zoomPixel.y);this.map.setCenter(location,zoom);}},CLASS_NAME:"OpenLayers.Control.PinchZoom"}); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index a772cad97..137103f7c 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -108,17 +108,36 @@ function fixmystreet_onload() { }); } fixmystreet.markers = new OpenLayers.Layer.Vector("Pins", pin_layer_options); + fixmystreet.markers.events.register( 'loadend', fixmystreet.markers, function(evt) { + if (fixmystreet.map.popups.length) fixmystreet.map.removePopup(fixmystreet.map.popups[0]); + }); var markers = fms_markers_list( fixmystreet.pins, true ); fixmystreet.markers.addFeatures( markers ); if (fixmystreet.page == 'around' || fixmystreet.page == 'reports' || fixmystreet.page == 'my') { - fixmystreet.markers.events.register( 'featureselected', fixmystreet.markers, function(evt) { - if (evt.feature.attributes.id) { - window.location = '/report/' + evt.feature.attributes.id; - } + var select = new OpenLayers.Control.SelectFeature( fixmystreet.markers ); + var selectedFeature; + function onPopupClose(evt) { + select.unselect(selectedFeature); OpenLayers.Event.stop(evt); + } + fixmystreet.markers.events.register( 'featureunselected', fixmystreet.markers, function(evt) { + var feature = evt.feature, popup = feature.popup; + fixmystreet.map.removePopup(popup); + popup.destroy(); + feature.popup = null; + }); + fixmystreet.markers.events.register( 'featureselected', fixmystreet.markers, function(evt) { + var feature = evt.feature; + selectedFeature = feature; + var popup = new OpenLayers.Popup.FramedCloud("popup", + feature.geometry.getBounds().getCenterLonLat(), + null, + "TITLE
More", + null, true, onPopupClose); + feature.popup = popup; + fixmystreet.map.addPopup(popup); }); - var select = new OpenLayers.Control.SelectFeature( fixmystreet.markers ); fixmystreet.map.addControl( select ); select.activate(); } else if (fixmystreet.page == 'new') { -- cgit v1.2.3 From 9a51dfaeef496a4d08b5054bf0e664184157cc29 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 04:15:30 +0000 Subject: Animate moving of map when pin clicked somewhere inconvenient. --- web/js/map-OpenLayers.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 137103f7c..38a2930d3 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -490,10 +490,13 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { new OpenLayers.Projection("EPSG:4326"), fixmystreet.map.getProjectionObject() ); - fixmystreet.map.setCenter(lonlat, fixmystreet.map.getZoom(), true, true); + var p = fixmystreet.map.getViewPortPxFromLonLat(lonlat) + p.x -= $(window).width() / 3; + lonlat = fixmystreet.map.getLonLatFromViewPortPx(p); + fixmystreet.map.panTo(lonlat); } else if (e.xy.x >= o.left && e.xy.x <= o.left + w + 24 && e.xy.y >= o.top && e.xy.y <= o.top + h + 64) { // underneath where the new sidebar will appear - fixmystreet.map.pan(-w, 0, { animate: false }); + fixmystreet.map.pan(-w, 0, { animate: true }); } } -- cgit v1.2.3 From 4c6fe90795c6f1597775ad317798a6c75f8f27f9 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 09:34:25 +0000 Subject: Remove some of #224 due to new #258. --- web/cobrands/fixmystreet/fixmystreet.js | 9 +++- web/js/map-OpenLayers.js | 82 ++++++++------------------------- web/js/map-bing-ol.js | 22 +++------ 3 files changed, 35 insertions(+), 78 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 273e389c4..ae7b2e820 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -80,6 +80,13 @@ $(function(){ //add mobile class if small screen if(Modernizr.mq('only screen and (max-width:48em)')) { $('html').addClass('mobile'); +// XXX Make map full screen here? +// if (fixmystreet.page == 'around') { +// $('#map_box').css({ +// height: $(window).height(), +// margin: 0 +// }); +// } } else { // Make map full screen on non-mobile sizes. var map_pos = 'fixed', map_height = '100%'; @@ -353,4 +360,4 @@ $(function(){ $('#sub_map_links').animate({'right':-maplinks_width}, 1200); } }); -}); \ No newline at end of file +}); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 38a2930d3..2375d5eb8 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -133,7 +133,7 @@ function fixmystreet_onload() { var popup = new OpenLayers.Popup.FramedCloud("popup", feature.geometry.getBounds().getCenterLonLat(), null, - "TITLE
More", + feature.attributes.title + "
More details", null, true, onPopupClose); feature.popup = popup; fixmystreet.map.addPopup(popup); @@ -379,61 +379,14 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }, trigger: function(e) { - if ($('html').hasClass('mobile') && fixmystreet.page != 'new') { - if (fixmystreet.page == 'mobile-full-map') { - this.locate_report(e); - $('#map_box').css({ - zIndex: 'auto', position: 'static', - width: 'auto', height: '10em', - margin: '0 -1em' - }); - fixmystreet.map.updateSize(); - } else { - this.mobile_full_screen_map(e); - } + if ($('html').hasClass('mobile')) { + this.locate_report_mobile(e); } else { this.locate_report(e); } }, - mobile_full_screen_map: function(e) { - if ( fixmystreet.markers.getVisibility() ) { - $('#hide_pins_link').click(); - } - var permalink_id; - if ($('#map_permalink').length) { - permalink_id = 'map_permalink'; - } - fixmystreet.map.addControls([ - new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), - new OpenLayers.Control.Permalink(permalink_id), - new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) - ]); - $('#map_box').css({ - zIndex: 0, position: 'fixed', - top: 0, left: 0, right: 0, bottom: 0, - width: '100%', height: '100%', - margin: 0 - }); - - // move and alter green banner, add close button - $('#map_box').append('Close'); - $('.big-green-banner').addClass('mobile-map-banner'); - // hide site-logo (z-index madness), show sub_map_links - // and push map zoom down a notch - $('#site-logo').hide(); - $('#sub_map_links').show(); - - // need to set up a click for #close-mobile-map somehow - - fixmystreet.map.updateSize(); - fixmystreet.page = 'mobile-full-map'; - // To make sure the click control is on top - this.deactivate(); - this.activate(); - }, - - locate_report: function(e) { + locate_report_pin_and_council: function(e) { var lonlat = fixmystreet.map.getLonLatFromViewPortPx(e.xy); if (fixmystreet.page == 'new') { /* Already have a pin */ @@ -453,7 +406,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#hide_pins_link').click(); } if (fixmystreet.page == 'new') { - return; + return true; } $.getJSON('/report/new/ajax', { latitude: $('#fixmystreet\\.latitude').val(), @@ -467,6 +420,21 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#form_category').change( form_category_onchange ); } }); + return false; + }, + + locate_report_mobile: function(e) { + if (this.locate_report_pin_and_council(e)) { + return; + } + fixmystreet.page = 'new'; + location.hash = 'report'; + }, + + locate_report: function(e) { + if (this.locate_report_pin_and_council(e)) { + return; + } $('#side-form, #site-logo').show(); /* For some reason on IOS5 if you use the jQuery show method it * doesn't display the JS validation error messages unless you do this @@ -476,8 +444,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { document.getElementById('side-form').style.display = 'block'; } $('#side').hide(); - //hide lots of the map ui on mobile - $('#sub_map_links, #fms_pan_zoom, #close-mobile-map', '.mobile').hide(); heightFix('#report-a-problem-sidebar:visible', '.content', 26); // If we clicked the map somewhere inconvenient @@ -500,14 +466,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { } } - if (fixmystreet.page == 'mobile-full-map') { - lonlat.transform( - new OpenLayers.Projection("EPSG:4326"), - fixmystreet.map.getProjectionObject() - ); - fixmystreet.map.setCenter(lonlat); - } - fixmystreet.page = 'new'; location.hash = 'report'; } diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 478bf6527..8f0ba4da0 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -3,21 +3,13 @@ function set_map_config(perm) { if ($('#map_permalink').length) { permalink_id = 'map_permalink'; } - if ($('html').hasClass('mobile')) { - fixmystreet.controls = [ - new OpenLayers.Control.Attribution(), - new OpenLayers.Control.ArgParser() - ]; - $('#sub_map_links').hide(); - } else { - fixmystreet.controls = [ - new OpenLayers.Control.Attribution(), - new OpenLayers.Control.ArgParser(), - new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), - new OpenLayers.Control.Permalink(permalink_id), - new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) - ]; - } + fixmystreet.controls = [ + new OpenLayers.Control.Attribution(), + new OpenLayers.Control.ArgParser(), + new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), + new OpenLayers.Control.Permalink(permalink_id), + new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) + ]; fixmystreet.map_type = OpenLayers.Layer.Bing; } -- cgit v1.2.3 From 00115a2171a6ae6877a9ed668f84254db78574f3 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 09:50:41 +0000 Subject: For #258, immediately go full screen map on mobile around page. --- web/cobrands/fixmystreet/fixmystreet.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index ae7b2e820..85b0e6f43 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -80,13 +80,14 @@ $(function(){ //add mobile class if small screen if(Modernizr.mq('only screen and (max-width:48em)')) { $('html').addClass('mobile'); -// XXX Make map full screen here? -// if (fixmystreet.page == 'around') { -// $('#map_box').css({ -// height: $(window).height(), -// margin: 0 -// }); -// } + if (fixmystreet.page == 'around') { + // Immediately go full screen map if on around page + $('#site-header').hide(); + $('#map_box').prependTo('.wrapper').css({ + height: $(window).height(), + margin: 0 + }); + } } else { // Make map full screen on non-mobile sizes. var map_pos = 'fixed', map_height = '100%'; -- cgit v1.2.3 From d06e85bdfe2b5262ad7db359f156d40719bc9877 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 09:54:22 +0000 Subject: Remove animation from report a problem nots on mobile Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index ae7b2e820..3507dc231 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -262,14 +262,14 @@ $(function(){ $('.mobile .content').after('

').hide(); $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('BACK'); } - $('html, body').animate({scrollTop:0}, 1000); + $('html, body').scrollTop(0); }); $('.mobile').on('click', '.rap-notes-close', function(e){ e.preventDefault(); //hide notes, show .content $('.mobile .content').show(); $('.rap-notes').hide(); - $('html, body').animate({scrollTop:0}, 1000); + $('html, body').scrollTop(0); }); //move 'skip this step' link on mobile -- cgit v1.2.3 From acf90f1d126a4d8bf4d269c8241aa8631b131571 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 09:57:01 +0000 Subject: Check fixmystreet object exists, it might not. --- web/cobrands/fixmystreet/fixmystreet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 85b0e6f43..533795596 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -80,7 +80,7 @@ $(function(){ //add mobile class if small screen if(Modernizr.mq('only screen and (max-width:48em)')) { $('html').addClass('mobile'); - if (fixmystreet.page == 'around') { + if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Immediately go full screen map if on around page $('#site-header').hide(); $('#map_box').prependTo('.wrapper').css({ -- cgit v1.2.3 From 45a9ac82101fd9f26a0206df5fa2846b0b2cad5b Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 10:00:39 +0000 Subject: Fix media query discrepancy that caused ipad portrait to show mobile version Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index a78e1a241..f1c48c9e0 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -78,7 +78,7 @@ $(function(){ $('html').removeClass('no-js').addClass('js'); //add mobile class if small screen - if(Modernizr.mq('only screen and (max-width:48em)')) { + if(!Modernizr.mq('only screen and (min-width:48em)')) { $('html').addClass('mobile'); if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Immediately go full screen map if on around page -- cgit v1.2.3 From 5ce989e900d8cfffd244145c7a9e97105457752c Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 10:08:10 +0000 Subject: Fix sub_map_links shooting off the page on close for the first viewing Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index f1c48c9e0..4ff8d935a 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -351,8 +351,9 @@ $(function(){ $('#sub_map_links').prepend(' '); //set up map_links_toggle click event - var maplinks_width = $('#sub_map_links').width()+16; $('#map_links_toggle').on('click', function(){ + var maplinks_width = $('#sub_map_links').width(); + if($(this).hasClass('closed')){ $(this).removeClass('closed'); $('#sub_map_links').animate({'right':'0'}, 1200); -- cgit v1.2.3 From 36f0d997cba098be84947fbcdfcc2a0a5e73e11b Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 10:40:10 +0000 Subject: Make map ui 2* bigger (fixes #264) Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 44 +++++++++++++++-------------- web/cobrands/fixmystreet/images/sprite.png | Bin 138171 -> 138581 bytes web/cobrands/fixmystreet/layout.scss | 2 +- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 5f8f9c1bd..ba071a39b 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -920,7 +920,7 @@ a:hover.button-left { // OpenLayers fix for navigation being top right #fms_pan_zoom { - width:48px; + width:96px; right: 1em !important; top: 1em !important; left: auto !important; @@ -933,6 +933,8 @@ a:hover.button-left { #fms_pan_zoom_panright, #fms_pan_zoom_zoomin, #fms_pan_zoom_zoomout { + width:36px !important; + height:36px !important; text-indent:-999999px; opacity:0.85; background:url('images/sprite.png') no-repeat; @@ -946,38 +948,38 @@ a:hover.button-left { } #fms_pan_zoom_panup { - background-position:-25px -218px; - left:15px !important; + background-position:-42px -222px; + left:30px !important; top:0 !important; } #fms_pan_zoom_pandown { - background-position:-25px -248px; - left:15px !important; - top:36px !important; + background-position:-42px -282px; + left:30px !important; + top:72px !important; } #fms_pan_zoom_panleft { - background-position:-10px -233px; - width:24px !important; + background-position:-12px -252px; + width:48px !important; left:0px !important; - top:18px !important; + top:36px !important; } #fms_pan_zoom_panright { - background-position:-34px -233px; - width:24px !important; - left:24px !important; - top:18px !important; + background-position:-60px -252px; + width:48px !important; + left:48px !important; + top:36px !important; } #fms_pan_zoom_zoomin { - background-position:-25px -280px; - height:22px !important; - left:15px !important; - top:70px !important; + background-position:-152px -223px; + height:44px !important; + left:30px !important; + top:140px !important; } #fms_pan_zoom_zoomout { - background-position:-25px -298px; - height:22px !important; - left:15px !important; - top:92px !important; + background-position:-152px -259px; + height:44px !important; + left:30px !important; + top:184px !important; } //hide pins, show old reports etc diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index d0f05adef..cd24de1fe 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 086d3d954..4dcb7de60 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -448,7 +448,7 @@ body.twothirdswidthpage { #sub_map_links { left:auto; bottom:auto; - top:14em; + top:22em; #map_links_toggle { display:block; cursor: pointer; -- cgit v1.2.3 From 71b43e75dc218ac1595b80a9f39957a0e58f6114 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 10:48:19 +0000 Subject: Fix #261, photos need confirmed time also. --- perllib/FixMyStreet/DB/ResultSet/Problem.pm | 50 ++++++++++++++++------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index 95d6a02d4..3557e77c7 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -62,39 +62,36 @@ sub recent_new { sub recent { my ( $rs ) = @_; - my $key = "recent:$site_key"; - my $result = Memcached::get($key); - if ( $result ) { - # Need to reattach schema so that confirmed column gets reinflated. - $result->[0]->result_source->schema( $rs->result_source->schema ) if $result->[0]; - } else { - $result = [ $rs->search( { - state => [ FixMyStreet::DB::Result::Problem->visible_states() ] - }, { - columns => [ 'id', 'title', 'confirmed' ], - order_by => { -desc => 'confirmed' }, - rows => 5, - } )->all ]; - Memcached::set($key, $result, 3600); - } - return $result; + return _recent( $rs, 5 ); } sub recent_photos { my ( $rs, $num, $lat, $lon, $dist ) = @_; - my $probs; + return _recent( $rs, $num, $lat, $lon, $dist, 1); +} + +sub _recent { + my ( $rs, $num, $lat, $lon, $dist, $photos ) = @_; + + my $key = $photos ? 'recent_photos' : 'recent'; + $key .= ":$site_key:$num"; + my $query = { state => [ FixMyStreet::DB::Result::Problem->visible_states() ], - photo => { '!=', undef }, }; + $query->{photo} = { '!=', undef } if $photos; + my $attrs = { - columns => [ 'id', 'title' ], + columns => [ 'id', 'title', 'confirmed' ], order_by => { -desc => 'confirmed' }, rows => $num, }; + + my $probs; + my $new = 0; if (defined $lat) { my $dist2 = $dist; # Create a copy of the variable to stop it being stringified into a locale in the next line! - my $key = "recent_photos:$site_key:$num:$lat:$lon:$dist2"; + $key .= ":$lat:$lon:$dist2"; $probs = Memcached::get($key); unless ($probs) { $attrs->{bind} = [ $lat, $lon, $dist ]; @@ -102,16 +99,23 @@ sub recent_photos { $probs = [ mySociety::Locale::in_gb_locale { $rs->search( $query, $attrs )->all; } ]; - Memcached::set($key, $probs, 3600); + $new = 1; } } else { - my $key = "recent_photos:$site_key:$num"; $probs = Memcached::get($key); unless ($probs) { $probs = [ $rs->search( $query, $attrs )->all ]; - Memcached::set($key, $probs, 3600); + $new = 1; } } + + if ( $new ) { + Memcached::set($key, $probs, 3600); + } else { + # Need to reattach schema so that confirmed column gets reinflated. + $probs->[0]->result_source->schema( $rs->result_source->schema ) if $probs->[0]; + } + return $probs; } -- cgit v1.2.3 From aed8f7ab664b01069b2aa3b7d6539d74e5bc0a96 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 10:56:23 +0000 Subject: Move sub_map_links to bottom on desktop Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 4dcb7de60..55e6aa2de 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -448,7 +448,7 @@ body.twothirdswidthpage { #sub_map_links { left:auto; bottom:auto; - top:22em; + bottom:1em; #map_links_toggle { display:block; cursor: pointer; -- cgit v1.2.3 From 195d9b4e10132018859ff120c89819c1f94fa7ed Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 11:11:47 +0000 Subject: Bugfix. --- web/js/map-OpenLayers.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 2375d5eb8..0ed66ca53 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -406,7 +406,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#hide_pins_link').click(); } if (fixmystreet.page == 'new') { - return true; + return false; } $.getJSON('/report/new/ajax', { latitude: $('#fixmystreet\\.latitude').val(), @@ -420,7 +420,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#form_category').change( form_category_onchange ); } }); - return false; + return lonlat; }, locate_report_mobile: function(e) { @@ -432,7 +432,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }, locate_report: function(e) { - if (this.locate_report_pin_and_council(e)) { + var lonlat = this.locate_report_pin_and_council(e); + if (!lonlat) { return; } $('#side-form, #site-logo').show(); -- cgit v1.2.3 From d943a7bd4a61e7031fe82d4317641ecc6fb05c3f Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 11:12:10 +0000 Subject: All pins yellow, for #250. --- perllib/FixMyStreet/App/Controller/Around.pm | 2 +- perllib/FixMyStreet/App/Controller/Reports.pm | 2 +- perllib/FixMyStreet/Map/OSM.pm | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index ac8e0e719..e110cf8d7 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -189,7 +189,7 @@ sub display_location : Private { { latitude => $p->latitude, longitude => $p->longitude, - colour => $p->is_fixed ? 'green' : 'red', + colour => 'yellow', # $p->is_fixed ? 'green' : 'red', id => $p->id, title => $p->title, } diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 5305b23b4..f8302f93e 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -436,7 +436,7 @@ sub add_row { push @$pins, { latitude => $problem->{latitude}, longitude => $problem->{longitude}, - colour => FixMyStreet::DB::Result::Problem->fixed_states()->{$problem->{state}} ? 'green' : 'red', + colour => 'yellow', # FixMyStreet::DB::Result::Problem->fixed_states()->{$problem->{state}} ? 'green' : 'red', id => $problem->{id}, title => $problem->{title}, }; diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm index be185c35c..8ca5949d8 100644 --- a/perllib/FixMyStreet/Map/OSM.pm +++ b/perllib/FixMyStreet/Map/OSM.pm @@ -116,7 +116,10 @@ sub map_pins { # id => $p->id, # title => $p->title, #} - [ $p->latitude, $p->longitude, $p->is_fixed ? 'green' : 'red', $p->id, $p->title ] + [ $p->latitude, $p->longitude, + 'yellow', # $p->is_fixed ? 'green' : 'red', + $p->id, $p->title + ] } @$around_map, @$nearby; return (\@pins, $around_map_list, $nearby, $dist); -- cgit v1.2.3 From be88a751f3f3febe9b71d5148d68d839b7601de8 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 11:29:08 +0000 Subject: Green pin when creating, for #250. --- perllib/FixMyStreet/App/Controller/Report/New.pm | 2 +- web/js/map-OpenLayers.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 9eefc9396..a222b950d 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -1031,7 +1031,7 @@ sub generate_map : Private { pins => [ { latitude => $latitude, longitude => $longitude, - colour => 'yellow', + colour => 'green', # 'yellow', } ], ); } diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 0ed66ca53..8d8f03e37 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -392,7 +392,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { /* Already have a pin */ fixmystreet.markers.features[0].move(lonlat); } else { - var markers = fms_markers_list( [ [ lonlat.lat, lonlat.lon, 'yellow' ] ], false ); + var markers = fms_markers_list( [ [ lonlat.lat, lonlat.lon, 'green' ] ], false ); fixmystreet.bbox_strategy.deactivate(); fixmystreet.markers.removeAllFeatures(); fixmystreet.markers.addFeatures( markers ); -- cgit v1.2.3 From 6be95b8b2f9530e58652710eef0e39836980e0bc Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 11:31:00 +0000 Subject: Function return has reversed. --- web/js/map-OpenLayers.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 8d8f03e37..f9c2efcaf 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -424,7 +424,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }, locate_report_mobile: function(e) { - if (this.locate_report_pin_and_council(e)) { + var lonlat = this.locate_report_pin_and_council(e); + if (!lonlat) { return; } fixmystreet.page = 'new'; -- cgit v1.2.3 From 8a3f91c6dbbde8543aa64463967e7582494b2307 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 11:34:03 +0000 Subject: Mobile map ui moved. Also helper title text and ok/try again links added Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 79 +++++++++++++++++++-------------- web/cobrands/fixmystreet/fixmystreet.js | 8 ++++ web/cobrands/fixmystreet/layout.scss | 14 +++++- 3 files changed, 67 insertions(+), 34 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index ba071a39b..9ee3e4271 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -920,10 +920,9 @@ a:hover.button-left { // OpenLayers fix for navigation being top right #fms_pan_zoom { - width:96px; - right: 1em !important; - top: 1em !important; - left: auto !important; + right: 0.5em !important; + top: 2.75em !important; + left: 0.5em !important; } // Openlayers map controls (overrides) @@ -949,37 +948,41 @@ a:hover.button-left { #fms_pan_zoom_panup { background-position:-42px -222px; - left:30px !important; + right:30px !important; + left: auto !important; top:0 !important; } #fms_pan_zoom_pandown { background-position:-42px -282px; - left:30px !important; + right:30px !important; + left: auto !important; top:72px !important; } #fms_pan_zoom_panleft { background-position:-12px -252px; width:48px !important; - left:0px !important; + right:48px !important; + left: auto !important; top:36px !important; } #fms_pan_zoom_panright { background-position:-60px -252px; width:48px !important; - left:48px !important; + right:0 !important; + left: auto !important; top:36px !important; } #fms_pan_zoom_zoomin { background-position:-152px -223px; height:44px !important; - left:30px !important; - top:140px !important; + left:0 !important; + top:0 !important; } #fms_pan_zoom_zoomout { background-position:-152px -259px; height:44px !important; - left:30px !important; - top:184px !important; + left:0 !important; + top:44px !important; } //hide pins, show old reports etc @@ -996,15 +999,18 @@ a:hover.button-left { font-size:0.6875em; color:#fff; padding:0.6em 3em 0.5em 1em; - background:url('images/sprite.png') right -3976px no-repeat; + background-repeat:no-repeat; &#hide_pins_link { - background-position:right -3976px; + background-image:url('images/sprite.png'); + background-position: right -3976px; } &#all_pins_link { - background-position:right -4022px; + background-image:url('images/sprite.png'); + background-position: right -4022px; } &#map_permalink { - background-position:right -4070px; + background-image:url('images/sprite.png'); + background-position: right -4070px; } &:hover { background-color:#000; @@ -1012,29 +1018,36 @@ a:hover.button-left { } } } -//close the mobile map span -#close-mobile-map { - cursor:pointer ; - position:absolute; - top:3.5em; - left:1em; - z-index:1000; - display:block; - width:30px; - height:30px; - text-indent:-999999px; - opacity: 0.85; - background:url('images/sprite.png') -105px -284px no-repeat; - &:hover { - opacity:1; + +#mob_sub_map_links { + position: absolute; + z-index:1100; + bottom:0; + display:table; + margin:0; + width:100%; + background:rgba(0, 0, 0, 0.7); + a { + color:#fff; + width:50%; + padding:0.5em 0; + font-size:1em; + display:table-cell; + text-align:center; + &:hover { + background:#000; + text-decoration:none; + } } } .mobile-map-banner { - position: fixed; - top:-0.65em; + margin:0; + position: absolute; + top:0; left:0; right:0; + font-size:0.75em; background:rgba(0, 0, 0, 0.7); } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 4ff8d935a..912ea024b 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -87,6 +87,14 @@ $(function(){ height: $(window).height(), margin: 0 }); + $('.big-green-banner').addClass('mobile-map-banner').removeClass('.big-green-banner'); + $('#sub_map_links').hide(); + $('#map_box').append( + '

'+ + 'Try again?'+ + 'OK'+ + '

' + ); } } else { // Make map full screen on non-mobile sizes. diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 55e6aa2de..94cae722a 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -442,7 +442,19 @@ body.twothirdswidthpage { // Pull OpenLayers navigation down a bit #fms_pan_zoom { - top: 5em !important; + top: 4.75em !important; +} + +// push zoom back over to right +#fms_pan_zoom_zoomin { + left:auto !important; + right:30px; + top:130px !important; +} +#fms_pan_zoom_zoomout { + left:auto !important; + right:30px; + top:174px !important; } #sub_map_links { -- cgit v1.2.3 From e112859ac4712942a7da177a1882ca4ef1ea44cf Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 11:36:53 +0000 Subject: Fix map ui on tablet media query Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/layout.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 94cae722a..dc2ad5978 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -903,6 +903,10 @@ body.frontpage { #site-header { height:6em; } + // Pull OpenLayers navigation down a bit more + #fms_pan_zoom { + top: 7em !important; + } //fix the left margin on login bit #user-meta { -- cgit v1.2.3 From 5e9d0e7f7ad547d059025e152ca64fe294b67eea Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 11:56:18 +0000 Subject: Move disappearing of sub map links and appearing of tryagain/ok to after the click, also remove permalink and add receive updates Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 4 ++++ web/cobrands/fixmystreet/fixmystreet.js | 16 ++++++---------- web/cobrands/fixmystreet/images/sprite.png | Bin 138581 -> 138816 bytes web/js/map-OpenLayers.js | 8 ++++++++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 9ee3e4271..95a5357cb 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1012,6 +1012,10 @@ a:hover.button-left { background-image:url('images/sprite.png'); background-position: right -4070px; } + &.feed { + background-image:url('images/sprite.png'); + background-position: right -3936px; + } &:hover { background-color:#000; text-decoration:none; diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 912ea024b..f68a80e5a 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -87,14 +87,7 @@ $(function(){ height: $(window).height(), margin: 0 }); - $('.big-green-banner').addClass('mobile-map-banner').removeClass('.big-green-banner'); - $('#sub_map_links').hide(); - $('#map_box').append( - '

'+ - 'Try again?'+ - 'OK'+ - '

' - ); + $('.big-green-banner').addClass('mobile-map-banner').removeClass('.big-green-banner').text('Place pin on map'); } } else { // Make map full screen on non-mobile sizes. @@ -352,9 +345,12 @@ $(function(){ $('

').insertAfter($('#map')); } - //add permalink + //add permalink on desktop, force hide on mobile $('#sub_map_links').append('Permalink'); - + if($('.mobile').length){ + $('#map_permalink').hide(); + $('#key-tools a.feed').appendTo('#sub_map_links'); + } //add open/close toggle button on desk $('#sub_map_links').prepend(' '); diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index cd24de1fe..68fcb652f 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index f9c2efcaf..22183668d 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -430,6 +430,14 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { } fixmystreet.page = 'new'; location.hash = 'report'; + $('#sub_map_links').hide(); + $('#map_box').append( + '

'+ + 'Try again'+ + 'OK'+ + '

' + ); + $('.mobile-map-banner').text('Right place?'); }, locate_report: function(e) { -- cgit v1.2.3 From 4b87bd21bd46801807213a4aa54d533b2dbf49ce Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 12:27:20 +0000 Subject: Try again link for #258 Signed-off-by: Josh Angell --- web/js/map-OpenLayers.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 22183668d..390384733 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -267,6 +267,9 @@ $(function(){ $('#side').show(); $('#sub_map_links').show(); heightFix('#report-a-problem-sidebar:visible', '.content', 26); + //only on mobile + $('.mobile #mob_sub_map_links').remove(); + $('.mobile-map-banner').text('Place pin on map'); fixmystreet.page = 'around'; }); @@ -434,7 +437,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#map_box').append( '

'+ 'Try again'+ - 'OK'+ + 'OK'+ '

' ); $('.mobile-map-banner').text('Right place?'); -- cgit v1.2.3 From e2a347ad816f7f77ef9d06dd553f03ae22fb4636 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 12:39:50 +0000 Subject: Mobile JS can be same as desktop now. --- web/js/map-OpenLayers.js | 47 +++++++++++++---------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 390384733..ef12a71a4 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -268,7 +268,7 @@ $(function(){ $('#sub_map_links').show(); heightFix('#report-a-problem-sidebar:visible', '.content', 26); //only on mobile - $('.mobile #mob_sub_map_links').remove(); + $('#mob_sub_map_links').remove(); $('.mobile-map-banner').text('Place pin on map'); fixmystreet.page = 'around'; }); @@ -382,14 +382,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }, trigger: function(e) { - if ($('html').hasClass('mobile')) { - this.locate_report_mobile(e); - } else { - this.locate_report(e); - } - }, - - locate_report_pin_and_council: function(e) { var lonlat = fixmystreet.map.getLonLatFromViewPortPx(e.xy); if (fixmystreet.page == 'new') { /* Already have a pin */ @@ -409,7 +401,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#hide_pins_link').click(); } if (fixmystreet.page == 'new') { - return false; + return; } $.getJSON('/report/new/ajax', { latitude: $('#fixmystreet\\.latitude').val(), @@ -423,31 +415,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#form_category').change( form_category_onchange ); } }); - return lonlat; - }, - - locate_report_mobile: function(e) { - var lonlat = this.locate_report_pin_and_council(e); - if (!lonlat) { - return; - } - fixmystreet.page = 'new'; - location.hash = 'report'; - $('#sub_map_links').hide(); - $('#map_box').append( - '

'+ - 'Try again'+ - 'OK'+ - '

' - ); - $('.mobile-map-banner').text('Right place?'); - }, - locate_report: function(e) { - var lonlat = this.locate_report_pin_and_council(e); - if (!lonlat) { - return; - } $('#side-form, #site-logo').show(); /* For some reason on IOS5 if you use the jQuery show method it * doesn't display the JS validation error messages unless you do this @@ -479,6 +447,17 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { } } + if ($('html').hasClass('mobile')) { + $('#sub_map_links').hide(); + $('#map_box').append( + '

' + + 'Try again' + + 'OK' + + '

' + ); + $('.mobile-map-banner').text('Right place?'); + } + fixmystreet.page = 'new'; location.hash = 'report'; } -- cgit v1.2.3 From 2690a3d248b78ec53429077dae974fc741e68831 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 12:47:42 +0000 Subject: Some language changes to fix sub_map_links breaking Signed-off-by: Josh Angell --- templates/web/default/around/display_location.html | 4 ++-- templates/web/fixmystreet/around/display_location.html | 6 +++--- templates/web/fixmystreet/report/display.html | 2 +- templates/web/fixmystreet/reports/council.html | 2 +- web/js/map-OpenLayers.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 329f74441..27f54f346 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -55,9 +55,9 @@ [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] | [% IF c.req.params.all_pins %] - [% loc('Hide old reports') %] + [% loc('Hide old') %] [% ELSE %] - [% loc('Include old reports') %] + [% loc('Show old') %] [% END %] [% END %]

diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index f955386e2..0fdee465c 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -55,9 +55,9 @@ [% END %] [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %] [% IF c.req.params.all_pins %] - [% loc('Hide old reports') %] + [% loc('Hide old') %] [% ELSE %] - [% loc('Include old reports') %] + [% loc('Show old') %] [% END %] [% END %]

@@ -82,7 +82,7 @@

Receive Updates
Get updates

diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index cc29795a7..92a177ffc 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -30,7 +30,7 @@

diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 00126d326..22e55aa43 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -50,7 +50,7 @@ [% ELSE %]

[% END %] diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 390384733..cc21a0fae 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -172,7 +172,7 @@ function fixmystreet_onload() { e.preventDefault(); fixmystreet.markers.setVisibility(true); var texts = [ - 'en', 'Include old reports', 'Hide old reports', + 'en', 'Show old', 'Hide old', 'nb', 'Inkluder utdaterte problemer', 'Skjul utdaterte rapporter', 'cy', 'Cynnwys hen adroddiadau', 'Cuddio hen adroddiadau' ]; -- cgit v1.2.3 From 13d3f671611fe75736247d8a1db54ebd349a81e6 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 12:53:23 +0000 Subject: Linter fix Signed-off-by: Josh Angell --- web/js/map-OpenLayers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 6fb0a7616..89059eae9 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -437,7 +437,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { new OpenLayers.Projection("EPSG:4326"), fixmystreet.map.getProjectionObject() ); - var p = fixmystreet.map.getViewPortPxFromLonLat(lonlat) + var p = fixmystreet.map.getViewPortPxFromLonLat(lonlat); p.x -= $(window).width() / 3; lonlat = fixmystreet.map.getLonLatFromViewPortPx(p); fixmystreet.map.panTo(lonlat); -- cgit v1.2.3 From 634fd777c49947a71cb7d653382963381cd2b385 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 12:56:09 +0000 Subject: Move mobile map banner out of #side and into #map_box so it doesn't disappear Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index f68a80e5a..3f6b5c721 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -87,7 +87,11 @@ $(function(){ height: $(window).height(), margin: 0 }); - $('.big-green-banner').addClass('mobile-map-banner').removeClass('.big-green-banner').text('Place pin on map'); + $('.big-green-banner') + .addClass('mobile-map-banner') + .removeClass('.big-green-banner') + .appendTo('#map_box') + .text('Place pin on map'); } } else { // Make map full screen on non-mobile sizes. -- cgit v1.2.3 From dfc33031a0a18d60929369d6ce44a730a9162b07 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 13:03:51 +0000 Subject: Use offset for skip to nave on mobile Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 3f6b5c721..a9341d949 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -303,8 +303,8 @@ $(function(){ */ $('.mobile').on('click', '#nav-link', function(e){ e.preventDefault(); - var foo = $('.wrapper').height() - 500; - $('html, body').animate({scrollTop:foo}, 1000); + var offset = $('#main-nav').offset().top; + $('html, body').animate({scrollTop:offset}, 1000); }); -- cgit v1.2.3 From e76b6ded6b23e4c8e133605841f1aba9291c55eb Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 13:17:40 +0000 Subject: Initial scroll event for when user clicks ok on mobile map, also altered how the Notes scroll so they use offset instead Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 4 ++-- web/js/map-OpenLayers.js | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index a9341d949..cdf1c6af7 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -268,14 +268,14 @@ $(function(){ $('.mobile .content').after('

').hide(); $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('BACK'); } - $('html, body').scrollTop(0); + $('html, body').scrollTop($('#report-a-problem-sidebar').offset().top); }); $('.mobile').on('click', '.rap-notes-close', function(e){ e.preventDefault(); //hide notes, show .content $('.mobile .content').show(); $('.rap-notes').hide(); - $('html, body').scrollTop(0); + $('html, body').scrollTop($('#report-a-problem-main').offset().top); }); //move 'skip this step' link on mobile diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 89059eae9..7b0cc936b 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -456,6 +456,13 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { '

' ); $('.mobile-map-banner').text('Right place?'); + + // mobile user clicks 'ok' on map + $('#mob_ok').on('click', function(e){ + e.preventDefault(); + var height = $('#map_box').height(); + $('html, body').animate({scrollTop:height}, 1000); + }); } fixmystreet.page = 'new'; -- cgit v1.2.3 From 890417a33a07bc70953e30c0709868632a7d249c Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 13:17:40 +0000 Subject: Initial scroll event for when user clicks ok on mobile map, also altered how the Notes scroll so they use offset instead Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 4 ++-- web/js/map-OpenLayers.js | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index a9341d949..cdf1c6af7 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -268,14 +268,14 @@ $(function(){ $('.mobile .content').after('

').hide(); $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('BACK'); } - $('html, body').scrollTop(0); + $('html, body').scrollTop($('#report-a-problem-sidebar').offset().top); }); $('.mobile').on('click', '.rap-notes-close', function(e){ e.preventDefault(); //hide notes, show .content $('.mobile .content').show(); $('.rap-notes').hide(); - $('html, body').scrollTop(0); + $('html, body').scrollTop($('#report-a-problem-main').offset().top); }); //move 'skip this step' link on mobile diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 89059eae9..87400c9d8 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -456,6 +456,16 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { '

' ); $('.mobile-map-banner').text('Right place?'); + + // mobile user clicks 'ok' on map + $('#mob_ok').on('click', function(e){ + e.preventDefault(); + //scroll the height of the map box instead of the offset + //of the #side-form or whatever as we will probably want + //to do this on other pages where #side-form might not be + var height = $('#map_box').height(); + $('html, body').animate({scrollTop:height}, 1000); + }); } fixmystreet.page = 'new'; -- cgit v1.2.3 From 5eddd423bcf5c17a0a9e6740cfec979a1232b558 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 14:44:19 +0000 Subject: Don't say we're a webapp, as we quite like the back button, fixes #267. --- templates/web/fixmystreet/header.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 3bd42b1b2..878118afc 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -7,8 +7,6 @@ - - -- cgit v1.2.3 From d6d3a2904cafa7236b5426a9d19f0807c28e153f Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 15:39:53 +0000 Subject: Move popups to come out of the middle of the pin. --- web/js/map-OpenLayers.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 87400c9d8..b50f8c30f 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -134,7 +134,8 @@ function fixmystreet_onload() { feature.geometry.getBounds().getCenterLonLat(), null, feature.attributes.title + "
More details", - null, true, onPopupClose); + { size: new OpenLayers.Size(0,0), offset: new OpenLayers.Pixel(0,-40) }, + true, onPopupClose); feature.popup = popup; fixmystreet.map.addPopup(popup); }); -- cgit v1.2.3 From e56fd090eeb9667c90b9709dfa0c8045a45f27e2 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 15:40:39 +0000 Subject: Better way of fixing size of map, and hide URL bar, fixes #266 (not sure we'll keep it though). --- web/cobrands/fixmystreet/fixmystreet.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index cdf1c6af7..f97476910 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -84,7 +84,9 @@ $(function(){ // Immediately go full screen map if on around page $('#site-header').hide(); $('#map_box').prependTo('.wrapper').css({ - height: $(window).height(), + position: 'absolute', + top: 0, left: 0, right: 0, bottom: 0, + height: 'auto', margin: 0 }); $('.big-green-banner') @@ -371,3 +373,14 @@ $(function(){ } }); }); + +// Hide URL bar +$(window).load(function(){ + window.setTimeout(function(){ + var s = window.pageYOffset || document.compatMode === "CSS1Compat" && document.documentElement.scrollTop || document.body.scrollTop || 0; + if (s < 20 && !location.hash) { + window.scrollTo(0, 1); + } + }, 0); +}); + -- cgit v1.2.3 From 44fa0d98123ea920ec3f7cca12e482af280b4a86 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 15:44:35 +0000 Subject: Disable URL bar hiding. --- web/cobrands/fixmystreet/fixmystreet.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index f97476910..39ab7b2b4 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -374,6 +374,8 @@ $(function(){ }); }); +/* +XXX Disabled because jerky on Android and makes map URL bar height too small on iPhone. // Hide URL bar $(window).load(function(){ window.setTimeout(function(){ @@ -383,4 +385,5 @@ $(window).load(function(){ } }, 0); }); +*/ -- cgit v1.2.3 From 0b06d212c635a6696c41e339e56b1e0c058f10a1 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 15:46:25 +0000 Subject: Add class for when map is 'complete' Signed-off-by: Josh Angell --- web/js/map-OpenLayers.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 87400c9d8..2328fc6a3 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -451,7 +451,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('#sub_map_links').hide(); $('#map_box').append( '

' + - 'Try again' + + 'Try again' + 'OK' + '

' ); @@ -465,6 +465,9 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { //to do this on other pages where #side-form might not be var height = $('#map_box').height(); $('html, body').animate({scrollTop:height}, 1000); + + //add this class so we can modify the look of the links inside + $('#mob_sub_map_links').addClass('map_complete'); }); } -- cgit v1.2.3 From f00eaa221cdefd6d2d70c8c2029df801bc0d0420 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 15:50:01 +0000 Subject: Remember pin hiding state in case they try again. --- web/js/map-OpenLayers.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index b50f8c30f..d4aa51a34 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -263,6 +263,10 @@ $(function(){ // Okay, back to around view. fixmystreet.bbox_strategy.activate(); fixmystreet.markers.refresh( { force: true } ); + if ( fixmystreet.state_pins_were_hidden ) { + // If we had pins hidden when we clicked map (which had to show the pin layer as I'm doing it in one layer), hide them again. + $('#hide_pins_link').click(); + } fixmystreet.drag.deactivate(); $('#side-form').hide(); $('#side').show(); @@ -399,6 +403,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { // link so that it updates the text in case they go // back if ( ! fixmystreet.markers.getVisibility() ) { + fixmystreet.state_pins_were_hidden = true; $('#hide_pins_link').click(); } if (fixmystreet.page == 'new') { -- cgit v1.2.3 From 23767d9095367d50134ce1930632225566fbce19 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 15:59:02 +0000 Subject: Examples that work. --- templates/web/fixmystreet/alert/index.html | 2 +- templates/web/fixmystreet/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index c7bcf248d..21ea076d8 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -21,7 +21,7 @@ within a certain distance of a particular location.') %] -- cgit v1.2.3 From be80850df588e2d69bc2cde5e70464557230bce2 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 16:03:58 +0000 Subject: Hack to push form underneath abs. positioned map. --- web/cobrands/fixmystreet/fixmystreet.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 39ab7b2b4..c8422ac31 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -89,6 +89,9 @@ $(function(){ height: 'auto', margin: 0 }); + $('#side-form').css({ + paddingTop: $(window).height() + }); $('.big-green-banner') .addClass('mobile-map-banner') .removeClass('.big-green-banner') -- cgit v1.2.3 From aed77780b3b363512fa0effd36e0c60d62397fac Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 16:11:01 +0000 Subject: Initial styles for mobile completed map buttons Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 22 ++++++++++++++++++++++ web/cobrands/fixmystreet/images/sprite.png | Bin 138816 -> 138744 bytes web/js/map-OpenLayers.js | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 95a5357cb..efe50d6ff 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1043,6 +1043,28 @@ a:hover.button-left { text-decoration:none; } } + &.map_complete { + background:none; + display:block; + border-bottom:4px solid #fff; + a#try_again { + display:block; + margin:0 auto 6em auto; + background:rgba(0, 0, 0, 0.8); + @include border-radius(0.5em); + } + a#mob_ok { + position:absolute; + right:1em; + bottom:0; + height:20px; + padding-top:30px; + display:block; + width:4em; + background:#fff url('images/sprite.png') 12px -4140px no-repeat; + color:#000; + } + } } .mobile-map-banner { diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index 68fcb652f..d0839890a 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 4c789cc19..3a6cec3e5 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -470,10 +470,11 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { //of the #side-form or whatever as we will probably want //to do this on other pages where #side-form might not be var height = $('#map_box').height(); - $('html, body').animate({scrollTop:height}, 1000); + $('html, body').animate({scrollTop:height-60}, 1000); //add this class so we can modify the look of the links inside $('#mob_sub_map_links').addClass('map_complete'); + $('#mob_ok').text('MAP'); }); } -- cgit v1.2.3 From 008a592f0a599f0af7ccc1358e3c921e836587bf Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 16:23:32 +0000 Subject: Pad top of rap-notes to window height to account for the map going full=screen over the top Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index c8422ac31..af8ad2cff 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -271,6 +271,9 @@ $(function(){ }else{ //if not, move them and show, hiding .content $('.mobile .content').after('

').hide(); + $('.rap-notes').css({ + paddingTop: $(window).height() + }); $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('BACK'); } $('html, body').scrollTop($('#report-a-problem-sidebar').offset().top); -- cgit v1.2.3 From d04f5d84ca070718e5ce28ab8c45db5bec03c442 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 16:25:54 +0000 Subject: Change links once the scrolling is complete, not before. --- web/js/map-OpenLayers.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 3a6cec3e5..9d5b474f1 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -470,11 +470,12 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { //of the #side-form or whatever as we will probably want //to do this on other pages where #side-form might not be var height = $('#map_box').height(); - $('html, body').animate({scrollTop:height-60}, 1000); + $('html, body').animate({scrollTop:height-60}, 1000, function(){ + //add this class so we can modify the look of the links inside + $('#mob_sub_map_links').addClass('map_complete'); + $('#mob_ok').text('MAP'); + }); - //add this class so we can modify the look of the links inside - $('#mob_sub_map_links').addClass('map_complete'); - $('#mob_ok').text('MAP'); }); } -- cgit v1.2.3 From d180953fab70128ce1e8215d98177456482d6051 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 1 Mar 2012 16:35:07 +0000 Subject: Add scroll to top js when map is completed on mobile Signed-off-by: Josh Angell --- web/js/map-OpenLayers.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 3a6cec3e5..414bb1fc5 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -469,8 +469,12 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { //scroll the height of the map box instead of the offset //of the #side-form or whatever as we will probably want //to do this on other pages where #side-form might not be - var height = $('#map_box').height(); - $('html, body').animate({scrollTop:height-60}, 1000); + if($(this).parent().hasClass('map_complete')){ + $('html, body').animate({scrollTop:0}, 1000); + }else{ + var height = $('#map_box').height(); + $('html, body').animate({scrollTop:height-60}, 1000); + } //add this class so we can modify the look of the links inside $('#mob_sub_map_links').addClass('map_complete'); -- cgit v1.2.3 From 2e697be14d06a9ef1bfe0bdb97b7820fb04d45c2 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 20:35:56 +0000 Subject: Allow back button to work when reading mobile reporting notes, fixes #260. --- web/cobrands/fixmystreet/fixmystreet.js | 14 ++++++++------ web/js/map-OpenLayers.js | 10 +++++++++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index af8ad2cff..427e2f9cc 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -261,29 +261,31 @@ $(function(){ //show/hide notes on mobile $('.mobile #report-a-problem-sidebar').after('How to send successful reports').hide(); - $('.mobile').on('click', '.rap-notes-trigger', function(e){ + $('.rap-notes-trigger').click(function(e){ e.preventDefault(); //check if we've already moved the notes if($('.rap-notes').length > 0){ //if we have, show and hide .content - $('.mobile .content').hide(); + $('.content').hide(); $('.rap-notes').show(); }else{ //if not, move them and show, hiding .content - $('.mobile .content').after('

').hide(); + $('.content').after('

').hide(); $('.rap-notes').css({ paddingTop: $(window).height() }); - $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('BACK'); + $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('Back'); } $('html, body').scrollTop($('#report-a-problem-sidebar').offset().top); + location.hash = 'rap-notes'; }); $('.mobile').on('click', '.rap-notes-close', function(e){ e.preventDefault(); //hide notes, show .content - $('.mobile .content').show(); + $('.content').show(); $('.rap-notes').hide(); - $('html, body').scrollTop($('#report-a-problem-main').offset().top); + $('html, body').scrollTop($('#mob_ok').offset().top); + location.hash = 'report'; }); //move 'skip this step' link on mobile diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index abee9ebfa..aec9b69b1 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -259,7 +259,15 @@ $(function(){ } $(window).hashchange(function(){ - if (location.hash) { return; } + if (location.hash == '#report' && $('.rap-notes').is(':visible')) { + $('.rap-notes-close').click(); + return; + } + + if (location.hash) { + return; + } + // Okay, back to around view. fixmystreet.bbox_strategy.activate(); fixmystreet.markers.refresh( { force: true } ); -- cgit v1.2.3 From 2d41451cda490536e4012a1b7a5e4ce49d3a175e Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 20:50:24 +0000 Subject: Add 'below' to fix #244, rearrange note slightly to be in better place. --- perllib/FixMyStreet/DB/Result/Problem.pm | 2 +- templates/web/default/js_validation_msgs.html | 2 +- .../web/fixmystreet/report/new/fill_in_details_form.html | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 7ceabf1da..d0867c5ca 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -329,7 +329,7 @@ sub check_for_errors { || $self->name =~ m/\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i ) { $errors{name} = _( -'Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box' +'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below' ); } diff --git a/templates/web/default/js_validation_msgs.html b/templates/web/default/js_validation_msgs.html index 0263f75ce..f89ab4bcc 100644 --- a/templates/web/default/js_validation_msgs.html +++ b/templates/web/default/js_validation_msgs.html @@ -5,7 +5,7 @@ detail: '[% loc('Please enter some details') %]', name: { required: '[% loc('Please enter your name') %]', - validName: '[% loc('Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box') %]' + validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]' }, category: '[% loc('Please choose a category') %]', rznvy: { 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 61305ac80..4578deaf3 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -172,18 +172,17 @@ [% END %] - - - [%# if there is nothing in the name field then set check box as default on form %]

[% loc('Show my name publicly') %]

+ + [% loc('Your phone number (optional)') %] -- cgit v1.2.3 From c00e4b4e097d29e1d7c3b4913a75978f5a49599c Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 21:00:17 +0000 Subject: Fix #245 and default to logged in name if we've got one. --- templates/web/fixmystreet/around/display_location.html | 1 + web/cobrands/fixmystreet/base.scss | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index 0fdee465c..6c78a0c01 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -116,6 +116,7 @@ [% INCLUDE "report/new/fill_in_details_form.html" js = 1, report.used_map = 1 + report.name = c.user.name %]

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index efe50d6ff..731127897 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -509,7 +509,6 @@ p.label-valid { } // this is the user's logged in details or the login link etc #user-meta { - display:table-caption; p { position: relative; background:$primary; @@ -1357,4 +1356,4 @@ ul.breadcrumb { border-bottom:none; margin-bottom:0; } -} \ No newline at end of file +} -- cgit v1.2.3 From bddd00fa75258c07e94ac9a668725d7f847c4c1f Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 21:22:23 +0000 Subject: Preload the new report pin, for #239. --- web/cobrands/fixmystreet/fixmystreet.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 427e2f9cc..074b69a9e 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -77,6 +77,9 @@ function tabs(elem) $(function(){ $('html').removeClass('no-js').addClass('js'); + // Preload the new report pin + document.createElement('img').src = '/i/pin-green.png'; + //add mobile class if small screen if(!Modernizr.mq('only screen and (min-width:48em)')) { $('html').addClass('mobile'); -- cgit v1.2.3 From 7b373378a67a760e5486393c031cb1d9ac265df1 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 1 Mar 2012 21:35:55 +0000 Subject: No password box needed if signed in, shrink placeholders a bit to fix #243, correct some wording. --- templates/web/fixmystreet/auth/general.html | 4 ++-- templates/web/fixmystreet/report/display.html | 8 ++++---- .../web/fixmystreet/report/new/fill_in_details_form.html | 13 +++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html index a0cb80726..556d5bb3c 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -52,10 +52,10 @@ [% loc('Your name') %] - [% loc('Enter a new password (optional)') %] + [% loc('Enter a password (optional)') %]

- +

diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 92a177ffc..b3cfcff6a 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -132,7 +132,7 @@

[% loc("Now to submit your report…") %]

[% loc("Now to submit your update…") %]

[% loc("Do you have a FixMyStreet password?") %]

@@ -157,10 +157,10 @@ [% INCLUDE name %] - [% loc('Enter a new password (optional)') %] + [% loc('Enter a password (optional)') %]

- +

@@ -195,4 +195,4 @@ [% loc( 'Alert me to future updates' ) %]

-[% END %] \ No newline at end of file +[% END %] 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 4578deaf3..63a78a158 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -65,7 +65,7 @@ [% IF field_errors.detail %]

[% field_errors.detail %]

[% END %] - + [% IF js %]

@@ -122,13 +122,14 @@ [% loc('Show my name publicly') %]

+ + [% loc('Your phone number (optional)') %] - [% loc('Enter a new password (optional)') %] -

@@ -186,10 +187,10 @@ [% loc('Your phone number (optional)') %] - [% loc('Enter a new password (optional)') %] + [% loc('Enter a password (optional)') %]

- +

-- cgit v1.2.3 From 55409fb82ab2d75216255f77938632cb54d47fef Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 01:05:00 +0000 Subject: Get test suite all passing again, and fix bug displaying partial photo and my stupid use of c as a variable. --- perllib/FixMyStreet/App/Controller/Report/New.pm | 2 +- perllib/FixMyStreet/Cobrand/FixMyStreet.pm | 31 ++++++++++++++++++++++ perllib/FixMyStreet/Cobrand/UKCouncils.pm | 2 +- perllib/FixMyStreet/TestMech.pm | 2 ++ t/app/controller/admin.t | 2 ++ t/app/controller/report_new.t | 12 ++++----- t/app/controller/report_updates.t | 8 +++--- t/app/model/problem.t | 4 +-- t/map/tilma/original.t | 14 +++++----- templates/web/fixmystreet/around/around_index.html | 4 +-- templates/web/fixmystreet/report/display.html | 3 +-- .../fixmystreet/report/new/fill_in_details.html | 8 +++--- 12 files changed, 63 insertions(+), 29 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index a222b950d..12b48a99b 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -23,7 +23,7 @@ FixMyStreet::App::Controller::Report::New =head1 DESCRIPTION -Create a new report, or complete a partial one . +Create a new report, or complete a partial one. =head1 PARAMETERS diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm index 242194e01..97b4c3c8b 100644 --- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm +++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm @@ -1,5 +1,36 @@ package FixMyStreet::Cobrand::FixMyStreet; use base 'FixMyStreet::Cobrand::Default'; +# FixMyStreet should return all cobrands +sub restriction { + return {}; +} + +sub generate_problem_banner { + my ( $self, $problem ) = @_; + + my $banner = {}; + if ( $problem->is_open && time() - $problem->lastupdate_local->epoch > 8 * 7 * 24 * 60 * 60 ) + { + $banner->{id} = 'unknown'; + $banner->{text} = _('Unknown'); + } + if ($problem->is_fixed) { + $banner->{id} = 'fixed'; + $banner->{text} = _('Fixed'); + } + if ($problem->is_closed) { + $banner->{id} = 'closed'; + $banner->{text} = _('Closed'); + } + + if ( grep { $problem->state eq $_ } ( 'investigating', 'in progress', 'planned' ) ) { + $banner->{id} = 'progress'; + $banner->{text} = _('In progress'); + } + + return $banner; +} + 1; diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm index 9aaa8eca0..570c90c46 100644 --- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm +++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm @@ -1,5 +1,5 @@ package FixMyStreet::Cobrand::UKCouncils; -use base 'FixMyStreet::Cobrand::FixMyStreet'; +use base 'FixMyStreet::Cobrand::Default'; use strict; use warnings; diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index 185b59daa..a8cbc98f2 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -224,6 +224,7 @@ sub form_errors { my $mech = shift; my $result = scraper { process 'div.form-error', 'errors[]', 'TEXT'; + process 'p.form-error', 'errors[]', 'TEXT'; } ->scrape( $mech->response ); return $result->{errors} || []; @@ -365,6 +366,7 @@ sub extract_problem_banner { my $result = scraper { process 'div#side > p.banner', id => '@id', text => 'TEXT'; + process 'div.banner > p', id => '@id', text => 'TEXT'; } ->scrape( $mech->response ); diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index 0a6f09585..d8a1c24a1 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -79,6 +79,8 @@ my $alert = FixMyStreet::App->model('DB::Alert')->find_or_create( subtest 'check summary counts' => sub { my $problems = FixMyStreet::App->model('DB::Problem')->search( { state => { -in => [qw/confirmed fixed closed investigating planned/, 'in progress', 'fixed - user', 'fixed - council'] } } ); + ok $mech->host('www.fixmystreet.com'); + my $problem_count = $problems->count; $problems->update( { cobrand => '' } ); diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 076813868..6da9afa24 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -191,7 +191,7 @@ foreach my $test ( changes => {}, errors => [ 'Please enter your email', -'Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box', +'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below', ], }, { @@ -213,7 +213,7 @@ foreach my $test ( changes => {}, errors => [ 'Please enter your email', -'Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box', +'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below', ], }, { @@ -360,7 +360,7 @@ foreach my $test ( "submit location" ); # click through to the report page - $mech->follow_link_ok( { text => 'skip this step', }, + $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" ); $mech->submit_form_ok( @@ -473,7 +473,7 @@ subtest "test password errors for a user who is signing in as they report" => su "submit location" ); # click through to the report page - $mech->follow_link_ok( { text => 'skip this step', }, + $mech->follow_link_ok( { text => 'Skip this step', }, "follow 'skip this step' link" ); $mech->submit_form_ok( @@ -520,7 +520,7 @@ subtest "test report creation for a user who is signing in as they report" => su "submit location" ); # click through to the report page - $mech->follow_link_ok( { text => 'skip this step', }, + $mech->follow_link_ok( { text => 'Skip this step', }, "follow 'skip this step' link" ); $mech->submit_form_ok( @@ -614,7 +614,7 @@ foreach my $test ( "submit location" ); # click through to the report page - $mech->follow_link_ok( { text => 'skip this step', }, + $mech->follow_link_ok( { text => 'Skip this step', }, "follow 'skip this step' link" ); # check that the fields are correctly prefilled diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 39cb5d6d8..99f1ba62d 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -826,7 +826,7 @@ for my $test ( update => 'Update from a registered user' }, initial_banner => undef, - endstate_banner => ' This problem has been fixed. ', + endstate_banner => 'Fixed', alert => 1, anonymous => 0, }, @@ -848,8 +848,8 @@ for my $test ( changed => { update => 'Another update from a registered user' }, - initial_banner => ' This problem has been fixed. ', - endstate_banner => ' This problem has been fixed. ', + initial_banner => 'Fixed', + endstate_banner => 'Fixed', alert => 0, anonymous => 0, }, @@ -953,7 +953,7 @@ foreach my $test ( fixed => 1, }, changed => { update => 'Update from owner' }, - initial_banner => ' This problem is in progress. ', + initial_banner => 'In progress', initial_state => 'in progress', alert => 1, # we signed up for alerts before, do not unsign us anonymous => 0, diff --git a/t/app/model/problem.t b/t/app/model/problem.t index ad42c5fdf..638e89200 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -56,7 +56,7 @@ for my $test ( title => 'Please enter a subject', detail => 'Please enter some details', council => 'No council selected', - name => 'Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box', + name => 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below', } }, { @@ -68,7 +68,7 @@ for my $test ( title => 'Please enter a subject', detail => 'Please enter some details', council => 'No council selected', - name => 'Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box', + name => 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below', } }, { diff --git a/t/map/tilma/original.t b/t/map/tilma/original.t index 3add7719e..04c4d578c 100644 --- a/t/map/tilma/original.t +++ b/t/map/tilma/original.t @@ -56,31 +56,31 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( for my $test ( { state => 'fixed', - colour => 'green', + colour => 'yellow', }, { state => 'fixed - user', - colour => 'green', + colour => 'yellow', }, { state => 'fixed - council', - colour => 'green', + colour => 'yellow', }, { state => 'confirmed', - colour => 'red', + colour => 'yellow', }, { state => 'investigating', - colour => 'red', + colour => 'yellow', }, { state => 'planned', - colour => 'red', + colour => 'yellow', }, { state => 'in progress', - colour => 'red', + colour => 'yellow', }, ) { subtest "pin colour for state $test->{state}" => sub { diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html index 95577134a..7207a7292 100644 --- a/templates/web/fixmystreet/around/around_index.html +++ b/templates/web/fixmystreet/around/around_index.html @@ -42,11 +42,11 @@ [% IF partial_token %]

- + [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :") %]

[% END %] -[% INCLUDE 'footer.html' %] \ No newline at end of file +[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index b3cfcff6a..d9e98af71 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -15,9 +15,8 @@ [% IF banner.id %] - [% END %] diff --git a/templates/web/fixmystreet/report/new/fill_in_details.html b/templates/web/fixmystreet/report/new/fill_in_details.html index d4351143c..fa783ab64 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details.html +++ b/templates/web/fixmystreet/report/new/fill_in_details.html @@ -1,8 +1,8 @@ [% - SET c = ''; - SET c = 'mappage' IF report.used_map; + SET class = ''; + SET class = 'mappage' IF report.used_map; PROCESS "maps/${map.type}.html" IF report.used_map; - INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass => c + INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass => class %] [% IF report.used_map %] @@ -33,4 +33,4 @@ [% PROCESS 'report/new/fill_in_details_form.html' %] -[% INCLUDE 'footer.html' %] \ No newline at end of file +[% INCLUDE 'footer.html' %] -- cgit v1.2.3 From fe17a22241a1cc4d7479eb7e9e915dcdc64fbda6 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 10:21:52 +0000 Subject: Fix some of #246. --- templates/web/fixmystreet/report/display.html | 2 +- .../web/fixmystreet/report/new/fill_in_details_form.html | 2 +- templates/web/fixmystreet/reports/index.html | 12 +++++++----- web/cobrands/fixmystreet/base.scss | 12 ++++++++++-- web/cobrands/fixmystreet/fixmystreet.js | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index d9e98af71..b6ba8c5fb 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -74,7 +74,7 @@ [% IF field_errors.update %]

[% field_errors.update %]

[% END %] - + [% IF c.user && c.user.belongs_to_council( problem.council ) %] [% loc( 'State' ) %] 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 63a78a158..eb169c1d6 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -65,7 +65,7 @@ [% IF field_errors.detail %]

[% field_errors.detail %]

[% END %] - + [% IF js %]

diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html index eb0c9d412..96367d4bb 100755 --- a/templates/web/fixmystreet/reports/index.html +++ b/templates/web/fixmystreet/reports/index.html @@ -3,7 +3,10 @@

[% loc('All Reports') %]

[% 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.') %]

+ [% 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.') %] +

@@ -19,9 +22,8 @@ [% FOREACH area IN areas_info_sorted %] + [%- ELSIF ! (loop.count % 2) %] class="a" + [%- END %]> @@ -32,4 +34,4 @@ [% END %]

[% area.name %]

[% open.${area.id}.new or 0 %]

[% open.${area.id}.older or 0 %]

-[% INCLUDE 'footer.html' pagefooter => 'yes' %] \ No newline at end of file +[% INCLUDE 'footer.html' pagefooter => 'yes' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 731127897..43ab64135 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -647,6 +647,7 @@ button, input[type=submit],.btn{ button.green-btn, input.green-btn{ @include button-reset; + background-color: #9FDE23; @include background (linear-gradient(#9FDE23, #7FB900)) ; color:#fff; border-color: #5B9700; @@ -660,6 +661,7 @@ input.green-btn{ button.red-btn, input.red-btn{ @include button-reset; + background-color: #FF0038; @include background (linear-gradient(#FF0038, #BF002A)) ; color:#fff; border-color: #80001C; @@ -921,7 +923,7 @@ a:hover.button-left { #fms_pan_zoom { right: 0.5em !important; top: 2.75em !important; - left: 0.5em !important; + left: auto !important; } // Openlayers map controls (overrides) @@ -1177,6 +1179,13 @@ table.nicetable { } } tr { + &.gone { + color: #666666; + background-color: #cccccc; + } + &.a { + background:#f6f6f6; + } &:nth-child(even) { background:#f6f6f6; } @@ -1187,7 +1196,6 @@ table.nicetable { td { padding:0.25em; a { - color:#333; &:hover { text-decoration:none; } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 074b69a9e..b79976664 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -81,7 +81,7 @@ $(function(){ document.createElement('img').src = '/i/pin-green.png'; //add mobile class if small screen - if(!Modernizr.mq('only screen and (min-width:48em)')) { + if (Modernizr.mq('only screen and (max-width:48em)') && !Modernizr.mq('only screen and (width:48em)')) { $('html').addClass('mobile'); if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Immediately go full screen map if on around page -- cgit v1.2.3 From e63bc8af54f40838271f9c0cacf861cdc600c03d Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 10:57:22 +0000 Subject: Fix some more of #246. --- web/cobrands/fixmystreet/base.scss | 6 ++++++ web/cobrands/fixmystreet/layout.scss | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 43ab64135..304066a73 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -364,6 +364,12 @@ label{ } } } +// IE6 doesn't extend the grey box back with the above negative margins, and +// the password box falls off screen for some reason. Just have boring margins, +// it looks okay. +.ie6 .form-box { + margin: 0 0 0.25em 0; +} .form-txt-submit-box { min-height:3em; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index dc2ad5978..47f7bb641 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -199,6 +199,11 @@ body { margin-top:7em; } } +// If no box-shadow, just want a boring black border to stand it out from the map. +.ie6 .content, .ie7 .content, .ie8 .content { + border: solid 1px black; + margin-bottom: 0; +} // map page - has fixed header and different styling body.mappage { @@ -563,6 +568,10 @@ body.twothirdswidthpage { } } } +// The padding is for the fading out when it's fixed positioned, which it isn't in IE6. +.ie6 .shadow-wrap { + padding-top: 0; +} // pokes over the RHS with a little triangle .big-green-banner { -- cgit v1.2.3 From 28032886923829170f5f989c53428fe7a1d8232e Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 11:13:19 +0000 Subject: Fix hashchange not working in IE6 for #246, and better animatino when clicking underneath where the sidebar will appear. --- web/js/map-OpenLayers.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index aec9b69b1..a95325d34 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -264,7 +264,7 @@ $(function(){ return; } - if (location.hash) { + if (location.hash && location.hash != '#') { return; } @@ -445,8 +445,9 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { var sidebar = $('#report-a-problem-sidebar'); if (sidebar.css('position') == 'absolute') { var w = sidebar.width(), h = sidebar.height(), o = sidebar.offset(); - if (e.xy.y <= o.top) { - // top of the page, pin hidden by header + if (e.xy.y <= o.top || (e.xy.x >= o.left && e.xy.x <= o.left + w + 24 && e.xy.y >= o.top && e.xy.y <= o.top + h + 64)) { + // top of the page, pin hidden by header; + // or underneath where the new sidebar will appear lonlat.transform( new OpenLayers.Projection("EPSG:4326"), fixmystreet.map.getProjectionObject() @@ -455,9 +456,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { p.x -= $(window).width() / 3; lonlat = fixmystreet.map.getLonLatFromViewPortPx(p); fixmystreet.map.panTo(lonlat); - } else if (e.xy.x >= o.left && e.xy.x <= o.left + w + 24 && e.xy.y >= o.top && e.xy.y <= o.top + h + 64) { - // underneath where the new sidebar will appear - fixmystreet.map.pan(-w, 0, { animate: true }); } } -- cgit v1.2.3 From 7494b18c1dc76d49c61b20c458894d788ef3b2de Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 12:47:01 +0000 Subject: To allow pins and pan/zoom to be clicked in IE6 and IE7, the container must also be reduced to the minimum width to prevent invisible coverage. #246 --- web/cobrands/fixmystreet/layout.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 47f7bb641..dbb5f54eb 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -231,6 +231,10 @@ body.mappage { } .ie6, .ie7 { body.mappage { + .container { + float: left; + width: 27em; + } .nav-wrapper{ z-index:1; .nav-wrapper-2 { -- cgit v1.2.3 From 7dd734be0ee3efb57199879e6b86fe1605fe23ee Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 13:29:36 +0000 Subject: Fix display of navigation icons in IE6 for #246. --- web/cobrands/fixmystreet/base.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 304066a73..31cd86153 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -926,9 +926,15 @@ a:hover.button-left { } // OpenLayers fix for navigation being top right +// Left and right so that zoom can be left, pan right. #fms_pan_zoom { right: 0.5em !important; top: 2.75em !important; + left: 0.5em !important; +} +// The left and right of the above causes the navigation to move off-screen left in IE6. +// XXX Need to check IE7 +.ie6 #fms_pan_zoom { left: auto !important; } @@ -947,7 +953,9 @@ a:hover.button-left { &:hover { opacity:1; } + filter: none !important; // Override OpenLayers PNG handling of the navigation } + #fms_pan_zoom_zoomworld { display:none !important; visibility:none !important; -- cgit v1.2.3 From 4eab56c784bb53d2e174e7b7101da7eba49a1a02 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 13:30:41 +0000 Subject: Enable scroll wheel if mobile full screen map view. --- web/js/map-OpenLayers.js | 3 +++ web/js/map-bing-ol.js | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index a95325d34..7789159c1 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -395,6 +395,9 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }, trigger: function(e) { + if (typeof fixmystreet.nav_control != 'undefined') { + fixmystreet.nav_control.disableZoomWheel(); + } var lonlat = fixmystreet.map.getLonLatFromViewPortPx(e.xy); if (fixmystreet.page == 'new') { /* Already have a pin */ diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 8f0ba4da0..89b274b18 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -3,10 +3,17 @@ function set_map_config(perm) { if ($('#map_permalink').length) { permalink_id = 'map_permalink'; } + + var nav_opts = { zoomWheelEnabled: false }; + if (fixmystreet.page == 'around' && $('html').hasClass('mobile')) { + nav_opts = {}; + } + fixmystreet.nav_control = new OpenLayers.Control.Navigation(nav_opts); + fixmystreet.controls = [ new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), - new OpenLayers.Control.Navigation({ zoomWheelEnabled: false }), + fixmystreet.nav_control, new OpenLayers.Control.Permalink(permalink_id), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; -- cgit v1.2.3 From 95eabe2b50e150e420ee4f2f53ed3acdae872afa Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 13:31:24 +0000 Subject: Enable high accuracy for geolocation, and remove .mq test that wrongly passes on Android. Needs iPad checking. --- web/cobrands/fixmystreet/fixmystreet.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index b79976664..bf25d2f89 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -81,7 +81,7 @@ $(function(){ document.createElement('img').src = '/i/pin-green.png'; //add mobile class if small screen - if (Modernizr.mq('only screen and (max-width:48em)') && !Modernizr.mq('only screen and (width:48em)')) { + if (Modernizr.mq('only screen and (max-width:47.9375em)')) { $('html').addClass('mobile'); if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Immediately go full screen map if on around page @@ -249,6 +249,7 @@ $(function(){ $('this').html("Unknown error"); } }, { + enableHighAccuracy: true, timeout: 10000 }); }); -- cgit v1.2.3 From e54162a799f69d69fd0fd509ad97c372655ee106 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 14:41:07 +0000 Subject: Fix issue with overlapping map/form due to map height changing, by fixing height once we know it. --- web/cobrands/fixmystreet/fixmystreet.js | 6 ------ web/js/map-OpenLayers.js | 10 +++++++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index bf25d2f89..d1c825a2b 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -92,9 +92,6 @@ $(function(){ height: 'auto', margin: 0 }); - $('#side-form').css({ - paddingTop: $(window).height() - }); $('.big-green-banner') .addClass('mobile-map-banner') .removeClass('.big-green-banner') @@ -275,9 +272,6 @@ $(function(){ }else{ //if not, move them and show, hiding .content $('.content').after('

').hide(); - $('.rap-notes').css({ - paddingTop: $(window).height() - }); $('#report-a-problem-sidebar').appendTo('.rap-notes').show().after('Back'); } $('html, body').scrollTop($('#report-a-problem-sidebar').offset().top); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 7789159c1..92ced9981 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -463,13 +463,18 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { } if ($('html').hasClass('mobile')) { + var $map_box = $('#map_box'), + width = $map_box.width(), + height = $map_box.height(); $('#sub_map_links').hide(); - $('#map_box').append( + $map_box.append( '

' + 'Try again' + 'OK' + '

' - ); + ).css({ position: 'relative', width: width, height: height }); + // Making it relative here makes it much easier to do the scrolling later + $('.mobile-map-banner').text('Right place?'); // mobile user clicks 'ok' on map @@ -481,7 +486,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { if($(this).parent().hasClass('map_complete')){ $('html, body').animate({scrollTop:0}, 1000); }else{ - var height = $('#map_box').height(); $('html, body').animate({scrollTop:height-60}, 1000, function(){ //add this class so we can modify the look of the links inside $('#mob_sub_map_links').addClass('map_complete'); -- cgit v1.2.3 From d981a13e902066d9ffdf3cbdc4bd6b1f9e313d4a Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 2 Mar 2012 15:11:59 +0000 Subject: Default map height without JavaScript so that pin will more likely be visible. --- templates/web/default/maps/openlayers.html | 4 ++-- web/cobrands/fixmystreet/base.scss | 4 ++-- web/cobrands/fixmystreet/fixmystreet.js | 16 +++++++++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html index 24b23d55e..e815642f1 100644 --- a/templates/web/default/maps/openlayers.html +++ b/templates/web/default/maps/openlayers.html @@ -59,8 +59,8 @@ var fixmystreet = { east = c.uri_with( { lat = map.compass.east.0, lon = map.compass.east.1, zoom = map.zoom } ) west = c.uri_with( { lat = map.compass.west.0, lon = map.compass.west.1, zoom = map.zoom } ) world = c.uri_with( { zoom = 0 } ); - SET zoom_in = c.uri_with( { zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1; - SET zoom_out = c.uri_with( { zoom = map.zoom - 1 } ) IF map.zoom > 0; + SET zoom_in = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom + 1 } ) IF map.zoom < map.numZoomLevels - 1; + SET zoom_out = c.uri_with( { lat = map.latitude, lon = map.longitude, zoom = map.zoom - 1 } ) IF map.zoom > 0; SET zoom_in = '#' IF map.zoom >= map.numZoomLevels - 1; SET zoom_out = '#' IF map.zoom <= 0; %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 31cd86153..09304aabf 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -915,7 +915,7 @@ a:hover.button-left { #map_box{ @extend .full-width; background: #333; - height: 10em; + height: 29em; margin-bottom: 1em; overflow: hidden; position: relative; @@ -929,7 +929,7 @@ a:hover.button-left { // Left and right so that zoom can be left, pan right. #fms_pan_zoom { right: 0.5em !important; - top: 2.75em !important; + top: 0.5em !important; left: 0.5em !important; } // The left and right of the above causes the navigation to move off-screen left in IE6. diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index d1c825a2b..3f8fb4f4e 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -75,23 +75,29 @@ function tabs(elem) $(function(){ - $('html').removeClass('no-js').addClass('js'); + var $html = $('html'), + $map_box = $('#map_box'); + + $html.removeClass('no-js').addClass('js'); // Preload the new report pin document.createElement('img').src = '/i/pin-green.png'; //add mobile class if small screen if (Modernizr.mq('only screen and (max-width:47.9375em)')) { - $('html').addClass('mobile'); + $html.addClass('mobile'); + $map_box.css({ height: '10em' }); if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Immediately go full screen map if on around page $('#site-header').hide(); - $('#map_box').prependTo('.wrapper').css({ + $map_box.prependTo('.wrapper').css({ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0, height: 'auto', margin: 0 }); + // Bit yucky, but the ID doesn't exist yet. + $("").appendTo(document.documentElement); $('.big-green-banner') .addClass('mobile-map-banner') .removeClass('.big-green-banner') @@ -101,11 +107,11 @@ $(function(){ } else { // Make map full screen on non-mobile sizes. var map_pos = 'fixed', map_height = '100%'; - if ($('html').hasClass('ie6')) { + if ($html.hasClass('ie6')) { map_pos = 'absolute'; map_height = $(window).height(); } - $('#map_box').prependTo('.wrapper').css({ + $map_box.prependTo('.wrapper').css({ zIndex: 0, position: map_pos, top: 0, left: 0, right: 0, bottom: 0, width: '100%', height: map_height, -- cgit v1.2.3 From 222f7acba38a17219de0bf190daece52ccf54d8c Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 3 Mar 2012 00:54:57 +0000 Subject: Fix bug on Android due to caching variable too early. --- web/cobrands/fixmystreet/fixmystreet.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 3f8fb4f4e..2e5ef2594 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -75,8 +75,7 @@ function tabs(elem) $(function(){ - var $html = $('html'), - $map_box = $('#map_box'); + var $html = $('html'); $html.removeClass('no-js').addClass('js'); @@ -86,11 +85,11 @@ $(function(){ //add mobile class if small screen if (Modernizr.mq('only screen and (max-width:47.9375em)')) { $html.addClass('mobile'); - $map_box.css({ height: '10em' }); + $('#map_box').css({ height: '10em' }); if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Immediately go full screen map if on around page $('#site-header').hide(); - $map_box.prependTo('.wrapper').css({ + $('#map_box').prependTo('.wrapper').css({ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0, height: 'auto', @@ -111,7 +110,7 @@ $(function(){ map_pos = 'absolute'; map_height = $(window).height(); } - $map_box.prependTo('.wrapper').css({ + $('#map_box').prependTo('.wrapper').css({ zIndex: 0, position: map_pos, top: 0, left: 0, right: 0, bottom: 0, width: '100%', height: map_height, -- cgit v1.2.3 From ad5173beb2cfdf9e3c2a746d088f0e068c29d775 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 3 Mar 2012 01:25:55 +0000 Subject: Change map button back to OK if used, as otherwise use of try again was forced potentially unnecessarily. --- web/js/map-OpenLayers.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 92ced9981..2f5947193 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -478,20 +478,19 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $('.mobile-map-banner').text('Right place?'); // mobile user clicks 'ok' on map - $('#mob_ok').on('click', function(e){ - e.preventDefault(); + $('#mob_ok').toggle(function(){ //scroll the height of the map box instead of the offset //of the #side-form or whatever as we will probably want //to do this on other pages where #side-form might not be - if($(this).parent().hasClass('map_complete')){ - $('html, body').animate({scrollTop:0}, 1000); - }else{ - $('html, body').animate({scrollTop:height-60}, 1000, function(){ - //add this class so we can modify the look of the links inside - $('#mob_sub_map_links').addClass('map_complete'); - $('#mob_ok').text('MAP'); - }); - } + $('html, body').animate({ scrollTop: height-60 }, 1000, function(){ + $('#mob_sub_map_links').addClass('map_complete'); + $('#mob_ok').text('MAP'); + }); + }, function(){ + $('html, body').animate({ scrollTop: 0 }, 1000, function(){ + $('#mob_sub_map_links').removeClass('map_complete'); + $('#mob_ok').text('OK'); + }); }); } -- cgit v1.2.3 From 135697bfc2ee9f5f9629a1a7b0cd70494b2d5f4f Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 3 Mar 2012 17:18:37 +0000 Subject: For the moment, tidy up alerts page a bit, #223. --- templates/web/fixmystreet/alert/list.html | 15 ++++++++------- templates/web/fixmystreet/header.html | 1 - web/cobrands/fixmystreet/base.scss | 26 ++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html index 4b25b54b4..ccd5ed11c 100644 --- a/templates/web/fixmystreet/alert/list.html +++ b/templates/web/fixmystreet/alert/list.html @@ -6,7 +6,7 @@ END; %] -[% INCLUDE 'header.html', title => title %] +[% INCLUDE 'header.html', title = title, bodyclass = 'twothirdswidthpage' %] [% IF pretty_pc %] [% @@ -22,6 +22,7 @@ +[%# XXX These photos should perhaps be in a vertical column on the right hand side, as currently. %] [% IF photos.size %]

[% loc('Photos of recent nearby reports') %]

@@ -67,17 +68,17 @@

[% loc('Problems within the boundary of:') %]

+ - [% option.text %] + [% option.text %]

[% loc('Or problems reported to:') %]

+ - [% option.text %] + [% option.text %]

Date: Tue, 6 Mar 2012 15:37:08 +0000 Subject: Get updates on report page using drawer. --- templates/web/fixmystreet/alert/updates.html | 5 ++++ templates/web/fixmystreet/report/display.html | 37 ++++++++++++--------------- web/cobrands/fixmystreet/fixmystreet.js | 8 +++++- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/templates/web/fixmystreet/alert/updates.html b/templates/web/fixmystreet/alert/updates.html index 73d3727e6..2240844e4 100644 --- a/templates/web/fixmystreet/alert/updates.html +++ b/templates/web/fixmystreet/alert/updates.html @@ -5,6 +5,11 @@ [% INCLUDE 'errors.html' %] +

+ + +

[% loc('Receive email when updates are left on this problem.') %]

diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index eaaf37f9c..afb7857d0 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -22,9 +22,23 @@ [% INCLUDE 'report/_main.html' %] - - - +

+ +

[% loc('Get updates' ) %]
[% loc( 'Problems nearby' ) %]

- [% INCLUDE 'report/updates.html' %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 073e942da..1d18b4d98 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -377,9 +377,14 @@ $.fn.drawer = function(id, ajax) { if (!d.length) { d = $('

'); } + var max_height = $(window).height() - $('.content').offset().top - $('.shadow-wrap').height(); + var height = d.height(); + if (!height || height > max_height) { + height = max_height; + } d.css({ backgroundColor: 'white', - height: $(window).height() - $('.content').offset().top - $('.shadow-wrap').height(), + height: height, display: 'none', zIndex: 1001, position: 'relative', overflow: 'auto', padding: '1em' @@ -402,6 +407,7 @@ $.fn.drawer = function(id, ajax) { $('#key-tool-wards').drawer('council_wards', false); $('#key-tool-around-updates').drawer('updates_ajax', true); + $('#key-tool-report-updates').drawer('report-updates-data', false); // Go directly to RSS feed if RSS button clicked on alert page // (due to not wanting around form to submit, though good thing anyway) -- cgit v1.2.3 From e76d6c17cfe2bdcb8822e448a73e1b916eb22cee Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 6 Mar 2012 16:35:07 +0000 Subject: Add more ie gif fixes (for #246) Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 33 +++++++++++++++++++++ .../fixmystreet/images/ie_key_tools_sprite.gif | Bin 0 -> 375 bytes .../images/ie_key_tools_sprite_dark.gif | Bin 0 -> 373 bytes .../fixmystreet/images/ie_sub_map_links_sprite.gif | Bin 0 -> 461 bytes web/cobrands/fixmystreet/layout.scss | 7 +++++ 5 files changed, 40 insertions(+) create mode 100644 web/cobrands/fixmystreet/images/ie_key_tools_sprite.gif create mode 100644 web/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif create mode 100644 web/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 6dbcdc601..c4b3ea283 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -616,6 +616,23 @@ p.label-valid { } } } +.ie6 .shadow-wrap ul#key-tools li a { + &.abuse { + background-image:url('images/ie_key_tools_sprite.gif'); + background-position: right 0px; + } + &.feed { + background-image:url('images/ie_key_tools_sprite.gif'); + background-position: right -58px; + } + &.chevron { + background-image:url('images/ie_key_tools_sprite.gif'); + background-position: right -116px; + } + &:hover { + background-image:url('images/ie_key_tools_sprite_dark.gif'); + } +} //footer blocks @@ -1026,6 +1043,7 @@ a:hover.button-left { right:0; bottom: 0; z-index: 1100; + background:#333; background:rgba(0, 0, 0, 0.7); margin:0; a { @@ -1057,6 +1075,21 @@ a:hover.button-left { } } +.ie6 #sub_map_links a { + &#hide_pins_link { + background-image:url('images/ie_sub_map_links_sprite.gif'); + background-position: right 1px; + } + &#all_pins_link { + background-image:url('images/ie_sub_map_links_sprite.gif'); + background-position: right -45px; + } + &#map_permalink { + background-image:url('images/ie_sub_map_links_sprite.gif'); + background-position: right -93px; + } +} + #mob_sub_map_links { position: absolute; z-index:1100; diff --git a/web/cobrands/fixmystreet/images/ie_key_tools_sprite.gif b/web/cobrands/fixmystreet/images/ie_key_tools_sprite.gif new file mode 100644 index 000000000..aed0bafa3 Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_key_tools_sprite.gif differ diff --git a/web/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif b/web/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif new file mode 100644 index 000000000..0b2fd5741 Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif differ diff --git a/web/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif b/web/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif new file mode 100644 index 000000000..1afd136e7 Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 526567ed6..07e8778c9 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -494,6 +494,13 @@ body.twothirdswidthpage { } } } +.ie6 #sub_map_links #map_links_toggle { + height:1.75em; + background:#000 url('images/ie_sprite.gif') center -341px no-repeat; + &.closed { + background-position: center -381px; + } +} // log in bit, pokes above the .content div #user-meta{ -- cgit v1.2.3 From 5155a2d93896ee198bd586d3cf2635a20fe2329e Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 6 Mar 2012 17:00:57 +0000 Subject: Added sidebar styles (plus markup for faq page) - also included a sticky option Signed-off-by: Josh Angell --- templates/web/fixmystreet/faq/faq-en-gb.html | 17 ++++++++++++--- web/cobrands/fixmystreet/layout.scss | 32 ++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 4e1f0c874..4e128e58c 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -1,6 +1,6 @@ [% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] -

Frequently Asked Questions

What is FixMyStreet?: FixMyStreet is a site to help people report, view, @@ -86,7 +86,7 @@ href="https://secure.mysociety.org/donate/">please do.

Practical Questions

I’m from a council, where do you send the reports?: You can either leave a test report or contact us @@ -138,7 +138,7 @@ 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.

Organisation Questions

Who built FixMyStreet?: This site was built by mySociety, in conjunction with the Young Foundation. @@ -205,4 +205,15 @@ our servers). Let us know if we’ve missed anyone.

+ + [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 07e8778c9..71904cd4f 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -288,23 +288,47 @@ body.fullwidthpage { width:40em; } } -// two thirds width page, also has option for a sidebar +// two thirds width page, also has option for a sidebar which can be sticky or not body.twothirdswidthpage { @extend .fullwidthpage; .content { width:40em; position: relative; aside { - background:#fff; + background:#eee; position:absolute; - left:44em; + left:42em; top:0; - width:13.5em; + z-index: -1; + width:13em; padding:1em; @include box-shadow(0px 0px 6px 1px #000); } + .sticky-sidebar { + position: absolute; + left:42em; + z-index: -1; + aside { + position: fixed; + top:7em; + left:auto; + } + } } } +//as ie6 doesn;t like 'fixed' we will make it absolute again +.ie6 body.twothirdswidthpage .content .sticky-sidebar { + position:static; + aside { + position:absolute; + left:42em; + top:0; + } +} +//bit of extra space for ie7 +.ie7 body.twothirdswidthpage .content .sticky-sidebar aside { + top:11em; +} // table wrapper - this enables anything to become a -- cgit v1.2.3 From 67c9f2985ec537e6e47752b2a4d67051787ccf43 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 6 Mar 2012 17:18:35 +0000 Subject: Upgrade modernizr to include html5shiv Signed-off-by: Josh Angell --- templates/web/fixmystreet/common_header_tags.html | 2 +- web/js/modernizr.custom.03050.js | 4 ---- web/js/modernizr.custom.61367.js | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 web/js/modernizr.custom.03050.js create mode 100644 web/js/modernizr.custom.61367.js diff --git a/templates/web/fixmystreet/common_header_tags.html b/templates/web/fixmystreet/common_header_tags.html index ce8b95a93..c1f384d24 100644 --- a/templates/web/fixmystreet/common_header_tags.html +++ b/templates/web/fixmystreet/common_header_tags.html @@ -5,7 +5,7 @@ - + diff --git a/web/js/modernizr.custom.03050.js b/web/js/modernizr.custom.03050.js deleted file mode 100644 index 651a3bc81..000000000 --- a/web/js/modernizr.custom.03050.js +++ /dev/null @@ -1,4 +0,0 @@ -/* Modernizr 2.5.2 (Custom Build) | MIT & BSD - * Build: http://www.modernizr.com/download/#-mq-teststyles-load - */ -;window.Modernizr=function(a,b,c){function v(a){i.cssText=a}function w(a,b){return v(prefixes.join(a+";")+(b||""))}function x(a,b){return typeof a===b}function y(a,b){return!!~(""+a).indexOf(b)}function z(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:x(f,"function")?f.bind(d||b):f}return!1}var d="2.5.2",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j,k={}.toString,l={},m={},n={},o=[],p=o.slice,q,r=function(a,c,d,e){var h,i,j,k=b.createElement("div"),l=b.body,m=l?l:b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),k.appendChild(j);return h=["",""].join(""),k.id=g,m.innerHTML+=h,m.appendChild(k),l||f.appendChild(m),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},s=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return r("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},t={}.hasOwnProperty,u;!x(t,"undefined")&&!x(t.call,"undefined")?u=function(a,b){return t.call(a,b)}:u=function(a,b){return b in a&&x(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=p.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(p.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(p.call(arguments)))};return e});for(var A in l)u(l,A)&&(q=A.toLowerCase(),e[q]=l[A](),o.push((e[q]?"":"no-")+q));return v(""),h=j=null,e._version=d,e.mq=s,e.testStyles=r,e}(this,this.document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=!!b.attachEvent,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f",a,""].join(""),k.id=g,m.innerHTML+=h,m.appendChild(k),l||(m.style.background="",f.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},s=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return r("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},t={}.hasOwnProperty,u;!x(t,"undefined")&&!x(t.call,"undefined")?u=function(a,b){return t.call(a,b)}:u=function(a,b){return b in a&&x(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=p.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(p.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(p.call(arguments)))};return e});for(var A in l)u(l,A)&&(q=A.toLowerCase(),e[q]=l[A](),o.push((e[q]?"":"no-")+q));return v(""),h=j=null,function(a,b){function g(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function h(){var a=k.elements;return typeof a=="string"?a.split(" "):a}function i(a){var b={},c=a.createElement,e=a.createDocumentFragment,f=e();a.createElement=function(a){var e=(b[a]||(b[a]=c(a))).cloneNode();return k.shivMethods&&e.canHaveChildren&&!d.test(a)?f.appendChild(e):e},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+h().join().replace(/\w+/g,function(a){return b[a]=c(a),f.createElement(a),'c("'+a+'")'})+");return n}")(k,f)}function j(a){var b;return a.documentShived?a:(k.shivCSS&&!e&&(b=!!g(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),f||(b=!i(a)),b&&(a.documentShived=b),a)}var c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea)$/i,e,f;(function(){var a=b.createElement("a");a.innerHTML="",e="hidden"in a,f=a.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var k={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:j};a.html5=k,j(b)}(this,b),e._version=d,e.mq=s,e.testStyles=r,e}(this,this.document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f Date: Wed, 7 Mar 2012 09:29:14 +0000 Subject: Made .banner styles more default to cope with other states (for #268) Left a comment to the effect that we might need other images/colours for the other states Signed-off-by: Josh Angell --- templates/web/fixmystreet/report/display.html | 4 ++-- web/cobrands/fixmystreet/base.scss | 23 ++++++++++++++++++----- web/cobrands/fixmystreet/layout.scss | 25 ++++++++++++++++++------- 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index afb7857d0..2ac0f407c 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -121,11 +121,11 @@ [% ELSE %] - [% loc('Your email address' ) %] + [% loc('Email' ) %] [% IF field_errors.email %]

[% field_errors.email %]

[% END %] - +

[% loc("Now to submit your update…") %]

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 9fb8f165e..879ef7846 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -785,8 +785,8 @@ a:hover.button-left { .banner { position: relative; - z-index:1000; - #fixed { + z-index:1100; + p { position: absolute; top:-1.95em; right:0; @@ -794,8 +794,9 @@ a:hover.button-left { font-size:0.6875em;//11px line-height:1em; padding:0.5em 1em; - color:#fff; - background: $contrast1; + margin:0; + color:#1a1a1a; + background: #ccc; text: { transform:uppercase; align:center; @@ -808,7 +809,19 @@ a:hover.button-left { width: 0; height: 0; border-left: 0.5em solid transparent; - border-bottom: 0.5em solid #4B8304; + border-bottom: 0.5em solid #888; + } + &#fixed { + color:#fff; + background: $contrast1; + &:before { + border-bottom: 0.5em solid #4B8304; + } + } + &#unknown, + &#closed, + &#progress { + // do we need other colours for these states? } } } diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 71904cd4f..433fe1152 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -636,17 +636,28 @@ body.twothirdswidthpage { } .banner { - // fixed banner image - #fixed { + // state banners + p { top:-2.25em; - padding-top:5em; - background-image:url(images/sprite.png); - background-position:-324px -326px; - background-repeat:no-repeat; + padding:1em; &:before { left:-0.75em; border-left: 0.75em solid transparent; - border-bottom: 0.75em solid #4B8304; + border-bottom: 0.75em solid #888; + } + &#fixed { + padding-top:5em; + background-image:url(images/sprite.png); + background-position:-324px -326px; + background-repeat:no-repeat; + &:before { + border-bottom: 0.75em solid #4B8304; + } + } + &#unknown, + &#closed, + &#progress { + // do we need other colours/images for these states? } } } -- cgit v1.2.3 From b58f6b619a357b62a4855cdb7cbff190dbf89444 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 7 Mar 2012 10:13:56 +0000 Subject: Alert page photos in right hand sidebar, for #255. --- templates/web/fixmystreet/alert/index.html | 6 ++++-- templates/web/fixmystreet/alert/list.html | 6 ++++-- templates/web/fixmystreet/reports/council.html | 4 ++-- web/cobrands/fixmystreet/base.scss | 3 --- web/cobrands/fixmystreet/layout.scss | 6 ++++++ 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index f731d3dbf..0903937f7 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -28,12 +28,14 @@ within a certain distance of a particular location.') %] [% IF photos.size %] -

[% loc('Some photos of recent reports') %]

+ [% END %] diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html index cc1b3e5fd..c488e72ee 100644 --- a/templates/web/fixmystreet/alert/list.html +++ b/templates/web/fixmystreet/alert/list.html @@ -22,12 +22,14 @@ [%# XXX These photos should perhaps be in a vertical column on the right hand side, as currently. %] [% IF photos.size %] -

[% loc('Photos of recent nearby reports') %]

+ [% END %] diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 275fe35d4..707ecabc8 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -77,7 +77,7 @@ [% IF children.size %] -

[% loc('Wards of this council') %]

[% loc('Follow a ward link to view only reports within that ward.') %]

[% child.name %]

Date: Wed, 7 Mar 2012 10:34:00 +0000 Subject: Move sidebar to top of markup on help page Signed-off-by: Josh Angell --- templates/web/fixmystreet/faq/faq-en-gb.html | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 4e128e58c..418f4387f 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -1,5 +1,16 @@ [% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] + +

Frequently Asked Questions

What is FixMyStreet?

- - - [% INCLUDE 'footer.html' pagefooter = 'yes' %] -- cgit v1.2.3 From 3acd51c7a2a0533b2fa45c1fbf18349ce20266f7 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 10:34:15 +0000 Subject: Add mediaquery styles for twothirdswidthpage and sidebar Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/layout.scss | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index c00e1229f..a843efb9c 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -303,12 +303,12 @@ body.twothirdswidthpage { width:13em; padding:1em; @include box-shadow(0px 0px 6px 1px #000); - } - aside h2 { - margin-top: 0; - } - aside img { - margin-bottom: 0.25em; + h2 { + margin-top: 0; + } + img { + margin-bottom: 0.25em; + } } .sticky-sidebar { position: absolute; @@ -1017,4 +1017,18 @@ body.frontpage { width: auto; } + //make twothirdswidthpage nearly as small as main + //.content: just enough to still fit the sidebar in + body.twothirdswidthpage { + .content { + width:30em; + .sticky-sidebar { + left:32em; + top:30em; + aside { + top:9em; + } + } + } + } } -- cgit v1.2.3 From 391878c3761ba11d6fe447a0d5e3547a250304ff Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 7 Mar 2012 11:20:47 +0000 Subject: Put padding on inner div to stop animation jump, no important on hidden-js so that size can be calculated by JS. --- web/cobrands/fixmystreet/base.scss | 2 +- web/cobrands/fixmystreet/fixmystreet.js | 8 +++++--- web/js/map-OpenLayers.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 5a523bebd..52d40c540 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1345,7 +1345,7 @@ ul.breadcrumb { // hide anything with this class if js is working .js .hidden-js { - display: none !important; + display: none; visibility: hidden; } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 1d18b4d98..af178698c 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -377,6 +377,9 @@ $.fn.drawer = function(id, ajax) { if (!d.length) { d = $('

'); } + // Put the padding on an inner div to prevent the jarring jump at end of hide/show animation + var innerDiv = $('

').css({ padding: '1em' }); + d.wrapInner(innerDiv); var max_height = $(window).height() - $('.content').offset().top - $('.shadow-wrap').height(); var height = d.height(); if (!height || height > max_height) { @@ -386,12 +389,11 @@ $.fn.drawer = function(id, ajax) { backgroundColor: 'white', height: height, display: 'none', zIndex: 1001, position: 'relative', - overflow: 'auto', - padding: '1em' + overflow: 'auto' }).removeClass('hidden-js'); if (ajax) { var href = $this.attr('href') + ';ajax=1'; - d.load(href); + innerDiv.load(href); } d.find('h2').css({ marginTop: 0 }); $('.shadow-wrap').append(d); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index b6859f486..8ee217dff 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -441,7 +441,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { document.getElementById('side-form').style.display = 'block'; } $('#side').hide(); - heightFix('#report-a-problem-sidebar:visible', '.content', 26); + heightFix('#report-a-problem-sidebar', '.content', 26); // If we clicked the map somewhere inconvenient var sidebar = $('#report-a-problem-sidebar'); -- cgit v1.2.3 From ed317e44e611e5e7eaa67f2a392198cd4d91524d Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 11:33:14 +0000 Subject: Make ie site-logo gif better Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/images/ie_logo.gif | Bin 3043 -> 2349 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/cobrands/fixmystreet/images/ie_logo.gif b/web/cobrands/fixmystreet/images/ie_logo.gif index bce71595f..17c9f59b8 100644 Binary files a/web/cobrands/fixmystreet/images/ie_logo.gif and b/web/cobrands/fixmystreet/images/ie_logo.gif differ -- cgit v1.2.3 From 9ce5b5cbfa812133180d1f510debb70bc4e71193 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 11:34:02 +0000 Subject: Lots of ie specific fixes - logo not appearing, funny content div on mappage, margin-top on .content etc Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 5 ---- web/cobrands/fixmystreet/layout.scss | 56 +++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 5a523bebd..15b1ee20a 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -818,11 +818,6 @@ a:hover.button-left { border-bottom: 0.5em solid #4B8304; } } - &#unknown, - &#closed, - &#progress { - // do we need other colours for these states? - } } } diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index a843efb9c..e1971dbb0 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -82,7 +82,7 @@ body { background: none; border-top: 0px; .container { - position: static;//reset position so z-index resets + position: static;//reset position so the nav links become clickable } } #site-logo { @@ -91,6 +91,14 @@ body { z-index: 3; } .ie6, .ie7 { + #site-header { + height:3em; + .container { + //ie broken z-index bug: the site-logo won't appear if we don't do this + //doesn't seem to render the nav link unclickable like in other browsers + position: relative; + } + } #site-logo { position: absolute; top:-3.25em; @@ -193,16 +201,17 @@ body { margin-bottom: -1em; @include box-shadow(0px 0px 6px 1px #000); } -//weird margining thing for ie8 -.ie8 { - .wrapper .content { - margin-top:7em; +.ie6, .ie7, .ie8 { + .content { + // If no box-shadow, just want a boring black border to stand it out from the map. + border: 1px solid black; + //take off margins so we line up properly + margin: 0; } } -// If no box-shadow, just want a boring black border to stand it out from the map. -.ie6 .content, .ie7 .content, .ie8 .content { - border: solid 1px black; - margin-bottom: 0; +//weird margining thing for ie8 +.ie8 .content { + margin-top:3em; } // map page - has fixed header and different styling @@ -231,10 +240,6 @@ body.mappage { } .ie6, .ie7 { body.mappage { - .container { - float: left; - width: 27em; - } .nav-wrapper{ z-index:1; .nav-wrapper-2 { @@ -247,10 +252,6 @@ body.mappage { } } } -//colour background the same as that of the ie_logo.gif -.ie6 body.mappage .nav-wrapper .nav-wrapper-2 { - background: #1a1a1a; -} //ie8 needs different stuff on .nav-wrapper so we //have to define all the rest of it again as this resets //the z-index base yet again :S @@ -322,7 +323,7 @@ body.twothirdswidthpage { } } } -//as ie6 doesn;t like 'fixed' we will make it absolute again +//as ie6 doesn't like 'fixed' we will make it absolute again .ie6 body.twothirdswidthpage .content .sticky-sidebar { position:static; aside { @@ -331,10 +332,6 @@ body.twothirdswidthpage { top:0; } } -//bit of extra space for ie7 -.ie7 body.twothirdswidthpage .content .sticky-sidebar aside { - top:11em; -} // table wrapper - this enables anything to become a @@ -660,11 +657,13 @@ body.twothirdswidthpage { border-bottom: 0.75em solid #4B8304; } } - &#unknown, - &#closed, - &#progress { - // do we need other colours/images for these states? - } + } +} +.ie6 .banner p { + top:-1.5em; + &#fixed { + padding-top:1em; + background-image:none; } } @@ -797,6 +796,9 @@ body.frontpage { //logo fix .ie6, .ie7, .ie8 { body.frontpage { + #site-header{ + height:4em; + } #site-logo { position:relative; width:60em; -- cgit v1.2.3 From 7dc515c80fce5550c0734f7c8ff6d0524f522b36 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 11:49:06 +0000 Subject: yet more ie6 fixing Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/layout.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index e1971dbb0..9f76c4fbb 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -523,9 +523,9 @@ body.twothirdswidthpage { } .ie6 #sub_map_links #map_links_toggle { height:1.75em; - background:#000 url('images/ie_sprite.gif') center -341px no-repeat; + background:#000 url('images/ie_sub_map_links_sprite.gif') center -143px no-repeat; &.closed { - background-position: center -381px; + background-position: center -183px; } } -- cgit v1.2.3 From 4266ae67e9f26dc2b354337527d69f1521aee4ce Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 11:55:59 +0000 Subject: pretty ie6 'fixed' gif Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/images/ie_fixed.gif | Bin 0 -> 321 bytes web/cobrands/fixmystreet/layout.scss | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 web/cobrands/fixmystreet/images/ie_fixed.gif diff --git a/web/cobrands/fixmystreet/images/ie_fixed.gif b/web/cobrands/fixmystreet/images/ie_fixed.gif new file mode 100644 index 000000000..438bd6894 Binary files /dev/null and b/web/cobrands/fixmystreet/images/ie_fixed.gif differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 9f76c4fbb..068e9a71f 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -662,8 +662,8 @@ body.twothirdswidthpage { .ie6 .banner p { top:-1.5em; &#fixed { - padding-top:1em; - background-image:none; + background-image:url(images/ie_fixed.gif); + background-position:center 0.75em; } } -- cgit v1.2.3 From f11cbd34cb24fe20a39361d945cf6cbc0c8356ee Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 7 Mar 2012 12:32:21 +0000 Subject: This is definitely needed to allow pins/zoom to be clickable on the map in IE6/7. --- web/cobrands/fixmystreet/layout.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 068e9a71f..7de292abd 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -240,6 +240,11 @@ body.mappage { } .ie6, .ie7 { body.mappage { + .container { + float: left; + width: 27em; + margin-left: 1.4em; + } .nav-wrapper{ z-index:1; .nav-wrapper-2 { @@ -252,6 +257,13 @@ body.mappage { } } } +.ie6 { + body.mappage { + .container { + margin-left: 0.7em; + } + } +} //ie8 needs different stuff on .nav-wrapper so we //have to define all the rest of it again as this resets //the z-index base yet again :S -- cgit v1.2.3 From 8a9f7ce243fd36130c3ac4c171b8a66d06842f85 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 7 Mar 2012 12:42:52 +0000 Subject: Margin left has been removed, so reduce this accordingly. --- web/cobrands/fixmystreet/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 7de292abd..9aa9af11e 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -735,7 +735,7 @@ textarea.form-error { } .ie6, .ie7 { #report-a-problem-sidebar { - top:5em; + left: 29em; // 0.5em left margin gone on .content in IE6/7, so reduce this accordingly. } } -- cgit v1.2.3 From 920691b99f8a8cb194a0bb19a2c10ce7aafc2fff Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 14:17:49 +0000 Subject: Add close toggle to adverts (for #263) Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/base.scss | 16 ++++++++++++++++ web/cobrands/fixmystreet/fixmystreet.js | 20 ++++++++++++++++++++ web/cobrands/fixmystreet/images/sprite.png | Bin 138744 -> 140420 bytes 3 files changed, 36 insertions(+) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 57b3dc863..5959eb99a 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1299,6 +1299,22 @@ table.nicetable { background:$primary; padding:1em; margin-bottom:1em; + overflow:hidden; + position: relative; + .close-promo { + position:absolute; + top:0.5em; + right:0.5em; + display:block; + width:16px; + height:16px; + text-indent:-999999px; + background:url(images/sprite.png) -341px -263px no-repeat; + @include border-radius(4px); + &:hover { + background:#222 url(images/sprite.png) -341px -223px no-repeat; + } + } } .alert { diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index af178698c..ba9e8c2d2 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -449,6 +449,26 @@ $.fn.drawer = function(id, ajax) { $('#sub_map_links').animate({'right':-maplinks_width}, 1200); } }); + + + /* + * Add close buttons for .promo's + */ + if($('.promo').length){ + $('.promo').append(''); + } + //only close its own parent + $('.promo').on('click', '.close-promo', function(e){ + e.preventDefault(); + $(this).parent('.promo').animate({ + 'height':0, + 'padding-top':0, + 'padding-bottom':0 + },{ + duration:500, + queue:false + }).fadeOut(500); + }); }); /* diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index d0839890a..a03ae56c2 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ -- cgit v1.2.3 From 84f1d553ae8e5fb0821d2e416538fa935bf2feaf Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 7 Mar 2012 14:27:49 +0000 Subject: Hide sub map links when report process started (fixes #265); bit of space under key tools in mobile environment, and fix typo. --- templates/web/fixmystreet/report/new/fill_in_details_form.html | 2 +- web/cobrands/fixmystreet/base.scss | 1 + web/cobrands/fixmystreet/layout.scss | 1 + web/js/map-OpenLayers.js | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) 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 104fe4e7d..3ccc22c2c 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -24,7 +24,7 @@ [% IF partial_token %]

[% loc('Please note your report has not yet been sent. Choose a category and add further information below, then submit.') %]

[% END %] -

[% loc('You have located the problem at the point marked with a yellow pin on the map. If this is not the correct location, simply click on the map again. ') %]

[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]

[% END %]

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 5959eb99a..967d7422f 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -558,6 +558,7 @@ p.label-valid { @extend .full-width; ul#key-tools{ @include list-reset-soft; + margin-bottom: 1em; display: table; width:100%; li{ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 9aa9af11e..91c32c6af 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -591,6 +591,7 @@ body.twothirdswidthpage { padding-top: 3em; ul#key-tools { border-top: 0.25em solid $primary; + margin: 0; @include box-shadow(-0em 0px 1em 1em #fff); li { border:none; diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 8ee217dff..101585c07 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -461,11 +461,11 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { } } + $('#sub_map_links').hide(); if ($('html').hasClass('mobile')) { var $map_box = $('#map_box'), width = $map_box.width(), height = $map_box.height(); - $('#sub_map_links').hide(); $map_box.append( '

' + 'Try again' + -- cgit v1.2.3 From 6c439ef2f42bd3f7fb11605cf3c62fa9aeee7b57 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 15:30:24 +0000 Subject: Change the behaviour of the js sliding in thing (for #257) Should think about re-structuring the ajax call: perhaps adding a loading gif and then setting the global d_offset variable on success - it might all need moving around a bit though Signed-off-by: Josh Angell --- templates/web/fixmystreet/reports/council.html | 2 +- web/cobrands/fixmystreet/base.scss | 4 ++++ web/cobrands/fixmystreet/fixmystreet.js | 27 +++++++++---------------- web/cobrands/fixmystreet/images/sprite.png | Bin 140420 -> 124999 bytes web/cobrands/fixmystreet/layout.scss | 6 +++++- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 707ecabc8..3de6f81eb 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -80,7 +80,7 @@

[% loc('Wards of this council') %]

[% loc('Follow a ward link to view only reports within that ward.') %]

[% child.name %]

'); } - // Put the padding on an inner div to prevent the jarring jump at end of hide/show animation - var innerDiv = $('

').css({ padding: '1em' }); - d.wrapInner(innerDiv); - var max_height = $(window).height() - $('.content').offset().top - $('.shadow-wrap').height(); - var height = d.height(); - if (!height || height > max_height) { - height = max_height; - } - d.css({ - backgroundColor: 'white', - height: height, - display: 'none', zIndex: 1001, position: 'relative', - overflow: 'auto' - }).removeClass('hidden-js'); + d.removeClass('hidden-js'); if (ajax) { var href = $this.attr('href') + ';ajax=1'; - innerDiv.load(href); + d.load(href); } d.find('h2').css({ marginTop: 0 }); - $('.shadow-wrap').append(d); + $('.content').append(d); + d_offset = d.offset().top; + d.hide(); $this.data('setup', true); } - d.animate( { height: 'show' } ); + d.animate({height:'show'},1000); + $('html, body').animate({scrollTop:d_offset-80}, 1000); + }, function(e){ var $this = $(this), d = $('#' + id); $this.removeClass('hover'); - d.animate( { height: 'hide' } ); + d.animate({height:'hide'}); }); }; diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index a03ae56c2..c2ac370ab 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 9aa9af11e..f04d270cd 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -597,7 +597,7 @@ body.twothirdswidthpage { a { font-size: 0.75em; color:#888888; - padding: 0.5em 1em 0.5em 0; + padding: 0.5em 1.5em 0.5em 0; text-transform:none; &.abuse { background-image:url(images/sprite.png); @@ -611,6 +611,10 @@ body.twothirdswidthpage { background-image:url(images/sprite.png); background-position:right -3225px; } + &.hover { + background-image:url(images/sprite.png); + background-position:right -1876px; + } } } &.singleton { -- cgit v1.2.3 From 083695a6a681d1942fbe36deb8102d66a0cc5d3f Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 16:57:07 +0000 Subject: Finalised how the js slidey drawer works - adding back in bits that I previously took out... Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 24 ++++++++++++++++-------- web/cobrands/fixmystreet/layout.scss | 4 ++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index f50b66fd0..c82afe37f 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -369,18 +369,25 @@ $(function(){ } // A sliding drawer from the bottom of the page -// TODO Not have independent scrolling; height broken in IE6 (at least). Think fixing former will fix latter. $.fn.drawer = function(id, ajax) { this.toggle(function(){ - var $this = $(this), d = $('#' + id); + var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'); if (!$this.addClass('hover').data('setup')) { + // move .shadow-wrap to end of .content first + if(!$('.shadow-wrap.moved').length){ + $sw.appendTo('.content').addClass('moved'); + } + if (!d.length) { d = $('

'); } + // Put the padding on an inner div to prevent the jarring jump at end of hide/show animation + var innerDiv = $('

'); + d.wrapInner(innerDiv); d.removeClass('hidden-js'); if (ajax) { var href = $this.attr('href') + ';ajax=1'; - d.load(href); + innerDiv.load(href); } d.find('h2').css({ marginTop: 0 }); $('.content').append(d); @@ -388,13 +395,14 @@ $.fn.drawer = function(id, ajax) { d.hide(); $this.data('setup', true); } - d.animate({height:'show'},1000); - $('html, body').animate({scrollTop:d_offset-80}, 1000); - + $sw.addClass('active'); + d.animate({height:'show'},500); + $('html, body').animate({scrollTop:d_offset-60}, 1000); }, function(e){ - var $this = $(this), d = $('#' + id); + var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'); $this.removeClass('hover'); - d.animate({height:'hide'}); + $sw.removeClass('active'); + d.animate( { height: 'hide' } ); }); }; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index d6f4bdbaa..d17365ccb 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -627,6 +627,10 @@ body.twothirdswidthpage { } } } + &.active { + padding:3em 0; + position: static; + } } // The padding is for the fading out when it's fixed positioned, which it isn't in IE6. .ie6 .shadow-wrap { -- cgit v1.2.3 From 71eaea2a4fba993a1f7f673eb4398d234c01eae5 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 7 Mar 2012 17:11:59 +0000 Subject: Add spiny ajax spinner thing to the ajax part of the drawer js function (for #257) Signed-off-by: Josh Angell --- web/cobrands/fixmystreet/fixmystreet.js | 12 ++++++++---- web/cobrands/fixmystreet/images/spinner-black-333.gif | Bin 0 -> 1849 bytes 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 web/cobrands/fixmystreet/images/spinner-black-333.gif diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index c82afe37f..0ec9214f2 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -387,7 +387,10 @@ $.fn.drawer = function(id, ajax) { d.removeClass('hidden-js'); if (ajax) { var href = $this.attr('href') + ';ajax=1'; - innerDiv.load(href); + $this.prepend('

'); + innerDiv.load(href, function(){ + $('img', $this).remove(); + }); } d.find('h2').css({ marginTop: 0 }); $('.content').append(d); @@ -396,13 +399,14 @@ $.fn.drawer = function(id, ajax) { $this.data('setup', true); } $sw.addClass('active'); - d.animate({height:'show'},500); + d.animate({height:'show'}, 300); $('html, body').animate({scrollTop:d_offset-60}, 1000); }, function(e){ var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'); $this.removeClass('hover'); - $sw.removeClass('active'); - d.animate( { height: 'hide' } ); + d.animate({height: 'hide'}, 600, function(){ + $sw.removeClass('active'); + }); }); }; diff --git a/web/cobrands/fixmystreet/images/spinner-black-333.gif b/web/cobrands/fixmystreet/images/spinner-black-333.gif new file mode 100644 index 000000000..63b3a9d08 Binary files /dev/null and b/web/cobrands/fixmystreet/images/spinner-black-333.gif differ -- cgit v1.2.3 From 3c29ed23b27f91b814e399b3503ef415208969ff Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 8 Mar 2012 09:32:34 +0000 Subject: Prevent animation jump when closing notice. --- web/cobrands/fixmystreet/fixmystreet.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 0ec9214f2..97130653f 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -465,6 +465,7 @@ $.fn.drawer = function(id, ajax) { e.preventDefault(); $(this).parent('.promo').animate({ 'height':0, + 'margin-bottom':0, 'padding-top':0, 'padding-bottom':0 },{ -- cgit v1.2.3 From 410d1f1edc737d1d60e83f90053fe028eff3de30 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 8 Mar 2012 12:38:17 +0000 Subject: backports package. --- conf/packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/packages b/conf/packages index d5ebbb3db..766e7747c 100644 --- a/conf/packages +++ b/conf/packages @@ -32,7 +32,7 @@ libtest-exception-perl libipc-run3-perl libyaml-perl liblist-moreutils-perl -libhaml-ruby +ruby-compass | libhaml-ruby libtemplate-perl postgresql-server-dev-8.4 gnuplot -- cgit v1.2.3 From 1a5baa677635b0fb981bd4cf83e1843f8d5ef8ab Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 8 Mar 2012 14:05:01 +0000 Subject: Store full size photos that are uploaded on filesystem, put hash in database. Fixes #9, basics for #209 (needs light box adding). --- bin/send-reports | 2 +- conf/general.yml-example | 2 +- notes/INSTALL | 2 +- notes/no-update-server | 2 +- perllib/FixMyStreet/App.pm | 25 ++++++ perllib/FixMyStreet/App/Controller/Open311.pm | 2 +- perllib/FixMyStreet/App/Controller/Photo.pm | 46 +++++++++-- .../FixMyStreet/App/Controller/Questionnaire.pm | 5 +- perllib/FixMyStreet/App/Controller/Report/New.pm | 94 +++++++--------------- .../FixMyStreet/App/Controller/Report/Update.pm | 5 +- perllib/FixMyStreet/App/Controller/Rss.pm | 4 +- perllib/FixMyStreet/DB/Result/Comment.pm | 11 +-- perllib/FixMyStreet/DB/Result/Problem.pm | 11 +-- t/app/controller/report_import.t | 4 +- templates/web/default/alert/index.html | 2 +- templates/web/default/alert/list.html | 2 +- templates/web/default/around/around_index.html | 2 +- templates/web/default/index.html | 2 +- .../default/report/new/fill_in_details_form.html | 2 +- templates/web/default/static/fun.html | 4 +- templates/web/fixmystreet/alert/index.html | 2 +- templates/web/fixmystreet/alert/list.html | 2 +- templates/web/fixmystreet/around/around_index.html | 2 +- .../fixmystreet/around/around_map_list_items.html | 2 +- .../web/fixmystreet/around/on_map_list_items.html | 2 +- templates/web/fixmystreet/index.html | 2 +- templates/web/fixmystreet/questionnaire/index.html | 1 + templates/web/fixmystreet/report/display.html | 1 + .../report/new/fill_in_details_form.html | 9 ++- templates/web/fixmystreet/report/photo.html | 4 +- templates/web/fixmystreet/reports/council.html | 2 +- templates/web/fixmystreet/static/fun.html | 4 +- 32 files changed, 129 insertions(+), 133 deletions(-) diff --git a/bin/send-reports b/bin/send-reports index d92c10467..e012cc1f0 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -69,7 +69,7 @@ while (my $row = $unsent->next) { $h{phone_line} = $h{phone} ? _('Phone:') . " $h{phone}\n\n" : ''; if ($row->photo) { $h{has_photo} = _("This web page also contains a photo of the problem, provided by the user.") . "\n\n"; - $h{image_url} = $email_base_url . '/photo?id=' . $row->id; + $h{image_url} = $email_base_url . '/photo/' . $row->id . '.full.jpeg'; } else { $h{has_photo} = ''; $h{image_url} = ''; diff --git a/conf/general.yml-example b/conf/general.yml-example index efdb5d007..323678487 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -22,7 +22,7 @@ TEST_EMAIL_PREFIX: '' CONTACT_NAME: 'FixMyStreet' STAGING_SITE: 1 -UPLOAD_CACHE: '/upload/' +UPLOAD_DIR: '/upload/' GEO_CACHE: '/cache/' GOOGLE_MAPS_API_KEY: '' BING_MAPS_API_KEY: '' diff --git a/notes/INSTALL b/notes/INSTALL index 560eb6c0f..bb28e60fa 100644 --- a/notes/INSTALL +++ b/notes/INSTALL @@ -21,7 +21,7 @@ to populate the alert types table. Copy conf/general.yml-example to conf/general.yml and set it up appropriately: * provide the relevant database connection details * the BASE_URL to be where your test site will run - eg 'http://localhost' -* set UPLOAD_CACHE and GEO_CACHE to your preferred values +* set UPLOAD_DIR and GEO_CACHE to your preferred values * MAP_TYPE - OSM is probably the best one to try to start with, it's being successfully used. diff --git a/notes/no-update-server b/notes/no-update-server index ad1ce26e2..1f59c0116 100644 --- a/notes/no-update-server +++ b/notes/no-update-server @@ -323,7 +323,7 @@ TEST_EMAIL_PREFIX: '' CONTACT_NAME: 'FiksGataMi' STAGING_SITE: 1 -UPLOAD_CACHE: '/var/lib/fixmystreet/upload/' +UPLOAD_DIR: '/var/lib/fixmystreet/upload/' GEO_CACHE: '/var/lib/fixmystreet/cache/' GOOGLE_MAPS_API_KEY: '' diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 0582d88c9..262379b79 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -11,6 +11,7 @@ use mySociety::EmailUtil; use mySociety::Random qw(random_bytes); use FixMyStreet::Map; +use Path::Class; use URI; use URI::QueryParam; @@ -415,6 +416,30 @@ sub render_fragment { $c->view('Web')->render($c, $template, $vars); } +=head2 get_photo_params + +Returns a hashref of details of any attached photo for use in templates. +Hashref contains height, width and url keys. + +=cut + +sub get_photo_params { + my ($self, $key) = @_; + $key = ($key eq 'id') ? '' : "/$key"; + + return {} unless $self->photo; + + my $photo = {}; + if (length($self->photo) == 40) { + $photo->{url_full} = '/photo' . $key . '/' . $self->id . '.full.jpeg'; + } else { + ( $photo->{width}, $photo->{height} ) = + Image::Size::imgsize( \$self->photo ); + } + $photo->{url} = '/photo' . $key . '/' . $self->id . '.jpeg'; + + return $photo; +} =head1 SEE ALSO diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm index fe1494b95..34e2b7cd3 100644 --- a/perllib/FixMyStreet/App/Controller/Open311.pm +++ b/perllib/FixMyStreet/App/Controller/Open311.pm @@ -283,7 +283,7 @@ sub output_requests : Private { my $display_photos = $c->cobrand->allow_photo_display; if ($display_photos && $problem->photo) { my $url = $c->cobrand->base_url(); - my $imgurl = $url . "/photo?id=$id"; + my $imgurl = $url . "/photo/$id.full.jpeg"; $request->{'media_url'} = [ $imgurl ]; } push(@problemlist, $request); diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index 3f55e4692..3ca7f13a9 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -5,6 +5,7 @@ use namespace::autoclean; BEGIN {extends 'Catalyst::Controller'; } use DateTime::Format::HTTP; +use Path::Class; =head1 NAME @@ -25,17 +26,30 @@ Display a photo =cut -sub index :Path :Args(0) { +sub during :LocalRegex('^([0-9a-f]{40})\.temp\.jpeg$') { my ( $self, $c ) = @_; + my ( $hash ) = @{ $c->req->captures }; - my $id = $c->req->param('id'); - my $comment = $c->req->param('c'); - $c->detach( 'no_photo' ) unless $id || $comment; + my $file = file( $c->config->{UPLOAD_DIR}, "$hash.jpeg" ); + my $photo = $file->slurp; + + if ( $c->cobrand->default_photo_resize ) { + $photo = _shrink( $photo, $c->cobrand->default_photo_resize ); + } else { + $photo = _shrink( $photo, 'x250' ); + } + + $c->forward( 'output', [ $photo ] ); +} + +sub index :LocalRegex('^(c/)?(\d+)(?:\.(full|tn|fp))?\.jpeg$') { + my ( $self, $c ) = @_; + my ( $is_update, $id, $size ) = @{ $c->req->captures }; my @photo; - if ( $comment ) { + if ( $is_update ) { @photo = $c->model('DB::Comment')->search( { - id => $comment, + id => $id, state => 'confirmed', photo => { '!=', undef }, } ); @@ -56,14 +70,30 @@ sub index :Path :Args(0) { $c->detach( 'no_photo' ) unless @photo; my $photo = $photo[0]->photo; - if ( $c->req->param('tn' ) ) { + + # If photo field contains a hash + if (length($photo) == 40) { + my $file = file( $c->config->{UPLOAD_DIR}, "$photo.jpeg" ); + $photo = $file->slurp; + } + + if ( $size eq 'tn' ) { $photo = _shrink( $photo, 'x100' ); - } elsif ( $c->req->param('fp' ) ) { + } elsif ( $size eq 'fp' ) { $photo = _crop( $photo ); + } elsif ( $size eq 'full' ) { } elsif ( $c->cobrand->default_photo_resize ) { $photo = _shrink( $photo, $c->cobrand->default_photo_resize ); + } else { + $photo = _shrink( $photo, 'x250' ); } + $c->forward( 'output', [ $photo ] ); +} + +sub output : Private { + my ( $self, $c, $photo ) = @_; + my $dt = DateTime->now(); $dt->set_year( $dt->year + 1 ); diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm index f0cb02115..6ed7ddd9d 100755 --- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm +++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm @@ -205,10 +205,7 @@ sub submit_standard : Private { } ); if ( my $fileid = $c->stash->{upload_fileid} ) { - my $file = file( $c->config->{UPLOAD_CACHE}, "$fileid.jpg" ); - my $blob = $file->slurp; - $file->remove; - $update->photo($blob); + $update->photo( $fileid ); } $update->insert; } diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 12b48a99b..c61f4847c 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -5,6 +5,7 @@ use namespace::autoclean; BEGIN { extends 'Catalyst::Controller'; } use FixMyStreet::Geocode; +use Digest::SHA1 qw(sha1_hex); use Encode; use Image::Magick; use List::MoreUtils qw(uniq); @@ -47,7 +48,10 @@ back into lat/lng by the map code. =head2 image related -Parameters are 'photo' or 'upload_fileid'. The 'photo' is used when a user has selected a file. Once it has been uploaded it is cached on disk so that if there are errors on the form it need not be uploaded again. The cache location is stored in 'upload_fileid'. +Parameters are 'photo' or 'upload_fileid'. The 'photo' is used when a user has +selected a file. Once it has been uploaded it is cached on disk so that if +there are errors on the form it need not be uploaded again. The hash of the +photo is stored in 'upload_fileid'. =head2 optional @@ -200,8 +204,8 @@ sub report_import : Path('/import') { } # handle the photo upload - $c->forward( 'process_photo_upload', [ { rotate_photo => 1 } ] ); - my $photo = $c->stash->{upload_fileid}; + $c->forward( 'process_photo_upload' ); + my $fileid = $c->stash->{upload_fileid}; if ( my $error = $c->stash->{photo_error} ) { push @errors, $error; } @@ -224,7 +228,7 @@ sub report_import : Path('/import') { if $@; } - unless ( $photo || ( $latitude || $longitude ) ) { + unless ( $fileid || ( $latitude || $longitude ) ) { push @errors, 'Either a location or a photo must be provided.'; } @@ -292,11 +296,8 @@ sub report_import : Path('/import') { ); # If there was a photo add that too - if ( $photo ) { - my $file = file( $c->config->{UPLOAD_CACHE}, "$photo.jpg" ); - my $blob = $file->slurp; - $file->remove; - $report->photo($blob); + if ( $fileid ) { + $report->photo($fileid); } # save the report; @@ -825,11 +826,7 @@ sub process_photo : Private { } sub process_photo_upload : Private { - my ( $self, $c, $args ) = @_; - - # setup args and set defaults - $args ||= {}; - $args->{rotate_photo} ||= 0; + my ( $self, $c ) = @_; # check for upload or return my $upload = $c->req->upload('photo') @@ -842,9 +839,13 @@ sub process_photo_upload : Private { return; } - # convert the photo into a blob (also resize etc) - my $photo_blob = - eval { _process_photo( $upload->fh, $args->{rotate_photo} ) }; + # get the photo into a variable + my $photo_blob = eval { + my $filename = $upload->tempname; + my $out = `jhead -se -autorot $filename`; + my $photo = $upload->slurp; + return $photo; + }; if ( my $error = $@ ) { my $format = _( "That image doesn't appear to have uploaded correctly (%s), please try again." @@ -853,21 +854,18 @@ sub process_photo_upload : Private { return; } - # we have an image we can use - save it to the cache in case there is an - # error - my $cache_dir = dir( $c->config->{UPLOAD_CACHE} ); + # we have an image we can use - save it to the upload dir for storage + my $cache_dir = dir( $c->config->{UPLOAD_DIR} ); $cache_dir->mkpath; unless ( -d $cache_dir && -w $cache_dir ) { warn "Can't find/write to photo cache directory '$cache_dir'"; return; } - # create a random name and store the file there - my $fileid = int rand 1_000_000_000; - my $file = $cache_dir->file("$fileid.jpg"); - $file->openw->print($photo_blob); + my $fileid = sha1_hex($photo_blob); + $upload->copy_to( file($cache_dir, $fileid . '.jpeg') ); - # stick the random number on the stash + # stick the hash on the stash, so don't have to reupload in case of error $c->stash->{upload_fileid} = $fileid; return 1; @@ -883,12 +881,12 @@ does return true and put fileid on stash, otherwise false. sub process_photo_cache : Private { my ( $self, $c ) = @_; - # get the fileid and make sure it is just a number + # get the fileid and make sure it is just a hex number my $fileid = $c->req->param('upload_fileid') || ''; - $fileid =~ s{\D+}{}g; + $fileid =~ s{[^0-9a-f]}{}gi; return unless $fileid; - my $file = file( $c->config->{UPLOAD_CACHE}, "$fileid.jpg" ); + my $file = file( $c->config->{UPLOAD_DIR}, "$fileid.jpeg" ); return unless -e $file; $c->stash->{upload_fileid} = $fileid; @@ -980,10 +978,7 @@ sub save_user_and_report : Private { # If there was a photo add that too if ( my $fileid = $c->stash->{upload_fileid} ) { - my $file = file( $c->config->{UPLOAD_CACHE}, "$fileid.jpg" ); - my $blob = $file->slurp; - $file->remove; - $report->photo($blob); + $report->photo($fileid); } # Set a default if possible @@ -1123,41 +1118,6 @@ sub redirect_to_around : Private { return $c->res->redirect($around_uri); } -sub _process_photo { - my $fh = shift; - my $import = shift; - - my $blob = join('', <$fh>); - close $fh; - my ($handle, $filename) = mySociety::TempFiles::named_tempfile('.jpeg'); - print $handle $blob; - close $handle; - - my $photo = Image::Magick->new; - my $err = $photo->Read($filename); - unlink $filename; - throw Error::Simple("read failed: $err") if "$err"; - $err = $photo->Scale(geometry => "250x250>"); - throw Error::Simple("resize failed: $err") if "$err"; - my @blobs = $photo->ImageToBlob(); - undef $photo; - $photo = $blobs[0]; - return $photo unless $import; # Only check orientation for iPhone imports at present - - # Now check if it needs orientating - ($fh, $filename) = mySociety::TempFiles::named_tempfile('.jpeg'); - print $fh $photo; - close $fh; - my $out = `jhead -se -autorot $filename`; - if ($out) { - open(FP, $filename) or throw Error::Simple($!); - $photo = join('', ); - close FP; - } - unlink $filename; - return $photo; -} - __PACKAGE__->meta->make_immutable; 1; diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index 29933e2f6..600684a40 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -282,10 +282,7 @@ sub save_update : Private { # If there was a photo add that too if ( my $fileid = $c->stash->{upload_fileid} ) { - my $file = file( $c->config->{UPLOAD_CACHE}, "$fileid.jpg" ); - my $blob = $file->slurp; - $file->remove; - $update->photo($blob); + $update->photo($fileid); } if ( $update->in_storage ) { diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 822780b81..4d0b6cb93 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -267,8 +267,8 @@ sub add_row : Private { $item{category} = $row->{category} if $row->{category}; if ($c->cobrand->allow_photo_display && $row->{photo}) { - my $key = $alert_type->item_table eq 'comment' ? 'c' : 'id'; - $item{description} .= ent("\n

cobrand->base_url . "/photo?$key=$row->{id}\">"); + my $key = $alert_type->item_table eq 'comment' ? 'c/' : ''; + $item{description} .= ent("\n

cobrand->base_url . "/photo/$key$row->{id}.jpeg\">"); } if ( $row->{used_map} ) { diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index 958194eb8..195fe4019 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -132,21 +132,12 @@ sub confirm { =head2 get_photo_params Returns a hashref of details of any attached photo for use in templates. -Hashref contains height, width and url keys. =cut sub get_photo_params { my $self = shift; - - return {} unless $self->photo; - - my $photo = {}; - ( $photo->{width}, $photo->{height} ) = - Image::Size::imgsize( \$self->photo ); - $photo->{url} = '/photo?c=' . $self->id; - - return $photo; + return FixMyStreet::App::get_photo_params($self, 'c'); } =head2 meta_problem_state diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index d0867c5ca..ce7488703 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -400,21 +400,12 @@ sub url { =head2 get_photo_params Returns a hashref of details of any attached photo for use in templates. -Hashref contains height, width and url keys. =cut sub get_photo_params { my $self = shift; - - return {} unless $self->photo; - - my $photo = {}; - ( $photo->{width}, $photo->{height} ) = - Image::Size::imgsize( \$self->photo ); - $photo->{url} = '/photo?id=' . $self->id; - - return $photo; + return FixMyStreet::App::get_photo_params($self, 'id'); } =head2 is_open diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t index d6bff240c..934bf0346 100644 --- a/t/app/controller/report_import.t +++ b/t/app/controller/report_import.t @@ -128,7 +128,7 @@ subtest "Submit a correct entry" => sub { "check imported fields are shown"; # Check photo present, and still there after map submission (testing bug #18) - $mech->content_contains( '

content_contains('longitude" value="-0.141587"', 'Check longitude'); $mech->submit_form_ok( @@ -139,7 +139,7 @@ subtest "Submit a correct entry" => sub { }, "New map location" ); - $mech->content_contains( '

content_contains('longitude" value="-0.142608"', 'Check longitude'); diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index d8478cf98..274d61780 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -30,7 +30,7 @@ postcode or street name and area:' ) %]

[% loc('Some photos of recent reports') %]

[% FOREACH p IN photos %]

+ src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"> [% END %]

[% END %] diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index c763331cc..9f2bd69d0 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -27,7 +27,7 @@

[% loc('Photos of recent nearby reports') %]

[% FOREACH p IN photos %]

+ src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"> [% END %]

[% END %] diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html index c07eb2ca2..012354f4a 100644 --- a/templates/web/default/around/around_index.html +++ b/templates/web/default/around/around_index.html @@ -39,7 +39,7 @@ [% IF partial_token %]

- + [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :") %]

[% END %] diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 0a0ee7170..e5f98b0c5 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -63,7 +63,7 @@

[% FOREACH p IN recent_photos %] + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"> [% END %]

[% END %] diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index 2809b9c0e..ed8b07ea1 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -95,7 +95,7 @@ [% END %] [% IF report.photo %] -

[% END %] [% END %] diff --git a/templates/web/default/static/fun.html b/templates/web/default/static/fun.html index abe9d4028..00976f3ec 100644 --- a/templates/web/default/static/fun.html +++ b/templates/web/default/static/fun.html @@ -10,7 +10,7 @@ Do let us know if you find any more.

+
Dumped Piano (right)

The reporter of this problem summed it up with their report, which consisted solely of the one character “!”. — @@ -20,7 +20,7 @@ Do let us know if you find any more.

“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — Problem report -
+
Boxes full of cheese dumped (right)

“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — Problem report diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index 0903937f7..7bec66305 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -33,7 +33,7 @@ within a certain distance of a particular location.') %]
[% loc('Some photos of recent reports') %]
[% FOREACH p IN photos %] + src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"> [% END %]

diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html index c488e72ee..8305fff6f 100644 --- a/templates/web/fixmystreet/alert/list.html +++ b/templates/web/fixmystreet/alert/list.html @@ -27,7 +27,7 @@

[% loc('Photos of recent nearby reports') %]

[% FOREACH p IN photos %]

+ src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"> [% END %]

- + [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :") %]

[% IF p.problem.photo %]

[% END %] diff --git a/templates/web/fixmystreet/around/on_map_list_items.html b/templates/web/fixmystreet/around/on_map_list_items.html index 3c3b66cf9..9329e6833 100644 --- a/templates/web/fixmystreet/around/on_map_list_items.html +++ b/templates/web/fixmystreet/around/on_map_list_items.html @@ -11,7 +11,7 @@

[% IF p.photo %]

[% END %] diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index d393eeac6..605e428a3 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -81,7 +81,7 @@ Modernizr.load({ [% prettify_epoch( p.confirmed_local.epoch, 1 ) %]

diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html index a1a159aa8..3b23c81cd 100644 --- a/templates/web/fixmystreet/questionnaire/index.html +++ b/templates/web/fixmystreet/questionnaire/index.html @@ -83,6 +83,7 @@ your experience of getting the problem fixed?') %]

[% IF c.cobrand.allow_photo_upload %]

[% IF upload_fileid %] +

[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]

[% END %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 2ac0f407c..a79cbe0ca 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -101,6 +101,7 @@ [% IF c.cobrand.allow_photo_upload %]

[% IF upload_fileid %] +

[% loc('You have already attached a photo to this update, attaching another one will replace it.') %]

[% END %] 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 3ccc22c2c..d908aee99 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -93,14 +93,15 @@ [% IF upload_fileid || report.photo %] -

[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]

- [% IF upload_fileid %] - +

+ [% END %] +

[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]

+ [% IF report.photo %] -

[% END %] [% END %] diff --git a/templates/web/fixmystreet/report/photo.html b/templates/web/fixmystreet/report/photo.html index e74f0bbfe..a338391ce 100644 --- a/templates/web/fixmystreet/report/photo.html +++ b/templates/web/fixmystreet/report/photo.html @@ -1,6 +1,8 @@ [% IF c.cobrand.allow_photo_display && object.photo %] [% photo = object.get_photo_params %]

+ [% IF photo.url_full %][% END + %] Photo of this report

+ [%- IF photo.url_full %][% END %]

[% END %] diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 3de6f81eb..142a1750d 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -118,7 +118,7 @@

[% IF problem.photo %]

[% END %] diff --git a/templates/web/fixmystreet/static/fun.html b/templates/web/fixmystreet/static/fun.html index b0402922a..57a74a0d7 100644 --- a/templates/web/fixmystreet/static/fun.html +++ b/templates/web/fixmystreet/static/fun.html @@ -10,7 +10,7 @@ Do let us know if you find any more.

+
Dumped Piano (right)

The reporter of this problem summed it up with their report, which consisted solely of the one character “!”. — @@ -20,7 +20,7 @@ Do let us know if you find any more.

“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — Problem report -
+
Boxes full of cheese dumped (right)

“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — Problem report -- cgit v1.2.3 From ac920f434dc6be5335e3dbdbe8621a30518888e1 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Thu, 8 Mar 2012 16:10:44 +0000 Subject: Josh testing eclipse and git --- web/cobrands/fixmystreet/layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index d17365ccb..711a3d511 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -1,3 +1,4 @@ +//this is josh testing eclipse @import "compass"; @import "_colours"; @import "_mixins"; -- cgit v1.2.3 From a31dfba56178093e2a34c57fc8d13bb44b147f76 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Fri, 9 Mar 2012 11:30:30 +0000 Subject: Removing my test commit message --- web/cobrands/fixmystreet/layout.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 711a3d511..d17365ccb 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -1,4 +1,3 @@ -//this is josh testing eclipse @import "compass"; @import "_colours"; @import "_mixins"; -- cgit v1.2.3 From 60cc1906bd594e208d81279de328cf8c0c2c6aa0 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Fri, 9 Mar 2012 11:41:16 +0000 Subject: Take out gap on report page in the header area (for #274). Related: also made .general-sidebar-notes go mainline when the middle media query kicks in. --- web/cobrands/fixmystreet/layout.scss | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index d17365ccb..f1362bc81 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -1,3 +1,4 @@ + @import "compass"; @import "_colours"; @import "_mixins"; @@ -777,11 +778,6 @@ textarea.form-error { } } -// Report page -.problem-header { - min-height:19em; -} - // Frontpage body.frontpage { @@ -1019,7 +1015,8 @@ body.frontpage { //put the RAP notes into the main copy area // Note: Also used for the non-JS case. - #report-a-problem-sidebar { + #report-a-problem-sidebar, + .general-sidebar-notes { position: static; width: auto; @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); -- cgit v1.2.3 From 1dfc915c3546ca508c2964c12cf890c8f90e7b9a Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Fri, 9 Mar 2012 11:46:03 +0000 Subject: Also added the general-sidebar-notes to the no-js case so they mainline there as well. --- web/cobrands/fixmystreet/layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index f1362bc81..5b03fa902 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -749,6 +749,7 @@ textarea.form-error { } } +.no-js .general-sidebar-notes, .no-js #report-a-problem-sidebar { position: static; width: auto; -- cgit v1.2.3 From 7b96e41ebaf23febdd09f68df1acf6febad11dc5 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 9 Mar 2012 13:43:32 +0000 Subject: Fix bug whereby Firefox did not move the pin from under the help when it appeared. --- web/js/map-OpenLayers.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 101585c07..58d1e21ec 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -236,6 +236,9 @@ $(function(){ fixmystreet.map.moveStart = { zoom: this.getZoom(), center: this.getCenter() }; }); fixmystreet.map.events.register("zoomend", null, function(e){ + if ( fixmystreet.map.moveStart && !fixmystreet.map.moveStart.zoom ) { + return true; // getZoom() on Firefox appears to return null at first? + } if ( !fixmystreet.map.moveStart || !this.getCenter().equals(fixmystreet.map.moveStart.center) ) { // Centre has moved, e.g. by double-click. Same whether zoom in or out fixmystreet.map.pan(-q, -25, { animate: false }); @@ -433,6 +436,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { }); $('#side-form, #site-logo').show(); + fixmystreet.map.updateSize(); // might have done, and otherwise Firefox gets confused. /* For some reason on IOS5 if you use the jQuery show method it * doesn't display the JS validation error messages unless you do this * or you cause a screen redraw by changing the phone orientation. -- cgit v1.2.3 From 8742bca85b88af69b2f6cf3e6095a873482a9d94 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Fri, 9 Mar 2012 17:13:45 +0000 Subject: For #257: make js load cover .content with new content if its big, otherwise display like a mini drawer --- web/cobrands/fixmystreet/fixmystreet.js | 80 ++++++++++++++++++++++++--------- web/cobrands/fixmystreet/layout.scss | 4 +- 2 files changed, 62 insertions(+), 22 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 97130653f..dfa5ddbf0 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -371,42 +371,82 @@ $(function(){ // A sliding drawer from the bottom of the page $.fn.drawer = function(id, ajax) { this.toggle(function(){ - var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'); + var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'), tot_height = $(window).height() - $('.content[role="main"]').offset().top; if (!$this.addClass('hover').data('setup')) { - // move .shadow-wrap to end of .content first - if(!$('.shadow-wrap.moved').length){ - $sw.appendTo('.content').addClass('moved'); - } - + // make a drawer div with an innerDiv if (!d.length) { d = $('
'); } - // Put the padding on an inner div to prevent the jarring jump at end of hide/show animation var innerDiv = $('
'); d.wrapInner(innerDiv); - d.removeClass('hidden-js'); + + // if ajax, load it with a spinner if (ajax) { var href = $this.attr('href') + ';ajax=1'; - $this.prepend(' '); + $this.prepend(' '); innerDiv.load(href, function(){ - $('img', $this).remove(); + $('.spinner').remove(); }); } + // do some css + d.removeClass('hidden-js'); d.find('h2').css({ marginTop: 0 }); - $('.content').append(d); - d_offset = d.offset().top; - d.hide(); + + // check to see if drawer is taller than the window or not + var height = d.height(); + if (!height || height > $(window).height()) { + // its tall - so put it after .content + $('.content[role="main"]').after(d); + d.addClass('content'); + // position over the top of the main .content but hide below the bottom of the window + d.css({ + position: 'absolute', + zIndex: '1100', + top: tot_height + }); + if(!$('.shadow-wrap.static').length){ + $sw.prependTo(d).addClass('static'); + } + }else{ + // its short, so add to shadow-wrap and tweak css + d.hide(); + $sw.append(d); + $('div', d).css({ + padding: '1em', + background: '#fff' + }); + } + $this.data('setup', true); } - $sw.addClass('active'); - d.animate({height:'show'}, 300); - $('html, body').animate({scrollTop:d_offset-60}, 1000); + + //do the animation + if (!height || height > $(window).height()) { + if(!$('.shadow-wrap.static').length){ + $sw.prependTo(d).addClass('static'); + } + d.animate({top:'0'}, 1300, function(){ + $('.content[role="main"]').fadeOut(); + }); + }else{ + d.animate({height:'show'}, 600); + } }, function(e){ - var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'); + var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'), tot_height = $(window).height() - $('.content[role="main"]').offset().top; $this.removeClass('hover'); - d.animate({height: 'hide'}, 600, function(){ - $sw.removeClass('active'); - }); + + //do the animation + if ($('.content[role="main"]').is(':hidden')) { + $('.content[role="main"]').show(); + d.animate({top: tot_height}, 1300, function(){ + // move tools back + if($('.shadow-wrap.static').length){ + $sw.appendTo($('.content[role="main"]')).removeClass('static'); + } + }); + }else{ + d.animate({height: 'hide'}, 600); + } }); }; diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 5b03fa902..d1f4416b3 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -628,8 +628,8 @@ body.twothirdswidthpage { } } } - &.active { - padding:3em 0; + &.static { + padding:0 0 1em 0; position: static; } } -- cgit v1.2.3 From ce862841a03b6b02cb35003732d2c24f9dd29378 Mon Sep 17 00:00:00 2001 From: Matthew Somerville
Date: Fri, 9 Mar 2012 23:51:34 +0000 Subject: Fix reopening of drawer, and start/end it at right height to look smooth. --- web/cobrands/fixmystreet/fixmystreet.js | 94 ++++++++++++++------------------- 1 file changed, 41 insertions(+), 53 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index dfa5ddbf0..b158bc218 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -368,10 +368,30 @@ $(function(){ $('
').insertAfter($('#map')); } -// A sliding drawer from the bottom of the page +// A sliding drawer from the bottom of the page, small version +// that doesn't change the main content at all. +$.fn.small_drawer = function(id) { + this.toggle(function(){ + var $this = $(this), d = $('#' + id); + if (!$this.addClass('hover').data('setup')) { + d.hide().removeClass('hidden-js').css({ + padding: '1em', + background: '#fff' + }).appendTo($('.shadow-wrap')); + $this.data('setup', true); + } + d.slideDown(); + }, function(e){ + var $this = $(this), d = $('#' + id); + $this.removeClass('hover'); + d.slideUp(); + }); +}; + +// A sliding drawer from the bottom of the page, large version $.fn.drawer = function(id, ajax) { this.toggle(function(){ - var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'), tot_height = $(window).height() - $('.content[role="main"]').offset().top; + var $this = $(this), d = $('#' + id), $content = $('.content[role="main"]'); if (!$this.addClass('hover').data('setup')) { // make a drawer div with an innerDiv if (!d.length) { @@ -388,71 +408,39 @@ $.fn.drawer = function(id, ajax) { $('.spinner').remove(); }); } - // do some css - d.removeClass('hidden-js'); - d.find('h2').css({ marginTop: 0 }); - // check to see if drawer is taller than the window or not - var height = d.height(); - if (!height || height > $(window).height()) { - // its tall - so put it after .content - $('.content[role="main"]').after(d); - d.addClass('content'); - // position over the top of the main .content but hide below the bottom of the window - d.css({ + // Tall drawer - put after .content for scrolling to work okay. + // position over the top of the main .content in precisely the right location + d.insertAfter($content).addClass('content').css({ position: 'absolute', zIndex: '1100', - top: tot_height - }); - if(!$('.shadow-wrap.static').length){ - $sw.prependTo(d).addClass('static'); - } - }else{ - // its short, so add to shadow-wrap and tweak css - d.hide(); - $sw.append(d); - $('div', d).css({ - padding: '1em', - background: '#fff' - }); - } - + marginTop: 0, + top: $(window).height() - $content.offset().top + }).removeClass('hidden-js').find('h2').css({ marginTop: 0 }); $this.data('setup', true); } //do the animation - if (!height || height > $(window).height()) { - if(!$('.shadow-wrap.static').length){ - $sw.prependTo(d).addClass('static'); - } - d.animate({top:'0'}, 1300, function(){ - $('.content[role="main"]').fadeOut(); - }); - }else{ - d.animate({height:'show'}, 600); - } + $('.shadow-wrap').prependTo(d).addClass('static'); + d.show().animate({top:'3em'}, 1000, function(){ + $content.fadeOut(); + }); }, function(e){ - var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'), tot_height = $(window).height() - $('.content[role="main"]').offset().top; + var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'), + $content = $('.content[role="main"]'), + tot_height = $(window).height() - d.offset().top; $this.removeClass('hover'); - - //do the animation - if ($('.content[role="main"]').is(':hidden')) { - $('.content[role="main"]').show(); - d.animate({top: tot_height}, 1300, function(){ - // move tools back - if($('.shadow-wrap.static').length){ - $sw.appendTo($('.content[role="main"]')).removeClass('static'); - } - }); - }else{ - d.animate({height: 'hide'}, 600); - } + $content.show(); + d.animate({ top: tot_height }, 1000, function(){ + d.hide(); + $sw.appendTo($content).removeClass('static'); + }); }); }; $('#key-tool-wards').drawer('council_wards', false); $('#key-tool-around-updates').drawer('updates_ajax', true); - $('#key-tool-report-updates').drawer('report-updates-data', false); + $('#key-tool-report-updates').small_drawer('report-updates-data'); // Go directly to RSS feed if RSS button clicked on alert page // (due to not wanting around form to submit, though good thing anyway) -- cgit v1.2.3 From ac385219bed1f3e5e41227b7e415b1b14d0b1c0d Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 10 Mar 2012 00:26:22 +0000 Subject: Have report email alerts appear somewhere sensible in mobile view. --- templates/web/fixmystreet/report/display.html | 14 +++++++------- web/cobrands/fixmystreet/fixmystreet.js | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index a79cbe0ca..03a6f79b5 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -22,6 +22,13 @@ [% INCLUDE 'report/_main.html' %] +
+
+
[% loc('Report abuse' ) %]
+
[% loc('Get updates' ) %]
+
[% loc( 'Problems nearby' ) %]
+
+

@@ -40,13 +47,6 @@
-
-
-
[% loc('Report abuse' ) %]
-
[% loc('Get updates' ) %]
-
[% loc( 'Problems nearby' ) %]
-
-
[% INCLUDE 'report/updates.html' %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index b158bc218..df87e6e8e 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -377,7 +377,7 @@ $.fn.small_drawer = function(id) { d.hide().removeClass('hidden-js').css({ padding: '1em', background: '#fff' - }).appendTo($('.shadow-wrap')); + }); $this.data('setup', true); } d.slideDown(); @@ -464,6 +464,7 @@ $.fn.drawer = function(id, ajax) { if($('.mobile').length){ $('#map_permalink').hide(); $('#key-tools a.feed').appendTo('#sub_map_links'); + $('#report-updates-data').insertAfter($('#map_box')); } //add open/close toggle button on desk $('#sub_map_links').prepend(' '); -- cgit v1.2.3 From 8418a9014b4b9234ad26ae0b7d9c1d60cacd3fb5 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 10 Mar 2012 00:31:01 +0000 Subject: Fix drawers mostly in IE6, and turn off absolute positioning when drawer finishes as otherwise middle media query goes all wrong due to container 100% width. --- web/cobrands/fixmystreet/fixmystreet.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index df87e6e8e..c487ec227 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -415,6 +415,7 @@ $.fn.drawer = function(id, ajax) { position: 'absolute', zIndex: '1100', marginTop: 0, + left: 0, top: $(window).height() - $content.offset().top }).removeClass('hidden-js').find('h2').css({ marginTop: 0 }); $this.data('setup', true); @@ -423,18 +424,20 @@ $.fn.drawer = function(id, ajax) { //do the animation $('.shadow-wrap').prependTo(d).addClass('static'); d.show().animate({top:'3em'}, 1000, function(){ - $content.fadeOut(); + $content.fadeOut(function() { + d.css({ position: 'relative' }); + }); }); }, function(e){ var $this = $(this), d = $('#' + id), $sw = $('.shadow-wrap'), $content = $('.content[role="main"]'), tot_height = $(window).height() - d.offset().top; $this.removeClass('hover'); - $content.show(); - d.animate({ top: tot_height }, 1000, function(){ + d.css({ position: 'absolute' }).animate({ top: tot_height }, 1000, function(){ d.hide(); $sw.appendTo($content).removeClass('static'); }); + $content.show(); }); }; -- cgit v1.2.3 From b5f2bfd08d2faea2f80bbcb57fb04d2d9fb4051d Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 10 Mar 2012 01:05:44 +0000 Subject: Do sensible things for the drawer links on mobile, be that reordering slightly so that wards appear next to their link, or not having a drawer for around updates. --- templates/web/fixmystreet/reports/council.html | 32 ++++++++++++-------------- web/cobrands/fixmystreet/base.scss | 2 +- web/cobrands/fixmystreet/fixmystreet.js | 12 ++++++++-- web/cobrands/fixmystreet/layout.scss | 4 ++++ 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 142a1750d..374f9713a 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -21,6 +21,15 @@
+ +
+ [% IF ward %] + [% ward.name %], [% council.name %] + [% ELSE %] + [% council.name %] + [% END %] +
+ [% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %]
This council no longer exists. [% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] @@ -58,24 +67,8 @@
[% END %] -
- [% IF ward %] - [% ward.name %], [% council.name %] - [% ELSE %] - [% council.name %] - [% END %] -
- [% INCLUDE 'reports/cobrand_stats.html' %] -[% IF c.cobrand.moniker == 'fixmystreet' %] -
- FixMyStreet is now available for local council websites. - Find out more. -
-[% END %] - - [% IF children.size %]

[% loc('Wards of this council') %]
@@ -88,7 +81,12 @@
[% END %] - +[% IF c.cobrand.moniker == 'fixmystreet' %] +
+ FixMyStreet is now available for local council websites. + Find out more. +
+[% END %] [% INCLUDE 'pagination.html', param = 'p' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index f95a4a7e9..04277d0b1 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -102,7 +102,7 @@ h1 { font-size: 2em; line-height: 1em; font-weight: normal; - margin-top: 0; + margin-top: 0.5em; margin-bottom: 0.5em; } #front-main h1 { diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index c487ec227..316409ccc 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -441,8 +441,16 @@ $.fn.drawer = function(id, ajax) { }); }; - $('#key-tool-wards').drawer('council_wards', false); - $('#key-tool-around-updates').drawer('updates_ajax', true); + if ($('html.mobile').length) { + $('#council_wards').hide().removeClass('hidden-js').find('h2').hide(); + $('#key-tool-wards').click(function(e){ + e.preventDefault(); + $('#council_wards').slideToggle(); + }); + } else { + $('#key-tool-wards').drawer('council_wards', false); + $('#key-tool-around-updates').drawer('updates_ajax', true); + } $('#key-tool-report-updates').small_drawer('report-updates-data'); // Go directly to RSS feed if RSS button clicked on alert page diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index d1f4416b3..16432a360 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -15,6 +15,10 @@ body { background: #1A1A1A url(images/tile.jpg) 0 0 repeat; } +h1 { + margin-top: 0; +} + // Page wrapper and header bits follow .container{ -- cgit v1.2.3 From 58b05ad2f998216df3680c3c9c68dfd119adf390 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 10 Mar 2012 01:22:53 +0000 Subject: Float RSS icons on alerts page. --- web/cobrands/fixmystreet/base.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 04277d0b1..bf433bdbf 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1482,5 +1482,8 @@ ul.breadcrumb { .a { background: #f6f6f6; } + img[width="16"] { + float: right; + } } -- cgit v1.2.3 From 9cc72424e17293fc8bd6226b721ac4e66dcc185e Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 10 Mar 2012 01:28:18 +0000 Subject: Buttons are no longer within this old container. --- web/cobrands/fixmystreet/fixmystreet.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 316409ccc..231f09130 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -455,12 +455,12 @@ $.fn.drawer = function(id, ajax) { // Go directly to RSS feed if RSS button clicked on alert page // (due to not wanting around form to submit, though good thing anyway) - $('.shadow-wrap').on('click', '#alert_rss_button', function(e){ + $('.container').on('click', '#alert_rss_button', function(e){ e.preventDefault(); var feed = $('input[name=feed][type=radio]:checked').nextAll('a').attr('href'); window.location.href = feed; }); - $('.shadow-wrap').on('click', '#alert_email_button', function(e){ + $('.container').on('click', '#alert_email_button', function(e){ e.preventDefault(); var form = $('
').attr({ method:'post', action:"/alert/subscribe" }); $('#alerts input[type=text], #alerts input[type=hidden], #alerts input[type=radio]:checked').each(function() { -- cgit v1.2.3 From 342c091c70aae5c2051af49bf4963e49d632eef4 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 10 Mar 2012 01:39:05 +0000 Subject: Span mobile table heading across all rows. --- web/cobrands/fixmystreet/base.scss | 8 ++++---- web/cobrands/fixmystreet/fixmystreet.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index bf433bdbf..05ff23ac9 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1268,16 +1268,16 @@ table.nicetable { } } tr { - &.gone { - color: #666666; - background-color: #cccccc; - } &.a { background:#f6f6f6; } &:nth-child(even) { background:#f6f6f6; } + &.gone { + color: #666666; + background-color: #cccccc; + } &:hover { background:#FFF5CC; cursor:pointer; diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 231f09130..af1915621 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -355,7 +355,7 @@ $(function(){ */ $('.mobile .nicetable th.title').remove(); $('.mobile .nicetable td.title').each(function(i){ - $(this).insertBefore($(this).parent('tr')).wrap(''); + $(this).attr('colspan', 5).insertBefore($(this).parent('tr')).wrap(''); }); // $('.mobile .nicetable tr.heading > td.title').css({'min-width':'300px'}); // $('.mobile .nicetable tr > td.data').css({'max-width':'12%'}); -- cgit v1.2.3 From d32e8c880a3840f38425e79862256f2f52c904d8 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 10 Mar 2012 17:11:54 +0000 Subject: Minor IE6 and IE7 fixes to drawer display. --- web/cobrands/fixmystreet/fixmystreet.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index af1915621..6da87a2e7 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -390,6 +390,13 @@ $.fn.small_drawer = function(id) { // A sliding drawer from the bottom of the page, large version $.fn.drawer = function(id, ajax) { + // IE7 positions the fixed tool bar 1em to the left unless it comes after + // the full-width section, ho-hum. Move it to where it would be after an + // open/close anyway + if ($('html.ie7').length) { + var $sw = $('.shadow-wrap'), $content = $('.content[role="main"]'); + $sw.appendTo($content); + } this.toggle(function(){ var $this = $(this), d = $('#' + id), $content = $('.content[role="main"]'); if (!$this.addClass('hover').data('setup')) { @@ -414,7 +421,7 @@ $.fn.drawer = function(id, ajax) { d.insertAfter($content).addClass('content').css({ position: 'absolute', zIndex: '1100', - marginTop: 0, + marginTop: $('html.ie6, html.ie7').length ? '-3em' : 0, // IE6/7 otherwise include the 3em padding and stay too low left: 0, top: $(window).height() - $content.offset().top }).removeClass('hidden-js').find('h2').css({ marginTop: 0 }); -- cgit v1.2.3 From f8f2c93aa7a9dd01403b140d6ba42b85412df2dc Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Mon, 12 Mar 2012 10:30:26 +0000 Subject: Add Kasabi API key. --- conf/general.yml-example | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/general.yml-example b/conf/general.yml-example index 323678487..1418b0810 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -26,6 +26,7 @@ UPLOAD_DIR: '/upload/' GEO_CACHE: '/cache/' GOOGLE_MAPS_API_KEY: '' BING_MAPS_API_KEY: '' +KASABI_API_KEY: '' LONDON_REPORTIT_URL: '' LONDON_REPORTIT_KEY: '' -- cgit v1.2.3 From e66add783ba63d1ecbfd3dbd472234bc5c5cadc7 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 12 Mar 2012 13:12:42 +0000 Subject: Add fancybox assets and include in the fixmystreet cobrand head file. --- templates/web/fixmystreet/common_header_tags.html | 1 + web/js/fancybox/blank.gif | Bin 0 -> 43 bytes web/js/fancybox/fancy_close.png | Bin 0 -> 1517 bytes web/js/fancybox/fancy_loading.png | Bin 0 -> 10195 bytes web/js/fancybox/fancy_nav_left.png | Bin 0 -> 1446 bytes web/js/fancybox/fancy_nav_right.png | Bin 0 -> 1454 bytes web/js/fancybox/fancy_shadow_e.png | Bin 0 -> 107 bytes web/js/fancybox/fancy_shadow_n.png | Bin 0 -> 106 bytes web/js/fancybox/fancy_shadow_ne.png | Bin 0 -> 347 bytes web/js/fancybox/fancy_shadow_nw.png | Bin 0 -> 324 bytes web/js/fancybox/fancy_shadow_s.png | Bin 0 -> 111 bytes web/js/fancybox/fancy_shadow_se.png | Bin 0 -> 352 bytes web/js/fancybox/fancy_shadow_sw.png | Bin 0 -> 340 bytes web/js/fancybox/fancy_shadow_w.png | Bin 0 -> 103 bytes web/js/fancybox/fancy_title_left.png | Bin 0 -> 503 bytes web/js/fancybox/fancy_title_main.png | Bin 0 -> 96 bytes web/js/fancybox/fancy_title_over.png | Bin 0 -> 70 bytes web/js/fancybox/fancy_title_right.png | Bin 0 -> 506 bytes web/js/fancybox/fancybox-x.png | Bin 0 -> 203 bytes web/js/fancybox/fancybox-y.png | Bin 0 -> 176 bytes web/js/fancybox/fancybox.png | Bin 0 -> 15287 bytes web/js/fancybox/jquery.easing-1.3.pack.js | 72 ++ web/js/fancybox/jquery.fancybox-1.3.4.css | 359 +++++++ web/js/fancybox/jquery.fancybox-1.3.4.js | 1156 +++++++++++++++++++++ web/js/fancybox/jquery.fancybox-1.3.4.pack.js | 46 + web/js/fancybox/jquery.mousewheel-3.0.4.pack.js | 14 + 26 files changed, 1648 insertions(+) create mode 100644 web/js/fancybox/blank.gif create mode 100644 web/js/fancybox/fancy_close.png create mode 100644 web/js/fancybox/fancy_loading.png create mode 100644 web/js/fancybox/fancy_nav_left.png create mode 100644 web/js/fancybox/fancy_nav_right.png create mode 100644 web/js/fancybox/fancy_shadow_e.png create mode 100644 web/js/fancybox/fancy_shadow_n.png create mode 100644 web/js/fancybox/fancy_shadow_ne.png create mode 100644 web/js/fancybox/fancy_shadow_nw.png create mode 100644 web/js/fancybox/fancy_shadow_s.png create mode 100644 web/js/fancybox/fancy_shadow_se.png create mode 100644 web/js/fancybox/fancy_shadow_sw.png create mode 100644 web/js/fancybox/fancy_shadow_w.png create mode 100644 web/js/fancybox/fancy_title_left.png create mode 100644 web/js/fancybox/fancy_title_main.png create mode 100644 web/js/fancybox/fancy_title_over.png create mode 100644 web/js/fancybox/fancy_title_right.png create mode 100644 web/js/fancybox/fancybox-x.png create mode 100644 web/js/fancybox/fancybox-y.png create mode 100644 web/js/fancybox/fancybox.png create mode 100644 web/js/fancybox/jquery.easing-1.3.pack.js create mode 100644 web/js/fancybox/jquery.fancybox-1.3.4.css create mode 100644 web/js/fancybox/jquery.fancybox-1.3.4.js create mode 100644 web/js/fancybox/jquery.fancybox-1.3.4.pack.js create mode 100644 web/js/fancybox/jquery.mousewheel-3.0.4.pack.js diff --git a/templates/web/fixmystreet/common_header_tags.html b/templates/web/fixmystreet/common_header_tags.html index c1f384d24..bd078f136 100644 --- a/templates/web/fixmystreet/common_header_tags.html +++ b/templates/web/fixmystreet/common_header_tags.html @@ -7,6 +7,7 @@ + diff --git a/web/js/fancybox/blank.gif b/web/js/fancybox/blank.gif new file mode 100644 index 000000000..35d42e808 Binary files /dev/null and b/web/js/fancybox/blank.gif differ diff --git a/web/js/fancybox/fancy_close.png b/web/js/fancybox/fancy_close.png new file mode 100644 index 000000000..07035307a Binary files /dev/null and b/web/js/fancybox/fancy_close.png differ diff --git a/web/js/fancybox/fancy_loading.png b/web/js/fancybox/fancy_loading.png new file mode 100644 index 000000000..250301796 Binary files /dev/null and b/web/js/fancybox/fancy_loading.png differ diff --git a/web/js/fancybox/fancy_nav_left.png b/web/js/fancybox/fancy_nav_left.png new file mode 100644 index 000000000..ebaa6a4fd Binary files /dev/null and b/web/js/fancybox/fancy_nav_left.png differ diff --git a/web/js/fancybox/fancy_nav_right.png b/web/js/fancybox/fancy_nav_right.png new file mode 100644 index 000000000..873294e96 Binary files /dev/null and b/web/js/fancybox/fancy_nav_right.png differ diff --git a/web/js/fancybox/fancy_shadow_e.png b/web/js/fancybox/fancy_shadow_e.png new file mode 100644 index 000000000..2eda08936 Binary files /dev/null and b/web/js/fancybox/fancy_shadow_e.png differ diff --git a/web/js/fancybox/fancy_shadow_n.png b/web/js/fancybox/fancy_shadow_n.png new file mode 100644 index 000000000..69aa10e23 Binary files /dev/null and b/web/js/fancybox/fancy_shadow_n.png differ diff --git a/web/js/fancybox/fancy_shadow_ne.png b/web/js/fancybox/fancy_shadow_ne.png new file mode 100644 index 000000000..79f6980a3 Binary files /dev/null and b/web/js/fancybox/fancy_shadow_ne.png differ diff --git a/web/js/fancybox/fancy_shadow_nw.png b/web/js/fancybox/fancy_shadow_nw.png new file mode 100644 index 000000000..7182cd938 Binary files /dev/null and b/web/js/fancybox/fancy_shadow_nw.png differ diff --git a/web/js/fancybox/fancy_shadow_s.png b/web/js/fancybox/fancy_shadow_s.png new file mode 100644 index 000000000..d8858bfb7 Binary files /dev/null and b/web/js/fancybox/fancy_shadow_s.png differ diff --git a/web/js/fancybox/fancy_shadow_se.png b/web/js/fancybox/fancy_shadow_se.png new file mode 100644 index 000000000..541e3ffd3 Binary files /dev/null and b/web/js/fancybox/fancy_shadow_se.png differ diff --git a/web/js/fancybox/fancy_shadow_sw.png b/web/js/fancybox/fancy_shadow_sw.png new file mode 100644 index 000000000..b451689fa Binary files /dev/null and b/web/js/fancybox/fancy_shadow_sw.png differ diff --git a/web/js/fancybox/fancy_shadow_w.png b/web/js/fancybox/fancy_shadow_w.png new file mode 100644 index 000000000..8a4e4a887 Binary files /dev/null and b/web/js/fancybox/fancy_shadow_w.png differ diff --git a/web/js/fancybox/fancy_title_left.png b/web/js/fancybox/fancy_title_left.png new file mode 100644 index 000000000..6049223d1 Binary files /dev/null and b/web/js/fancybox/fancy_title_left.png differ diff --git a/web/js/fancybox/fancy_title_main.png b/web/js/fancybox/fancy_title_main.png new file mode 100644 index 000000000..8044271f2 Binary files /dev/null and b/web/js/fancybox/fancy_title_main.png differ diff --git a/web/js/fancybox/fancy_title_over.png b/web/js/fancybox/fancy_title_over.png new file mode 100644 index 000000000..d9f458f4b Binary files /dev/null and b/web/js/fancybox/fancy_title_over.png differ diff --git a/web/js/fancybox/fancy_title_right.png b/web/js/fancybox/fancy_title_right.png new file mode 100644 index 000000000..e36d9db2a Binary files /dev/null and b/web/js/fancybox/fancy_title_right.png differ diff --git a/web/js/fancybox/fancybox-x.png b/web/js/fancybox/fancybox-x.png new file mode 100644 index 000000000..c2130f869 Binary files /dev/null and b/web/js/fancybox/fancybox-x.png differ diff --git a/web/js/fancybox/fancybox-y.png b/web/js/fancybox/fancybox-y.png new file mode 100644 index 000000000..7ef399b99 Binary files /dev/null and b/web/js/fancybox/fancybox-y.png differ diff --git a/web/js/fancybox/fancybox.png b/web/js/fancybox/fancybox.png new file mode 100644 index 000000000..65e14f68f Binary files /dev/null and b/web/js/fancybox/fancybox.png differ diff --git a/web/js/fancybox/jquery.easing-1.3.pack.js b/web/js/fancybox/jquery.easing-1.3.pack.js new file mode 100644 index 000000000..9028179e7 --- /dev/null +++ b/web/js/fancybox/jquery.easing-1.3.pack.js @@ -0,0 +1,72 @@ +/* + * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/ + * + * Uses the built in easing capabilities added In jQuery 1.1 + * to offer multiple easing options + * + * TERMS OF USE - jQuery Easing + * + * Open source under the BSD License. + * + * Copyright © 2008 George McGinley Smith + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * Neither the name of the author nor the names of contributors may be used to endorse + * or promote products derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * +*/ + +// t: current time, b: begInnIng value, c: change In value, d: duration +eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('h.i[\'1a\']=h.i[\'z\'];h.O(h.i,{y:\'D\',z:9(x,t,b,c,d){6 h.i[h.i.y](x,t,b,c,d)},17:9(x,t,b,c,d){6 c*(t/=d)*t+b},D:9(x,t,b,c,d){6-c*(t/=d)*(t-2)+b},13:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t+b;6-c/2*((--t)*(t-2)-1)+b},X:9(x,t,b,c,d){6 c*(t/=d)*t*t+b},U:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t+1)+b},R:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t+b;6 c/2*((t-=2)*t*t+2)+b},N:9(x,t,b,c,d){6 c*(t/=d)*t*t*t+b},M:9(x,t,b,c,d){6-c*((t=t/d-1)*t*t*t-1)+b},L:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t+b;6-c/2*((t-=2)*t*t*t-2)+b},K:9(x,t,b,c,d){6 c*(t/=d)*t*t*t*t+b},J:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t*t*t+1)+b},I:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t*t+b;6 c/2*((t-=2)*t*t*t*t+2)+b},G:9(x,t,b,c,d){6-c*8.C(t/d*(8.g/2))+c+b},15:9(x,t,b,c,d){6 c*8.n(t/d*(8.g/2))+b},12:9(x,t,b,c,d){6-c/2*(8.C(8.g*t/d)-1)+b},Z:9(x,t,b,c,d){6(t==0)?b:c*8.j(2,10*(t/d-1))+b},Y:9(x,t,b,c,d){6(t==d)?b+c:c*(-8.j(2,-10*t/d)+1)+b},W:9(x,t,b,c,d){e(t==0)6 b;e(t==d)6 b+c;e((t/=d/2)<1)6 c/2*8.j(2,10*(t-1))+b;6 c/2*(-8.j(2,-10*--t)+2)+b},V:9(x,t,b,c,d){6-c*(8.o(1-(t/=d)*t)-1)+b},S:9(x,t,b,c,d){6 c*8.o(1-(t=t/d-1)*t)+b},Q:9(x,t,b,c,d){e((t/=d/2)<1)6-c/2*(8.o(1-t*t)-1)+b;6 c/2*(8.o(1-(t-=2)*t)+1)+b},P:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6-(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b},H:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6 a*8.j(2,-10*t)*8.n((t*d-s)*(2*8.g)/p)+c+b},T:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d/2)==2)6 b+c;e(!p)p=d*(.3*1.5);e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);e(t<1)6-.5*(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b;6 a*8.j(2,-10*(t-=1))*8.n((t*d-s)*(2*8.g)/p)*.5+c+b},F:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*(t/=d)*t*((s+1)*t-s)+b},E:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*((t=t/d-1)*t*((s+1)*t+s)+1)+b},16:9(x,t,b,c,d,s){e(s==u)s=1.l;e((t/=d/2)<1)6 c/2*(t*t*(((s*=(1.B))+1)*t-s))+b;6 c/2*((t-=2)*t*(((s*=(1.B))+1)*t+s)+2)+b},A:9(x,t,b,c,d){6 c-h.i.v(x,d-t,0,c,d)+b},v:9(x,t,b,c,d){e((t/=d)<(1/2.k)){6 c*(7.q*t*t)+b}m e(t<(2/2.k)){6 c*(7.q*(t-=(1.5/2.k))*t+.k)+b}m e(t<(2.5/2.k)){6 c*(7.q*(t-=(2.14/2.k))*t+.11)+b}m{6 c*(7.q*(t-=(2.18/2.k))*t+.19)+b}},1b:9(x,t,b,c,d){e(t')[0], { prop: 0 }), + + isIE6 = $.browser.msie && $.browser.version < 7 && !window.XMLHttpRequest, + + /* + * Private methods + */ + + _abort = function() { + loading.hide(); + + imgPreloader.onerror = imgPreloader.onload = null; + + if (ajaxLoader) { + ajaxLoader.abort(); + } + + tmp.empty(); + }, + + _error = function() { + if (false === selectedOpts.onError(selectedArray, selectedIndex, selectedOpts)) { + loading.hide(); + busy = false; + return; + } + + selectedOpts.titleShow = false; + + selectedOpts.width = 'auto'; + selectedOpts.height = 'auto'; + + tmp.html( '
The requested content cannot be loaded.
Please try again later.
' ); + + _process_inline(); + }, + + _start = function() { + var obj = selectedArray[ selectedIndex ], + href, + type, + title, + str, + emb, + ret; + + _abort(); + + selectedOpts = $.extend({}, $.fn.fancybox.defaults, (typeof $(obj).data('fancybox') == 'undefined' ? selectedOpts : $(obj).data('fancybox'))); + + ret = selectedOpts.onStart(selectedArray, selectedIndex, selectedOpts); + + if (ret === false) { + busy = false; + return; + } else if (typeof ret == 'object') { + selectedOpts = $.extend(selectedOpts, ret); + } + + title = selectedOpts.title || (obj.nodeName ? $(obj).attr('title') : obj.title) || ''; + + if (obj.nodeName && !selectedOpts.orig) { + selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj); + } + + if (title === '' && selectedOpts.orig && selectedOpts.titleFromAlt) { + title = selectedOpts.orig.attr('alt'); + } + + href = selectedOpts.href || (obj.nodeName ? $(obj).attr('href') : obj.href) || null; + + if ((/^(?:javascript)/i).test(href) || href == '#') { + href = null; + } + + if (selectedOpts.type) { + type = selectedOpts.type; + + if (!href) { + href = selectedOpts.content; + } + + } else if (selectedOpts.content) { + type = 'html'; + + } else if (href) { + if (href.match(imgRegExp)) { + type = 'image'; + + } else if (href.match(swfRegExp)) { + type = 'swf'; + + } else if ($(obj).hasClass("iframe")) { + type = 'iframe'; + + } else if (href.indexOf("#") === 0) { + type = 'inline'; + + } else { + type = 'ajax'; + } + } + + if (!type) { + _error(); + return; + } + + if (type == 'inline') { + obj = href.substr(href.indexOf("#")); + type = $(obj).length > 0 ? 'inline' : 'ajax'; + } + + selectedOpts.type = type; + selectedOpts.href = href; + selectedOpts.title = title; + + if (selectedOpts.autoDimensions) { + if (selectedOpts.type == 'html' || selectedOpts.type == 'inline' || selectedOpts.type == 'ajax') { + selectedOpts.width = 'auto'; + selectedOpts.height = 'auto'; + } else { + selectedOpts.autoDimensions = false; + } + } + + if (selectedOpts.modal) { + selectedOpts.overlayShow = true; + selectedOpts.hideOnOverlayClick = false; + selectedOpts.hideOnContentClick = false; + selectedOpts.enableEscapeButton = false; + selectedOpts.showCloseButton = false; + } + + selectedOpts.padding = parseInt(selectedOpts.padding, 10); + selectedOpts.margin = parseInt(selectedOpts.margin, 10); + + tmp.css('padding', (selectedOpts.padding + selectedOpts.margin)); + + $('.fancybox-inline-tmp').unbind('fancybox-cancel').bind('fancybox-change', function() { + $(this).replaceWith(content.children()); + }); + + switch (type) { + case 'html' : + tmp.html( selectedOpts.content ); + _process_inline(); + break; + + case 'inline' : + if ( $(obj).parent().is('#fancybox-content') === true) { + busy = false; + return; + } + + $('
') + .hide() + .insertBefore( $(obj) ) + .bind('fancybox-cleanup', function() { + $(this).replaceWith(content.children()); + }).bind('fancybox-cancel', function() { + $(this).replaceWith(tmp.children()); + }); + + $(obj).appendTo(tmp); + + _process_inline(); + break; + + case 'image': + busy = false; + + $.fancybox.showActivity(); + + imgPreloader = new Image(); + + imgPreloader.onerror = function() { + _error(); + }; + + imgPreloader.onload = function() { + busy = true; + + imgPreloader.onerror = imgPreloader.onload = null; + + _process_image(); + }; + + imgPreloader.src = href; + break; + + case 'swf': + selectedOpts.scrolling = 'no'; + + str = ''; + + tmp.html(str); + + _process_inline(); + break; + + case 'ajax': + busy = false; + + $.fancybox.showActivity(); + + selectedOpts.ajax.win = selectedOpts.ajax.success; + + ajaxLoader = $.ajax($.extend({}, selectedOpts.ajax, { + url : href, + data : selectedOpts.ajax.data || {}, + error : function(XMLHttpRequest, textStatus, errorThrown) { + if ( XMLHttpRequest.status > 0 ) { + _error(); + } + }, + success : function(data, textStatus, XMLHttpRequest) { + var o = typeof XMLHttpRequest == 'object' ? XMLHttpRequest : ajaxLoader; + if (o.status == 200) { + if ( typeof selectedOpts.ajax.win == 'function' ) { + ret = selectedOpts.ajax.win(href, data, textStatus, XMLHttpRequest); + + if (ret === false) { + loading.hide(); + return; + } else if (typeof ret == 'string' || typeof ret == 'object') { + data = ret; + } + } + + tmp.html( data ); + _process_inline(); + } + } + })); + + break; + + case 'iframe': + _show(); + break; + } + }, + + _process_inline = function() { + var + w = selectedOpts.width, + h = selectedOpts.height; + + if (w.toString().indexOf('%') > -1) { + w = parseInt( ($(window).width() - (selectedOpts.margin * 2)) * parseFloat(w) / 100, 10) + 'px'; + + } else { + w = w == 'auto' ? 'auto' : w + 'px'; + } + + if (h.toString().indexOf('%') > -1) { + h = parseInt( ($(window).height() - (selectedOpts.margin * 2)) * parseFloat(h) / 100, 10) + 'px'; + + } else { + h = h == 'auto' ? 'auto' : h + 'px'; + } + + tmp.wrapInner('
'); + + selectedOpts.width = tmp.width(); + selectedOpts.height = tmp.height(); + + _show(); + }, + + _process_image = function() { + selectedOpts.width = imgPreloader.width; + selectedOpts.height = imgPreloader.height; + + $("").attr({ + 'id' : 'fancybox-img', + 'src' : imgPreloader.src, + 'alt' : selectedOpts.title + }).appendTo( tmp ); + + _show(); + }, + + _show = function() { + var pos, equal; + + loading.hide(); + + if (wrap.is(":visible") && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) { + $.event.trigger('fancybox-cancel'); + + busy = false; + return; + } + + busy = true; + + $(content.add( overlay )).unbind(); + + $(window).unbind("resize.fb scroll.fb"); + $(document).unbind('keydown.fb'); + + if (wrap.is(":visible") && currentOpts.titlePosition !== 'outside') { + wrap.css('height', wrap.height()); + } + + currentArray = selectedArray; + currentIndex = selectedIndex; + currentOpts = selectedOpts; + + if (currentOpts.overlayShow) { + overlay.css({ + 'background-color' : currentOpts.overlayColor, + 'opacity' : currentOpts.overlayOpacity, + 'cursor' : currentOpts.hideOnOverlayClick ? 'pointer' : 'auto', + 'height' : $(document).height() + }); + + if (!overlay.is(':visible')) { + if (isIE6) { + $('select:not(#fancybox-tmp select)').filter(function() { + return this.style.visibility !== 'hidden'; + }).css({'visibility' : 'hidden'}).one('fancybox-cleanup', function() { + this.style.visibility = 'inherit'; + }); + } + + overlay.show(); + } + } else { + overlay.hide(); + } + + final_pos = _get_zoom_to(); + + _process_title(); + + if (wrap.is(":visible")) { + $( close.add( nav_left ).add( nav_right ) ).hide(); + + pos = wrap.position(), + + start_pos = { + top : pos.top, + left : pos.left, + width : wrap.width(), + height : wrap.height() + }; + + equal = (start_pos.width == final_pos.width && start_pos.height == final_pos.height); + + content.fadeTo(currentOpts.changeFade, 0.3, function() { + var finish_resizing = function() { + content.html( tmp.contents() ).fadeTo(currentOpts.changeFade, 1, _finish); + }; + + $.event.trigger('fancybox-change'); + + content + .empty() + .removeAttr('filter') + .css({ + 'border-width' : currentOpts.padding, + 'width' : final_pos.width - currentOpts.padding * 2, + 'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2 + }); + + if (equal) { + finish_resizing(); + + } else { + fx.prop = 0; + + $(fx).animate({prop: 1}, { + duration : currentOpts.changeSpeed, + easing : currentOpts.easingChange, + step : _draw, + complete : finish_resizing + }); + } + }); + + return; + } + + wrap.removeAttr("style"); + + content.css('border-width', currentOpts.padding); + + if (currentOpts.transitionIn == 'elastic') { + start_pos = _get_zoom_from(); + + content.html( tmp.contents() ); + + wrap.show(); + + if (currentOpts.opacity) { + final_pos.opacity = 0; + } + + fx.prop = 0; + + $(fx).animate({prop: 1}, { + duration : currentOpts.speedIn, + easing : currentOpts.easingIn, + step : _draw, + complete : _finish + }); + + return; + } + + if (currentOpts.titlePosition == 'inside' && titleHeight > 0) { + title.show(); + } + + content + .css({ + 'width' : final_pos.width - currentOpts.padding * 2, + 'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2 + }) + .html( tmp.contents() ); + + wrap + .css(final_pos) + .fadeIn( currentOpts.transitionIn == 'none' ? 0 : currentOpts.speedIn, _finish ); + }, + + _format_title = function(title) { + if (title && title.length) { + if (currentOpts.titlePosition == 'float') { + return '
' + title + '
'; + } + + return '
' + title + '
'; + } + + return false; + }, + + _process_title = function() { + titleStr = currentOpts.title || ''; + titleHeight = 0; + + title + .empty() + .removeAttr('style') + .removeClass(); + + if (currentOpts.titleShow === false) { + title.hide(); + return; + } + + titleStr = $.isFunction(currentOpts.titleFormat) ? currentOpts.titleFormat(titleStr, currentArray, currentIndex, currentOpts) : _format_title(titleStr); + + if (!titleStr || titleStr === '') { + title.hide(); + return; + } + + title + .addClass('fancybox-title-' + currentOpts.titlePosition) + .html( titleStr ) + .appendTo( 'body' ) + .show(); + + switch (currentOpts.titlePosition) { + case 'inside': + title + .css({ + 'width' : final_pos.width - (currentOpts.padding * 2), + 'marginLeft' : currentOpts.padding, + 'marginRight' : currentOpts.padding + }); + + titleHeight = title.outerHeight(true); + + title.appendTo( outer ); + + final_pos.height += titleHeight; + break; + + case 'over': + title + .css({ + 'marginLeft' : currentOpts.padding, + 'width' : final_pos.width - (currentOpts.padding * 2), + 'bottom' : currentOpts.padding + }) + .appendTo( outer ); + break; + + case 'float': + title + .css('left', parseInt((title.width() - final_pos.width - 40)/ 2, 10) * -1) + .appendTo( wrap ); + break; + + default: + title + .css({ + 'width' : final_pos.width - (currentOpts.padding * 2), + 'paddingLeft' : currentOpts.padding, + 'paddingRight' : currentOpts.padding + }) + .appendTo( wrap ); + break; + } + + title.hide(); + }, + + _set_navigation = function() { + if (currentOpts.enableEscapeButton || currentOpts.enableKeyboardNav) { + $(document).bind('keydown.fb', function(e) { + if (e.keyCode == 27 && currentOpts.enableEscapeButton) { + e.preventDefault(); + $.fancybox.close(); + + } else if ((e.keyCode == 37 || e.keyCode == 39) && currentOpts.enableKeyboardNav && e.target.tagName !== 'INPUT' && e.target.tagName !== 'TEXTAREA' && e.target.tagName !== 'SELECT') { + e.preventDefault(); + $.fancybox[ e.keyCode == 37 ? 'prev' : 'next'](); + } + }); + } + + if (!currentOpts.showNavArrows) { + nav_left.hide(); + nav_right.hide(); + return; + } + + if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex !== 0) { + nav_left.show(); + } + + if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex != (currentArray.length -1)) { + nav_right.show(); + } + }, + + _finish = function () { + if (!$.support.opacity) { + content.get(0).style.removeAttribute('filter'); + wrap.get(0).style.removeAttribute('filter'); + } + + if (selectedOpts.autoDimensions) { + content.css('height', 'auto'); + } + + wrap.css('height', 'auto'); + + if (titleStr && titleStr.length) { + title.show(); + } + + if (currentOpts.showCloseButton) { + close.show(); + } + + _set_navigation(); + + if (currentOpts.hideOnContentClick) { + content.bind('click', $.fancybox.close); + } + + if (currentOpts.hideOnOverlayClick) { + overlay.bind('click', $.fancybox.close); + } + + $(window).bind("resize.fb", $.fancybox.resize); + + if (currentOpts.centerOnScroll) { + $(window).bind("scroll.fb", $.fancybox.center); + } + + if (currentOpts.type == 'iframe') { + $('').appendTo(content); + } + + wrap.show(); + + busy = false; + + $.fancybox.center(); + + currentOpts.onComplete(currentArray, currentIndex, currentOpts); + + _preload_images(); + }, + + _preload_images = function() { + var href, + objNext; + + if ((currentArray.length -1) > currentIndex) { + href = currentArray[ currentIndex + 1 ].href; + + if (typeof href !== 'undefined' && href.match(imgRegExp)) { + objNext = new Image(); + objNext.src = href; + } + } + + if (currentIndex > 0) { + href = currentArray[ currentIndex - 1 ].href; + + if (typeof href !== 'undefined' && href.match(imgRegExp)) { + objNext = new Image(); + objNext.src = href; + } + } + }, + + _draw = function(pos) { + var dim = { + width : parseInt(start_pos.width + (final_pos.width - start_pos.width) * pos, 10), + height : parseInt(start_pos.height + (final_pos.height - start_pos.height) * pos, 10), + + top : parseInt(start_pos.top + (final_pos.top - start_pos.top) * pos, 10), + left : parseInt(start_pos.left + (final_pos.left - start_pos.left) * pos, 10) + }; + + if (typeof final_pos.opacity !== 'undefined') { + dim.opacity = pos < 0.5 ? 0.5 : pos; + } + + wrap.css(dim); + + content.css({ + 'width' : dim.width - currentOpts.padding * 2, + 'height' : dim.height - (titleHeight * pos) - currentOpts.padding * 2 + }); + }, + + _get_viewport = function() { + return [ + $(window).width() - (currentOpts.margin * 2), + $(window).height() - (currentOpts.margin * 2), + $(document).scrollLeft() + currentOpts.margin, + $(document).scrollTop() + currentOpts.margin + ]; + }, + + _get_zoom_to = function () { + var view = _get_viewport(), + to = {}, + resize = currentOpts.autoScale, + double_padding = currentOpts.padding * 2, + ratio; + + if (currentOpts.width.toString().indexOf('%') > -1) { + to.width = parseInt((view[0] * parseFloat(currentOpts.width)) / 100, 10); + } else { + to.width = currentOpts.width + double_padding; + } + + if (currentOpts.height.toString().indexOf('%') > -1) { + to.height = parseInt((view[1] * parseFloat(currentOpts.height)) / 100, 10); + } else { + to.height = currentOpts.height + double_padding; + } + + if (resize && (to.width > view[0] || to.height > view[1])) { + if (selectedOpts.type == 'image' || selectedOpts.type == 'swf') { + ratio = (currentOpts.width ) / (currentOpts.height ); + + if ((to.width ) > view[0]) { + to.width = view[0]; + to.height = parseInt(((to.width - double_padding) / ratio) + double_padding, 10); + } + + if ((to.height) > view[1]) { + to.height = view[1]; + to.width = parseInt(((to.height - double_padding) * ratio) + double_padding, 10); + } + + } else { + to.width = Math.min(to.width, view[0]); + to.height = Math.min(to.height, view[1]); + } + } + + to.top = parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - to.height - 40) * 0.5)), 10); + to.left = parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - to.width - 40) * 0.5)), 10); + + return to; + }, + + _get_obj_pos = function(obj) { + var pos = obj.offset(); + + pos.top += parseInt( obj.css('paddingTop'), 10 ) || 0; + pos.left += parseInt( obj.css('paddingLeft'), 10 ) || 0; + + pos.top += parseInt( obj.css('border-top-width'), 10 ) || 0; + pos.left += parseInt( obj.css('border-left-width'), 10 ) || 0; + + pos.width = obj.width(); + pos.height = obj.height(); + + return pos; + }, + + _get_zoom_from = function() { + var orig = selectedOpts.orig ? $(selectedOpts.orig) : false, + from = {}, + pos, + view; + + if (orig && orig.length) { + pos = _get_obj_pos(orig); + + from = { + width : pos.width + (currentOpts.padding * 2), + height : pos.height + (currentOpts.padding * 2), + top : pos.top - currentOpts.padding - 20, + left : pos.left - currentOpts.padding - 20 + }; + + } else { + view = _get_viewport(); + + from = { + width : currentOpts.padding * 2, + height : currentOpts.padding * 2, + top : parseInt(view[3] + view[1] * 0.5, 10), + left : parseInt(view[2] + view[0] * 0.5, 10) + }; + } + + return from; + }, + + _animate_loading = function() { + if (!loading.is(':visible')){ + clearInterval(loadingTimer); + return; + } + + $('div', loading).css('top', (loadingFrame * -40) + 'px'); + + loadingFrame = (loadingFrame + 1) % 12; + }; + + /* + * Public methods + */ + + $.fn.fancybox = function(options) { + if (!$(this).length) { + return this; + } + + $(this) + .data('fancybox', $.extend({}, options, ($.metadata ? $(this).metadata() : {}))) + .unbind('click.fb') + .bind('click.fb', function(e) { + e.preventDefault(); + + if (busy) { + return; + } + + busy = true; + + $(this).blur(); + + selectedArray = []; + selectedIndex = 0; + + var rel = $(this).attr('rel') || ''; + + if (!rel || rel == '' || rel === 'nofollow') { + selectedArray.push(this); + + } else { + selectedArray = $("a[rel=" + rel + "], area[rel=" + rel + "]"); + selectedIndex = selectedArray.index( this ); + } + + _start(); + + return; + }); + + return this; + }; + + $.fancybox = function(obj) { + var opts; + + if (busy) { + return; + } + + busy = true; + opts = typeof arguments[1] !== 'undefined' ? arguments[1] : {}; + + selectedArray = []; + selectedIndex = parseInt(opts.index, 10) || 0; + + if ($.isArray(obj)) { + for (var i = 0, j = obj.length; i < j; i++) { + if (typeof obj[i] == 'object') { + $(obj[i]).data('fancybox', $.extend({}, opts, obj[i])); + } else { + obj[i] = $({}).data('fancybox', $.extend({content : obj[i]}, opts)); + } + } + + selectedArray = jQuery.merge(selectedArray, obj); + + } else { + if (typeof obj == 'object') { + $(obj).data('fancybox', $.extend({}, opts, obj)); + } else { + obj = $({}).data('fancybox', $.extend({content : obj}, opts)); + } + + selectedArray.push(obj); + } + + if (selectedIndex > selectedArray.length || selectedIndex < 0) { + selectedIndex = 0; + } + + _start(); + }; + + $.fancybox.showActivity = function() { + clearInterval(loadingTimer); + + loading.show(); + loadingTimer = setInterval(_animate_loading, 66); + }; + + $.fancybox.hideActivity = function() { + loading.hide(); + }; + + $.fancybox.next = function() { + return $.fancybox.pos( currentIndex + 1); + }; + + $.fancybox.prev = function() { + return $.fancybox.pos( currentIndex - 1); + }; + + $.fancybox.pos = function(pos) { + if (busy) { + return; + } + + pos = parseInt(pos); + + selectedArray = currentArray; + + if (pos > -1 && pos < currentArray.length) { + selectedIndex = pos; + _start(); + + } else if (currentOpts.cyclic && currentArray.length > 1) { + selectedIndex = pos >= currentArray.length ? 0 : currentArray.length - 1; + _start(); + } + + return; + }; + + $.fancybox.cancel = function() { + if (busy) { + return; + } + + busy = true; + + $.event.trigger('fancybox-cancel'); + + _abort(); + + selectedOpts.onCancel(selectedArray, selectedIndex, selectedOpts); + + busy = false; + }; + + // Note: within an iframe use - parent.$.fancybox.close(); + $.fancybox.close = function() { + if (busy || wrap.is(':hidden')) { + return; + } + + busy = true; + + if (currentOpts && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) { + busy = false; + return; + } + + _abort(); + + $(close.add( nav_left ).add( nav_right )).hide(); + + $(content.add( overlay )).unbind(); + + $(window).unbind("resize.fb scroll.fb"); + $(document).unbind('keydown.fb'); + + content.find('iframe').attr('src', isIE6 && /^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank'); + + if (currentOpts.titlePosition !== 'inside') { + title.empty(); + } + + wrap.stop(); + + function _cleanup() { + overlay.fadeOut('fast'); + + title.empty().hide(); + wrap.hide(); + + $.event.trigger('fancybox-cleanup'); + + content.empty(); + + currentOpts.onClosed(currentArray, currentIndex, currentOpts); + + currentArray = selectedOpts = []; + currentIndex = selectedIndex = 0; + currentOpts = selectedOpts = {}; + + busy = false; + } + + if (currentOpts.transitionOut == 'elastic') { + start_pos = _get_zoom_from(); + + var pos = wrap.position(); + + final_pos = { + top : pos.top , + left : pos.left, + width : wrap.width(), + height : wrap.height() + }; + + if (currentOpts.opacity) { + final_pos.opacity = 1; + } + + title.empty().hide(); + + fx.prop = 1; + + $(fx).animate({ prop: 0 }, { + duration : currentOpts.speedOut, + easing : currentOpts.easingOut, + step : _draw, + complete : _cleanup + }); + + } else { + wrap.fadeOut( currentOpts.transitionOut == 'none' ? 0 : currentOpts.speedOut, _cleanup); + } + }; + + $.fancybox.resize = function() { + if (overlay.is(':visible')) { + overlay.css('height', $(document).height()); + } + + $.fancybox.center(true); + }; + + $.fancybox.center = function() { + var view, align; + + if (busy) { + return; + } + + align = arguments[0] === true ? 1 : 0; + view = _get_viewport(); + + if (!align && (wrap.width() > view[0] || wrap.height() > view[1])) { + return; + } + + wrap + .stop() + .animate({ + 'top' : parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - content.height() - 40) * 0.5) - currentOpts.padding)), + 'left' : parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - content.width() - 40) * 0.5) - currentOpts.padding)) + }, typeof arguments[0] == 'number' ? arguments[0] : 200); + }; + + $.fancybox.init = function() { + if ($("#fancybox-wrap").length) { + return; + } + + $('body').append( + tmp = $('
'), + loading = $('
'), + overlay = $('
'), + wrap = $('
') + ); + + outer = $('
') + .append('
') + .appendTo( wrap ); + + outer.append( + content = $('
'), + close = $(''), + title = $('
'), + + nav_left = $(''), + nav_right = $('') + ); + + close.click($.fancybox.close); + loading.click($.fancybox.cancel); + + nav_left.click(function(e) { + e.preventDefault(); + $.fancybox.prev(); + }); + + nav_right.click(function(e) { + e.preventDefault(); + $.fancybox.next(); + }); + + if ($.fn.mousewheel) { + wrap.bind('mousewheel.fb', function(e, delta) { + if (busy) { + e.preventDefault(); + + } else if ($(e.target).get(0).clientHeight == 0 || $(e.target).get(0).scrollHeight === $(e.target).get(0).clientHeight) { + e.preventDefault(); + $.fancybox[ delta > 0 ? 'prev' : 'next'](); + } + }); + } + + if (!$.support.opacity) { + wrap.addClass('fancybox-ie'); + } + + if (isIE6) { + loading.addClass('fancybox-ie6'); + wrap.addClass('fancybox-ie6'); + + $('').prependTo(outer); + } + }; + + $.fn.fancybox.defaults = { + padding : 10, + margin : 40, + opacity : false, + modal : false, + cyclic : false, + scrolling : 'auto', // 'auto', 'yes' or 'no' + + width : 560, + height : 340, + + autoScale : true, + autoDimensions : true, + centerOnScroll : false, + + ajax : {}, + swf : { wmode: 'transparent' }, + + hideOnOverlayClick : true, + hideOnContentClick : false, + + overlayShow : true, + overlayOpacity : 0.7, + overlayColor : '#777', + + titleShow : true, + titlePosition : 'float', // 'float', 'outside', 'inside' or 'over' + titleFormat : null, + titleFromAlt : false, + + transitionIn : 'fade', // 'elastic', 'fade' or 'none' + transitionOut : 'fade', // 'elastic', 'fade' or 'none' + + speedIn : 300, + speedOut : 300, + + changeSpeed : 300, + changeFade : 'fast', + + easingIn : 'swing', + easingOut : 'swing', + + showCloseButton : true, + showNavArrows : true, + enableEscapeButton : true, + enableKeyboardNav : true, + + onStart : function(){}, + onCancel : function(){}, + onComplete : function(){}, + onCleanup : function(){}, + onClosed : function(){}, + onError : function(){} + }; + + $(document).ready(function() { + $.fancybox.init(); + }); + +})(jQuery); \ No newline at end of file diff --git a/web/js/fancybox/jquery.fancybox-1.3.4.pack.js b/web/js/fancybox/jquery.fancybox-1.3.4.pack.js new file mode 100644 index 000000000..1373ed083 --- /dev/null +++ b/web/js/fancybox/jquery.fancybox-1.3.4.pack.js @@ -0,0 +1,46 @@ +/* + * FancyBox - jQuery Plugin + * Simple and fancy lightbox alternative + * + * Examples and documentation at: http://fancybox.net + * + * Copyright (c) 2008 - 2010 Janis Skarnelis + * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. + * + * Version: 1.3.4 (11/11/2010) + * Requires: jQuery v1.3+ + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */ + +;(function(b){var m,t,u,f,D,j,E,n,z,A,q=0,e={},o=[],p=0,d={},l=[],G=null,v=new Image,J=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,W=/[^\.]\.(swf)\s*$/i,K,L=1,y=0,s="",r,i,h=false,B=b.extend(b("
")[0],{prop:0}),M=b.browser.msie&&b.browser.version<7&&!window.XMLHttpRequest,N=function(){t.hide();v.onerror=v.onload=null;G&&G.abort();m.empty()},O=function(){if(false===e.onError(o,q,e)){t.hide();h=false}else{e.titleShow=false;e.width="auto";e.height="auto";m.html('
The requested content cannot be loaded.
Please try again later.
'); +F()}},I=function(){var a=o[q],c,g,k,C,P,w;N();e=b.extend({},b.fn.fancybox.defaults,typeof b(a).data("fancybox")=="undefined"?e:b(a).data("fancybox"));w=e.onStart(o,q,e);if(w===false)h=false;else{if(typeof w=="object")e=b.extend(e,w);k=e.title||(a.nodeName?b(a).attr("title"):a.title)||"";if(a.nodeName&&!e.orig)e.orig=b(a).children("img:first").length?b(a).children("img:first"):b(a);if(k===""&&e.orig&&e.titleFromAlt)k=e.orig.attr("alt");c=e.href||(a.nodeName?b(a).attr("href"):a.href)||null;if(/^(?:javascript)/i.test(c)|| +c=="#")c=null;if(e.type){g=e.type;if(!c)c=e.content}else if(e.content)g="html";else if(c)g=c.match(J)?"image":c.match(W)?"swf":b(a).hasClass("iframe")?"iframe":c.indexOf("#")===0?"inline":"ajax";if(g){if(g=="inline"){a=c.substr(c.indexOf("#"));g=b(a).length>0?"inline":"ajax"}e.type=g;e.href=c;e.title=k;if(e.autoDimensions)if(e.type=="html"||e.type=="inline"||e.type=="ajax"){e.width="auto";e.height="auto"}else e.autoDimensions=false;if(e.modal){e.overlayShow=true;e.hideOnOverlayClick=false;e.hideOnContentClick= +false;e.enableEscapeButton=false;e.showCloseButton=false}e.padding=parseInt(e.padding,10);e.margin=parseInt(e.margin,10);m.css("padding",e.padding+e.margin);b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){b(this).replaceWith(j.children())});switch(g){case "html":m.html(e.content);F();break;case "inline":if(b(a).parent().is("#fancybox-content")===true){h=false;break}b('
').hide().insertBefore(b(a)).bind("fancybox-cleanup",function(){b(this).replaceWith(j.children())}).bind("fancybox-cancel", +function(){b(this).replaceWith(m.children())});b(a).appendTo(m);F();break;case "image":h=false;b.fancybox.showActivity();v=new Image;v.onerror=function(){O()};v.onload=function(){h=true;v.onerror=v.onload=null;e.width=v.width;e.height=v.height;b("").attr({id:"fancybox-img",src:v.src,alt:e.title}).appendTo(m);Q()};v.src=c;break;case "swf":e.scrolling="no";C='";m.html(C);F();break;case "ajax":h=false;b.fancybox.showActivity();e.ajax.win=e.ajax.success;G=b.ajax(b.extend({},e.ajax,{url:c,data:e.ajax.data||{},error:function(x){x.status>0&&O()},success:function(x,H,R){if((typeof R=="object"?R:G).status==200){if(typeof e.ajax.win== +"function"){w=e.ajax.win(c,x,H,R);if(w===false){t.hide();return}else if(typeof w=="string"||typeof w=="object")x=w}m.html(x);F()}}}));break;case "iframe":Q()}}else O()}},F=function(){var a=e.width,c=e.height;a=a.toString().indexOf("%")>-1?parseInt((b(window).width()-e.margin*2)*parseFloat(a)/100,10)+"px":a=="auto"?"auto":a+"px";c=c.toString().indexOf("%")>-1?parseInt((b(window).height()-e.margin*2)*parseFloat(c)/100,10)+"px":c=="auto"?"auto":c+"px";m.wrapInner('
');e.width=m.width();e.height=m.height();Q()},Q=function(){var a,c;t.hide();if(f.is(":visible")&&false===d.onCleanup(l,p,d)){b.event.trigger("fancybox-cancel");h=false}else{h=true;b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");f.is(":visible")&&d.titlePosition!=="outside"&&f.css("height",f.height());l=o;p=q;d=e;if(d.overlayShow){u.css({"background-color":d.overlayColor, +opacity:d.overlayOpacity,cursor:d.hideOnOverlayClick?"pointer":"auto",height:b(document).height()});if(!u.is(":visible")){M&&b("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});u.show()}}else u.hide();i=X();s=d.title||"";y=0;n.empty().removeAttr("style").removeClass();if(d.titleShow!==false){if(b.isFunction(d.titleFormat))a=d.titleFormat(s,l,p,d);else a=s&&s.length? +d.titlePosition=="float"?'
'+s+'
':'
'+s+"
":false;s=a;if(!(!s||s==="")){n.addClass("fancybox-title-"+d.titlePosition).html(s).appendTo("body").show();switch(d.titlePosition){case "inside":n.css({width:i.width-d.padding*2,marginLeft:d.padding,marginRight:d.padding}); +y=n.outerHeight(true);n.appendTo(D);i.height+=y;break;case "over":n.css({marginLeft:d.padding,width:i.width-d.padding*2,bottom:d.padding}).appendTo(D);break;case "float":n.css("left",parseInt((n.width()-i.width-40)/2,10)*-1).appendTo(f);break;default:n.css({width:i.width-d.padding*2,paddingLeft:d.padding,paddingRight:d.padding}).appendTo(f)}}}n.hide();if(f.is(":visible")){b(E.add(z).add(A)).hide();a=f.position();r={top:a.top,left:a.left,width:f.width(),height:f.height()};c=r.width==i.width&&r.height== +i.height;j.fadeTo(d.changeFade,0.3,function(){var g=function(){j.html(m.contents()).fadeTo(d.changeFade,1,S)};b.event.trigger("fancybox-change");j.empty().removeAttr("filter").css({"border-width":d.padding,width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2});if(c)g();else{B.prop=0;b(B).animate({prop:1},{duration:d.changeSpeed,easing:d.easingChange,step:T,complete:g})}})}else{f.removeAttr("style");j.css("border-width",d.padding);if(d.transitionIn=="elastic"){r=V();j.html(m.contents()); +f.show();if(d.opacity)i.opacity=0;B.prop=0;b(B).animate({prop:1},{duration:d.speedIn,easing:d.easingIn,step:T,complete:S})}else{d.titlePosition=="inside"&&y>0&&n.show();j.css({width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2}).html(m.contents());f.css(i).fadeIn(d.transitionIn=="none"?0:d.speedIn,S)}}}},Y=function(){if(d.enableEscapeButton||d.enableKeyboardNav)b(document).bind("keydown.fb",function(a){if(a.keyCode==27&&d.enableEscapeButton){a.preventDefault();b.fancybox.close()}else if((a.keyCode== +37||a.keyCode==39)&&d.enableKeyboardNav&&a.target.tagName!=="INPUT"&&a.target.tagName!=="TEXTAREA"&&a.target.tagName!=="SELECT"){a.preventDefault();b.fancybox[a.keyCode==37?"prev":"next"]()}});if(d.showNavArrows){if(d.cyclic&&l.length>1||p!==0)z.show();if(d.cyclic&&l.length>1||p!=l.length-1)A.show()}else{z.hide();A.hide()}},S=function(){if(!b.support.opacity){j.get(0).style.removeAttribute("filter");f.get(0).style.removeAttribute("filter")}e.autoDimensions&&j.css("height","auto");f.css("height","auto"); +s&&s.length&&n.show();d.showCloseButton&&E.show();Y();d.hideOnContentClick&&j.bind("click",b.fancybox.close);d.hideOnOverlayClick&&u.bind("click",b.fancybox.close);b(window).bind("resize.fb",b.fancybox.resize);d.centerOnScroll&&b(window).bind("scroll.fb",b.fancybox.center);if(d.type=="iframe")b('').appendTo(j); +f.show();h=false;b.fancybox.center();d.onComplete(l,p,d);var a,c;if(l.length-1>p){a=l[p+1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}if(p>0){a=l[p-1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}},T=function(a){var c={width:parseInt(r.width+(i.width-r.width)*a,10),height:parseInt(r.height+(i.height-r.height)*a,10),top:parseInt(r.top+(i.top-r.top)*a,10),left:parseInt(r.left+(i.left-r.left)*a,10)};if(typeof i.opacity!=="undefined")c.opacity=a<0.5?0.5:a;f.css(c); +j.css({width:c.width-d.padding*2,height:c.height-y*a-d.padding*2})},U=function(){return[b(window).width()-d.margin*2,b(window).height()-d.margin*2,b(document).scrollLeft()+d.margin,b(document).scrollTop()+d.margin]},X=function(){var a=U(),c={},g=d.autoScale,k=d.padding*2;c.width=d.width.toString().indexOf("%")>-1?parseInt(a[0]*parseFloat(d.width)/100,10):d.width+k;c.height=d.height.toString().indexOf("%")>-1?parseInt(a[1]*parseFloat(d.height)/100,10):d.height+k;if(g&&(c.width>a[0]||c.height>a[1]))if(e.type== +"image"||e.type=="swf"){g=d.width/d.height;if(c.width>a[0]){c.width=a[0];c.height=parseInt((c.width-k)/g+k,10)}if(c.height>a[1]){c.height=a[1];c.width=parseInt((c.height-k)*g+k,10)}}else{c.width=Math.min(c.width,a[0]);c.height=Math.min(c.height,a[1])}c.top=parseInt(Math.max(a[3]-20,a[3]+(a[1]-c.height-40)*0.5),10);c.left=parseInt(Math.max(a[2]-20,a[2]+(a[0]-c.width-40)*0.5),10);return c},V=function(){var a=e.orig?b(e.orig):false,c={};if(a&&a.length){c=a.offset();c.top+=parseInt(a.css("paddingTop"), +10)||0;c.left+=parseInt(a.css("paddingLeft"),10)||0;c.top+=parseInt(a.css("border-top-width"),10)||0;c.left+=parseInt(a.css("border-left-width"),10)||0;c.width=a.width();c.height=a.height();c={width:c.width+d.padding*2,height:c.height+d.padding*2,top:c.top-d.padding-20,left:c.left-d.padding-20}}else{a=U();c={width:d.padding*2,height:d.padding*2,top:parseInt(a[3]+a[1]*0.5,10),left:parseInt(a[2]+a[0]*0.5,10)}}return c},Z=function(){if(t.is(":visible")){b("div",t).css("top",L*-40+"px");L=(L+1)%12}else clearInterval(K)}; +b.fn.fancybox=function(a){if(!b(this).length)return this;b(this).data("fancybox",b.extend({},a,b.metadata?b(this).metadata():{})).unbind("click.fb").bind("click.fb",function(c){c.preventDefault();if(!h){h=true;b(this).blur();o=[];q=0;c=b(this).attr("rel")||"";if(!c||c==""||c==="nofollow")o.push(this);else{o=b("a[rel="+c+"], area[rel="+c+"]");q=o.index(this)}I()}});return this};b.fancybox=function(a,c){var g;if(!h){h=true;g=typeof c!=="undefined"?c:{};o=[];q=parseInt(g.index,10)||0;if(b.isArray(a)){for(var k= +0,C=a.length;ko.length||q<0)q=0;I()}};b.fancybox.showActivity=function(){clearInterval(K);t.show();K=setInterval(Z,66)};b.fancybox.hideActivity=function(){t.hide()};b.fancybox.next=function(){return b.fancybox.pos(p+ +1)};b.fancybox.prev=function(){return b.fancybox.pos(p-1)};b.fancybox.pos=function(a){if(!h){a=parseInt(a);o=l;if(a>-1&&a1){q=a>=l.length?0:l.length-1;I()}}};b.fancybox.cancel=function(){if(!h){h=true;b.event.trigger("fancybox-cancel");N();e.onCancel(o,q,e);h=false}};b.fancybox.close=function(){function a(){u.fadeOut("fast");n.empty().hide();f.hide();b.event.trigger("fancybox-cleanup");j.empty();d.onClosed(l,p,d);l=e=[];p=q=0;d=e={};h=false}if(!(h||f.is(":hidden"))){h= +true;if(d&&false===d.onCleanup(l,p,d))h=false;else{N();b(E.add(z).add(A)).hide();b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");j.find("iframe").attr("src",M&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");d.titlePosition!=="inside"&&n.empty();f.stop();if(d.transitionOut=="elastic"){r=V();var c=f.position();i={top:c.top,left:c.left,width:f.width(),height:f.height()};if(d.opacity)i.opacity=1;n.empty().hide();B.prop=1; +b(B).animate({prop:0},{duration:d.speedOut,easing:d.easingOut,step:T,complete:a})}else f.fadeOut(d.transitionOut=="none"?0:d.speedOut,a)}}};b.fancybox.resize=function(){u.is(":visible")&&u.css("height",b(document).height());b.fancybox.center(true)};b.fancybox.center=function(a){var c,g;if(!h){g=a===true?1:0;c=U();!g&&(f.width()>c[0]||f.height()>c[1])||f.stop().animate({top:parseInt(Math.max(c[3]-20,c[3]+(c[1]-j.height()-40)*0.5-d.padding)),left:parseInt(Math.max(c[2]-20,c[2]+(c[0]-j.width()-40)*0.5- +d.padding))},typeof a=="number"?a:200)}};b.fancybox.init=function(){if(!b("#fancybox-wrap").length){b("body").append(m=b('
'),t=b('
'),u=b('
'),f=b('
'));D=b('
').append('
').appendTo(f); +D.append(j=b('
'),E=b(''),n=b('
'),z=b(''),A=b(''));E.click(b.fancybox.close);t.click(b.fancybox.cancel);z.click(function(a){a.preventDefault();b.fancybox.prev()});A.click(function(a){a.preventDefault();b.fancybox.next()}); +b.fn.mousewheel&&f.bind("mousewheel.fb",function(a,c){if(h)a.preventDefault();else if(b(a.target).get(0).clientHeight==0||b(a.target).get(0).scrollHeight===b(a.target).get(0).clientHeight){a.preventDefault();b.fancybox[c>0?"prev":"next"]()}});b.support.opacity||f.addClass("fancybox-ie");if(M){t.addClass("fancybox-ie6");f.addClass("fancybox-ie6");b('').prependTo(D)}}}; +b.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing", +easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};b(document).ready(function(){b.fancybox.init()})})(jQuery); \ No newline at end of file diff --git a/web/js/fancybox/jquery.mousewheel-3.0.4.pack.js b/web/js/fancybox/jquery.mousewheel-3.0.4.pack.js new file mode 100644 index 000000000..cb66588e2 --- /dev/null +++ b/web/js/fancybox/jquery.mousewheel-3.0.4.pack.js @@ -0,0 +1,14 @@ +/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net) +* Licensed under the MIT License (LICENSE.txt). +* +* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. +* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. +* Thanks to: Seamus Leahy for adding deltaX and deltaY +* +* Version: 3.0.4 +* +* Requires: 1.2.2+ +*/ + +(function(d){function g(a){var b=a||window.event,i=[].slice.call(arguments,1),c=0,h=0,e=0;a=d.event.fix(b);a.type="mousewheel";if(a.wheelDelta)c=a.wheelDelta/120;if(a.detail)c=-a.detail/3;e=c;if(b.axis!==undefined&&b.axis===b.HORIZONTAL_AXIS){e=0;h=-1*c}if(b.wheelDeltaY!==undefined)e=b.wheelDeltaY/120;if(b.wheelDeltaX!==undefined)h=-1*b.wheelDeltaX/120;i.unshift(a,c,h,e);return d.event.handle.apply(this,i)}var f=["DOMMouseScroll","mousewheel"];d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a= +f.length;a;)this.addEventListener(f[--a],g,false);else this.onmousewheel=g},teardown:function(){if(this.removeEventListener)for(var a=f.length;a;)this.removeEventListener(f[--a],g,false);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery); \ No newline at end of file -- cgit v1.2.3 From 3fc302069d8136e55edf7c91d0e4afe069e22b1c Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 12 Mar 2012 13:34:08 +0000 Subject: Add fancy box css, class to report page and js hook (for #209) --- templates/web/fixmystreet/header.html | 1 + templates/web/fixmystreet/report/photo.html | 2 +- web/cobrands/fixmystreet/fixmystreet.js | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index fade721d5..dd1a90c5f 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -13,6 +13,7 @@ + diff --git a/templates/web/fixmystreet/report/photo.html b/templates/web/fixmystreet/report/photo.html index a338391ce..c78f76e2f 100644 --- a/templates/web/fixmystreet/report/photo.html +++ b/templates/web/fixmystreet/report/photo.html @@ -1,7 +1,7 @@ [% IF c.cobrand.allow_photo_display && object.photo %] [% photo = object.get_photo_params %]
- [% IF photo.url_full %][% END + [% IF photo.url_full %][% END %] [%- IF photo.url_full %][% END %]
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 6da87a2e7..97f97f22a 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -520,6 +520,13 @@ $.fn.drawer = function(id, ajax) { queue:false }).fadeOut(500); }); + + + + /* + * Fancybox fullscreen images + */ + $('.fancy-image').fancybox(); }); /* -- cgit v1.2.3 From ab82bbd08b3cb1def8b0988230d3ecfc602e3b37 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 12 Mar 2012 16:14:37 +0000 Subject: Add home button to fullscreenmap on mobile, also adjust mixin for button-reset --- web/cobrands/fixmystreet/_mixins.scss | 20 ++++++++++---------- web/cobrands/fixmystreet/base.scss | 33 +++++++++++++++------------------ web/cobrands/fixmystreet/fixmystreet.js | 3 ++- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss index 793c9090b..f77152dd6 100644 --- a/web/cobrands/fixmystreet/_mixins.scss +++ b/web/cobrands/fixmystreet/_mixins.scss @@ -1,5 +1,5 @@ // Button reset -@mixin button-reset { +@mixin button-reset($c1: #eee, $c2: #ccc, $c3: #999, $c4: #333, $c5: #777, $c6: #999, $c7: #666, $c8: #fff){ cursor:pointer; font:{ size: 0.875em; @@ -13,16 +13,16 @@ width: auto; height: auto; @include border-radius(4px); - background: #eee; - @include background (linear-gradient(#eee, #ccc)) ; - border:1px solid #999; - color:#333; + background: $c1; + @include background (linear-gradient($c1, $c2)) ; + border:1px solid $c3; + color:$c4; &:hover{ - color:#fff; - background:#777; - @include background (linear-gradient(#999, #777)) ; + background:$c5; + @include background (linear-gradient($c6, $c5)); text-decoration: none; - border:1px solid #666; + border:1px solid $c7; + color:$c8; } } @@ -69,4 +69,4 @@ display:block; } } -} \ No newline at end of file +} diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 05ff23ac9..a900c4331 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -693,29 +693,13 @@ button, input[type=submit],.btn{ .green-btn, button.green-btn, input.green-btn{ - @include button-reset; - background-color: #9FDE23; - @include background (linear-gradient(#9FDE23, #7FB900)) ; - color:#fff; - border-color: #5B9700; - &:hover{ - @include background (linear-gradient(#7FB900, #9FDE23)) ; - border-color: #5B9700; - } + @include button-reset(#9FDE23, #7FB900, #5B9700, #fff, #9FDE23, #7FB900, #5B9700, #fff); } .red-btn, button.red-btn, input.red-btn{ - @include button-reset; - background-color: #FF0038; - @include background (linear-gradient(#FF0038, #BF002A)) ; - color:#fff; - border-color: #80001C; - &:hover{ - @include background (linear-gradient(#BF002A, #FF0038)) ; - border-color: #80001C; - } + @include button-reset(#FF0038, #BF002A, #80001C, #fff, #FF0038, #BF002A, #80001C, #fff); } .final-submit, @@ -1155,6 +1139,19 @@ a:hover.button-left { right:0; font-size:0.75em; background:rgba(0, 0, 0, 0.7); + padding:0.75em 30px; + a { + @include button-reset(#333, #1a1a1a, #1a1a1a, #fff, #333, #1a1a1a, #1a1a1a, #fff); + font: { + weight:normal; + size:0.875em; + } + line-height:1; + padding:0.5em 0.75em; + position:absolute; + left:0.3em; + top:0.3em; + } } .olControlAttribution { diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 97f97f22a..173c247c3 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -104,7 +104,8 @@ $(function(){ .addClass('mobile-map-banner') .removeClass('.big-green-banner') .appendTo('#map_box') - .text('Place pin on map'); + .text('Place pin on map') + .prepend('home'); } } else { // Make map full screen on non-mobile sizes. -- cgit v1.2.3 From d2c70168d1aa1090314be160b9650f1a501e14e5 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Mon, 12 Mar 2012 17:27:43 +0000 Subject: Changing how the frontpage sits and the logo for it, also the border-top, mysoc tab and bit stripe on the homepage are now images Need to fix the smaller logo on other pages and check IE. --- web/cobrands/fixmystreet/images/sprite.png | Bin 124999 -> 119079 bytes web/cobrands/fixmystreet/images/tile-y.jpg | Bin 0 -> 35144 bytes web/cobrands/fixmystreet/layout.scss | 25 +++++++++++++++++-------- 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 web/cobrands/fixmystreet/images/tile-y.jpg diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index c2ac370ab..e13572b60 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/cobrands/fixmystreet/images/tile-y.jpg b/web/cobrands/fixmystreet/images/tile-y.jpg new file mode 100644 index 000000000..63682f1c4 Binary files /dev/null and b/web/cobrands/fixmystreet/images/tile-y.jpg differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 16432a360..6b750ee50 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -62,7 +62,10 @@ h1 { width: 100%; min-height: 4em; position: absolute; - border-top: 0.25em solid $primary; + border-top:4px solid #1a1a1a; + @include border-image(url(images/tile-y.jpg) 4 0 0 0); + border-left:0; + border-right:0; z-index:2; } } @@ -163,11 +166,12 @@ h1 { &#mysoc-menu{ padding: 0em 0.5em; margin-left: 0.25em; - background:$primary; + background:$primary url(images/tile-y.jpg); @include border-radius(0 0 0.375em 0.375em); - @include box-shadow(0em 0.3em 0.1em 0em #000); + //@include box-shadow(0em 0.3em 0.1em 0em #000); li{ a{ + background:none; color:#000; text-transform: uppercase; font-size: 0.6875em; @@ -356,7 +360,7 @@ body.twothirdswidthpage { .tablewrapper { display:table; width:100%; - padding:1em 0; + padding:0 0 1em 0; >div { display:table-cell; width:50%; @@ -792,8 +796,7 @@ body.frontpage { width:100%; } .content { - padding-top:14em; - margin:0 auto; + margin:14em auto 0 auto; } } .nav-wrapper-2{ @@ -855,11 +858,11 @@ body.frontpage { // big yellow bit full screen width #front-main { - background:$primary; + background:$primary url(images/tile-y.jpg); position:absolute; width:100%; left:0; - top:1em; + top:-15em; #front-main-container { max-width: 57em; margin:0 auto; @@ -870,6 +873,7 @@ body.frontpage { color:#222; } #postcodeForm { + background:none; overflow:hidden; margin-right:0.5em; label { @@ -941,6 +945,11 @@ body.frontpage { border-left:1em solid #fff; } +#front-howto h2, +#front-recently h2 { + margin-top:0; +} + .ie6, .ie7 { .tablewrapper { -- cgit v1.2.3 From 2d303093aa9ddb482aa4cfcf1bffab06e1e574f4 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Mon, 12 Mar 2012 23:16:49 +0000 Subject: Shared JS file, this function might not be defined. --- web/js/map-OpenLayers.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 58d1e21ec..2978bf7fe 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -445,7 +445,9 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { document.getElementById('side-form').style.display = 'block'; } $('#side').hide(); - heightFix('#report-a-problem-sidebar', '.content', 26); + if (typeof heightFix !== undefined) { + heightFix('#report-a-problem-sidebar', '.content', 26); + } // If we clicked the map somewhere inconvenient var sidebar = $('#report-a-problem-sidebar'); -- cgit v1.2.3 From 500d5f63a85b81db8efe9fbfae3c093c2f0356a8 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Mon, 12 Mar 2012 23:17:05 +0000 Subject: Update lastupdate timestamp if anything has changed, not just state. --- perllib/FixMyStreet/App/Controller/Admin.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 0e34ea64b..83f77f401 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -627,10 +627,6 @@ sub report_edit : Path('report_edit') : Args(1) { $problem->photo(undef); } - if ( $new_state ne $old_state ) { - $problem->lastupdate( \'ms_current_timestamp()' ); - } - if ( $new_state eq 'confirmed' and $old_state eq 'unconfirmed' ) { $problem->confirmed( \'ms_current_timestamp()' ); } @@ -639,6 +635,7 @@ sub report_edit : Path('report_edit') : Args(1) { $problem->discard_changes; } else { + $problem->lastupdate( \'ms_current_timestamp()' ) if $edited || $new_state ne $old_state; $problem->update; if ( $new_state ne $old_state ) { -- cgit v1.2.3 From e969202aee6953ab5d8fcf6d075249109352d97e Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 13 Mar 2012 00:46:06 +0000 Subject: .data() doesn't appear to work here in Firefox 3.6 (though does in the other place it's used, sigh), so set our own variable instead. Set gallery of all images, typo. --- templates/web/fixmystreet/report/new/fill_in_details_text.html | 10 +++++----- templates/web/fixmystreet/report/photo.html | 2 +- web/cobrands/fixmystreet/fixmystreet.js | 10 ++++++++-- web/js/map-OpenLayers.js | 4 ++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/templates/web/fixmystreet/report/new/fill_in_details_text.html b/templates/web/fixmystreet/report/new/fill_in_details_text.html index 4838168ee..8b5e3a2ad 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_text.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_text.html @@ -1,13 +1,13 @@ [% IF area_ids_to_list.size != 0; - loc('Please fill in details of the problem below. The council won\'t be able -to help unless you leave as much detail as you can, so please describe the exact location of -the problem (e.g. on a wall), what it is, how long it has been there, a description (and a -photo of the problem if you have one), etc.'); + loc('The council won’t be able to help unless you leave as much +detail as you can. Please describe the exact location of the problem (e.g. on a +wall), what it is, how long it has been there, a description (and a photo of +the problem if you have one), etc.'); IF category_extras; ' ' _ loc('Some categories may require additional information.'); END; ELSE; loc('Please fill in details of the problem below.'); END; -%] \ No newline at end of file +%] diff --git a/templates/web/fixmystreet/report/photo.html b/templates/web/fixmystreet/report/photo.html index c78f76e2f..a7761a721 100644 --- a/templates/web/fixmystreet/report/photo.html +++ b/templates/web/fixmystreet/report/photo.html @@ -1,7 +1,7 @@ [% IF c.cobrand.allow_photo_display && object.photo %] [% photo = object.get_photo_params %]
- [% IF photo.url_full %][% END + [% IF photo.url_full %][% END %] [%- IF photo.url_full %][% END %]
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 173c247c3..324915e16 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -119,7 +119,10 @@ $(function(){ top: 0, left: 0, right: 0, bottom: 0, width: '100%', height: map_height, margin: 0 - }).data('size', 'full'); + }); + if (typeof fixmystreet !== 'undefined') { + fixmystreet.state_map = 'full'; + } } //heightfix the desktop .content div @@ -527,7 +530,10 @@ $.fn.drawer = function(id, ajax) { /* * Fancybox fullscreen images */ - $('.fancy-image').fancybox(); + $('a[rel=fancy]').fancybox({ + 'overlayColor': '#000000' + }); + }); /* diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 2978bf7fe..6ffcb5c1d 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -227,7 +227,7 @@ $(function(){ fixmystreet.map.setCenter(centre, fixmystreet.zoom || 3); } - if ($('#map_box').data('size')=='full') { + if (fixmystreet.state_map && fixmystreet.state_map == 'full') { // TODO Work better with window resizing, this is pretty 'set up' only at present var q = $(window).width() / 4; // Need to try and fake the 'centre' being 75% from the left @@ -445,7 +445,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { document.getElementById('side-form').style.display = 'block'; } $('#side').hide(); - if (typeof heightFix !== undefined) { + if (typeof heightFix !== 'undefined') { heightFix('#report-a-problem-sidebar', '.content', 26); } -- cgit v1.2.3 From 1fff28a08401bf970694a3e5507d076cf38b0d0d Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 13 Mar 2012 01:14:43 +0000 Subject: fancybox must come later in order for it to work in e.g. FF3.6. Fix CSS paths for it to work in IE6. For #209 --- templates/web/fixmystreet/common_header_tags.html | 4 +-- web/js/fancybox/jquery.fancybox-1.3.4.css | 32 +++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/templates/web/fixmystreet/common_header_tags.html b/templates/web/fixmystreet/common_header_tags.html index bd078f136..0b234b55a 100644 --- a/templates/web/fixmystreet/common_header_tags.html +++ b/templates/web/fixmystreet/common_header_tags.html @@ -7,11 +7,11 @@ - - + + [% map_js %] [% IF category_extras_json && category_extras_json != '{}' %] diff --git a/web/js/fancybox/jquery.fancybox-1.3.4.css b/web/js/fancybox/jquery.fancybox-1.3.4.css index 6f53d8f4a..54c6f2479 100644 --- a/web/js/fancybox/jquery.fancybox-1.3.4.css +++ b/web/js/fancybox/jquery.fancybox-1.3.4.css @@ -324,15 +324,15 @@ /* IE6 */ -.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_close.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_close.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_nav_right.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_nav_left.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_nav_right.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; } -.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_main.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_title_right.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; } +.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_title_left.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_title_main.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_title_right.png', sizingMethod='scale'); } .fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame { height: expression(this.parentNode.clientHeight + "px"); @@ -343,17 +343,17 @@ top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'); } -#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_loading.png', sizingMethod='scale'); } +#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_loading.png', sizingMethod='scale'); } /* IE6, IE7, IE8 */ .fancybox-ie .fancybox-bg { background: transparent !important; } -.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_n.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_ne.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_e.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_se.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_s.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_sw.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_w.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='fancybox/fancy_shadow_nw.png', sizingMethod='scale'); } \ No newline at end of file +.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_shadow_n.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_shadow_ne.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_shadow_e.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_shadow_se.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_shadow_s.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_shadow_sw.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_shadow_w.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/js/fancybox/fancy_shadow_nw.png', sizingMethod='scale'); } -- cgit v1.2.3 From d9cb6e86ccb22f5ee46b2895241202dd617fffe8 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 13 Mar 2012 09:19:06 +0000 Subject: Added better image to tile accross the top border, now it works in safari/ff too... --- web/cobrands/fixmystreet/images/tile-y-border.jpg | Bin 0 -> 1031 bytes web/cobrands/fixmystreet/layout.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 web/cobrands/fixmystreet/images/tile-y-border.jpg diff --git a/web/cobrands/fixmystreet/images/tile-y-border.jpg b/web/cobrands/fixmystreet/images/tile-y-border.jpg new file mode 100644 index 000000000..04c75a9de Binary files /dev/null and b/web/cobrands/fixmystreet/images/tile-y-border.jpg differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 6b750ee50..e1de72daf 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -63,7 +63,7 @@ h1 { min-height: 4em; position: absolute; border-top:4px solid #1a1a1a; - @include border-image(url(images/tile-y.jpg) 4 0 0 0); + @include border-image(url(images/tile-y-border.jpg) 4 0 0 0); border-left:0; border-right:0; z-index:2; -- cgit v1.2.3 From 3746cea540c7a915f9a5be040e7f6831d7c58096 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 13 Mar 2012 09:23:12 +0000 Subject: Update sprite with new logo style --- web/cobrands/fixmystreet/images/sprite.png | Bin 119079 -> 115313 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index e13572b60..c6419f397 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ -- cgit v1.2.3 From 5df25a319af7485bdbfa2d989debd1ad4ebd8745 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 13 Mar 2012 09:42:12 +0000 Subject: Update ie logos to have no yellow like the main ones --- web/cobrands/fixmystreet/images/ie_front_logo.gif | Bin 4225 -> 3954 bytes web/cobrands/fixmystreet/images/ie_logo.gif | Bin 2349 -> 2400 bytes web/cobrands/fixmystreet/images/ie_mysoc_logo.gif | Bin 599 -> 462 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/cobrands/fixmystreet/images/ie_front_logo.gif b/web/cobrands/fixmystreet/images/ie_front_logo.gif index 34277ea74..71225283f 100644 Binary files a/web/cobrands/fixmystreet/images/ie_front_logo.gif and b/web/cobrands/fixmystreet/images/ie_front_logo.gif differ diff --git a/web/cobrands/fixmystreet/images/ie_logo.gif b/web/cobrands/fixmystreet/images/ie_logo.gif index 17c9f59b8..66dd1de22 100644 Binary files a/web/cobrands/fixmystreet/images/ie_logo.gif and b/web/cobrands/fixmystreet/images/ie_logo.gif differ diff --git a/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif b/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif index 8df76b210..e00fd955a 100644 Binary files a/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif and b/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif differ -- cgit v1.2.3 From 050aba1697d5bc5cd0d0fe69f34d61763b82353b Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 13 Mar 2012 11:16:32 +0000 Subject: Add suggetion icon to images with bigger resolutions available (for #209) --- templates/web/fixmystreet/report/photo.html | 2 +- web/cobrands/fixmystreet/images/sprite.png | Bin 115313 -> 115610 bytes web/cobrands/fixmystreet/layout.scss | 31 ++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/templates/web/fixmystreet/report/photo.html b/templates/web/fixmystreet/report/photo.html index a7761a721..02ab9228b 100644 --- a/templates/web/fixmystreet/report/photo.html +++ b/templates/web/fixmystreet/report/photo.html @@ -3,6 +3,6 @@
[% IF photo.url_full %][% END %] - [%- IF photo.url_full %][% END %] + [%- IF photo.url_full %]zoom[% END %]
[% END %] diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png index c6419f397..68de30268 100644 Binary files a/web/cobrands/fixmystreet/images/sprite.png and b/web/cobrands/fixmystreet/images/sprite.png differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index e1de72daf..5a91dea2d 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -594,6 +594,7 @@ body.twothirdswidthpage { // Wraps around #key-tools box - sticks to the bottom of the screen on desktop .shadow-wrap { position:fixed; + z-index:10; //this is just to ensure anythign inside .content that has position set goes sites it bottom: 0; width: 29em; overflow: hidden; @@ -705,6 +706,36 @@ body.twothirdswidthpage { width: 29em; } +// fancybox gallery images have a magnifying glass in the corner +.update-img { + a { + @include inline-block; + position:relative; + span { + position:absolute; + top:0; + right:0; + display:block; + width:20px; + height:20px; + opacity: 0.5; + background:#fff url(images/sprite.png) -16px -1098px no-repeat; + //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ + font: 0/0 a; + color: transparent; + } + &:hover span { + opacity: 1; + } + } +} +//bit of a hack - as we can't use em's, push the span out to the right +//by how much it would be if the user did not resize the text +.issue-list li .update-wrap .update-img a span { + right:-16px; + top:-8px; +} + /*FORMS*/ input[type=text], input[type=password], -- cgit v1.2.3 From cca10b9222072ac3404a6291a84b0318cc95c647 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 13 Mar 2012 14:06:41 +0000 Subject: Rename footer help links div. --- templates/web/fixmystreet/footer.html | 4 ++-- web/cobrands/fixmystreet/base.scss | 2 +- web/cobrands/fixmystreet/layout.scss | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 93e88dcc2..5ac9c881d 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -12,7 +12,7 @@

+ - \ No newline at end of file + diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index a900c4331..8def019c3 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -662,7 +662,7 @@ p.label-valid { } } -#footer-ads { +#footer-help { ul { @include list-reset-soft; li { diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 5a91dea2d..cfa0cf218 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -459,7 +459,7 @@ body.twothirdswidthpage { } } -#footer-ads { +#footer-help { border-left:1em solid #fff; ul { display:table; @@ -473,7 +473,7 @@ body.twothirdswidthpage { } } .ie6, .ie7 { - #footer-ads { + #footer-help { margin-left:2%; ul { width:100%; -- cgit v1.2.3 From 477cbe20daf95c34ca7382701c0c8e74eb894de4 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 13 Mar 2012 14:38:31 +0000 Subject: Add placeholder polyfill for IE (see #221) abd also some Ie testing in general, removed quite a bit that was just breaking layouts in IE. --- templates/web/fixmystreet/common_header_tags.html | 2 +- web/cobrands/fixmystreet/fixmystreet.js | 9 +++ web/cobrands/fixmystreet/layout.scss | 70 +++++++++------------- web/js/modernizr.custom.61367.js | 4 -- web/js/modernizr.custom.76759.js | 4 ++ .../placeholder_polyfill.jquery.min.js | 23 +++++++ .../placeholder_polyfill.min.css | 2 + 7 files changed, 66 insertions(+), 48 deletions(-) delete mode 100644 web/js/modernizr.custom.61367.js create mode 100644 web/js/modernizr.custom.76759.js create mode 100644 web/js/placeholder_polyfill/placeholder_polyfill.jquery.min.js create mode 100644 web/js/placeholder_polyfill/placeholder_polyfill.min.css diff --git a/templates/web/fixmystreet/common_header_tags.html b/templates/web/fixmystreet/common_header_tags.html index 0b234b55a..f0c6c76a7 100644 --- a/templates/web/fixmystreet/common_header_tags.html +++ b/templates/web/fixmystreet/common_header_tags.html @@ -5,7 +5,7 @@ - + diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 324915e16..3074569ac 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -3,6 +3,15 @@ * FixMyStreet JavaScript */ +//test for and load placeholder polyfill if neccessary +Modernizr.load({ + test: Modernizr.input.placeholder, + nope: [ + '/js/placeholder_polyfill/placeholder_polyfill.min.css', + '/js/placeholder_polyfill/placeholder_polyfill.jquery.min.js' + ] +}); + function form_category_onchange() { var cat = $('#form_category'); var args = { diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 5a91dea2d..180d155b4 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -168,7 +168,6 @@ h1 { margin-left: 0.25em; background:$primary url(images/tile-y.jpg); @include border-radius(0 0 0.375em 0.375em); - //@include box-shadow(0em 0.3em 0.1em 0em #000); li{ a{ background:none; @@ -249,11 +248,6 @@ body.mappage { } .ie6, .ie7 { body.mappage { - .container { - float: left; - width: 27em; - margin-left: 1.4em; - } .nav-wrapper{ z-index:1; .nav-wrapper-2 { @@ -262,7 +256,6 @@ body.mappage { } #site-logo { position: absolute; - top:-3.25em; } } } @@ -287,14 +280,6 @@ body.mappage { } #site-logo { position: absolute; - top:-3.25em; - } - //also need to reset some weird margining stuff... - #user-meta p { - top:1em; - } - .content { - margin-top:3em; } } } @@ -578,19 +563,11 @@ body.twothirdswidthpage { } .ie6, .ie7 { #user-meta { - // position: relative; z-index:1; - p { - // top:5em; - } - } -} -.ie8 { - #user-meta p { - top:5em; } } + // Wraps around #key-tools box - sticks to the bottom of the screen on desktop .shadow-wrap { position:fixed; @@ -768,7 +745,6 @@ textarea.form-error { left:29.5em; top:5em; width:15em; - //z-index: -1; @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); .sidebar-tips { background:#eeeeee; @@ -843,35 +819,44 @@ body.frontpage { background-position:-2px -108px; } #user-meta { + z-index:10; p { - top:-2em; + top:-4em; right:0; + color:#FFD000; + background:none; + @include box-shadow(rgba(0, 0, 0, 0) 0 0 0); + a { + background:#fff; + color:#1a1a1a; + &:hover { + background:#ddd; + } + } } } } //logo fix .ie6, .ie7, .ie8 { body.frontpage { - #site-header{ - height:4em; - } #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:-1em; + body.frontpage { + #site-header { + height:3em; + } + #site-logo { + top:-1em; + } + #user-meta p { + top:-2em; + } } } .ie6 body.frontpage #site-logo { @@ -879,11 +864,11 @@ body.frontpage { } //weird margining thing for ie8 .ie8 body.frontpage { - .wrapper .content { - margin-top:5em; + #front-main { + top:-12em; } - #user-meta p { - top:3em; + .table-cell .content { + margin-top:12em; } } @@ -944,7 +929,6 @@ body.frontpage { .ie6, .ie7 { #front-main { top:2em; - padding-top:1em; } } diff --git a/web/js/modernizr.custom.61367.js b/web/js/modernizr.custom.61367.js deleted file mode 100644 index e2360af7f..000000000 --- a/web/js/modernizr.custom.61367.js +++ /dev/null @@ -1,4 +0,0 @@ -/* Modernizr 2.5.3 (Custom Build) | MIT & BSD - * Build: http://www.modernizr.com/download/#-shiv-mq-teststyles-load - */ -;window.Modernizr=function(a,b,c){function v(a){i.cssText=a}function w(a,b){return v(prefixes.join(a+";")+(b||""))}function x(a,b){return typeof a===b}function y(a,b){return!!~(""+a).indexOf(b)}function z(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:x(f,"function")?f.bind(d||b):f}return!1}var d="2.5.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j,k={}.toString,l={},m={},n={},o=[],p=o.slice,q,r=function(a,c,d,e){var h,i,j,k=b.createElement("div"),l=b.body,m=l?l:b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),k.appendChild(j);return h=["",""].join(""),k.id=g,m.innerHTML+=h,m.appendChild(k),l||(m.style.background="",f.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},s=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return r("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},t={}.hasOwnProperty,u;!x(t,"undefined")&&!x(t.call,"undefined")?u=function(a,b){return t.call(a,b)}:u=function(a,b){return b in a&&x(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=p.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(p.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(p.call(arguments)))};return e});for(var A in l)u(l,A)&&(q=A.toLowerCase(),e[q]=l[A](),o.push((e[q]?"":"no-")+q));return v(""),h=j=null,function(a,b){function g(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function h(){var a=k.elements;return typeof a=="string"?a.split(" "):a}function i(a){var b={},c=a.createElement,e=a.createDocumentFragment,f=e();a.createElement=function(a){var e=(b[a]||(b[a]=c(a))).cloneNode();return k.shivMethods&&e.canHaveChildren&&!d.test(a)?f.appendChild(e):e},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+h().join().replace(/\w+/g,function(a){return b[a]=c(a),f.createElement(a),'c("'+a+'")'})+");return n}")(k,f)}function j(a){var b;return a.documentShived?a:(k.shivCSS&&!e&&(b=!!g(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),f||(b=!i(a)),b&&(a.documentShived=b),a)}var c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea)$/i,e,f;(function(){var a=b.createElement("a");a.innerHTML="",e="hidden"in a,f=a.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var k={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:j};a.html5=k,j(b)}(this,b),e._version=d,e.mq=s,e.testStyles=r,e}(this,this.document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f",a,""].join(""),k.id=g,m.innerHTML+=h,m.appendChild(k),l||(m.style.background="",f.appendChild(m)),i=c(k,a),l?k.parentNode.removeChild(k):m.parentNode.removeChild(m),!!i},s=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return r("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},t={}.hasOwnProperty,u;!x(t,"undefined")&&!x(t.call,"undefined")?u=function(a,b){return t.call(a,b)}:u=function(a,b){return b in a&&x(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=p.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(p.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(p.call(arguments)))};return e});for(var B in l)u(l,B)&&(q=B.toLowerCase(),e[q]=l[B](),o.push((e[q]?"":"no-")+q));return e.input||A(),v(""),h=j=null,function(a,b){function g(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function h(){var a=k.elements;return typeof a=="string"?a.split(" "):a}function i(a){var b={},c=a.createElement,e=a.createDocumentFragment,f=e();a.createElement=function(a){var e=(b[a]||(b[a]=c(a))).cloneNode();return k.shivMethods&&e.canHaveChildren&&!d.test(a)?f.appendChild(e):e},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+h().join().replace(/\w+/g,function(a){return b[a]=c(a),f.createElement(a),'c("'+a+'")'})+");return n}")(k,f)}function j(a){var b;return a.documentShived?a:(k.shivCSS&&!e&&(b=!!g(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),f||(b=!i(a)),b&&(a.documentShived=b),a)}var c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea)$/i,e,f;(function(){var a=b.createElement("a");a.innerHTML="",e="hidden"in a,f=a.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var k={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:j};a.html5=k,j(b)}(this,b),e._version=d,e.mq=s,e.testStyles=r,e}(this,this.document),function(a,b,c){function d(a){return o.call(a)=="[object Function]"}function e(a){return typeof a=="string"}function f(){}function g(a){return!a||a=="loaded"||a=="complete"||a=="uninitialized"}function h(){var a=p.shift();q=1,a?a.t?m(function(){(a.t=="c"?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){a!="img"&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l={},o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};y[c]===1&&(r=1,y[c]=[],l=b.createElement(a)),a=="object"?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),a!="img"&&(r||y[c]===2?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i(b=="c"?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),p.length==1&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&o.call(a.opera)=="[object Opera]",l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return o.call(a)=="[object Array]"},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f'+l+"").appendTo(i); +j=(k.width()>h.width());if(j){k.attr("title",l);}a(k,h);h.data("placeholder",k);k.data("input",k);k.click(function(){e(this).data("input").focus();});h.focusin(function(){e(this).data("placeholder").addClass(g.options.hideClass); +});h.focusout(function(){c(e(this),g.options);});c(h,g.options);e(document).bind("fontresize",function(){a(k,h);});if(e.event.special.resize){e("textarea").bind("resize",function(n){a(k,h); +});}else{e("textarea").css("resize","none");}});};e(function(){if("placeholder" in e("")[0]){return;}e("input[placeholder], textarea[placeholder]").placeHolder({visibleToScreenreaders:true}); +});})(jQuery); \ No newline at end of file diff --git a/web/js/placeholder_polyfill/placeholder_polyfill.min.css b/web/js/placeholder_polyfill/placeholder_polyfill.min.css new file mode 100644 index 000000000..602cf1fe3 --- /dev/null +++ b/web/js/placeholder_polyfill/placeholder_polyfill.min.css @@ -0,0 +1,2 @@ +label span.placeholder{position:absolute;font-size:75%;color:#999;font-family:sans-serif;padding:4px 3px;z-index:1}label span.placeholder-hide-exept-screenreader{clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px);padding:0!important;border:0!important;height:1px!important;width:1px!important;overflow:hidden} +label span.placeholder-hide{display:none}label.visuallyhidden-with-placeholder{clip:auto!important;height:auto!important;overflow:visible!important;position:absolute!important;left:-999em} \ No newline at end of file -- cgit v1.2.3 From 2c119c6e5b7fd062ec3240d84122573e3ee5cf76 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 13 Mar 2012 15:26:45 +0000 Subject: Tweak hover style for report a problem button --- web/cobrands/fixmystreet/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index b909e0e83..139b9257a 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -155,7 +155,7 @@ h1 { color:#333; @include border-radius(0.25em); &:hover { - background:$primary/0.9; + background:$primary/1.1; } } span { -- cgit v1.2.3 From 3743af062f8c1bc3155491c9d1737ce21dac6047 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Tue, 13 Mar 2012 17:22:17 +0000 Subject: Pagination styles and some js fixing --- templates/web/fixmystreet/pagination.html | 15 +++++ templates/web/fixmystreet/reports/council.html | 4 +- web/cobrands/fixmystreet/base.scss | 79 +++++++++++++++++++------- web/cobrands/fixmystreet/fixmystreet.js | 6 +- web/cobrands/fixmystreet/layout.scss | 30 ---------- 5 files changed, 82 insertions(+), 52 deletions(-) create mode 100644 templates/web/fixmystreet/pagination.html diff --git a/templates/web/fixmystreet/pagination.html b/templates/web/fixmystreet/pagination.html new file mode 100644 index 000000000..4f4d00a79 --- /dev/null +++ b/templates/web/fixmystreet/pagination.html @@ -0,0 +1,15 @@ +[% IF pager.last_page > 1 %] +

+ [% IF pager.previous_page %] + Previous + [% END %] + + [% pager.first %] to [% pager.last %] of [% pager.total_entries %] + + [% IF pager.next_page %] + Next + [% END %] +

+[% END %] diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 374f9713a..b426adcaa 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -61,7 +61,7 @@

[% tprintf(loc('Get updates of problems in this %s'), thing) %]
[% loc('Wards of this council') %] +
[% loc('Wards of this council') %]

@@ -96,6 +96,8 @@ %] +[% INCLUDE 'pagination.html', param = 'p' %] +

[% INCLUDE 'footer.html' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 8def019c3..068f33ab6 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -580,7 +580,7 @@ p.label-valid { size:0.6875em; family: 'helvetica', 'arial', sans-serif; } - &:hover, &.hover { + &:hover, &.hover, &.active { text-decoration:none; background-color:#333; color:#fff; @@ -597,7 +597,7 @@ p.label-valid { background-image:url('images/sprite.png'); background-position:center -2716px; } - &.hover { + &.hover, &.active { background-image:url('images/sprite.png'); background-position:center -2064px; } @@ -944,6 +944,41 @@ a:hover.button-left { } } +// fancybox gallery images have a magnifying glass in the corner +.update-img { + a { + @include inline-block; + position:relative; + span { + position:absolute; + top:0; + right:0; + display:block; + width:20px; + height:20px; + opacity: 0.5; + background:#fff url(images/sprite.png) -16px -1098px no-repeat; + //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ + font: 0/0 a; + color: transparent; + } + &:hover span { + opacity: 1; + } + } +} +//bit of a hack - as we can't use em's, push the span out to the right +//by how much it would be if the user did not resize the text +.issue-list li .update-wrap .update-img a span { + right:-16px; + top:-8px; +} + +.problem-header { + margin-bottom:1em; +} + + // map stuff #map_box{ @extend .full-width; @@ -1330,23 +1365,29 @@ table.nicetable { } } -ul.breadcrumb { - @include list-reset; - margin:-1em -1em 1em -1em; - overflow:hidden; - li { - span { - display:block; - padding:0.5em 1em 0.5em 0; - } - a { - background:url('images/sprite.png') right -3220px no-repeat; - padding:0.5em 2.5em 0.5em 1em; - color:#333; - &:hover { - color:#000; - text-decoration:none; - } +.pagination { + text-align:center; + padding:0.5em 1em; + background:#eee; + position:relative; + .prev { + position:absolute; + left:0.5em; + } + .next { + position:absolute; + right:0.5em; + } + a { + @include inline-block; + background:$primary; + padding-left:0.5em; + padding-right:0.5em; + color:#1a1a1a; + &:hover { + color:#1a1a1a; + text-decoration:none; + background:$primary/1.1; } } } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 3074569ac..6b26a94cd 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -308,7 +308,7 @@ $(function(){ //move 'skip this step' link on mobile $('.mobile #skip-this-step').hide(); - $('.mobile #skip-this-step a').appendTo('#key-tools').addClass('chevron').wrap('

'); + $('.mobile #skip-this-step a').addClass('chevron').wrap('

').appendTo('#key-tools'); /* * Tabs @@ -465,7 +465,9 @@ $.fn.drawer = function(id, ajax) { $('#council_wards').hide().removeClass('hidden-js').find('h2').hide(); $('#key-tool-wards').click(function(e){ e.preventDefault(); - $('#council_wards').slideToggle(); + $('#council_wards').slideToggle('800', function(){ + $('#key-tool-wards').toggleClass('active'); + }); }); } else { $('#key-tool-wards').drawer('council_wards', false); diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 139b9257a..191793fcb 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -683,36 +683,6 @@ body.twothirdswidthpage { width: 29em; } -// fancybox gallery images have a magnifying glass in the corner -.update-img { - a { - @include inline-block; - position:relative; - span { - position:absolute; - top:0; - right:0; - display:block; - width:20px; - height:20px; - opacity: 0.5; - background:#fff url(images/sprite.png) -16px -1098px no-repeat; - //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ - font: 0/0 a; - color: transparent; - } - &:hover span { - opacity: 1; - } - } -} -//bit of a hack - as we can't use em's, push the span out to the right -//by how much it would be if the user did not resize the text -.issue-list li .update-wrap .update-img a span { - right:-16px; - top:-8px; -} - /*FORMS*/ input[type=text], input[type=password], -- cgit v1.2.3 From 0104e80bf9ea96c52bf8b3bb2bc7b311be7e1f15 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 13 Mar 2012 23:32:40 +0000 Subject: Remove empty li from council mobile page, put in necessary IE CSS for the third time. --- web/cobrands/fixmystreet/fixmystreet.js | 1 + web/cobrands/fixmystreet/layout.scss | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 6b26a94cd..29aecef52 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -497,6 +497,7 @@ $.fn.drawer = function(id, ajax) { if($('.mobile').length){ $('#map_permalink').hide(); $('#key-tools a.feed').appendTo('#sub_map_links'); + $('#key-tools li:empty').remove(); $('#report-updates-data').insertAfter($('#map_box')); } //add open/close toggle button on desk diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 191793fcb..6247c7474 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -248,6 +248,12 @@ body.mappage { } .ie6, .ie7 { body.mappage { + // The below is *mandatory* to allow pins/zoom to be clickable in IE6/7. Do NOT remove. + .container { + float: left; + width: 27em; + margin-left: 1.4em; + } .nav-wrapper{ z-index:1; .nav-wrapper-2 { -- cgit v1.2.3 From 8d07e6e0036a15901b3eb077325beace61f2e1b8 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 14 Mar 2012 09:49:25 +0000 Subject: Fix logged in message to be in proper place for IE6/7 and make the 'fixmy' yellow in the ie6 gif (for #276) --- web/cobrands/fixmystreet/images/ie_logo.gif | Bin 2400 -> 2384 bytes web/cobrands/fixmystreet/layout.scss | 7 +++++++ 2 files changed, 7 insertions(+) diff --git a/web/cobrands/fixmystreet/images/ie_logo.gif b/web/cobrands/fixmystreet/images/ie_logo.gif index 66dd1de22..cfcbd258b 100644 Binary files a/web/cobrands/fixmystreet/images/ie_logo.gif and b/web/cobrands/fixmystreet/images/ie_logo.gif differ diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 6247c7474..ff75409ec 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -570,8 +570,15 @@ body.twothirdswidthpage { .ie6, .ie7 { #user-meta { z-index:1; + p { + top:-2em; + } } } +.ie6 #user-meta { + width:57em; //ie6 doesn't like max-width +} + // Wraps around #key-tools box - sticks to the bottom of the screen on desktop -- cgit v1.2.3 From 7fad968ed54e502ffffb6567b07c5eddd3e063e8 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 14 Mar 2012 10:04:14 +0000 Subject: Move the general desktop .content heightfix to the end of the document ready function, that way the fix gets applied after all the page manipulation (for #277) --- web/cobrands/fixmystreet/fixmystreet.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 29aecef52..aab20fc0b 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -134,13 +134,6 @@ $(function(){ } } - //heightfix the desktop .content div - if(Modernizr.mq('only screen and (min-width:48em)')) { - if (!($('body').hasClass('frontpage'))){ - heightFix(window, '.content', -176); - } - } - $('#pc').focus(); $('input[type=submit]').removeAttr('disabled'); @@ -546,6 +539,19 @@ $.fn.drawer = function(id, ajax) { 'overlayColor': '#000000' }); + + + /* + * heightfix the desktop .content div + * + * this must be kept as the last thing done so that the + * rendered height is used after any page manipulation (such as tabs) + */ + if(Modernizr.mq('only screen and (min-width:48em)')) { + if (!($('body').hasClass('frontpage'))){ + heightFix(window, '.content', -176); + } + } }); /* -- cgit v1.2.3 From 54e89eb5366ebc55fdd10547139f431fcca80aca Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 14 Mar 2012 11:04:34 +0000 Subject: Changed the placeholder polyfill for a better one that works. --- templates/web/fixmystreet/common_header_tags.html | 2 ++ web/cobrands/fixmystreet/base.scss | 10 ++++++++++ web/cobrands/fixmystreet/fixmystreet.js | 23 ++++++++++++---------- web/js/jquery.placeholder.min.js | 2 ++ .../placeholder_polyfill.jquery.min.js | 23 ---------------------- .../placeholder_polyfill.min.css | 2 -- 6 files changed, 27 insertions(+), 35 deletions(-) create mode 100644 web/js/jquery.placeholder.min.js delete mode 100644 web/js/placeholder_polyfill/placeholder_polyfill.jquery.min.js delete mode 100644 web/js/placeholder_polyfill/placeholder_polyfill.min.css diff --git a/templates/web/fixmystreet/common_header_tags.html b/templates/web/fixmystreet/common_header_tags.html index f0c6c76a7..ea952ccdc 100644 --- a/templates/web/fixmystreet/common_header_tags.html +++ b/templates/web/fixmystreet/common_header_tags.html @@ -7,6 +7,8 @@ + + diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 068f33ab6..b0e312375 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -285,12 +285,22 @@ h4.static-with-rule{ } } :-moz-placeholder { + color:#888888; font: { style:italic; size:0.9375em; } } :-ms-placeholder { + color:#888888; + font: { + style:italic; + size:0.9375em; + } +} +//this only gets used when the browser doesn't support @placeholder +.placeholder { + color:#888888; font: { style:italic; size:0.9375em; diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index aab20fc0b..7b3f4fefe 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -3,15 +3,6 @@ * FixMyStreet JavaScript */ -//test for and load placeholder polyfill if neccessary -Modernizr.load({ - test: Modernizr.input.placeholder, - nope: [ - '/js/placeholder_polyfill/placeholder_polyfill.min.css', - '/js/placeholder_polyfill/placeholder_polyfill.jquery.min.js' - ] -}); - function form_category_onchange() { var cat = $('#form_category'); var args = { @@ -91,6 +82,7 @@ $(function(){ $html.removeClass('no-js').addClass('js'); + // Preload the new report pin document.createElement('img').src = '/i/pin-green.png'; @@ -541,10 +533,13 @@ $.fn.drawer = function(id, ajax) { + + + /* * heightfix the desktop .content div * - * this must be kept as the last thing done so that the + * this must be kept near the end so that the * rendered height is used after any page manipulation (such as tabs) */ if(Modernizr.mq('only screen and (min-width:48em)')) { @@ -552,6 +547,14 @@ $.fn.drawer = function(id, ajax) { heightFix(window, '.content', -176); } } + + + /* + * Placeholder polyfill from https://github.com/mathiasbynens/jquery-placeholder/ + * + * It needs to be at the end or it won't behave as expected + */ + $('input, textarea').placeholder(); }); /* diff --git a/web/js/jquery.placeholder.min.js b/web/js/jquery.placeholder.min.js new file mode 100644 index 000000000..122277a31 --- /dev/null +++ b/web/js/jquery.placeholder.min.js @@ -0,0 +1,2 @@ +/*! http://mths.be/placeholder v2.0.5 by @mathias */ +;(function(f,h,$){var a='placeholder' in h.createElement('input'),d='placeholder' in h.createElement('textarea'),i=$.fn,c=$.valHooks,k,j;if(a&&d){j=i.placeholder=function(){return this};j.input=j.textarea=true}else{j=i.placeholder=function(){var l=this;l.filter((a?'textarea':':input')+'[placeholder]').not('.placeholder').bind({'focus.placeholder':b,'blur.placeholder':e}).data('placeholder-enabled',true).trigger('blur.placeholder');return l};j.input=a;j.textarea=d;k={get:function(m){var l=$(m);return l.data('placeholder-enabled')&&l.hasClass('placeholder')?'':m.value},set:function(m,n){var l=$(m);if(!l.data('placeholder-enabled')){return m.value=n}if(n==''){m.value=n;if(m!=h.activeElement){e.call(m)}}else{if(l.hasClass('placeholder')){b.call(m,true,n)||(m.value=n)}else{m.value=n}}return l}};a||(c.input=k);d||(c.textarea=k);$(function(){$(h).delegate('form','submit.placeholder',function(){var l=$('.placeholder',this).each(b);setTimeout(function(){l.each(e)},10)})});$(f).bind('beforeunload.placeholder',function(){$('.placeholder').each(function(){this.value=''})})}function g(m){var l={},n=/^jQuery\d+$/;$.each(m.attributes,function(p,o){if(o.specified&&!n.test(o.name)){l[o.name]=o.value}});return l}function b(m,n){var l=this,o=$(l);if(l.value==o.attr('placeholder')&&o.hasClass('placeholder')){if(o.data('placeholder-password')){o=o.hide().next().show().attr('id',o.removeAttr('id').data('placeholder-id'));if(m===true){return o[0].value=n}o.focus()}else{l.value='';o.removeClass('placeholder')}}}function e(){var q,l=this,p=$(l),m=p,o=this.id;if(l.value==''){if(l.type=='password'){if(!p.data('placeholder-textinput')){try{q=p.clone().attr({type:'text'})}catch(n){q=$('').attr($.extend(g(this),{type:'text'}))}q.removeAttr('name').data({'placeholder-password':true,'placeholder-id':o}).bind('focus.placeholder',b);p.data({'placeholder-textinput':q,'placeholder-id':o}).before(q)}p=p.removeAttr('id').hide().prev().attr('id',o).show()}p.addClass('placeholder');p[0].value=p.attr('placeholder')}else{p.removeClass('placeholder')}}}(this,document,jQuery)); \ No newline at end of file diff --git a/web/js/placeholder_polyfill/placeholder_polyfill.jquery.min.js b/web/js/placeholder_polyfill/placeholder_polyfill.jquery.min.js deleted file mode 100644 index 0c2f19be5..000000000 --- a/web/js/placeholder_polyfill/placeholder_polyfill.jquery.min.js +++ /dev/null @@ -1,23 +0,0 @@ -/** -* HTML5 placeholder polyfill -* -* code: https://github.com/ginader/HTML5-placeholder-polyfill -* please report issues at: https://github.com/ginader/HTML5-placeholder-polyfill/issues -* -* Copyright (c) 2012 Dirk Ginader (ginader.de) -* Dual licensed under the MIT and GPL licenses: -* http://www.opensource.org/licenses/mit-license.php -* http://www.gnu.org/licenses/gpl.html -* -* Version: 1.8 -*/ -(function(e){var b=false;function c(f,g){if(e.trim(f.val())===""){f.data("placeholder").removeClass(g.hideClass);}else{f.data("placeholder").addClass(g.hideClass); -}}function a(h,g){var f=g.is("textarea");h.css({width:g.innerWidth()-(f?20:4),height:g.innerHeight()-6,lineHeight:g.css("line-height"),whiteSpace:f?"normal":"nowrap",overflow:"hidden"}).offset(g.offset()); -}function d(f){if(b&&window.console&&window.console.log){window.console.log(f);}}e.fn.placeHolder=function(f){var g=this;this.options=e.extend({className:"placeholder",visibleToScreenreaders:true,visibleToScreenreadersHideClass:"placeholder-hide-exept-screenreader",visibleToNoneHideClass:"placeholder-hide"},f); -this.options.hideClass=this.options.visibleToScreenreaders?this.options.visibleToScreenreadersHideClass:this.options.visibleToNoneHideClass;return e(this).each(function(){var h=e(this),l=h.attr("placeholder"),m=h.attr("id"),i,k,j; -i=h.closest("label")[0];h.attr("placeholder","");if(!i&&!m){d("the input element with the placeholder needs an id!");return;}i=i||e('label[for="'+m+'"]'); -if(!i){d("the input element with the placeholder needs a label!");return;}i.removeClass("visuallyhidden").addClass("visuallyhidden-with-placeholder");k=e(''+l+"").appendTo(i); -j=(k.width()>h.width());if(j){k.attr("title",l);}a(k,h);h.data("placeholder",k);k.data("input",k);k.click(function(){e(this).data("input").focus();});h.focusin(function(){e(this).data("placeholder").addClass(g.options.hideClass); -});h.focusout(function(){c(e(this),g.options);});c(h,g.options);e(document).bind("fontresize",function(){a(k,h);});if(e.event.special.resize){e("textarea").bind("resize",function(n){a(k,h); -});}else{e("textarea").css("resize","none");}});};e(function(){if("placeholder" in e("")[0]){return;}e("input[placeholder], textarea[placeholder]").placeHolder({visibleToScreenreaders:true}); -});})(jQuery); \ No newline at end of file diff --git a/web/js/placeholder_polyfill/placeholder_polyfill.min.css b/web/js/placeholder_polyfill/placeholder_polyfill.min.css deleted file mode 100644 index 602cf1fe3..000000000 --- a/web/js/placeholder_polyfill/placeholder_polyfill.min.css +++ /dev/null @@ -1,2 +0,0 @@ -label span.placeholder{position:absolute;font-size:75%;color:#999;font-family:sans-serif;padding:4px 3px;z-index:1}label span.placeholder-hide-exept-screenreader{clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px);padding:0!important;border:0!important;height:1px!important;width:1px!important;overflow:hidden} -label span.placeholder-hide{display:none}label.visuallyhidden-with-placeholder{clip:auto!important;height:auto!important;overflow:visible!important;position:absolute!important;left:-999em} \ No newline at end of file -- cgit v1.2.3 From cc6de3bf2b1bbc267ef2ebf52f3574d2b4fadb7f Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 14 Mar 2012 11:04:53 +0000 Subject: Update error message (missed from previous). --- perllib/FixMyStreet/App/Controller/Report/New.pm | 2 +- perllib/FixMyStreet/App/Controller/Report/Update.pm | 2 +- t/app/controller/report_new.t | 2 +- t/app/controller/report_updates.t | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index c61f4847c..8d249b899 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -648,7 +648,7 @@ sub process_user : Private { # The user is trying to sign in. We only care about email from the params. if ( $c->req->param('submit_sign_in') || $c->req->param('password_sign_in') ) { unless ( $c->forward( '/auth/sign_in' ) ) { - $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. Passwords and user accounts are a brand new service, so you probably do not have one yet – please fill in the right hand side of this form to get one.'); + $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.'); return 1; } my $user = $c->user->obj; diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index 600684a40..15444f556 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -122,7 +122,7 @@ sub process_user : Private { # The user is trying to sign in. We only care about email from the params. if ( $c->req->param('submit_sign_in') || $c->req->param('password_sign_in') ) { unless ( $c->forward( '/auth/sign_in', [ $email ] ) ) { - $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. Passwords and user accounts are a brand new service, so you probably do not have one yet – please fill in the right hand side of this form to get one.'); + $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.'); return 1; } my $user = $c->user->obj; diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 6da9afa24..625c7531f 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -493,7 +493,7 @@ subtest "test password errors for a user who is signing in as they report" => su # check that we got the errors expected is_deeply $mech->form_errors, [ - 'There was a problem with your email/password combination. Passwords and user accounts are a brand new service, so you probably do not have one yet – please fill in the right hand side of this form to get one.' + "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the \x{2018}sign in by email\x{2019} section of the form.", ], "check there were errors"; }; diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 99f1ba62d..9c2b0861b 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -604,7 +604,7 @@ for my $test ( password_sign_in => 'secret', }, field_errors => [ - "There was a problem with your email/password combination. Passwords and user accounts are a brand new service, so you probably do not have one yet \x{2013} please fill in the right hand side of this form to get one.", + "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the \x{2018}sign in by email\x{2019} section of the form.", 'Please enter your name', # FIXME Not really necessary error ], }, -- cgit v1.2.3 From 5342e1d16aa7d1776522acd5c13b2f4f704f3b93 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 14 Mar 2012 11:07:07 +0000 Subject: Council info pages. --- perllib/FixMyStreet/App/Controller/Static.pm | 7 + templates/email/default/submit-brent.txt | 3 +- templates/email/default/submit-example.txt | 3 +- templates/email/default/submit.txt | 3 +- templates/web/default/faq/faq-en-gb.html | 2 +- templates/web/default/reports/council.html | 7 - templates/web/fixmystreet/faq/faq-en-gb.html | 2 +- templates/web/fixmystreet/footer.html | 2 +- templates/web/fixmystreet/reports/council.html | 2 +- templates/web/fixmystreet/static/for_councils.html | 46 +++ .../web/fixmystreet/static/for_councils_faq.html | 359 +++++++++++++++++++++ web/cobrands/fixmystreet/barnet.png | Bin 0 -> 52852 bytes 12 files changed, 419 insertions(+), 17 deletions(-) create mode 100644 templates/web/fixmystreet/static/for_councils.html create mode 100644 templates/web/fixmystreet/static/for_councils_faq.html create mode 100644 web/cobrands/fixmystreet/barnet.png diff --git a/perllib/FixMyStreet/App/Controller/Static.pm b/perllib/FixMyStreet/App/Controller/Static.pm index 2e6bda28c..52b230c27 100755 --- a/perllib/FixMyStreet/App/Controller/Static.pm +++ b/perllib/FixMyStreet/App/Controller/Static.pm @@ -22,6 +22,13 @@ sub about : Global : Args(0) { # don't need to do anything here - should just pass through. } +sub for_councils : Path('/for-councils') : Args(0) { + my ( $self, $c ) = @_; +} +sub for_councils_faq : Path('/for-councils/faq') : Args(0) { + my ( $self, $c ) = @_; +} + sub faq : Global : Args(0) { my ( $self, $c ) = @_; diff --git a/templates/email/default/submit-brent.txt b/templates/email/default/submit-brent.txt index fcddcc8f1..4b3e20968 100644 --- a/templates/email/default/submit-brent.txt +++ b/templates/email/default/submit-brent.txt @@ -40,6 +40,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: -http://www.mysociety.org/fixmystreet-for-local-council-websites/ +Read more here: http://www.fixmystreet.com/for-councils diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt index 61850cafa..6d1815cd1 100644 --- a/templates/email/default/submit-example.txt +++ b/templates/email/default/submit-example.txt @@ -57,6 +57,5 @@ feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: -http://www.mysociety.org/fixmystreet-for-local-council-websites/ +Read more here: http://www.fixmystreet.com/for-councils diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt index 2542e786b..20fa17096 100644 --- a/templates/email/default/submit.txt +++ b/templates/email/default/submit.txt @@ -40,6 +40,5 @@ also welcome any other feedback you may have. FixMyStreet is now available for full integration into council websites, making life easier for both you and your residents. -Read more here: -http://www.mysociety.org/fixmystreet-for-local-council-websites/ +Read more here: http://www.fixmystreet.com/for-councils diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 599d3a37e..ed9d53c24 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -93,7 +93,7 @@ href="https://secure.mysociety.org/donate/">please do. to find out where reports go at the moment. Also contact us to update the address or addresses we use.

I’m from a council, can we have FixMyStreet on our website?

Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. Full details.

Do you remove silly or illegal content?

FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index 797d34d6b..ec9efbdbf 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -77,13 +77,6 @@ Its area is now covered by Bedford Borough Council - FixMyStreet is now available for local council websites. - Find out more. -

-[% END %] - [% INCLUDE 'pagination.html', param = 'p' %] [% INCLUDE column diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 418f4387f..462c43564 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -104,7 +104,7 @@ href="https://secure.mysociety.org/donate/">please do.

to find out where reports go at the moment. Also contact us to update the address or addresses we use.

I’m from a council, can we have FixMyStreet on our website?

Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. Full details.

Do you remove silly or illegal content?

FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 5ac9c881d..18f7c7b4b 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -20,7 +20,7 @@

[% loc('Are you from a council?') %]

[% loc('Would you like better integration with FixMyStreet? Find out about FixMyStreet for councils.') %]

diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index b426adcaa..cf5729fb3 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -84,7 +84,7 @@ [% IF c.cobrand.moniker == 'fixmystreet' %] [% END %] diff --git a/templates/web/fixmystreet/static/for_councils.html b/templates/web/fixmystreet/static/for_councils.html new file mode 100644 index 000000000..2e83c7c6c --- /dev/null +++ b/templates/web/fixmystreet/static/for_councils.html @@ -0,0 +1,46 @@ +[% INCLUDE 'header.html', title = loc('FixMyStreet for Councils'), bodyclass = 'twothirdswidthpage' %] + + + +

Shift your problem reporting online: FixMyStreet for Councils

+ +

Councils everywhere are looking to move street issue reporting online, to make +savings and improve services for their residents. FixMyStreet for +Councils is explicitly designed to support the shift to digital. + +

FixMyStreet is the most popular online street issue reporting application in +the UK. It’s known for prioritising usability and accessibility – and people +love to use it. With very little cost and effort, your staff and your website’s +users can enjoy its simple yet powerful features. + +

Embedding FixMyStreet in your council’s website is simple. As a cloud-based +service, it requires no development work from your team. We will match your +site’s look and feel seamlessly, and provide robust technical support and free +training to council users. We also offer a mobile web version of the product +as well as iPhone and Android apps branded for councils. + +

We can also integrate FixMyStreet with your CRM or customer management system, +to ensure automatic two-way updates, saving you even more time and money. + + + +

mySociety, the non-profit behind FixMyStreet, is a software provider to over +forty local authorities in the UK. We understand the challenges that councils +face in channel shift, and will bring our passion and expertise to support your +journey. + +

FixMyStreet for Councils brochure + +

Have questions? Read our Questions and Answers for Councils +or get in touch at hello@mysociety.org. + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/static/for_councils_faq.html b/templates/web/fixmystreet/static/for_councils_faq.html new file mode 100644 index 000000000..16c7d5cfe --- /dev/null +++ b/templates/web/fixmystreet/static/for_councils_faq.html @@ -0,0 +1,359 @@ +[% INCLUDE 'header.html', title = loc('Questions and Answers :: FixMyStreet for Councils'), bodyclass = 'twothirdswidthpage' %] + +

+ +

Questions about FixMyStreet for Councils

+ +

General information

+ +

What is FixMyStreet For Councils?

FixMyStreet is a street issue-reporting and mapping application +designed specifically for local authority websites. + +

It integrates seamlessly with council websites, fully reflecting their look +and feel. All copy, categories, information, reporting fields and links can be +customised to the specific needs of the council. FixMyStreet can also be +connected to a CRM or fault management system for automatic two-way updates. + +

The software is open source and is based on mySociety’s award-winning +FixMyStreet.com platform, which has been operating for five years. It is the +most widely-used street issue web application in the UK, sending over 5,000 +reports to local authorities each month. +

Who built it?

+FixMyStreet for Councils was built by mySociety Ltd, a company registered in +England and Wales, company number 03277032. mySociety Ltd is wholly owned by +the charity UK Citizens Online Democracy (charity number 1076346). All profits +are returned to the charity. +

What are the benefits for councils?

FixMyStreet for Councils will save you and your residents time. It will reduce duplicate reports and encourage the shift of street issue reporting to the web. + +

It also places a highly usable, attractive application on your website, and a very simple channel for responding to your residents if you wish to do so. + +

Most councils get a high volume of telephone calls to report street issues - by moving even a small proportion of that online, you can make significant savings over time. +

Why is FixMyStreet more effective than standard reporting forms?

As a rule, people do not enjoy filling in onerous forms on the web. They +often span several pages and require a lot of personal information – so many +people resort to calling instead. + +

Reporting on FixMyStreet is extremely simple and quick. The user pinpoints +the location of the problem on a map, provides a description and a photo if +they have one, and their email address. You’ll receive the email address with +the problem report, so your officers can get in touch if they need to. + +

Using a map as a way to locate an issue is very useful – people often don’t +know the exact nearest address, but they can show where it is on a map. + +

Finally, FixMyStreet allows you to comment on a report or update its status +– your update will be available for everyone interested to see on the website, +further reducing avoidable contact. +

What is the difference between FixMyStreet.com and FixMyStreet for Councils?

FixMyStreet.com is a national street issue reporting website that enables +anyone anywhere in Great Britain to report a problem to their council. The +reports are delivered to councils by email. + +

FixMyStreet for Councils is a product for council websites to enable their +residents to report issues to them. It becomes a natural part of the council’s +site, can be included in the list of top tasks, integrates council-relevant +information, and can be linked with council’s backoffice. + +

It uses the same software platform as the FixMyStreet.com site; issues +reported to a council on its own website are also shown on FixMyStreet.com, and +vice-versa. Read the Implementation FAQ above to learn why this approach really +works. + +

Which councils already have FixMyStreet?

+The London Borough of Bromley will soon be launching our upgraded FixMyStreet +for Councils product. For existing implementations, have a look at the +London Borough of Barnet’s website +or Southampton City Council’s +website. Meanwhile, West Berkshire Council is an example of a back-office +integration - they receive problems reported on FixMyStreet directly into their +CRM. +

Is there a mobile version of the FixMyStreet for Councils product?

As more and more people use their smartphones for online tasks, we make it +easy for councils to enable mobile street issue reporting. We offer two +products: +

A mobile web version of FixMyStreet – this presents users with a +mobile-optimised version of a council FixMyStreet web app, and enables mobile +reporting by simply entering a URL of the council’s web reporting page in their +mobile browser +
Mobile Apps - some users do prefer to use downlodable apps, so we are +currently developing iPhone and Android Apps with the capability to include +council branding. If you are interested, let us know. +

What is the cost to councils?

The front end product costs £3,500 in year one, reducing to £1,500 per annum in future years. +
The mobile web version costs £3,000 in year one and £1,000 per annum subsequently. +
Back-end integration costs depend on the complexity of your systems. Prices start at £3,500 in year one, then £1,500 per annum. +

+ +

The prices are all-inclusive, covering installation, updates, unlimited +problem reports and user training. There are no hidden fees. Please see our +brochure for more detail on what’s included. + +

There’s no commitment beyond the first 12 months, so you won’t be locked +into a lengthy contract. + +

Implementing FixMyStreet for Councils

How easy is it to implement FixMyStreet on a council website?

+Extremely easy. Because we run FixMyStreet as a cloud service, all you need to do is to provide details of your website’s colour scheme, fonts, and any customised links or information you’d like to include. We will do all the work in setting up your issue reporting application. The implementation can take as little as a week, and requires minimal work from your web team. +

Can we integrate FixMyStreet with the council’s CRM or fault management system?

Absolutely. Integrating with your back-office system ensures maximum efficiencies - all reports go straight into your database. When their status changes, updates can be automatically pushed out onto your website as well as to FixMyStreet.com. We are able to integrate with any back-office system. + +

We understand that each council has its own processes which have evolved over time. We will work with you to find the best integration solution to ensure minimum disruption to your work, while helping make your processes simpler and more streamlined. + +

If you’d like us to advise on the best integration options for you, get in touch. Our advice is completely free - we are always keen to talk to councils and learn about your needs. +

What is the technical architecture of FixMyStreet?

FixMyStreet for councils uses the same open source code base and +runs on the same servers as the national FixMyStreet site. At the same time it +has been designed to allow customisation of both design and functionality. +Using the URL of the site visited the code determines which version of +FixMyStreet to display and loads the appropriate design and customisations. + +

If you have back end integration then new reports to your council will be +sent to your CRM through the agreed mechanism ( e.g. Open311 ). If we cannot +send a report to you then it will be put back on the queue and we will try +again later so you won’t miss any reports. +

Why is linking FixMyStreet for Councils with the national FixMyStreet.com website a good idea?

+ +

There are three key benefits. First, by using the same underlying platform we can spread the cost of maintaining and hosting the system across the national site and different council users. This helps to keep prices low. Plus, we carry out all the technical maintenance and support, so you don’t need to. + +

Second, issues reported on FixMyStreet.com are also shown on your Council’s website, avoiding duplicate reports by different residents. + +

Third, the customised features on your own FixMyStreet (such as categories, information you gather from customers, additional details on issues the council is not responsible for, etc) will also be reflected on FixMyStreet.com. So wherever your residents report issues, they will get the right features and information from the council. +

Do you offer training?

+Yes. We offer a free two-hour remote training session to your users. If your location is within two hours’ travel from one of our FixMyStreet team members, we will provide training in person. +

What level of support do you provide after implementation?

We will provide technical support, address any questions, and make tweaks to your system if required. We will also go out of our way to help you with non-technical issues based on our significant experience with online problem reporting. + +

Throughout our contract with you, we will always be available by email or on the phone, and will get back to you quickly. + +

Problem reporting

Can we customise report categories and information requested?

Yes. You can add the categories most relevant to your council, and remove ones that are not. Your customised categories will appear on both your website’s FixMyStreet implementation, and on the national FixMystreet.com website. + +

You can also customise information requested for each issue type - for example, Southampton council asks its customers to report the approximate pothole size, to help prioritise its work. +

How can we deal with issues that the council is not responsible for?

+Most councils already get residents phoning up or emailing them about problems not within their remit. FixMyStreet can help reduce this in two ways: +We can include the most commonly misreported issues in the categories list so when a users selects these, we can give them alternative contact information. If there are known geographical areas that council is not responsible for, we can alert users to that when they click on the map, provided you have given us this information. +Alternatively, if you have contact details in relevant organisations, we can instead email reports to them, while telling the user that these are not the council’s responsibility. +

How are reports delivered to the council?

If your FixMyStreet is not integrated with your CRM or back-office system, you will receive reports by email to email addresses that you specify. Different type of problems can be sent to different addresses if you wish. + +

With back-office integration, reports will go straight into your CRM or fault management system. +

What information is provided in a problem report?

You will receive the following information: +

Issue category +
Precise location reported (in both latitude/longitude and easting/northing) +
Subject and issue description (we encourage users to give as much detail as possible) +
Link to a photo of the problem if the user has added one (we don’t send the actual photos so that we don’t clog your system) +
The user’s verified email address and phone number if given, so you can contact them directly if you wish +
A link to the issue on FixMyStreet for you to update the issue if required. +

How precise is location information provided in FixMyStreet?

Very. The user clicks on a map that includes useful information for +reporting, such as building positions and footpaths, so they can tell you the +location as precisely as they can. + +

This approach also helps capture superior location data even when the user +does not know the exact address. + +

We will send you the co-ordinates for the point clicked on the map, as well +as the nearest street address as an additional data point. You can also view +the map directly on the issue report page. +

Can we reflect more granular report statuses than just open and fixed?

+Yes. As a client council you get a selection of problem statuses, including: +Investigating, Planned, In Progress, Fixed and Closed. +

Getting the best out of FixMyStreet

Can we add photos showing that council has dealt with an issue?

+Yes - you can easily post a photo as an update to a report on your website. These will also be shown on the national FixMyStreet.com site. +

What can we do to help shift users to online reporting instead of calling us up?

+Online reporting is better for you and your residents, as it’s quick, effective and cheap. Good technology will certainly encourage the shift, but to make it fully effective you could do a a few things to help. +Direct residents to report issues on your website when they are in the telephone queue +When someone reports an issue to your call centre, tell them that next time they can do it much quicker online +Encourage council employees or other relevant organisations to report issues online +Respond to problem reports online, so that your residents know you engage well through this channel. +

How can a council respond to issue reports?

If you choose the back-office integration option, when an issue status +changes in your CRM or fault management system, it can also automatically +update on both your website and the national FixMyStreet website. This assumes +that your system can support automatic updates (most systems can). + +

If your back-office is not integrated, you can still easily respond by +changing the status manually on the website, or adding a few words of +commentary. This simple process is much quicker than a telephone call or email. +

How can we contact the person submitting the report if we need more information?

+Our software encourages users to submit as much information as possible, along with photographs. If you do need additional details, you can either post your question as an update to the issue online, or email the user directly (you will get their email address with the issue report). +

We are unable to fix every problem, in particular in the current budget environment. How do we deal with this?

Whether reported online or not, there are some issues that a council will +decide not to fix because it needs to prioritise more important problems. + +

Our online reporting application gives you a direct channel to explain to +your residents why certain problems cannot be addressed. This will lead to a +more open, constructive relationship. This may be a big culture change - we are +happy to support you with our experience in this area. + +

When deciding not to deal with a problem, you can close it so that it does +not show as an open problem. +

We are worried about being swamped with high volume of online reports. What can we do?

+While the volume of online reporting is likely to increase (a good thing, as it +replaces phone calls and alerts you to issues you didn’t know about), it +usually happens gradually, giving you plenty of time to adjust. We can stage +the introduction of your new reporting app to make the process even smoother. +

Does FixMyStreet for Councils offer reporting functionality?

We are currently working on a new reporting dashboard for councils, +accessible through a separate council log-in. This will have detailed reporting +on issue categories, timelines, statuses and help you identify emerging +hotspots. + +

Any new council implementation from April 2012 will have this new +functionality. Please get in touch if you’d like more detail. +

I’d like to discuss options for my council. What do I do?

Just drop us a line to hello@mysociety.org and we will get back +to you as soon as possible. + +

We will be happy to advise you on the options, and recommend an +implementation approach to fit your needs based on our experience. +

+ +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/web/cobrands/fixmystreet/barnet.png b/web/cobrands/fixmystreet/barnet.png new file mode 100644 index 000000000..0b373fb30 Binary files /dev/null and b/web/cobrands/fixmystreet/barnet.png differ -- cgit v1.2.3 From 2f71ffb4e740f5478967ee1b633c65e4ffd31d80 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 14 Mar 2012 11:24:07 +0000 Subject: Using Modernizr.mq() breaks e.g. IE form display due to adding to I assume. Use the mobile class instead. --- web/cobrands/fixmystreet/fixmystreet.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 7b3f4fefe..269540dad 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -531,24 +531,18 @@ $.fn.drawer = function(id, ajax) { 'overlayColor': '#000000' }); - - - - - /* * heightfix the desktop .content div * * this must be kept near the end so that the * rendered height is used after any page manipulation (such as tabs) */ - if(Modernizr.mq('only screen and (min-width:48em)')) { + if (!$('html.mobile').length) { if (!($('body').hasClass('frontpage'))){ heightFix(window, '.content', -176); } } - /* * Placeholder polyfill from https://github.com/mathiasbynens/jquery-placeholder/ * -- cgit v1.2.3 From af8f5d1648b341d8b9ca4a323eb4a85c14378626 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 14 Mar 2012 12:30:35 +0000 Subject: Disable placeholder, interferes badly with current validation. --- templates/web/fixmystreet/auth/general.html | 4 ++-- templates/web/fixmystreet/report/display.html | 4 ++-- .../web/fixmystreet/report/new/fill_in_details_form.html | 12 ++++++------ web/cobrands/fixmystreet/fixmystreet.js | 6 ------ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html index 67a15cc73..585232bc5 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -52,9 +52,9 @@ [% loc('Name') %] - [% loc('Password') %] + [% loc('Password (optional)') %]

- +

diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 03a6f79b5..b7daeca24 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -154,10 +154,10 @@ [% INCLUDE name %] - [% loc('Password') %] + [% loc('Password (optional)') %]

- +

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 d908aee99..283f748ba 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -127,8 +127,8 @@

[% loc('We never show your email address or phone number.') %]

- [% loc('Phone number') %] - + [% loc('Phone number (optional)') %] +

@@ -185,13 +185,13 @@

[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]

- [% loc('Phone number') %] - + [% loc('Phone number (optional)') %] + - [% loc('Password') %] + [% loc('Password (optional)') %]

- +

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 269540dad..e54d2fe93 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -543,12 +543,6 @@ $.fn.drawer = function(id, ajax) { } } - /* - * Placeholder polyfill from https://github.com/mathiasbynens/jquery-placeholder/ - * - * It needs to be at the end or it won't behave as expected - */ - $('input, textarea').placeholder(); }); /* -- cgit v1.2.3 From c9681f6bbc04659b9d6ed5eaa46b8c2edd704f9e Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 14 Mar 2012 12:36:03 +0000 Subject: Move most mobile-related JS into resize() so that site keeps working on browser resize. --- web/cobrands/fixmystreet/fixmystreet.js | 95 +++++++++++++++++++++------------ web/js/map-OpenLayers.js | 4 ++ 2 files changed, 65 insertions(+), 34 deletions(-) diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index e54d2fe93..c2801c880 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -86,45 +86,72 @@ $(function(){ // Preload the new report pin document.createElement('img').src = '/i/pin-green.png'; - //add mobile class if small screen - if (Modernizr.mq('only screen and (max-width:47.9375em)')) { - $html.addClass('mobile'); - $('#map_box').css({ height: '10em' }); - if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { - // Immediately go full screen map if on around page - $('#site-header').hide(); + var last_type; + $(window).resize(function(){ + var type = $('#site-header').css('borderTopWidth'); + if (type == '4px') { type = 'mobile'; } + else if (type == '0px') { type = 'desktop'; } + else { return; } + if (last_type == type) { return; } + if (type == 'mobile') { + $html.addClass('mobile'); + $('#map_box').prependTo('.content').css({ + zIndex: '', position: '', + top: '', left: '', right: '', bottom: '', + width: '', height: '10em', + margin: '' + }); + if (typeof fixmystreet !== 'undefined') { + fixmystreet.state_map = ''; // XXX + } + if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { + // Immediately go full screen map if on around page + $('#site-header').hide(); + $('#map_box').prependTo('.wrapper').css({ + position: 'absolute', + top: 0, left: 0, right: 0, bottom: 0, + height: 'auto', + margin: 0 + }); + $('#fms_pan_zoom').css({ top: '2.75em !important' }); + $('.big-green-banner') + .addClass('mobile-map-banner') + .appendTo('#map_box') + .text('Place pin on map') + .prepend('home'); + } + } else { + // Make map full screen on non-mobile sizes. + $html.removeClass('mobile'); + var map_pos = 'fixed', map_height = '100%'; + if ($html.hasClass('ie6')) { + map_pos = 'absolute'; + map_height = $(window).height(); + } $('#map_box').prependTo('.wrapper').css({ - position: 'absolute', + zIndex: 0, position: map_pos, top: 0, left: 0, right: 0, bottom: 0, - height: 'auto', + width: '100%', height: map_height, margin: 0 }); - // Bit yucky, but the ID doesn't exist yet. - $("").appendTo(document.documentElement); - $('.big-green-banner') - .addClass('mobile-map-banner') - .removeClass('.big-green-banner') - .appendTo('#map_box') - .text('Place pin on map') - .prepend('home'); - } - } else { - // Make map full screen on non-mobile sizes. - var map_pos = 'fixed', map_height = '100%'; - if ($html.hasClass('ie6')) { - map_pos = 'absolute'; - map_height = $(window).height(); - } - $('#map_box').prependTo('.wrapper').css({ - zIndex: 0, position: map_pos, - top: 0, left: 0, right: 0, bottom: 0, - width: '100%', height: map_height, - margin: 0 - }); - if (typeof fixmystreet !== 'undefined') { - fixmystreet.state_map = 'full'; + if (typeof fixmystreet !== 'undefined') { + fixmystreet.state_map = 'full'; + } + if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { + // Remove full-screen-ness + $('#site-header').show(); + $('#fms_pan_zoom').css({ top: '4.75em !important' }); + $('.big-green-banner') + .removeClass('mobile-map-banner') + .prependTo('#side') + .text('Click map to report a problem'); + } } - } + last_type = type; + }); + + //add mobile class if small screen + $(window).resize(); $('#pc').focus(); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 6ffcb5c1d..a7b7d6a14 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -210,6 +210,10 @@ $(function(){ displayProjection: new OpenLayers.Projection("EPSG:4326") }); + if ($('html').hasClass('mobile')) { + $('#fms_pan_zoom').css({ top: '2.75em !important' }); + } + fixmystreet.layer_options = OpenLayers.Util.extend({ zoomOffset: fixmystreet.zoomOffset, transitionEffect: 'resize', -- cgit v1.2.3

[% problem.title | html %]

+ [% loc( 'Provide an update') %] +

[% loc("Now to submit your update… do you have a FixMyStreet password?") %]

Additional Information

[% loc('Reporting a problem') %]

[% loc("Now to submit your report… do you have a FixMyStreet password?") %]

External import

[% loc('Updates') %]

[% loc('Problems in this area') %]

[% loc('Reports on and around the map') %]

+ [% + tprintf( + loc( 'Closest nearby problems (within %skm)' ), + distance + ) + %] +

[% loc('How to report a problem') %]

[% loc('Recently reported problems') %]

[% ELSE %][% END - %] - [%- IF NOT title AND NOT c.req.path %]

- [% loc( 'Provide an update') %] -

[% loc( 'Provide an update') %]

[% loc("Now to submit your update… do you have a FixMyStreet password?") %]

[% loc("Now to submit your update… do you have a FixMyStreet password?") %]

[% loc('Problems in this area') %]

[% loc('Reports on and around the map') %]

- [% - tprintf( - loc( 'Closest nearby problems (within %skm)' ), - distance - ) - %] -

[% loc( 'Click on the map to report a problem.' ) %]

[% loc('Problems on the map') %]

[% loc( 'Problems nearby' ) %]

[% problem.title | html %]

[% loc("Now to submit your report… do you have a FixMyStreet password?") %]

[% loc("Now to submit your report… do you have a FixMyStreet password?") %]

[% loc( 'Click on the map to report a problem.' ) %]

[% loc( 'Click on the map to report a problem.' ) %]

[% loc('Problems on the map') %]

[% loc('Problems on the map') %]

[% loc( 'Problems nearby' ) %]

[% loc( 'Problems nearby' ) %]

[% loc('Reporting a problem') %]

[% loc("Now to submit your report… do you have a FixMyStreet password?") %]

[% loc("Now to submit your report… do you have a FixMyStreet password?") %]

[% loc('Reporting a problem') %]

[% loc('Reporting a problem') %]

[% loc("Now to submit your report… do you have a FixMyStreet password?") %]

[% loc("Now to submit your report… do you have a FixMyStreet password?") %]

[% p.problem.title | html %]

[% loc('Problems on the map') %]

[% loc( 'Problems nearby' ) %]

[% p.title | html %]

[% loc("Now to submit your report… do you have a FixMyStreet password?") %]

[% loc("Now to submit your report…") %]

[% loc("Do you have a FixMyStreet password?") %]

[% loc('Yes I have a password') %]

[% loc('No Let me confirm my report by email') %]

[% p.problem.title | html %]

[% p.problem.title | html %]

[% loc('Problems on the map') %]

[% loc( 'Problems nearby' ) %]

[% p.title | html %]

[% p.title | html %]

[% loc( 'Click on the map to report a problem.' ) %]

[% loc( 'Click map to report a problem' ) %]

[% loc('Report, view, or discuss local problems') %]

[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]

[% loc('How to report a problem') %]

[% loc('Recently reported problems') %]

[% p.title | html %]

Mobile apps

[% loc('Are you a developer? Would you like to contribute to FixMyStreet?') %]

[% loc('Are you from a council? Would you like better integration with FixMyStreet?') %]

[% loc('Are you a developer? Would you like to contribute to FixMyStreet?') %]

[% loc('Are you from a council? Would you like better integration with FixMyStreet?') %]

[% loc('Are you a developer?') %]

[% loc('Are you from a council?') %]

[% loc('Report, view, or discuss local problems') %]

[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]

[% loc('Report, view, or discuss local problems') %]

[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]

[% loc('How to report a problem') %]

[% loc('How to report a problem') %]

[% loc('Recently reported problems') %]

[% loc('Recently reported problems') %]

[% p.title | html %]

[% p.title | html %]

Mobile apps

[% ELSE %]
[% END - %] - [%- IF NOT title AND NOT c.req.path %]