Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* ajusted ui of topbar.

Browse Source
This commit is contained in:
Catouse
2014-04-17 14:11:00 +08:00
parent c42329314b
commit 4f32ba4b31
5 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.php
+2 -2
View File
@@ -40,8 +40,8 @@ $config->views = ',html,json,mhtml,';
$config->wideSize = 1400;
/* Supported languages. */
$config->langs['zh-cn'] = '中文简体';
$config->langs['zh-tw'] = '中文繁體';
$config->langs['zh-cn'] = '简体';
$config->langs['zh-tw'] = '繁體';
$config->langs['en'] = 'English';
/* Supported charsets. */
module/common/lang/zh-cn.php
+4
View File
@@ -122,7 +122,11 @@ $lang->exportFileTypeList['html'] = 'html';
$lang->exportTypeList['all'] = '全部记录';
$lang->exportTypeList['selected'] = '选中记录';
/* 语言 */
$lang->lang = '语言';
/* 风格列表。*/
$lang->theme = '主题';
$lang->themes['default'] = '默认';
$lang->themes['green'] = '绿色';
$lang->themes['red'] = '红色';
module/common/model.php
+29 -21
View File
@@ -219,30 +219,38 @@ class commonModel extends model
{
global $lang, $app;
printf($lang->todayIs, date(DT_DATE4));
if(isset($app->user)) echo $app->user->realname . ' ';
if(isset($app->user) and $app->user->account != 'guest')
if(isset($app->user))
{
echo html::a(helper::createLink('user', 'logout'), $lang->logout);
}
else
{
echo html::a(helper::createLink('user', 'login'), $lang->login);
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>";
if($app->user->account == 'guest')
{
echo ' &nbsp; ' . html::a(helper::createLink('user', 'login'), $lang->login);
}
echo "<ul class='dropdown-menu pull-right'>";
if($app->user->account != 'guest')
{
echo '<li>' . html::a(helper::createLink('user', 'logout'), $lang->logout) . '</li>';
echo "<li class='divider'></li>";
}
echo "<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>";
}
echo "<li class='divider'></li>";
echo "<li class='dropdown-header'>" . $lang->lang . '</li>';
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></div>';
}
echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true'");
echo $lang->agileTraining;
echo "<div class='dropdown' id='langSelection'><a href='javascript:;' data-toggle='dropdown'>" . $app->config->langs[$app->cookie->lang] . " <span class='caret'></span></a><ul class='dropdown-menu pull-right'>";
foreach ($app->config->langs as $key => $value)
{
echo "<li" . ($app->cookie->lang == $key ? " class='active'" : '') . "><a href='javascript:selectLang(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
}
echo '</ul></div>';
echo "<div class='dropdown' id='themeSelection'><a href='javascript:;' data-toggle='dropdown'>" . $app->lang->themes[$app->cookie->theme] . " <span class='caret'></span></a><ul class='dropdown-menu pull-right'>";
foreach ($app->lang->themes as $key => $value)
{
echo "<li" . ($app->cookie->theme == $key ? " class='active'" : '') . "><a href='javascript:selectTheme(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
}
echo '</ul></div>';
}
/**
module/company/lang/zh-cn.php
+2 -2
View File
@@ -30,8 +30,8 @@ $lang->company->phone = '联系电话';
$lang->company->fax = '传真';
$lang->company->address = '通讯地址';
$lang->company->zipcode = '邮政编码';
$lang->company->website = '公司官网';
$lang->company->backyard = '公司内网';
$lang->company->website = '官网';
$lang->company->backyard = '内网';
$lang->company->pms = 'PMS网站';
$lang->company->guest = '匿名登录';
www/theme/default/style.css
+11 -6
View File
@@ -76,8 +76,12 @@ tr.text-top td {vertical-align: top!important;}
.label-badge {padding: 2px 6px}
/* dropdown */
.dropdown-menu > li > a {font-size: 12px;}
.dropdown-menu > .active > a {font-weight: bold;}
.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;}
.dropdown-menu > .active > a:before {content: '\e60d'; font-family: ZenIcon; font-size: 14px; position: absolute; left: 5px; top: 4px; display: block; color: #808080; font-weight: normal;}
.dropdown-menu .divider {margin: 1px 0}
.dropdown-header {padding: 5px 25px}
/* hr */
hr.small {margin: 10px 0}
@@ -285,13 +289,14 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
/* Header */
#header {padding: 12px 20px 0; background:#003366;}
#topbar {color: #ACCADF}
#topbar {color: #ACCADF;}
#topbar > .pull-right {margin-top: -2px;}
#topnav .dropdown {display: inline-block;}
#topnav .dropdown-menu {min-width: inherit;}
#topnav .dropdown-menu {min-width: 100px;}
#topnav > .dropdown .caret {border-top-color: #fff}
#topnav > .dropdown, #topnav > a {display: inline-block; margin-left: 4px;}
#topnav > .dropdown, #topnav > a {display: inline-block; margin-left: 5px;}
#topnav > .dropdown:before, #topnav > a:before {content: '|'; display: inline-block; margin-right: 6px; color: #999}
#topnav > a:first-child:before {display: none}
#topnav > *:first-child:before {display: none}
#topnav > a, #topnav > .dropdown > a, #companyname a {color:#d1e4f2;text-decoration:none;}
#topnav > a:hover, #topnav > .dropdown > a:hover, #companyname a:hover {color: #fff;}
#companyname {color:#ffcc00; font-weight: normal; margin: 0}