From 6fff62932fef758a32dcb741a7db4426bcde021f Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Fri, 2 May 2014 13:52:51 +0800
Subject: [PATCH]  * ajusted ui of language menu on 'topNavbar'.

---
 module/common/lang/zh-cn.php | 2 +-
 module/common/model.php      | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 3a33128c9d..d30f83811c 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -124,7 +124,7 @@ $lang->exportTypeList['all']      = '全部记录';
 $lang->exportTypeList['selected'] = '选中记录';
 
 /* 语言 */
-$lang->lang = '语言';
+$lang->lang = 'Language';
 
 /* 风格列表。*/
 $lang->theme               = '主题';
diff --git a/module/common/model.php b/module/common/model.php
index a774e80d14..8ba996e82d 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -235,8 +235,10 @@ class commonModel extends model
                 echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), $lang->changePassword, '', "class='iframe' data-width='500'") . '</li>';
                 echo "<li class='divider'></li>";
             }
+
+            $isLeft = ($app->company->website and $app->company->backyard) ? '' : ' left';
             
-            echo "<li class='dropdown-submenu" . (($app->company->website and $app->company->backyard) ? '' : ' left') . "'>";
+            echo "<li class='dropdown-submenu{$isLeft}'>";
             echo "<a href='javascript:;'>" . $lang->theme . "</a><ul class='dropdown-menu'>";
             foreach ($app->lang->themes as $key => $value)
             {
@@ -244,12 +246,13 @@ class commonModel extends model
             }
             echo '</ul></li>';
 
-            echo "<li class='divider'></li>";
-            echo "<li class='dropdown-header'>" . $lang->lang . '</li>';
+            echo "<li class='dropdown-submenu{$isLeft}'>";
+            echo "<a href='javascript:;'>" . $lang->lang . "</a><ul class='dropdown-menu'>";
             foreach ($app->config->langs as $key => $value)
             {
                 echo "<li class='lang-option" . ($app->cookie->lang == $key ? " active" : '') . "'><a href='javascript:selectLang(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
             }
+            echo '</ul></li>';
             
             echo '</ul></div>';