Add autofocus helper script with support from default template. Also change

previous autofocus implementations to use this script. git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@646 44740490-163a-0410-bde0-09ae8108e29a

Add autofocus helper script with support from default template. Also change
825729f6 · Olav Morken · e89cd8bf · 825729f6 · 825729f6 · 825729f6
Commit 825729f6 authored 17 years ago by Olav Morken
--- a/templates/default/httpredirect-debug.php
+++ b/templates/default/httpredirect-debug.php
 <?php 
 	$this->data['icon'] = 'debug.png';
+	$this->data['autofocus'] = 'sendlink';
 	$this->includeAtTemplateBase('includes/header.php'); 
 ?>
@@ -14,9 +15,6 @@
 		<pre style="overflow: scroll; border: 1px solid #eee"><?php echo $this->data['message']; ?></pre>
 		<p>[ <a id="sendlink" href="<?php echo htmlentities($this->data['url']); ?>">send SAML message</a> ]</p>
-		<script type="text/javascript">
-			document.getElementById('sendlink').focus();
-		</script>
 		<h2>Debug mode</h2>

--- a/templates/default/includes/header.php
+++ b/templates/default/includes/header.php
@@ -12,8 +12,18 @@ 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" />
 </head>
-<body>
+<?php
+$onLoad = '';
+if(array_key_exists('autofocus', $this->data)) {
+	$onLoad .= 'SimpleSAML_focus(\'' . $this->data['autofocus'] . '\');';
+}
+if($onLoad !== '') {
+	$onLoad = ' onload="' . $onLoad . '"';
+}
+?>
+<body<?php echo $onLoad; ?>>
 <div id="wrap">

--- a/templates/default/login.php
+++ b/templates/default/login.php
 <?php 
 	if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
+	$this->data['autofocus'] = 'username';
 	$this->includeAtTemplateBase('includes/header.php'); 
 ?>
-	<script type="text/javascript">
-		function focusit() {
-			document.getElementById('username').focus();
-		}
-		window.onload = focusit;
-	</script>
 <div id="content">
 	<?php if (isset($this->data['error'])) { ?>

--- a/templates/default/post-debug.php
+++ b/templates/default/post-debug.php
 <?php 
 	$this->data['icon'] = 'debug.png';
+	$this->data['autofocus'] = 'sendbutton';
 	$this->includeAtTemplateBase('includes/header.php'); 
 ?>
@@ -19,10 +20,6 @@
 			<input type="submit" value="Submit the response to the service" id="sendbutton" />
 		</form>
-		<script type="text/javascript">
-			document.getElementById('sendbutton').focus();
-		</script>
 		<h2>Debug mode</h2>
 		<p>As you are in debug mode you are lucky to see the content of the response you are sending:</p>

--- a/www/resources/script.js
+++ b/www/resources/script.js
+/**
+ * Set focus to the element with the given id.
+ *
+ * @param id  The id of the element which should receive focus.
+ */
+function SimpleSAML_focus(id) {
+  element = document.getElementById(id);
+  if(element != null) {
+    element.focus();
+  }
+}