From aa2388203ebc2fad01b8280777e5a40de4fcc813 Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Thu, 14 Mar 2013 16:22:10 -0700
Subject: Sign In fix

---
 includes/header.php | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'includes/header.php')

diff --git a/includes/header.php b/includes/header.php
index f8519a1..3965357 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -41,17 +41,17 @@ function htmlHeader($css = array(), $title = 'Pathery', $desc = '', $scripts = a
     </script>
 	 
 <script>
-<? echo userDataToJS(); ?>
 function showSignin() {
-	if (document.getElementById('oid_hidden') !== undefined) {
+	if (typeof document.getElementById('oid_hidden') !== 'undefined') {
 		document.getElementById('oid_hidden').id = 'oid_wrapper';
 	}
 }
 function hideSignin() {
-	if (document.getElementById('oid_wrapper') !== undefined) {
+	if (typeof document.getElementById('oid_wrapper') !== 'undefined') {
 		document.getElementById('oid_wrapper').id = 'oid_hidden';
 	}
 }
+<? echo userDataToJS(); ?>
 </script>
 	 
 </head>
@@ -145,7 +145,6 @@ function htmlFooter() {
 ?>
     })();
 	
-	createSignin();
 	</script>
 
 </body>
@@ -155,6 +154,24 @@ function htmlFooter() {
 
 function topbar($links) {
 	global $accepted, $wallColor, $wallEmblem, $request;
+	
+	
+	
+	//Empty first-div contains sound manager stuff
+	echo '<div></div>';
+	
+	//echo '<script>createSignin();</script>';
+	echo '	<div class="wrapper" id="oid_hidden" >
+			<h2>Sign in</h2>
+			<div id="oid_box">
+				<h2 style="color:#333;">Do you have an account here?</h2>
+				<a rel="nofollow" href="login?op=google"><img id="oid_btn" src="images/btns/signin_Google.png" alt="Sign in with Google" /></a>
+				<a rel="nofollow" href="login?op=yahoo"><img id="oid_btn" src="images/btns/signin_Yahoo.png" alt="Sign in with Yahoo" /></a>
+				<a id="oid_learn" href="http://openid.net/get-an-openid/what-is-openid/"  target="_blank" >Learn more about OpenID</a>
+				<a id="oid_cancel" href="javascript:hideSignin();">X</a>
+			</div>
+		</div>';
+	
 	echo '<div id="topbar"><div id="topbarContent">';
 
 	foreach ($links as $key => $value) {
@@ -183,16 +200,6 @@ function topbar($links) {
 	} else {
 		?>
 		<a href='javascript:showSignin();'>Sign in</a>
-<!-- 		<div class="wrapper" id="oid_hidden" >
-			<h2>Sign in</h2>
-			<div id="oid_box">
-				<h2 style="color:#333;">Do you have an account here?</h2>
-				<a rel="nofollow" href="login?op=google"><img id="oid_btn" src="images/btns/signin_Google.png" alt="Sign in with Google" /></a>
-				<a rel="nofollow" href="login?op=yahoo"><img id="oid_btn" src="images/btns/signin_Yahoo.png" alt="Sign in with Yahoo" /></a>
-				<a id="oid_learn" href="http://openid.net/get-an-openid/what-is-openid/"  target="_blank" >Learn more about OpenID</a>
-				<a id="oid_cancel" href="javascript:hideSignin();">X</a>
-			</div>
-		</div> -->
 <?
 	}
 	echo "	</div>";
-- 
cgit v1.2.3