Merge branch 'master' of git@github.com:easysoft/zentaopms

lib/dao/dao.class.php

@@ -486,7 +486,7 @@ class dao
 
             /* Remove the part after order and limit. */
             $subLength = strlen($sql);
-            $orderPOS  = strripos($sql, 'order');
+            $orderPOS  = strripos($sql, 'order ');
             $limitPOS  = strripos($sql , 'limit');
             if($limitPOS) $subLength = $limitPOS;
             if($orderPOS) $subLength = $orderPOS;

module/common/lang/en.php

@@ -126,7 +126,7 @@ $lang->exportTypeList['selected'] = 'Only checked';
 $lang->themes['default']   = 'Default';
 $lang->themes['green']     = 'Green';
 $lang->themes['red']       = 'Red';
-$lang->themes['classblue'] = 'Blue';
+$lang->themes['lightblue'] = 'Light Blue';
 
 /* Index mododule menu. */
 $lang->index = new stdclass();

module/common/lang/zh-cn.php

@@ -130,7 +130,7 @@ $lang->theme               = '主题';
 $lang->themes['default']   = '默认';
 $lang->themes['green']     = '绿色';
 $lang->themes['red']       = '红色';
-$lang->themes['classblue'] = '经典蓝';
+$lang->themes['lightblue'] = '亮蓝';
 
 /* 首页菜单设置。*/
 $lang->index = new stdclass();

module/common/model.php

@@ -224,7 +224,7 @@ class commonModel extends model
             echo "<div class='dropdown' id='userMenu'>";
             echo "<a href='javascript:;' data-toggle='dropdown'><i class='icon-user'></i> " . $app->user->realname . " <span class='caret'></span></a>";
 
-            echo "<ul class='dropdown-menu pull-right'><li class='dropdown-header'>" . $lang->theme . '</li>';
+            echo "<ul class='dropdown-menu'><li class='dropdown-header'>" . $lang->theme . '</li>';
             foreach ($app->lang->themes as $key => $value)
             {
                 echo "<li class='theme-option" . ($app->cookie->theme == $key ? " active" : '') . "'><a href='javascript:selectTheme(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
@@ -248,6 +248,10 @@ 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');      
+
         echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-class='modal-about'");
     }
 
@@ -553,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>';
     }

module/common/view/header.html.php

@@ -10,12 +10,6 @@ include 'chosen.html.php';
     <div class='pull-right' id='topnav'><?php commonModel::printTopBar();?></div>
     <h5 id='companyname'>
       <?php printf($lang->welcome, $app->company->name);?>
-      <small class='actions'>
-        <?php
-        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');      
-        ?>
-      </small>
     </h5>
   </div>
   <nav id='mainmenu'>

module/user/js/login.js

@@ -8,5 +8,15 @@ $(document).ready(function()
         selectLang($(this).data('value'));
     });
 
-    $('#mobile').popover({html: true, container: 'body'});
+    var mBtn = $('#mobile');
+    mBtn.popover({html: true, container: 'body'}).click(function(event)
+    {
+        event.stopPropagation();
+        $(document).one('click', function()
+        {
+            $('#mobile').popover('hide');
+        });
+    });
+    mBtn.attr('title', mBtn.attr('data-original-title'));
+
 })

module/user/view/login.html.php

@@ -23,7 +23,7 @@ include '../../common/view/header.lite.html.php';
             <?php endforeach;?>
           </ul>
         </div>
-        <button data-placement='bottom' data-toggle='popover' data-content="<?php if(extension_loaded('gd')) echo "<img height='297' width='297' src='" . $this->createLink('misc', 'qrcode') . "' />"; else echo $noGDLib; ?>" data-original-title="<i class='icon-mobile-phone'></i> <?php echo $lang->user->mobileLogin;?>" id='mobile' class='btn' title='<?php echo $lang->user->mobileLogin; ?>'><i class='icon-mobile-phone'></i></button>
+        <button data-placement='bottom' data-toggle='popover' data-content="<?php if(extension_loaded('gd')) echo "<img height='297' width='297' src='" . $this->createLink('misc', 'qrcode') . "' />"; else echo $noGDLib; ?>" title="<?php echo $lang->user->mobileLogin;?>" id='mobile' class='btn'><i class='icon-mobile-phone'></i></button>
       </div>
     </div>
     <div class="panel-content" id="login-form">

www/theme/default/style.css

@@ -77,6 +77,7 @@ tr.text-top td {vertical-align: top!important;}
 .label-badge {padding: 2px 6px}
 
 /* dropdown */
+.dropdown-menu {min-width: 80px}
 .dropdown-menu > li > a {font-size: 12px; padding: 5px 25px}
 .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:active {background: #f1f1f1; font-weight: bold;}
 .dropdown-menu > .active {position: relative;}
@@ -374,7 +375,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. */
@@ -447,7 +448,6 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
 .outer .table-form .table tbody > tr:last-child td {border-bottom: 1px solid #e5e5e5; padding-top: 5px}
 .outer .table.table-data.table-borderless tbody > tr:last-child td, .outer .table.table-form tbody > tr:last-child td {border: none}
 .outer .table tfoot td {border-top: 1px solid #ddd}
-.outer .table tfoot .dropdown-menu {min-width: 100px}
 .outer .table tfoot .form-control {padding: 1px 8px; height: 30px}
 .outer .table tfoot .btn {padding: 4px 12px;}
 .outer .table tfoot .btn > i {display: inline-block; margin-right: 1px; opacity: 0.8}