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

module/user/js/login.js

@@ -18,5 +18,62 @@ $(document).ready(function()
         });
     });
     mBtn.attr('title', mBtn.attr('data-original-title'));
-
+    showNotice();
 })
+
+/**
+ * Show browser notice 
+ * 
+ * @access public
+ * @return void
+ */
+function showNotice()
+{
+    var show = false;
+    var type = '';
+    /* IE 6,7. */
+    if($.browser.msie && $.browser.version <= 7)
+    {
+        show = true;
+        type = 'incompatible';
+    }
+
+    /* Souhu */
+    if(window.clientInformation.userAgent.indexOf('MetaSr') >= 0)
+    {
+        show = true;
+        type = 'notice';
+    }
+    else if(window.clientInformation.userAgent.indexOf('LBBROWSER') >= 0)
+    {
+        show = true;
+        type = 'notice';
+    }
+    else if(window.clientInformation.userAgent.indexOf('QQBrowser') >= 0)
+    {
+        show = true;
+        type = 'notice';
+    }
+    else if(window.clientInformation.userAgent.indexOf('TheWorld') >= 0)
+    {
+        show = true;
+        type = 'notice';
+    }
+    else if(window.clientInformation.userAgent.indexOf('BIDUBrowser') >= 0)
+    {
+        show = true;
+        type = 'notice';
+    }
+    else if(window.clientInformation.userAgent.indexOf('Maxthon') >= 0)
+    {
+        show = true;
+        type = 'notice';
+    }
+    /* 360. */
+    else if($.browser.chrome && !(window.clientInformation && window.clientInformation.mediaDevices))
+    {
+        show = true;
+        type = 'notice';
+    }
+    if(show) $('body').prepend('<div class="alert ' + (type == 'notice' ? 'alert-info' : 'alert-danger') + ' alert-dismissable"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button><p>' + browser[type] + '</p></div>');
+}

module/user/lang/en.php

@@ -182,3 +182,5 @@ $lang->user->noticeResetFile = "<h5>For security reason, system need to confirm
     <li>Keep the ok.txt content empty.</li>
     <li>If the file exists already, remove and recreate it again.</li>
     </ol>"; 
+$lang->user->browser['incompatible'] = 'ZenTao is not compatible with IE7,IE6 browser, please replace other browsers!';
+$lang->user->browser['notice']       = 'Use the browser, display and function may have problems, recommend the use of Chrome browser';

module/user/lang/zh-cn.php

@@ -182,3 +182,5 @@ $lang->user->noticeResetFile = '<h5>为了安全起见，系统需要确认您
     <li>文件内容为空。</li>
     <li>如果之前文件存在，删除之后重新创建。</li>
     </ol>'; 
+$lang->user->browser['incompatible'] = '禅道不兼容IE6、IE7浏览器，请更换其他浏览器！';
+$lang->user->browser['notice']       = '您可能使用的是杂牌浏览器，页面显示及功能可能会有问题，建议使用Chrome浏览器';

module/user/view/login.html.php

@@ -76,4 +76,5 @@ include '../../common/view/header.lite.html.php';
     <?php endif;?>
   </div>
 </div>
+<?php js::set('browser', $lang->user->browser)?>
 <?php include '../../common/view/footer.lite.html.php';?>