xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

[svn] Fixed setContentHeight to work properly for eye candy view, whilst removing it from the non-eyecandy view

Browse Source
This commit is contained in:
martin speleo 2009-07-03 21:29:02 +01:00
parent 7db1aae5ee
commit 4da6203828
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
media/js/base.js
View File

@ -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")

4
templates/base.html
View File

@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/>
<link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" />
<title>{% block title %}Troggle{% endblock %}</title>
<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script>
@ -13,7 +13,7 @@
{% block head %}{% endblock %}
</head>
<body onLoad="contentHeight();">
<body>
<div id="header">
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>