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

* ajusted style of 'topNavbar'.

Browse Source
This commit is contained in:
Catouse
2014-04-21 11:00:42 +08:00
parent 8e21998053
commit 332787a657
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
module/common/model.php
View File

@@ -223,19 +223,8 @@ 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>";
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>';
echo "<ul class='dropdown-menu pull-right'><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>";
@@ -249,6 +238,15 @@ class commonModel extends model
}
echo '</ul></div>';
if($app->user->account == 'guest')
{
echo html::a(helper::createLink('user', 'login'), $lang->login);
}
else
{
echo html::a(helper::createLink('user', 'logout'), $lang->logout);
}
}
echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-class='modal-about'");
}

4
www/theme/default/style.css
View File

@@ -304,9 +304,9 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
#topbar > .pull-right {margin-top: -4px;}
#topnav .dropdown-menu {min-width: 100px;}
#topnav > .dropdown .caret {border-top-color: #fff}
#topnav > .dropdown, #topnav > a {display: block; float: left; padding: 3px 10px; position: relative;}
#topnav > .dropdown, #topnav > a {display: block; float: left;}
#topnav > .dropdown > a, #topnav > a {display: block; padding: 3px 8px; position: relative;}
#topnav > .dropdown:hover, #topnav > .dropdown.open, #topnav > a:hover {background: #185695}
#topnav > a:before {content: ' '; display: block; position: absolute; left: -1px; border-left: 1px solid #999; height: 14px; top: 4px}
#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}