franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix mobile logon page

Browse Source
This commit is contained in:
Franzz
2014-06-16 12:50:24 +02:00
parent 04470285bc
commit dd6dfe81c2
3 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jquery/databap.js vendored
View File

@@ -64,7 +64,8 @@ function Databap()
$(window).bind('hashchange', self.onHashChange); $(window).bind('hashchange', self.onHashChange);
//Init first page //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(); else self.onHashChange();
//Load cache //Load cache

3
masks/logon.html
View File

@@ -35,7 +35,6 @@
<form id="logon_form" name="logon_form" method="post"> <form id="logon_form" name="logon_form" method="post">
<input type="hidden" name="auth_token" id="auth_token" value="" /> <input type="hidden" name="auth_token" id="auth_token" value="" />
<span class="feedback">[#]feedback[#]</span> <span class="feedback">[#]feedback[#]</span>
<input type="button" name="log_me_in" id="log_me_in" value="Ok" class="round" />
</form> </form>
</td> </td>
</tr> </tr>
@@ -56,7 +55,7 @@
{ {
//Events //Events
$(window).keyup(function(e){if(e.which==13) logMeIn();}); $(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 //Hashing and sending auth credentials

36
style/screen.css
View File

@@ -1092,7 +1092,7 @@ vertical-align 0% -5% -10% -15% -20% -25% -30%
top:50%; top:50%;
left:50%; left:50%;
margin-left:-230px; /* -(68+10*2+160+200+5*2+1*2)/2 */ 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 { #logon .box {
background:white; background:white;
@@ -1107,7 +1107,7 @@ vertical-align 0% -5% -10% -15% -20% -25% -30%
width:68px; width:68px;
background:#D9E5F2; background:#D9E5F2;
} }
#logon .box .fa { #logon .box .key .fa {
position:absolute; position:absolute;
top:50%; top:50%;
left:50%; left:50%;
@@ -1152,8 +1152,11 @@ vertical-align 0% -5% -10% -15% -20% -25% -30%
padding:2px 5px; padding:2px 5px;
width:200px; width:200px;
} }
#logon .box input[type=button] { #logon .box a.button {
width:auto; margin-right:0;
}
#logon .box a.button .fa {
margin:1px;
} }
#logon #footer { #logon #footer {
position:fixed; position:fixed;
@@ -2509,15 +2512,16 @@ vertical-align 0% -5% -10% -15% -20% -25% -30%
} }
#logon .container { #logon .container {
position:static;
top:0;
left:0; left:0;
margin:0; margin-left:0;
width:100%; width:100%;
} }
#logon .container #logon_box {
#logon .logon_msg, #logon .box {
margin:10px;
}
#logon .box {
background:white; background:white;
margin:10px;
overflow:auto; overflow:auto;
} }
#logon .box .key { #logon .box .key {
@@ -2530,10 +2534,6 @@ vertical-align 0% -5% -10% -15% -20% -25% -30%
#logon .box table td { #logon .box table td {
padding:0; padding:0;
margin:0; margin:0;
text-align:left;
font-size:18px;
color:#04357B;
height:50px;
} }
#logon .box .validate { #logon .box .validate {
text-align:right; text-align:right;
@@ -2542,10 +2542,6 @@ vertical-align 0% -5% -10% -15% -20% -25% -30%
float:left; float:left;
} }
#logon .box input { #logon .box input {
border:1px solid #04357B;
color:#04357B;
font-size:28px;
padding:1px 5px;
float:right; float:right;
width:90%; width:90%;
} }
@@ -2553,11 +2549,7 @@ vertical-align 0% -5% -10% -15% -20% -25% -30%
padding:1px 10px; padding:1px 10px;
width:auto; width:auto;
} }
#logon #footer {
position:fixed;
bottom:0;
}
/* Menu */ /* Menu */
#menu #menu_box ul li#close_menu_ln { #menu #menu_box ul li#close_menu_ln {