diff options
| -rw-r--r-- | templates/web/fixmystreet/header.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet/questionnaire/index.html | 1 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/display.html | 1 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/photo-js.html | 8 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 8 |
5 files changed, 17 insertions, 5 deletions
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index 6be57891a..f5d510922 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -13,14 +13,14 @@ <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> <![endif]--> <script src="[% version('/js/modernizr.custom.76759.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] - <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html index 3b23c81cd..ded95df04 100644 --- a/templates/web/fixmystreet/questionnaire/index.html +++ b/templates/web/fixmystreet/questionnaire/index.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; INCLUDE 'header.html', title = loc('Questionnaire'), bodyclass = 'mappage' %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 0f650b7c2..0bb13fa67 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); diff --git a/templates/web/fixmystreet/report/photo-js.html b/templates/web/fixmystreet/report/photo-js.html new file mode 100644 index 000000000..df0e2f92d --- /dev/null +++ b/templates/web/fixmystreet/report/photo-js.html @@ -0,0 +1,8 @@ +[% IF c.cobrand.allow_photo_display %] + [% extra_css = BLOCK %] + <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + [% END %] + [% extra_js = BLOCK %] + <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + [% END %] +[% END %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 0db8334fb..f73290b7b 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -560,9 +560,11 @@ $.fn.drawer = function(id, ajax) { /* * Fancybox fullscreen images */ - $('a[rel=fancy]').fancybox({ - 'overlayColor': '#000000' - }); + if (typeof $.fancybox == 'function') { + $('a[rel=fancy]').fancybox({ + 'overlayColor': '#000000' + }); + } /* * heightfix the desktop .content div |