summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/js/base.js3
-rw-r--r--templates/base.html4
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 @@
<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>