From eb76ac0ca5a154214a729a6b9de4744524f2a833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Sun, 21 Oct 2007 06:45:04 +0000
Subject: [PATCH] Making use of footer and header in templates
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@39 44740490-163a-0410-bde0-09ae8108e29a
---
templates/default/en/consent.php | 63 +------------------
templates/default/en/error.php | 63 +------------------
templates/default/en/httpredirect-debug.php | 67 +-------------------
templates/default/en/login-ldapmulti.php | 68 +--------------------
templates/default/en/login.php | 67 +-------------------
templates/default/en/metadata.php | 63 +------------------
templates/default/en/post-debug.php | 67 +-------------------
templates/default/en/selectidp.php | 65 +-------------------
templates/default/en/status.php | 5 +-
templates/default/includes/header.php | 25 +++++++-
10 files changed, 42 insertions(+), 511 deletions(-)
diff --git a/templates/default/en/consent.php b/templates/default/en/consent.php
index 21353e28f..cf375d53f 100644
--- a/templates/default/en/consent.php
+++ b/templates/default/en/consent.php
@@ -1,52 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><?php echo $data['header']; ?></title>
-
-<style type="text/css">
-
-/* these styles are in the head of this page because this is a unique page */
-
-/* THE BIG GUYS */
-* {margin:0;padding:0}
-body {text-align:center;padding: 20px 0;background: #222;color:#333;font:83%/1.5 arial,tahoma,verdana,sans-serif}
-img {border:none;display:block}
-hr {margin: 1em 0;background:#eee;height:1px;color:#eee;border:none;clear:both}
-
-/* LINKS */
-a,a:link,a:link,a:link,a:hover {font-weight:bold;background:transparent;text-decoration:underline;cursor:pointer}
-a:link {color:#c00}
-a:visited {color:#999}
-a:hover,a:active {color:#069}
-
-/* LISTS */
-ul {margin: .3em 0 1.5em 2em}
- ul.related {margin-top:-1em}
-li {margin-left:2em}
-dt {font-weight:bold}
-#wrap {border: 1px solid #fff;position:relative;background:#fff;width:600px;margin: 0 auto;text-align:left}
-#header {background: #666 url("/<?php echo $data['baseurlpath']; ?>resources/sprites.gif") repeat-x 0 100%;margin: 0 0 25px;padding: 0 0 8px}
-#header h1 {color:#fff;font-size: 145%;padding:20px 20px 12px}
-#poweredby {width:96px;height:63px;position:absolute;top:0;right:0}
-#content {padding: 0 20px}
-
-/* TYPOGRAPHY */
-p, ul, ol {margin: 0 0 1.5em}
-h1, h2, h3, h4, h5, h6 {letter-spacing: -1px;font-family: arial,verdana,sans-serif;margin: 1.2em 0 .3em;color:#000;border-bottom: 1px solid #eee;padding-bottom: .1em}
-h1 {font-size: 196%;margin-top:0;border:none}
-h2 {font-size: 136%}
-h3 {font-size: 126%}
-h4 {font-size: 116%}
-h5 {font-size: 106%}
-h6 {font-size: 96%}
-
-.old {text-decoration:line-through}
-</style>
-</head>
-<body>
-
-<div id="wrap">
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>User consent on attribute release</h1>
@@ -81,15 +33,4 @@ h6 {font-size: 96%}
</table>
- <hr />
-
- Copyright © 2007 <a href="http://rnd.feide.no/">Feide RnD</a>
-
- <hr />
-
- </div>
-
-</div>
-
-</body>
-</html>
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/templates/default/en/error.php b/templates/default/en/error.php
index 8d4600144..8fa49540d 100644
--- a/templates/default/en/error.php
+++ b/templates/default/en/error.php
@@ -1,52 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><?php echo $data['header']; ?></title>
-
-<style type="text/css">
-
-/* these styles are in the head of this page because this is a unique page */
-
-/* THE BIG GUYS */
-* {margin:0;padding:0}
-body {text-align:center;padding: 20px 0;background: #222;color:#333;font:83%/1.5 arial,tahoma,verdana,sans-serif}
-img {border:none;display:block}
-hr {margin: 1em 0;background:#eee;height:1px;color:#eee;border:none;clear:both}
-
-/* LINKS */
-a,a:link,a:link,a:link,a:hover {font-weight:bold;background:transparent;text-decoration:underline;cursor:pointer}
-a:link {color:#c00}
-a:visited {color:#999}
-a:hover,a:active {color:#069}
-
-/* LISTS */
-ul {margin: .3em 0 1.5em 2em}
- ul.related {margin-top:-1em}
-li {margin-left:2em}
-dt {font-weight:bold}
-#wrap {border: 1px solid #fff;position:relative;background:#fff;width:600px;margin: 0 auto;text-align:left}
-#header {background: #666 url("/<?php echo $data['baseurlpath']; ?>resources/sprites.gif") repeat-x 0 100%;margin: 0 0 25px;padding: 0 0 8px}
-#header h1 {color:#fff;font-size: 145%;padding:20px 20px 12px}
-#poweredby {width:96px;height:63px;position:absolute;top:0;right:0}
-#content {padding: 0 20px}
-
-/* TYPOGRAPHY */
-p, ul, ol {margin: 0 0 1.5em}
-h1, h2, h3, h4, h5, h6 {letter-spacing: -1px;font-family: arial,verdana,sans-serif;margin: 1.2em 0 .3em;color:#000;border-bottom: 1px solid #eee;padding-bottom: .1em}
-h1 {font-size: 196%;margin-top:0;border:none}
-h2 {font-size: 136%}
-h3 {font-size: 126%}
-h4 {font-size: 116%}
-h5 {font-size: 106%}
-h6 {font-size: 96%}
-
-.old {text-decoration:line-through}
-</style>
-</head>
-<body>
-
-<div id="wrap">
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>simpleSAMLphp error page</h1>
@@ -83,15 +35,4 @@ h6 {font-size: 96%}
- <hr />
-
- Copyright © 2007 <a href="http://rnd.feide.no/">Feide RnD</a>
-
- <hr />
-
- </div>
-
-</div>
-
-</body>
-</html>
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/templates/default/en/httpredirect-debug.php b/templates/default/en/httpredirect-debug.php
index a4633cacc..a3308cf63 100644
--- a/templates/default/en/httpredirect-debug.php
+++ b/templates/default/en/httpredirect-debug.php
@@ -1,56 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><?php echo $data['header']; ?></title>
-<script>
-<!--
-function sf(){document.f.username.focus();}
-// -->
-</script>
-<style type="text/css">
-
-/* these styles are in the head of this page because this is a unique page */
-
-/* THE BIG GUYS */
-* {margin:0;padding:0}
-body {text-align:center;padding: 20px 0;background: #222;color:#333;font:83%/1.5 arial,tahoma,verdana,sans-serif}
-img {border:none;display:block}
-hr {margin: 1em 0;background:#eee;height:1px;color:#eee;border:none;clear:both}
-
-/* LINKS */
-a,a:link,a:link,a:link,a:hover {font-weight:bold;background:transparent;text-decoration:underline;cursor:pointer}
-a:link {color:#c00}
-a:visited {color:#999}
-a:hover,a:active {color:#069}
-
-/* LISTS */
-ul {margin: .3em 0 1.5em 2em}
- ul.related {margin-top:-1em}
-li {margin-left:2em}
-dt {font-weight:bold}
-#wrap {border: 1px solid #fff;position:relative;background:#fff;width:600px;margin: 0 auto;text-align:left}
-#header {background: #666 url("/<?php echo $data['baseurlpath']; ?>resources/sprites.gif") repeat-x 0 100%;margin: 0 0 25px;padding: 0 0 8px}
-#header h1 {color:#fff;font-size: 145%;padding:20px 20px 12px}
-#poweredby {width:96px;height:63px;position:absolute;top:0;right:0}
-#content {padding: 0 20px}
-
-/* TYPOGRAPHY */
-p, ul, ol {margin: 0 0 1.5em}
-h1, h2, h3, h4, h5, h6 {letter-spacing: -1px;font-family: arial,verdana,sans-serif;margin: 1.2em 0 .3em;color:#000;border-bottom: 1px solid #eee;padding-bottom: .1em}
-h1 {font-size: 196%;margin-top:0;border:none}
-h2 {font-size: 136%}
-h3 {font-size: 126%}
-h4 {font-size: 116%}
-h5 {font-size: 106%}
-h6 {font-size: 96%}
-
-.old {text-decoration:line-through}
-</style>
-</head>
-<body onload="sf();">
-
-<div id="wrap">
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>simpleSAMLphp HTTP-REDIRECT debug</h1>
@@ -75,15 +23,4 @@ h6 {font-size: 96%}
- <hr />
-
- Copyright © 2007 <a href="http://rnd.feide.no/">Feide RnD</a>
-
- <hr />
-
- </div>
-
-</div>
-
-</body>
-</html>
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/templates/default/en/login-ldapmulti.php b/templates/default/en/login-ldapmulti.php
index fc9eac46e..7b80c4b05 100644
--- a/templates/default/en/login-ldapmulti.php
+++ b/templates/default/en/login-ldapmulti.php
@@ -1,56 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><?php echo $data['header']; ?></title>
-<script>
-<!--
-function sf(){document.f.username.focus();}
-// -->
-</script>
-<style type="text/css">
-
-/* these styles are in the head of this page because this is a unique page */
-
-/* THE BIG GUYS */
-* {margin:0;padding:0}
-body {text-align:center;padding: 20px 0;background: #222;color:#333;font:83%/1.5 arial,tahoma,verdana,sans-serif}
-img {border:none;display:block}
-hr {margin: 1em 0;background:#eee;height:1px;color:#eee;border:none;clear:both}
-
-/* LINKS */
-a,a:link,a:link,a:link,a:hover {font-weight:bold;background:transparent;text-decoration:underline;cursor:pointer}
-a:link {color:#c00}
-a:visited {color:#999}
-a:hover,a:active {color:#069}
-
-/* LISTS */
-ul {margin: .3em 0 1.5em 2em}
- ul.related {margin-top:-1em}
-li {margin-left:2em}
-dt {font-weight:bold}
-#wrap {border: 1px solid #fff;position:relative;background:#fff;width:600px;margin: 0 auto;text-align:left}
-#header {background: #666 url("/<?php echo $data['baseurlpath']; ?>resources/sprites.gif") repeat-x 0 100%;margin: 0 0 25px;padding: 0 0 8px}
-#header h1 {color:#fff;font-size: 145%;padding:20px 20px 12px}
-#poweredby {width:96px;height:63px;position:absolute;top:0;right:0}
-#content {padding: 0 20px}
-
-/* TYPOGRAPHY */
-p, ul, ol {margin: 0 0 1.5em}
-h1, h2, h3, h4, h5, h6 {letter-spacing: -1px;font-family: arial,verdana,sans-serif;margin: 1.2em 0 .3em;color:#000;border-bottom: 1px solid #eee;padding-bottom: .1em}
-h1 {font-size: 196%;margin-top:0;border:none}
-h2 {font-size: 136%}
-h3 {font-size: 126%}
-h4 {font-size: 116%}
-h5 {font-size: 106%}
-h6 {font-size: 96%}
-
-.old {text-decoration:line-through}
-</style>
-</head>
-<body onload="sf();">
-
-<div id="wrap">
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>simpleSAMLphp authentication</h1>
@@ -127,16 +75,4 @@ h6 {font-size: 96%}
<p>Hey! This simpleSAMLphp thing is pretty cool, where can I read more about it?
You can find more information about simpleSAMLphp at <a href="http://rnd.feide.no">the Feide RnD blog</a> over at <a href="http://uninett.no">UNINETT</a>.</p>
-
- <hr />
-
- Copyright © 2007 <a href="http://rnd.feide.no/">Feide RnD</a>
-
- <hr />
-
- </div>
-
-</div>
-
-</body>
-</html>
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/templates/default/en/login.php b/templates/default/en/login.php
index 756e37f62..334568122 100644
--- a/templates/default/en/login.php
+++ b/templates/default/en/login.php
@@ -1,56 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><?php echo $data['header']; ?></title>
-<script>
-<!--
-function sf(){document.f.username.focus();}
-// -->
-</script>
-<style type="text/css">
-
-/* these styles are in the head of this page because this is a unique page */
-
-/* THE BIG GUYS */
-* {margin:0;padding:0}
-body {text-align:center;padding: 20px 0;background: #222;color:#333;font:83%/1.5 arial,tahoma,verdana,sans-serif}
-img {border:none;display:block}
-hr {margin: 1em 0;background:#eee;height:1px;color:#eee;border:none;clear:both}
-
-/* LINKS */
-a,a:link,a:link,a:link,a:hover {font-weight:bold;background:transparent;text-decoration:underline;cursor:pointer}
-a:link {color:#c00}
-a:visited {color:#999}
-a:hover,a:active {color:#069}
-
-/* LISTS */
-ul {margin: .3em 0 1.5em 2em}
- ul.related {margin-top:-1em}
-li {margin-left:2em}
-dt {font-weight:bold}
-#wrap {border: 1px solid #fff;position:relative;background:#fff;width:600px;margin: 0 auto;text-align:left}
-#header {background: #666 url("/<?php echo $data['baseurlpath']; ?>resources/sprites.gif") repeat-x 0 100%;margin: 0 0 25px;padding: 0 0 8px}
-#header h1 {color:#fff;font-size: 145%;padding:20px 20px 12px}
-#poweredby {width:96px;height:63px;position:absolute;top:0;right:0}
-#content {padding: 0 20px}
-
-/* TYPOGRAPHY */
-p, ul, ol {margin: 0 0 1.5em}
-h1, h2, h3, h4, h5, h6 {letter-spacing: -1px;font-family: arial,verdana,sans-serif;margin: 1.2em 0 .3em;color:#000;border-bottom: 1px solid #eee;padding-bottom: .1em}
-h1 {font-size: 196%;margin-top:0;border:none}
-h2 {font-size: 136%}
-h3 {font-size: 126%}
-h4 {font-size: 116%}
-h5 {font-size: 106%}
-h6 {font-size: 96%}
-
-.old {text-decoration:line-through}
-</style>
-</head>
-<body onload="sf();">
-
-<div id="wrap">
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>simpleSAMLphp authentication</h1>
@@ -110,15 +58,4 @@ h6 {font-size: 96%}
You can find more information about simpleSAMLphp at <a href="http://rnd.feide.no">the Feide RnD blog</a> over at <a href="http://uninett.no">UNINETT</a>.</p>
- <hr />
-
- Copyright © 2007 <a href="http://rnd.feide.no/">Feide RnD</a>
-
- <hr />
-
- </div>
-
-</div>
-
-</body>
-</html>
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/templates/default/en/metadata.php b/templates/default/en/metadata.php
index bb6e93c18..e30c29123 100644
--- a/templates/default/en/metadata.php
+++ b/templates/default/en/metadata.php
@@ -1,52 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><?php echo $data['header']; ?></title>
-
-<style type="text/css">
-
-/* these styles are in the head of this page because this is a unique page */
-
-/* THE BIG GUYS */
-* {margin:0;padding:0}
-body {text-align:center;padding: 20px 0;background: #222;color:#333;font:83%/1.5 arial,tahoma,verdana,sans-serif}
-img {border:none;display:block}
-hr {margin: 1em 0;background:#eee;height:1px;color:#eee;border:none;clear:both}
-
-/* LINKS */
-a,a:link,a:link,a:link,a:hover {font-weight:bold;background:transparent;text-decoration:underline;cursor:pointer}
-a:link {color:#c00}
-a:visited {color:#999}
-a:hover,a:active {color:#069}
-
-/* LISTS */
-ul {margin: .3em 0 1.5em 2em}
- ul.related {margin-top:-1em}
-li {margin-left:2em}
-dt {font-weight:bold}
-#wrap {border: 1px solid #fff;position:relative;background:#fff;width:600px;margin: 0 auto;text-align:left}
-#header {background: #666 url("/<?php echo $data['baseurlpath']; ?>resources/sprites.gif") repeat-x 0 100%;margin: 0 0 25px;padding: 0 0 8px}
-#header h1 {color:#fff;font-size: 145%;padding:20px 20px 12px}
-#poweredby {width:96px;height:63px;position:absolute;top:0;right:0}
-#content {padding: 0 20px}
-
-/* TYPOGRAPHY */
-p, ul, ol {margin: 0 0 1.5em}
-h1, h2, h3, h4, h5, h6 {letter-spacing: -1px;font-family: arial,verdana,sans-serif;margin: 1.2em 0 .3em;color:#000;border-bottom: 1px solid #eee;padding-bottom: .1em}
-h1 {font-size: 196%;margin-top:0;border:none}
-h2 {font-size: 136%}
-h3 {font-size: 126%}
-h4 {font-size: 116%}
-h5 {font-size: 106%}
-h6 {font-size: 96%}
-
-.old {text-decoration:line-through}
-</style>
-</head>
-<body>
-
-<div id="wrap">
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>simpleSAMLphp status page</h1>
@@ -95,15 +47,4 @@ h6 {font-size: 96%}
<?php } ?>
- <hr />
-
- Copyright © 2007 <a href="http://rnd.feide.no/">Feide RnD</a>
-
- <hr />
-
- </div>
-
-</div>
-
-</body>
-</html>
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/templates/default/en/post-debug.php b/templates/default/en/post-debug.php
index b3dfebf11..a9a20e2ef 100644
--- a/templates/default/en/post-debug.php
+++ b/templates/default/en/post-debug.php
@@ -1,56 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><?php echo $data['header']; ?></title>
-<script>
-<!--
-function sf(){document.f.username.focus();}
-// -->
-</script>
-<style type="text/css">
-
-/* these styles are in the head of this page because this is a unique page */
-
-/* THE BIG GUYS */
-* {margin:0;padding:0}
-body {text-align:center;padding: 20px 0;background: #222;color:#333;font:83%/1.5 arial,tahoma,verdana,sans-serif}
-img {border:none;display:block}
-hr {margin: 1em 0;background:#eee;height:1px;color:#eee;border:none;clear:both}
-
-/* LINKS */
-a,a:link,a:link,a:link,a:hover {font-weight:bold;background:transparent;text-decoration:underline;cursor:pointer}
-a:link {color:#c00}
-a:visited {color:#999}
-a:hover,a:active {color:#069}
-
-/* LISTS */
-ul {margin: .3em 0 1.5em 2em}
- ul.related {margin-top:-1em}
-li {margin-left:2em}
-dt {font-weight:bold}
-#wrap {border: 1px solid #fff;position:relative;background:#fff;width:600px;margin: 0 auto;text-align:left}
-#header {background: #666 url("/<?php echo $data['baseurlpath']; ?>resources/sprites.gif") repeat-x 0 100%;margin: 0 0 25px;padding: 0 0 8px}
-#header h1 {color:#fff;font-size: 145%;padding:20px 20px 12px}
-#poweredby {width:96px;height:63px;position:absolute;top:0;right:0}
-#content {padding: 0 20px}
-
-/* TYPOGRAPHY */
-p, ul, ol {margin: 0 0 1.5em}
-h1, h2, h3, h4, h5, h6 {letter-spacing: -1px;font-family: arial,verdana,sans-serif;margin: 1.2em 0 .3em;color:#000;border-bottom: 1px solid #eee;padding-bottom: .1em}
-h1 {font-size: 196%;margin-top:0;border:none}
-h2 {font-size: 136%}
-h3 {font-size: 126%}
-h4 {font-size: 116%}
-h5 {font-size: 106%}
-h6 {font-size: 96%}
-
-.old {text-decoration:line-through}
-</style>
-</head>
-<body onload="sf();">
-
-<div id="wrap">
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>simpleSAMLphp authentication</h1>
@@ -77,15 +25,4 @@ h6 {font-size: 96%}
<pre style="overflow: scroll; border: 1px solid #eee"><?php echo $data['responseHTML']; ?></pre>
- <hr />
-
- Copyright © 2007 <a href="http://rnd.feide.no/">Feide RnD</a>
-
- <hr />
-
- </div>
-
-</div>
-
-</body>
-</html>
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/templates/default/en/selectidp.php b/templates/default/en/selectidp.php
index c1174f709..c9ab2518e 100644
--- a/templates/default/en/selectidp.php
+++ b/templates/default/en/selectidp.php
@@ -1,52 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><?php echo $data['header']; ?></title>
-
-<style type="text/css">
-
-/* these styles are in the head of this page because this is a unique page */
-
-/* THE BIG GUYS */
-* {margin:0;padding:0}
-body {text-align:center;padding: 20px 0;background: #222;color:#333;font:83%/1.5 arial,tahoma,verdana,sans-serif}
-img {border:none;display:block}
-hr {margin: 1em 0;background:#eee;height:1px;color:#eee;border:none;clear:both}
-
-/* LINKS */
-a,a:link,a:link,a:link,a:hover {font-weight:bold;background:transparent;text-decoration:underline;cursor:pointer}
-a:link {color:#c00}
-a:visited {color:#999}
-a:hover,a:active {color:#069}
-
-/* LISTS */
-ul {margin: .3em 0 1.5em 2em}
- ul.related {margin-top:-1em}
-li {margin-left:2em}
-dt {font-weight:bold}
-#wrap {border: 1px solid #fff;position:relative;background:#fff;width:600px;margin: 0 auto;text-align:left}
-#header {background: #666 url("/<?php echo $data['baseurlpath']; ?>resources/sprites.gif") repeat-x 0 100%;margin: 0 0 25px;padding: 0 0 8px}
-#header h1 {color:#fff;font-size: 145%;padding:20px 20px 12px}
-#poweredby {width:96px;height:63px;position:absolute;top:0;right:0}
-#content {padding: 0 20px}
-
-/* TYPOGRAPHY */
-p, ul, ol {margin: 0 0 1.5em}
-h1, h2, h3, h4, h5, h6 {letter-spacing: -1px;font-family: arial,verdana,sans-serif;margin: 1.2em 0 .3em;color:#000;border-bottom: 1px solid #eee;padding-bottom: .1em}
-h1 {font-size: 196%;margin-top:0;border:none}
-h2 {font-size: 136%}
-h3 {font-size: 126%}
-h4 {font-size: 116%}
-h5 {font-size: 106%}
-h6 {font-size: 96%}
-
-.old {text-decoration:line-through}
-</style>
-</head>
-<body>
-
-<div id="wrap">
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>SAML 2.0 IdP Discovery Service</h1>
@@ -74,17 +26,4 @@ h6 {font-size: 96%}
?>
-
-
- <hr />
-
- Copyright © 2007 <a href="http://rnd.feide.no/">Feide RnD</a>
-
- <hr />
-
- </div>
-
-</div>
-
-</body>
-</html>
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
diff --git a/templates/default/en/status.php b/templates/default/en/status.php
index 257f5ad12..6f675499a 100644
--- a/templates/default/en/status.php
+++ b/templates/default/en/status.php
@@ -1,4 +1,4 @@
-<?php include('includes/header.php'); ?>
+<?php $this->includeAtTemplateBase('includes/header.php'); ?>
<div id="header">
<h1>simpleSAMLphp status page</h1>
@@ -15,7 +15,6 @@
<h2>Your attributes</h2>
-
<table>
<?php
@@ -43,4 +42,4 @@
<p>Hey! This simpleSAMLphp thing is pretty cool, where can I read more about it?
You can find more information about simpleSAMLphp at <a href="http://rnd.feide.no">the Feide RnD blog</a> over at <a href="http://uninett.no">UNINETT</a>.</p>
-<?php include('includes/footer.php'); ?>
\ No newline at end of file
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/templates/default/includes/header.php b/templates/default/includes/header.php
index ca89a712b..13450be45 100644
--- a/templates/default/includes/header.php
+++ b/templates/default/includes/header.php
@@ -46,4 +46,27 @@ h6 {font-size: 96%}
</head>
<body>
-<div id="wrap">
\ No newline at end of file
+<div id="wrap">
+
+
+<?php
+
+$languages = $this->getLanguageList();
+$langnames = array(
+ 'no' => 'Norsk',
+ 'en' => 'English',
+ 'de' => 'Deutch',
+ 'dk' => 'Dansk'
+);
+
+
+foreach ($languages AS $lang => $current) {
+ if ($current) {
+ echo $langnames[$lang] . ' | ';
+ } else {
+ echo '<a href="' . SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), 'language=' . $lang) . '">' .
+ $langnames[$lang] . '</a> | ';
+ }
+}
+
+?>
\ No newline at end of file
--
GitLab