From ab1adad456578500a4be8edd8635c560e25417f7 Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 23 May 2013 15:42:56 +1000 Subject: [PATCH] Work for Oauth --- classes/lnApp/Controller/Login.php | 12 +- media/css/auth-buttons.css | 382 ++++++++++++++++++ media/img/auth-icons.png | Bin 0 -> 7306 bytes media/theme/baseadmin/css/pages/login.css | 56 +-- media/theme/baseadmin/img/login/fb_btn.png | Bin 4250 -> 0 bytes .../theme/baseadmin/img/login/twitter_btn.png | Bin 4579 -> 0 bytes views/pages/login.php | 17 +- 7 files changed, 415 insertions(+), 52 deletions(-) create mode 100644 media/css/auth-buttons.css create mode 100644 media/img/auth-icons.png delete mode 100644 media/theme/baseadmin/img/login/fb_btn.png delete mode 100644 media/theme/baseadmin/img/login/twitter_btn.png diff --git a/classes/lnApp/Controller/Login.php b/classes/lnApp/Controller/Login.php index 2468086..429b47e 100644 --- a/classes/lnApp/Controller/Login.php +++ b/classes/lnApp/Controller/Login.php @@ -40,12 +40,22 @@ class lnApp_Controller_Login extends Controller_TemplateDefault { } } - $output .= View::factory('pages/login'); + $oauthlogin = is_null($x=Session::instance()->get_once('login-no-oauth',NULL)) ? TRUE : ! $x; + $output .= View::factory('pages/login') + ->set('oauth',$oauthlogin); Style::factory() ->type('file') ->data('media/theme/baseadmin/css/pages/login.css'); + Style::factory() + ->type('file') + ->data('media/css/auth-buttons.css'); + + if ($oauthlogin) + foreach (ORM::factory('Oauth')->list_active() as $oo) + $output .= $oo->plugin()->html(); + $this->template->content = $output; $this->template->shownavbar = FALSE; } diff --git a/media/css/auth-buttons.css b/media/css/auth-buttons.css new file mode 100644 index 0000000..d426fff --- /dev/null +++ b/media/css/auth-buttons.css @@ -0,0 +1,382 @@ +/** + * Button Object + */ + +/** + * 1. Corrects inability to style clickable 'input' types in iOS + * 2. Remove excess padding in IE6/7 + * 3. IE6/7 inline-block hack for native block-level elements + */ + +.btn-auth, +.btn-auth:visited { + position: relative; + display: inline-block; + height: 22px; + padding: 0 1em; + border: 1px solid #999; + border-radius: 2px; + margin: 0; + text-align: center; + text-decoration: none; + font-size: 14px; + line-height: 22px; + white-space: nowrap; + cursor: pointer; + color: #222; + background: #fff; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + /* iOS */ + -webkit-appearance: none; /* 1 */ + /* IE6/7 hacks */ + *overflow: visible; /* 2 */ + *display: inline; /* 3 */ + *zoom: 1; /* 3 */ +} + +.btn-auth:hover, +.btn-auth:focus, +.btn-auth:active { + color: #222; + text-decoration: none; +} + +.btn-auth:before { + content: ""; + float: left; + width: 22px; + height: 22px; + background: url(../img/auth-icons.png) no-repeat 99px 99px; +} + +/** + * 36px + */ + +.btn-auth.large { + height: 36px; + line-height: 36px; + font-size: 20px; +} + +.btn-auth.large:before { + width: 36px; + height: 36px; +} + +/* + * Remove excess padding and border in FF3+ + */ + +.btn-auth::-moz-focus-inner { + border: 0; + padding: 0; +} + + +/* Facebook (extends .btn-auth) + ========================================================================== */ + +.btn-facebook, +.btn-facebook:visited { + border-color: #29447e; + border-bottom-color: #1a356e; + color: #fff; + background-color: #5872a7; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#637bad), to(#5872a7)); + background-image: -webkit-linear-gradient(#637bad, #5872a7); + background-image: -moz-linear-gradient(#637bad, #5872a7); + background-image: -ms-linear-gradient(#637bad, #5872a7); + background-image: -o-linear-gradient(#637bad, #5872a7); + background-image: linear-gradient(#637bad, #5872a7); + -webkit-box-shadow: inset 0 1px 0 #879ac0; + box-shadow: inset 0 1px 0 #879ac0; +} + +.btn-facebook:hover, +.btn-facebook:focus { + color: #fff; + background-color: #3b5998; +} + +.btn-facebook:active { + color: #fff; + background: #4f6aa3; + -webkit-box-shadow: inset 0 1px 0 #45619d; + box-shadow: inset 0 1px 0 #45619d; +} + +/* + * Icon + */ + +.btn-facebook:before { + border-right: 1px solid #465f94; + margin: 0 1em 0 -1em; + background-position: 0 0; +} + +.btn-facebook.large:before { + background-position: 0 -22px; +} + + +/* GitHub + ========================================================================== */ + +.btn-github, +.btn-github:visited { + border-color: #d4d4d4; + background: #ececec; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f4f4f4), to(#ececec)); + background-image: -webkit-linear-gradient(#f4f4f4, #ececec); + background-image: -moz-linear-gradient(#f4f4f4, #ececec); + background-image: -ms-linear-gradient(#f4f4f4, #ececec); + background-image: -o-linear-gradient(#f4f4f4, #ececec); + background-image: linear-gradient(#f4f4f4, #ececec); +} + +.btn-github:hover, +.btn-github:focus { + border-color: #518cc6; + border-bottom-color: #2a65a0; + color: #fff; + background-color: #599bdc; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#599bdc), to(#3072b3)); + background-image: -webkit-linear-gradient(#599bdc, #3072b3); + background-image: -moz-linear-gradient(#599bdc, #3072b3); + background-image: -ms-linear-gradient(#599bdc, #3072b3); + background-image: -o-linear-gradient(#599bdc, #3072b3); + background-image: linear-gradient(#599bdc, #3072b3); +} + +.btn-github:active { + border-color: #2A65A0; + border-bottom-color: #518CC6; + color: #fff; + background: #3072B3; + background: -webkit-gradient(linear, 0 0, 0 100%, from(#3072b3), to(#599bdc)); + background: -webkit-linear-gradient(#3072b3, #599bdc); + background: -moz-linear-gradient(#3072b3, #599bdc); + background: -ms-linear-gradient(#3072b3, #599bdc); + background: -o-linear-gradient(#3072b3, #599bdc); + background: linear-gradient(#3072b3, #599bdc); +} + +/* + * Icon + */ + +.btn-github:before { + margin: 0 0.6em 0 -0.6em; + background-position: -44px 0; +} + +.btn-github:hover:before, +.btn-github:focus:before, +.btn-github:active:before { + background-position: -66px 0; +} + +.btn-github.large:before { + background-position: -72px -22px; +} + +.btn-github.large:hover:before, +.btn-github.large:focus:before, +.btn-github.large:active:before { + background-position: -108px -22px; +} + + +/* Google + ========================================================================== */ + +.btn-google, +.btn-google:visited { + border-color: #3079ed; + color: #fff; + background: #4787ed; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4d90fe), to(#4787ed)); + background-image: -webkit-linear-gradient(#4d90fe, #4787ed); + background-image: -moz-linear-gradient(#4d90fe, #4787ed); + background-image: -ms-linear-gradient(#4d90fe, #4787ed); + background-image: -o-linear-gradient(#4d90fe, #4787ed); + background-image: linear-gradient(#4d90fe, #4787ed); +} + +.btn-google:hover, +.btn-google:focus, +.btn-google:active { + color: #fff; + background-color: #357ae8; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4d90fe), to(#357ae8)); + background-image: -webkit-linear-gradient(#4d90fe, #357ae8); + background-image: -moz-linear-gradient(#4d90fe, #357ae8); + background-image: -ms-linear-gradient(#4d90fe, #357ae8); + background-image: -o-linear-gradient(#4d90fe, #357ae8); + background-image: linear-gradient(#4d90fe, #357ae8); +} + +.btn-google:active { + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.3); +} + +/* + * Icon + */ + +.btn-google:before { + margin: 0 1em 0 -1em; + background-position: -88px 0; + background-color: #e6e6e6; +} + +.btn-google.large:before { + background-position: -144px -22px; +} + + +/* Open ID + ========================================================================== */ + +.btn-openid:hover, +.btn-openid:focus { + border-color: #777; + background: #fcfcfc; +} + +.btn-openid:active { + background: #f5f5f5; +} + +/* + * Icon + */ + +.btn-openid:before { + margin: 0 0.6em 0 -0.6em; + background-position: -154px 0; +} + +.btn-openid.large:before { + background-position: -252px -22px; +} + + +/* Twitter + ========================================================================== */ + +.btn-twitter, +.btn-twitter:visited { + border-color: #a6cde6; + color: #327695; + background: #cfe4f0; + /* css3 */ + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f5f7), to(rgba(255, 255, 255, 0))); + background-image: -webkit-linear-gradient(#f1f5f7, rgba(255, 255, 255, 0)); + background-image: -moz-linear-gradient(#f1f5f7, rgba(255, 255, 255, 0)); + background-image: -ms-linear-gradient(#f1f5f7, rgba(255, 255, 255, 0)); + background-image: -o-linear-gradient(#f1f5f7, rgba(255, 255, 255, 0)); + background-image: linear-gradient(#f1f5f7, rgba(255, 255, 255, 0)); + -webkit-box-shadow: inset 0 1px 0 #fff; + box-shadow: inset 0 1px 0 #fff; +} + +.btn-twitter:hover, +.btn-twitter:focus, +.btn-twitter:active { + color: #327695; + border-color: #8dc2e4; + background-color: #cadde9; +} + +.btn-twitter:active { + background: #cadde9; + -webkit-box-shadow: inset 0 1px 0 #bbd6e7; + box-shadow: inset 0 1px 0 #bbd6e7; +} + +/* + * Icon + */ + +.btn-twitter:before { + margin: 0 0.6em 0 -0.6em; + background-position: -22px 0; +} + +.btn-twitter.large:before { + background-position: -36px -22px; +} + + +/* Windows Live ID + ========================================================================== */ + +.btn-windows:hover, +.btn-windows:focus { + border-color: #777; + background: #fcfcfc; +} + +.btn-windows:active { + background: #f5f5f5; +} + +/* + * Icon + */ + +.btn-windows:before { + margin: 0 0.6em 0 -0.6em; + background-position: -110px 0; +} + +.btn-windows.large:before { + background-position: -180px -22px; +} + + +/* Yahoo! + ========================================================================== */ + +.btn-yahoo, +.btn-yahoo:visited { + border-color: #ffb305; + background: #ffc426; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0))); + background-image: -webkit-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)); + background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)); + background-image: -ms-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)); + background-image: -o-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)); + background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0)); +} + +.btn-yahoo:hover, +.btn-yahoo:focus { + background-color: #fabf20; +} + +.btn-yahoo:active { + border-color: #f09700; + background-image: none; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.3); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.3); +} + +/* + * Icon + */ + +.btn-yahoo:before { + margin: 0 0.6em 0 -0.6em; + background-position: -132px 0; +} + +.btn-yahoo.large:before { + background-position: -216px -22px; +} diff --git a/media/img/auth-icons.png b/media/img/auth-icons.png new file mode 100644 index 0000000000000000000000000000000000000000..00d3b032dd8e8c8d0e9d2ec72ae7086884849d59 GIT binary patch literal 7306 zcmZvhbx;&goX0m8>TEL0BmfR8VSxRq2)z zX(nVY+R-uuq?y?OIu=J!7H`z4qd>C#ZLQvv`08a((4x5 zi5&s}IPdCdX_$x4?G{O7mfK9lYT%%XOh;Bsw9h{}rz!H&#`KjwKrt~yt6o|0(>~W} znYwZq{1IzpVX7y(=(xOXK9smG>ey$vpg8+f{n%h3xW+F;Fq7#;TM0xWFYiyYeMBh_L0tr*}&hF z!2t+}@De>1NiJHlEC>^m zNS__0r?>k_>DL?US%(0b(eFYiw+L}W9>Zy~%-iaB_xqEmNRtYV^lIlm+_IV?1ooM2bmGy`fMyPf zJfRe?lHbd7AX?Bnf4pn4>gLE!BgQ(=%*b09l?=$%`0V%)hJ^Zl;bD%uuXN{}y7nv{ zy}NWPTLvBOlCjC@N_v_g(IP4y;~DF@pktcUa>r2UtEr&33; zFdKyklnf5rxImVzreBRdF56>|0(v9RVBn)p{!}26ivvFMF!>$emi>n)z+1b

>%x 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 InogMi0NI~|$p8QV literal 0 HcmV?d00001 diff --git a/media/theme/baseadmin/css/pages/login.css b/media/theme/baseadmin/css/pages/login.css index e0c7c6d..ddf728b 100644 --- a/media/theme/baseadmin/css/pages/login.css +++ b/media/theme/baseadmin/css/pages/login.css @@ -86,6 +86,10 @@ body{ color:#838383; /*font: 13px/1.7em 'Open Sans';*/} border-left: none; } +.login-social p { + margin-bottom: 1em; +} + span.login-checkbox { float: left; margin-top: 31px; @@ -137,52 +141,23 @@ span.login-checkbox > input[type='checkbox']:checked + label { } /** Buttons **/ -.twitter, .fb { +.social-btn { position: relative; height: 32px; - width: 157px; + width: 155px; display: block; - - background: url(../../img/login/twitter_btn.png) no-repeat; + padding-right: 5px; + float: left; } -.fb { - width: 162px; - - background: url(../../img/login/fb_btn.png) no-repeat; -} - -.twitter:active, .fb:active { - top: 1px; -} - -.twitter:hover, .fb:hover { - background-position: 0 -32px; -} - -.twitter a, .fb a { - padding: 5px 0 0 35px; - text-shadow: -1px -1px 0px rgba(0,0,0,.3); - color:#fff; - font-weight: bold; +.social-btn a { font-size: 11px; - height: 32px; display: block; } -.fb a { - padding: 5px 0 0 31px; - -} - -.twitter, .fb { - display: inline-block; -} - -.twitter a:hover, .fb a:hover { - color: #FFF; +.social-btn a:hover { text-decoration: none; } @@ -241,11 +216,6 @@ span.login-checkbox > input[type='checkbox']:checked + label { width: 100%; } - .twitter { - display: block; - margin-bottom: 1em; - } - .register .login-fields input { width: 204px; padding-left: 6px; @@ -253,11 +223,13 @@ span.login-checkbox > input[type='checkbox']:checked + label { } +.modal-body { + max-height: 500px; +} + .modal-body .account-container { margin-top: 10px; } - .modal-body .account-container h1 { font-weight: normal; } - diff --git a/media/theme/baseadmin/img/login/fb_btn.png b/media/theme/baseadmin/img/login/fb_btn.png deleted file mode 100644 index f820647c81cd8f5cc5eefa2c92804b1f09d806aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4250 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

@@ -45,8 +44,8 @@ +