From 9598eec787cf76c8464018fde2a811affb68ee78 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Tue, 22 Apr 2014 17:45:34 +0800
Subject: [PATCH]  * ajusted style of qrcode btn in footer and login form.

---
 module/common/model.php     |  4 ++--
 module/user/js/login.js     | 10 +++++++++-
 www/theme/default/style.css |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 90c82cad27..8a897f20d3 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -248,7 +248,7 @@ class commonModel extends model
                 echo html::a(helper::createLink('user', 'logout'), $lang->logout);
             }
         }
-        
+
         if($app->company->website)  echo html::a($app->company->website,  $lang->company->website,  '_blank');
         if($app->company->backyard) echo html::a($app->company->backyard, $lang->company->backyard, '_blank');      
 
@@ -557,7 +557,7 @@ class commonModel extends model
     public static function printQRCodeLink($color = '')
     {
         global $lang;
-        echo html::a('javascript:;', "<i class='icon-mobile-phone icon-large'></i> " . $lang->user->mobileLogin, '', "class='qrCode $color' id='qrcodeBtn'");
+        echo html::a('javascript:;', "<i class='icon-qrcode'></i>", '', "class='qrCode $color' id='qrcodeBtn' title='{$lang->user->mobileLogin}'");
         echo "<div class='popover top' id='qrcodePopover'><div class='arrow'></div><h3 class='popover-title'>{$lang->user->mobileLogin}</h3><div class='popover-content'><img src=\"" . helper::createLink('misc', 'qrCode') . "\"></div></div>";
         echo '<script>$(function(){$("#qrcodeBtn").click(function(){$("#qrcodePopover").toggleClass("show");}); $("#wrap").click(function(){$("#qrcodePopover").removeClass("show");});});</script>';
     }
diff --git a/module/user/js/login.js b/module/user/js/login.js
index b6eeea01bf..c1d9625511 100644
--- a/module/user/js/login.js
+++ b/module/user/js/login.js
@@ -8,5 +8,13 @@ $(document).ready(function()
         selectLang($(this).data('value'));
     });
 
-    $('#mobile').popover({html: true, container: 'body'});
+    $('#mobile').popover({html: true, container: 'body'}).click(function(event)
+    {
+        event.stopPropagation();
+    });
+
+    $(document).click(function()
+    {
+        $('#mobile').popover('hide');
+    });
 })
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 60c475cc0e..51137cc3f2 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -374,7 +374,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
 #crumbs .icon-angle-right{margin-right: 6px;}
 #footer #poweredby {float: right; margin-right: 20px;}
 #qrcodePopover.show {display: block; position: fixed; right: 5px; bottom: 40px; left: inherit; top: inherit;}
-#qrcodePopover.popover.top .arrow {left: 85%}
+#qrcodePopover.popover.top .arrow {left: inherit; right: 10px}
 
 
 /* Feature bar. */