From dd6dfe81c2ef0b52e6d7cbe00c410817389e5a55 Mon Sep 17 00:00:00 2001
From: franzz <francois@lutran.fr>
Date: Mon, 16 Jun 2014 12:50:24 +0200
Subject: [PATCH] fix mobile logon page

---
 jquery/databap.js |  3 ++-
 masks/logon.html  |  3 +--
 style/screen.css  | 36 ++++++++++++++----------------------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/jquery/databap.js b/jquery/databap.js
index d81162d..7daeb2d 100644
--- a/jquery/databap.js
+++ b/jquery/databap.js
@@ -64,7 +64,8 @@ function Databap()
 		$(window).bind('hashchange', self.onHashChange);
 		
 		//Init first page
-		if(self.hash()=='') self.goToInternalLink(self.consts.default_hash, self.consts.default_id); //Fix for old links
+		if(self.hash()=='logout') self.goToInternalLink(self.vars.page_to_hash['welcome']);
+		else if(self.hash()=='') self.goToInternalLink(self.consts.default_hash, self.consts.default_id); //Fix for old links
 		else self.onHashChange();
 		
 		//Load cache
diff --git a/masks/logon.html b/masks/logon.html
index b335555..5f2f14d 100755
--- a/masks/logon.html
+++ b/masks/logon.html
@@ -35,7 +35,6 @@
 							<form id="logon_form" name="logon_form" method="post">
 								<input type="hidden" name="auth_token" id="auth_token" value="" />
 								<span class="feedback">[#]feedback[#]</span>
-								<input type="button" name="log_me_in" id="log_me_in" value="Ok" class="round" />
 							</form>
 						</td>
 					</tr>
@@ -56,7 +55,7 @@
 	{
 		//Events
 		$(window).keyup(function(e){if(e.which==13) logMeIn();});
-		$('#log_me_in').click(logMeIn);
+		$('#logon_form').addButton('ok', '', logMeIn, 'log_me_in', '');
 	});
 
 	//Hashing and sending auth credentials
diff --git a/style/screen.css b/style/screen.css
index f52582c..5436e2c 100644
--- a/style/screen.css
+++ b/style/screen.css
@@ -1092,7 +1092,7 @@ vertical-align	0%		-5%			-10%		-15%		-20%		-25%		-30%
 	top:50%;
 	left:50%;
 	margin-left:-230px; /* -(68+10*2+160+200+5*2+1*2)/2 */
-	margin-top:-65px; /* -(10*2+20*4+20*2+20+2*2+1*2)/2 */
+	margin-top:-64px; /* -(10*2+20*4+20*2+20+2*2+1*2)/2 */
 }
 #logon .box {
 	background:white;
@@ -1107,7 +1107,7 @@ vertical-align	0%		-5%			-10%		-15%		-20%		-25%		-30%
 	width:68px;
 	background:#D9E5F2;
 }
-#logon .box .fa {
+#logon .box .key .fa {
 	position:absolute;
 	top:50%;
 	left:50%;
@@ -1152,8 +1152,11 @@ vertical-align	0%		-5%			-10%		-15%		-20%		-25%		-30%
 	padding:2px 5px;
 	width:200px;
 }
-#logon .box input[type=button] {
-	width:auto;
+#logon .box a.button {
+	margin-right:0;
+}
+#logon .box a.button .fa {
+	margin:1px;
 }
 #logon #footer {
 	position:fixed;
@@ -2509,15 +2512,16 @@ vertical-align	0%		-5%			-10%		-15%		-20%		-25%		-30%
 	}
 	
 	#logon .container {
-		position:static;
-		top:0;
 		left:0;
-		margin:0;
+		margin-left:0;
 		width:100%;
 	}
-	#logon .container #logon_box {
+	
+	#logon .logon_msg, #logon .box {
+		margin:10px;	
+	}
+	#logon .box {
 		background:white;
-		margin:10px;
 		overflow:auto;
 	}
 	#logon .box .key {
@@ -2530,10 +2534,6 @@ vertical-align	0%		-5%			-10%		-15%		-20%		-25%		-30%
 	#logon .box table td {
 		padding:0;
 		margin:0;
-		text-align:left;
-		font-size:18px;
-		color:#04357B;
-		height:50px;
 	}
 	#logon .box .validate {
 		text-align:right;
@@ -2542,10 +2542,6 @@ vertical-align	0%		-5%			-10%		-15%		-20%		-25%		-30%
 		float:left;
 	}
 	#logon .box input {
-		border:1px solid #04357B;
-		color:#04357B;
-		font-size:28px;
-		padding:1px 5px;
 		float:right;
 		width:90%;
 	}
@@ -2553,11 +2549,7 @@ vertical-align	0%		-5%			-10%		-15%		-20%		-25%		-30%
 		padding:1px 10px;
 		width:auto;
 	}
-	#logon #footer {
-		position:fixed;
-		bottom:0;
-	}
-	
+
 	/* Menu */
 
 	#menu #menu_box ul li#close_menu_ln {