From 01df7f39ad0ae265f310bc383a7822b1456c0a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Tue, 30 Sep 2008 12:36:59 +0000
Subject: [PATCH] Fix link to logo image, and removed reference to script in
 header and added support for onload parameter to header

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@903 44740490-163a-0410-bde0-09ae8108e29a
---
 templates/default/includes/footer.php | 2 +-
 templates/default/includes/header.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/default/includes/footer.php b/templates/default/includes/footer.php
index 16cff7797..0672a8c6a 100644
--- a/templates/default/includes/footer.php
+++ b/templates/default/includes/footer.php
@@ -3,7 +3,7 @@
 
 		<hr />
 
-		<img src="resources/icons/ssplogo-fish-small.png" style="float: right" />		
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/ssplogo-fish-small.png" alt="Small fish logo" style="float: right" />		
 		Copyright &copy; 2007-2008 <a href="http://rnd.feide.no/">Feide RnD</a>
 		
 		<br style="clear: right" />
diff --git a/templates/default/includes/header.php b/templates/default/includes/header.php
index 1c7cdf4fb..3cd9327d8 100644
--- a/templates/default/includes/header.php
+++ b/templates/default/includes/header.php
@@ -12,7 +12,6 @@ if(array_key_exists('header', $this->data)) {
 
 	<link rel="stylesheet" type="text/css" href="/<?php echo $this->data['baseurlpath']; ?>resources/default.css" />
 	<link rel="icon" type="image/icon" href="/<?php echo $this->data['baseurlpath']; ?>resources/icons/favicon.ico" />
-	<script type="text/javascript" src="/<?php echo $this->data['baseurlpath']; ?>resources/script.js"></script>
 	<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
 
 <?php	
@@ -26,6 +25,10 @@ $onLoad = '';
 if(array_key_exists('autofocus', $this->data)) {
 	$onLoad .= 'SimpleSAML_focus(\'' . $this->data['autofocus'] . '\');';
 }
+if (isset($this->data['onLoad'])) {
+	$onLoad .= $this->data['onLoad']; 
+}
+
 if($onLoad !== '') {
 	$onLoad = ' onload="' . $onLoad . '"';
 }
-- 
GitLab