From: Zach Prezkuta Date: Sat, 18 Aug 2012 20:47:59 +0000 (-0600) Subject: include login style when necessary X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b4a4ccfb2bf3d959fb33b59e3f6e75059710acc4;p=friendica.git include login style when necessary --- diff --git a/boot.php b/boot.php index dedae7fd54..a94d4dece5 100644 --- a/boot.php +++ b/boot.php @@ -904,6 +904,10 @@ if(! function_exists('login')) { $tpl = get_markup_template("logout.tpl"); } else { + $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array( + '$baseurl' => $a->get_baseurl(true) + )); + $tpl = get_markup_template("login.tpl"); $_SESSION['return_url'] = $a->query_string; } diff --git a/view/login_head.tpl b/view/login_head.tpl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/view/theme/frost-mobile/login-style.css b/view/theme/frost-mobile/login-style.css index 5283c584ba..618e07c0cb 100644 --- a/view/theme/frost-mobile/login-style.css +++ b/view/theme/frost-mobile/login-style.css @@ -26,7 +26,7 @@ img.login-button-image { max-width: 300px; } -.section-wrapper { +div.section-wrapper { position: relative; width: 300px; margin-left: auto; @@ -45,6 +45,8 @@ img.login-button-image { .field label { margin-left: 25px; font-weight: 700; + float: none; + width: auto; } .field input { @@ -62,6 +64,7 @@ img.login-button-image { background-position: 0 50%; width: 182px; padding-left: 18px; + margin-left: 50px; } #login-footer { diff --git a/view/theme/frost-mobile/login_head.tpl b/view/theme/frost-mobile/login_head.tpl new file mode 100644 index 0000000000..7a5d606cba --- /dev/null +++ b/view/theme/frost-mobile/login_head.tpl @@ -0,0 +1,2 @@ + + diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 7c69694ea4..a46b79566d 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -547,7 +547,7 @@ footer { margin-top: 10px; } - +/* #login_standard { width: 210px; float: left; @@ -577,9 +577,9 @@ footer { } #login-submit-button { -/* margin-top: 10px; */ + margin-top: 10px; margin-left: 200px; -} +}*/ input#dfrn-url { diff --git a/view/theme/frost/login-style.css b/view/theme/frost/login-style.css index 5b82c11d3b..3b9a9eb82b 100644 --- a/view/theme/frost/login-style.css +++ b/view/theme/frost/login-style.css @@ -1,6 +1,7 @@ body { font-family: helvetica,arial,freesans,clean,sans-serif; font-size: 14px; + /*background-image: none;*/ background-color: #ffffff; color: #505050;/* ZP Change*/ margin: 0px; @@ -19,7 +20,7 @@ img.login-button-image { max-width: 350px; } -.section-wrapper { +div.section-wrapper { position: relative; width: 800px; margin-left: auto; @@ -28,7 +29,8 @@ img.login-button-image { } .login-form { - margin-top: 200px; + padding-top: 200px; + margin-bottom: 50px; } .register-form { @@ -39,7 +41,13 @@ img.login-button-image { margin-top: 170px; } +.field { + margin-bottom: 2px; + padding-bottom: 0px; +} + .field label { + width: auto; position: absolute; margin-left: 0px; font-weight: 700; @@ -50,7 +58,8 @@ img.login-button-image { width: 200px; } -.openid input { +/*.openid input {*/ +#id_openid_url, .openid input { background: url(login-bg.gif) no-repeat; background-position: 0 50%; width: 182px; diff --git a/view/theme/frost/login_head.tpl b/view/theme/frost/login_head.tpl new file mode 100644 index 0000000000..cd140d6857 --- /dev/null +++ b/view/theme/frost/login_head.tpl @@ -0,0 +1,2 @@ + + diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 4401ffedb6..eaed395496 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -511,8 +511,10 @@ div.wall-item-content-wrapper.shiny { margin-top: 10px; } - -#login_standard { +.login-form { + margin-top: -150px; +} +/*#login_standard { width: 210px; float: left; } @@ -541,9 +543,9 @@ div.wall-item-content-wrapper.shiny { } #login-submit-button { -/* margin-top: 10px; */ + margin-top: 10px; margin-left: 200px; -} +}*/ input#dfrn-url {