From 7dce545b4cfa628423c1fcc8a5c0ca0e9bc7b324 Mon Sep 17 00:00:00 2001 From: martin speleo Date: Fri, 3 Jul 2009 21:29:02 +0100 Subject: [PATCH] [svn] Fixed setContentHeight to work properly for eye candy view, whilst removing it from the non-eyecandy view --- media/js/base.js | 3 ++- templates/base.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/media/js/base.js b/media/js/base.js index be96eaa..9f549ed 100644 --- a/media/js/base.js +++ b/media/js/base.js @@ -76,6 +76,7 @@ $(hoverLink).bind('mouseout', }; function showEyeCandy(){ +contentHeight(); switchStylestyle("eyeCandy"); $("#eyeCandyFooterPopUps").load("/eyecandy"); $(".leftMargin,.rightMargin").show(); @@ -85,7 +86,7 @@ linkHover("#cavesLink","#richardBanner"); linkHover("#caversLink","#timeMachine"); linkHover("#surveyBinderLink","#surveyHover"); linkHover("#troggle","#timeMachine"); -contentHeight();}; +}; function killEyeCandy(){ $("#content").removeAttr("style") diff --git a/templates/base.html b/templates/base.html index 5be9d0f..23e90ae 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,7 +3,7 @@ - + {% block title %}Troggle{% endblock %} @@ -13,7 +13,7 @@ {% block head %}{% endblock %} - +