diff --git a/module/common/model.php b/module/common/model.php index ca6c82e356..16b8c52630 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -539,6 +539,18 @@ class commonModel extends model echo html::a(helper::createLink('misc', 'qrCode'), "" . $lang->user->mobileLogin, '', "class='qrCode $color'"); } + /** + * Print QR code Link. + * + * @static + * @access public + * @return void + */ + public static function getQRCodeLink() + { + echo helper::createLink('misc', 'qrCode'); + } + /** * Diff two string. (see phpt) * diff --git a/module/user/css/login.css b/module/user/css/login.css index d61748c2ea..579a1fb501 100644 --- a/module/user/css/login.css +++ b/module/user/css/login.css @@ -108,7 +108,10 @@ html,body{background-color: #036;} width: 212px; } #login-panel .panel-content .button-s{ - min-width: 120px; + width: 120px; +} +#login-panel .panel-content .button-c{ + width: 88px; } #login-panel .panel-foot{ text-align: center; @@ -117,5 +120,45 @@ html,body{background-color: #036;} background-color: #e5e5e5; border-top: 1px solid #dfdfdf; } +.droppanel{ + display: none; + margin: 0; + padding: 4px 0; + position: absolute; + left: 0; + top: 55px; + background-color: #fff; + -moz-box-shadow:0px 2px 6px rgba(0,0,0,0.5); -webkit-box-shadow:0px 2px 6px rgba(0,0,0,0.5); box-shadow:0px 2px 6px rgba(0,0,0,0.5); + z-index: 9999; +} +#langs{ + left: -166px; +} +#qrcode{ + left: -310px; + padding: 0; +} +#qrcode h4{ + background-color: #e5e5e5; + line-height: 2em; + padding:5px 15px; +} +.droppanel li{ + list-style: none; + min-width: 120px; + font-size: 14px; +} +.droppanel li a{ + display: block; + padding: 8px 15px; + border-bottom: 1px dashed #eee; +} +.droppanel li a:hover{ + background-color: #e5e5e5; + color: #333; +} +.droppanel li a.active{ + background-color: #FAFFBD; +} #poweredby{float: none; color: #eee;text-align: center;margin-top: 20px;} #poweredby a{color: #fff;} \ No newline at end of file diff --git a/module/user/js/login.js b/module/user/js/login.js index b8e03a2a86..88477beff2 100644 --- a/module/user/js/login.js +++ b/module/user/js/login.js @@ -2,4 +2,29 @@ function setForm(){} $(document).ready(function() { $('#account').focus(); + + $("#lang").click(function(event) + { + $("#langs").toggle(); + event.stopPropagation(); + }); + + $(document).click(function(event) + { + $("#langs").hide(); + $("#qrcode").hide(); + }); + + $("#langs a").click(function() + { + $("#langs a").removeClass('active'); + $(this).addClass("active"); + selectLang($(this).attr("data-value")); + }); + + $("#mobile").click(function(event) { + $("#qrcode").toggle(); + event.stopPropagation(); + return false; + }); }) diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 4ab4065b0c..3994e5a41c 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -9,6 +9,7 @@ * @version $Id: login.html.php 5084 2013-07-10 01:31:38Z wyd621@gmail.com $ */ include '../../common/view/header.lite.html.php'; +// include '../../common/view/colorbox.html.php'; ?>
@@ -19,7 +20,15 @@ include '../../common/view/header.lite.html.php';
@@ -50,9 +59,7 @@ include '../../common/view/header.lite.html.php';
-
- -
+
user->loginWithDemoUser; ?> @@ -77,4 +84,42 @@ include '../../common/view/header.lite.html.php';
- \ No newline at end of file + +