mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #441 from fermionic/frost-permission-denied-login-style-wrong

Browse source 
include login style when necessary
This commit is contained in:
friendica 2012-08-18 15:16:43 -07:00
commit 64b6d26d4f
8 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -904,6 +904,10 @@ if(! function_exists('login')) {
$tpl = get_markup_template("logout.tpl"); $tpl = get_markup_template("logout.tpl");
} }
else { else {
$a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
'$baseurl' => $a->get_baseurl(true)
));
$tpl = get_markup_template("login.tpl"); $tpl = get_markup_template("login.tpl");
$_SESSION['return_url'] = $a->query_string; $_SESSION['return_url'] = $a->query_string;
} }

0
view/login_head.tpl Normal file
View file

5
view/theme/frost-mobile/login-style.css
View file

@ -26,7 +26,7 @@ img.login-button-image {
max-width: 300px; max-width: 300px;
} }
.section-wrapper { div.section-wrapper {
position: relative; position: relative;
width: 300px; width: 300px;
margin-left: auto; margin-left: auto;
@ -45,6 +45,8 @@ img.login-button-image {
.field label { .field label {
margin-left: 25px; margin-left: 25px;
font-weight: 700; font-weight: 700;
float: none;
width: auto;
} }
.field input { .field input {
@ -62,6 +64,7 @@ img.login-button-image {
background-position: 0 50%; background-position: 0 50%;
width: 182px; width: 182px;
padding-left: 18px; padding-left: 18px;
margin-left: 50px;
} }
#login-footer { #login-footer {

2
view/theme/frost-mobile/login_head.tpl Normal file
View file

@ -0,0 +1,2 @@
<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />

6
view/theme/frost-mobile/style.css
View file

@ -547,7 +547,7 @@ footer {
margin-top: 10px; margin-top: 10px;
} }
/*
#login_standard { #login_standard {
width: 210px; width: 210px;
float: left; float: left;
@ -577,9 +577,9 @@ footer {
} }
#login-submit-button { #login-submit-button {
/* margin-top: 10px; */ margin-top: 10px;
margin-left: 200px; margin-left: 200px;
} }*/
input#dfrn-url { input#dfrn-url {

15
view/theme/frost/login-style.css
View file

@ -1,6 +1,7 @@
body { body {
font-family: helvetica,arial,freesans,clean,sans-serif; font-family: helvetica,arial,freesans,clean,sans-serif;
font-size: 14px; font-size: 14px;
/*background-image: none;*/
background-color: #ffffff; background-color: #ffffff;
color: #505050;/* ZP Change*/ color: #505050;/* ZP Change*/
margin: 0px; margin: 0px;
@ -19,7 +20,7 @@ img.login-button-image {
max-width: 350px; max-width: 350px;
} }
.section-wrapper { div.section-wrapper {
position: relative; position: relative;
width: 800px; width: 800px;
margin-left: auto; margin-left: auto;
@ -28,7 +29,8 @@ img.login-button-image {
} }
.login-form { .login-form {
margin-top: 200px; padding-top: 200px;
margin-bottom: 50px;
} }
.register-form { .register-form {
@ -39,7 +41,13 @@ img.login-button-image {
margin-top: 170px; margin-top: 170px;
} }
.field {
margin-bottom: 2px;
padding-bottom: 0px;
}
.field label { .field label {
width: auto;
position: absolute; position: absolute;
margin-left: 0px; margin-left: 0px;
font-weight: 700; font-weight: 700;
@ -50,7 +58,8 @@ img.login-button-image {
width: 200px; width: 200px;
} }
.openid input { /*.openid input {*/
#id_openid_url, .openid input {
background: url(login-bg.gif) no-repeat; background: url(login-bg.gif) no-repeat;
background-position: 0 50%; background-position: 0 50%;
width: 182px; width: 182px;

2
view/theme/frost/login_head.tpl Normal file
View file

@ -0,0 +1,2 @@
<link rel="stylesheet" href="$baseurl/view/theme/frost/login-style.css" type="text/css" media="all" />

10
view/theme/frost/style.css
View file

@ -511,8 +511,10 @@ div.wall-item-content-wrapper.shiny {
margin-top: 10px; margin-top: 10px;
} }
.login-form {
#login_standard { margin-top: -150px;
}
/*#login_standard {
width: 210px; width: 210px;
float: left; float: left;
} }
@ -541,9 +543,9 @@ div.wall-item-content-wrapper.shiny {
} }
#login-submit-button { #login-submit-button {
/* margin-top: 10px; */ margin-top: 10px;
margin-left: 200px; margin-left: 200px;
} }*/
input#dfrn-url { input#dfrn-url {