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

* adjust style for every browser.

Browse Source
This commit is contained in:
wangyidong
2012-03-02 05:45:14 +00:00
parent 0b726c8b7d
commit 2232a46cf8
6 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
module/common/lang/en.php
View File

@@ -76,7 +76,7 @@ $lang->typeAB = 'Type';
$lang->common->common = 'Common module';
/* The main menu. */
$lang->menu->my = '<span id="mainbg"></span>Dashboard|my|index';
$lang->menu->my = '<span id="mainbg">&nbsp;</span>Dashboard|my|index';
$lang->menu->product = 'Product|product|index';
$lang->menu->project = 'Project|project|index';
$lang->menu->qa = 'Test|qa|index';
@@ -115,7 +115,7 @@ $lang->index->menu->product = 'Products|product|browse';
$lang->index->menu->project = 'Projects|project|browse';
/* Dashboard menu. */
$lang->my->menu->account = '<span id="mybg"></span>%s' . $lang->arrow;
$lang->my->menu->account = '<span id="mybg">&nbsp;</span>%s' . $lang->arrow;
$lang->my->menu->index = 'Index|my|index';
$lang->my->menu->todo = array('link' => 'Todo|my|todo|', 'subModule' => 'todo');
$lang->my->menu->task = 'Task|my|task|';
@@ -140,9 +140,9 @@ $lang->product->menu->edit = 'Edit|product|edit|productID=%s';
$lang->product->menu->delete = array('link' => 'Delete|product|delete|productID=%s', 'target' => 'hiddenwin');
$lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story';
$lang->product->menu->order = 'Order|product|order|productID=%s';
$lang->product->menu->create = array('link' => '<span class="icon-add1"></span>New Product|product|create', 'float' => 'right');
$lang->product->menu->project = array('link' => '<span class="icon-title"></span>Project list|product|project|status=all&productID=%s', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-all"></span>All product|product|index|locate=false', 'float' => 'right');
$lang->product->menu->create = array('link' => '<span class="icon-add1">&nbsp;</span>New Product|product|create', 'float' => 'right');
$lang->product->menu->project = array('link' => '<span class="icon-title">&nbsp;</span>Project list|product|project|status=all&productID=%s', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-all">&nbsp;</span>All product|product|index|locate=false', 'float' => 'right');
$lang->story->menu = $lang->product->menu;
$lang->productplan->menu = $lang->product->menu;
$lang->release->menu = $lang->product->menu;
@@ -164,9 +164,9 @@ $lang->project->menu->view = 'Info|project|view|projectID=%s';
$lang->project->menu->edit = 'Edit|project|edit|projectID=%s';
$lang->project->menu->delete = array('link' => 'Delete|project|delete|projectID=%s', 'target' => 'hiddenwin');
$lang->project->menu->order = 'Order|project|order|projectID=%s';
$lang->project->menu->create = array('link' => '<span class="icon-add1"></span>New Project|project|create', 'float' => 'right');
$lang->project->menu->copy = array('link' => '<span class="icon-copy"></span>Copy Project|project|create|projectID=&copyProjectID=%s', 'float' => 'right');
$lang->project->menu->all = array('link' => '<span class="icon-all"></span>Project list|project|index|locate=no', 'float' => 'right');
$lang->project->menu->create = array('link' => '<span class="icon-add1">&nbsp;</span>New Project|project|create', 'float' => 'right');
$lang->project->menu->copy = array('link' => '<span class="icon-copy">&nbsp;</span>Copy Project|project|create|projectID=&copyProjectID=%s', 'float' => 'right');
$lang->project->menu->all = array('link' => '<span class="icon-all">&nbsp;</span>Project list|project|index|locate=no', 'float' => 'right');
$lang->task->menu = $lang->project->menu;
$lang->build->menu = $lang->project->menu;
@@ -192,7 +192,7 @@ $lang->doc->menu->browse = array('link' => 'Doc|doc|browse|libID=%s');
$lang->doc->menu->edit = 'Edit Library|doc|editLib|libID=%s';
$lang->doc->menu->module = 'Modules|tree|browse|libID=%s&viewType=doc';
$lang->doc->menu->delete = array('link' => 'Delete Library|doc|deleteLib|libID=%s', 'target' => 'hiddenwin');
$lang->doc->menu->create = array('link' => '<span class="icon-add1"></span>New Library|doc|createLib', 'float' => 'right');
$lang->doc->menu->create = array('link' => '<span class="icon-add1">&nbsp;</span>New Library|doc|createLib', 'float' => 'right');
/* Company menu. */
$lang->company->menu->name = '%s' . $lang->arrow;
@@ -201,8 +201,8 @@ $lang->company->menu->dept = array('link' => 'Department|dept|browse', 's
$lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subModule' => 'group');
$lang->company->menu->edit = array('link' => 'Company|company|edit');
$lang->company->menu->dynamic = 'Dynamic|company|dynamic|';
$lang->company->menu->addGroup = array('link' => '<span class="icon-add1"></span>Add Group|group|create', 'float' => 'right');
$lang->company->menu->addUser = array('link' => '<span class="icon-add1"></span>Add User|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
$lang->company->menu->addGroup = array('link' => '<span class="icon-add1">&nbsp;</span>Add Group|group|create', 'float' => 'right');
$lang->company->menu->addUser = array('link' => '<span class="icon-add1">&nbsp;</span>Add User|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
$lang->dept->menu = $lang->company->menu;
$lang->group->menu = $lang->company->menu;
@@ -214,7 +214,7 @@ $lang->user->menu->bug = 'Bug|user|bug|account=%s';
$lang->user->menu->dynamic = 'Dynamic|user|dynamic|type=today&account=%s';
$lang->user->menu->projectList = 'Project|user|project|account=%s';
$lang->user->menu->profile = array('link' => 'Profile|user|profile|account=%s', 'alias' => 'edit');
$lang->user->menu->browse = array('link' => '<span class="icon-title"></span>Manage user|company|browse|', 'float' => 'right');
$lang->user->menu->browse = array('link' => '<span class="icon-title">&nbsp;</span>Manage user|company|browse|', 'float' => 'right');
/* Admin menu. */
$lang->admin->menu->index = array('link' => 'Index|admin|index', 'subModule' => 'admin');

24
module/common/lang/zh-cn.php
View File

@@ -76,7 +76,7 @@ $lang->typeAB = '类型';
$lang->common->common = '公有模块';
/* 主导航菜单。*/
$lang->menu->my = '<span id="mainbg"></span>我的地盘|my|index';
$lang->menu->my = '<span id="mainbg">&nbsp;</span>我的地盘|my|index';
$lang->menu->product = '产品视图|product|index';
$lang->menu->project = '项目视图|project|index';
$lang->menu->qa = '测试视图|qa|index';
@@ -115,7 +115,7 @@ $lang->index->menu->product = '浏览产品|product|browse';
$lang->index->menu->project = '浏览项目|project|browse';
/* 我的地盘菜单设置。*/
$lang->my->menu->account = '<span id="mybg"></span>%s' . $lang->arrow;
$lang->my->menu->account = '<span id="mybg">&nbsp;</span>%s' . $lang->arrow;
$lang->my->menu->index = '首页|my|index';
$lang->my->menu->todo = array('link' => '我的TODO|my|todo|', 'subModule' => 'todo');
$lang->my->menu->task = '我的任务|my|task|';
@@ -140,9 +140,9 @@ $lang->product->menu->edit = '编辑|product|edit|productID=%s';
$lang->product->menu->delete = array('link' => '删除|product|delete|productID=%s', 'target' => 'hiddenwin');
$lang->product->menu->module = '模块|tree|browse|productID=%s&view=story';
$lang->product->menu->order = '排序|product|order|productID=%s';
$lang->product->menu->create = array('link' => '<span class="icon-add1"></span>新增产品|product|create', 'float' => 'right');
$lang->product->menu->project = array('link' => '<span class="icon-title"></span>项目列表|product|project|status=all&productID=%s', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-all"></span>所有产品|product|index|locate=false', 'float' => 'right');
$lang->product->menu->create = array('link' => '<span class="icon-add1">&nbsp;</span>新增产品|product|create', 'float' => 'right');
$lang->product->menu->project = array('link' => '<span class="icon-title">&nbsp;</span>项目列表|product|project|status=all&productID=%s', 'float' => 'right');
$lang->product->menu->all = array('link' => '<span class="icon-all">&nbsp;</span>所有产品|product|index|locate=false', 'float' => 'right');
$lang->story->menu = $lang->product->menu;
$lang->productplan->menu = $lang->product->menu;
$lang->release->menu = $lang->product->menu;
@@ -164,9 +164,9 @@ $lang->project->menu->view = '概况|project|view|projectID=%s';
$lang->project->menu->edit = '编辑|project|edit|projectID=%s';
$lang->project->menu->delete = array('link' => '删除|project|delete|projectID=%s', 'target' => 'hiddenwin');
$lang->project->menu->order = '排序|project|order|projectID=%s';
$lang->project->menu->create = array('link' => '<span class="icon-add1"></span>新增项目|project|create', 'float' => 'right');
$lang->project->menu->copy = array('link' => '<span class="icon-copy"></span>复制项目|project|create|projectID=&copyProjectID=%s', 'float' => 'right');
$lang->project->menu->all = array('link' => '<span class="icon-all"></span>所有项目|project|index|locate=false', 'float' => 'right');
$lang->project->menu->create = array('link' => '<span class="icon-add1">&nbsp;</span>新增项目|project|create', 'float' => 'right');
$lang->project->menu->copy = array('link' => '<span class="icon-copy">&nbsp;</span>复制项目|project|create|projectID=&copyProjectID=%s', 'float' => 'right');
$lang->project->menu->all = array('link' => '<span class="icon-all">&nbsp;</span>所有项目|project|index|locate=false', 'float' => 'right');
$lang->task->menu = $lang->project->menu;
$lang->build->menu = $lang->project->menu;
@@ -192,7 +192,7 @@ $lang->doc->menu->browse = array('link' => '文档列表|doc|browse|libID=%s');
$lang->doc->menu->edit = '编辑文档库|doc|editLib|libID=%s';
$lang->doc->menu->module = '维护模块|tree|browse|libID=%s&viewType=doc';
$lang->doc->menu->delete = array('link' => '删除文档库|doc|deleteLib|libID=%s', 'target' => 'hiddenwin');
$lang->doc->menu->create = array('link' => '<span class="icon-add1"></span>新增文档库|doc|createLib', 'float' => 'right');
$lang->doc->menu->create = array('link' => '<span class="icon-add1">&nbsp;</span>新增文档库|doc|createLib', 'float' => 'right');
/* 组织结构视图菜单设置。*/
$lang->company->menu->name = '%s' . $lang->arrow;
@@ -201,8 +201,8 @@ $lang->company->menu->dept = array('link' => '部门维护|dept|browse',
$lang->company->menu->browseGroup = array('link' => '权限分组|group|browse', 'subModule' => 'group');
$lang->company->menu->edit = array('link' => '公司管理|company|edit');
$lang->company->menu->dynamic = '组织动态|company|dynamic|';
$lang->company->menu->addGroup = array('link' => '<span class="icon-add1"></span>添加分组|group|create', 'float' => 'right');
$lang->company->menu->addUser = array('link' => '<span class="icon-add1"></span>添加用户|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right');
$lang->company->menu->addGroup = array('link' => '<span class="icon-add1">&nbsp;</span>添加分组|group|create', 'float' => 'right');
$lang->company->menu->addUser = array('link' => '<span class="icon-add1">&nbsp;</span>添加用户|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right');
$lang->dept->menu = $lang->company->menu;
$lang->group->menu = $lang->company->menu;
@@ -214,7 +214,7 @@ $lang->user->menu->bug = 'Bug列表|user|bug|account=%s';
$lang->user->menu->dynamic = '用户动态|user|dynamic|type=today&account=%s';
$lang->user->menu->projectList = '项目列表|user|project|account=%s';
$lang->user->menu->profile = array('link' => '用户信息|user|profile|account=%s', 'alias' => 'edit');
$lang->user->menu->browse = array('link' => '<span class="icon-title"></span>用户管理|company|browse|', 'float' => 'right');
$lang->user->menu->browse = array('link' => '<span class="icon-title">&nbsp;</span>用户管理|company|browse|', 'float' => 'right');
/* 后台管理菜单设置。*/
$lang->admin->menu->index = array('link' => '首页|admin|index', 'subModule' => 'admin');

2
module/common/model.php
View File

@@ -296,7 +296,7 @@ class commonModel extends model
if(common::hasPriv($module, $method))
{
/* Is the currentModule active? */
if($currentModule == $subModule) $active = 'active';
if($currentModule == $subModule and $float != 'right') $active = 'active';
if($module == $currentModule and ($method == $currentMethod or strpos($alias, $currentMethod) !== false) and $float != 'right') $active = 'active';
echo "<li class='$float $active'>" . html::a(helper::createLink($module, $method, $vars), $label, $target, "id=submenu$subMenuKey") . "</li>\n";
}

10
module/my/view/blockprojects.html.php
View File

@@ -1,6 +1,6 @@
<div class='block linkbox1' id='projectbox'>
<?php if(count($projectStats) == 0):?>
<table class='table-1 a-center emptybg' height='140px'>
<table class='table-1 a-center emptybg' height='138px'>
<caption><span class='icon-title'></span><?php echo $lang->my->home->projects;?></caption>
<tr>
<td valign='middle'>
@@ -9,10 +9,10 @@
<td><span class='icon-notice'></span></td>
<td><?php printf($lang->my->home->noProjectsTip, $this->createLink('project', 'create'));?></td>
</tr>
<tr>
<td></td>
<td class='h-30px'><?php echo $lang->my->home->otherNoTip;?></td>
</tr>
<tr>
<td></td>
<td class='h-30px'><?php echo $lang->my->home->otherNoTip;?></td>
</tr>
<tr>
<td><span class='icon-help'></span></td>
<td><?php echo $lang->my->home->help; ?></td>

2
www/js/my.full.js
View File

@@ -437,7 +437,7 @@ function setContentHeight()
var footerH = $('#footer').height();
if(document.documentElement.clientHeight >= document.documentElement.scrollHeight)
{
var outerH = winHeight - headerH - footerH - 85;
var outerH = winHeight - headerH - footerH - 90;
if ($.browser.msie && ($.browser.version == "6.0") && !$.support.style) outerH = winHeight - headerH - footerH - 98;
$('.outer').height(outerH);
}

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

@@ -277,8 +277,10 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
#mainmenu a {color:white; font-weight:normal;}
#mainmenu .active {background-color:#e5e5e5;}
#mainmenu .active a {color:#33a52e; font-weight:bold;}
#mainmenu #mainbg{ padding-left:16px; background:url(images/main/index_bg.png) left bottom;}
#mainmenu .active #mainbg{ padding-left:16px; background:url(images/main/index_bg.png) left top;}
#mainmenu #mainbg{ padding-left:12px; background:url(images/main/index_bg.png) left bottom;}
/* For IE 6*/
*html #mainmenu #mainbg{ background:none;}
#mainmenu .active #mainbg{background-position: left top;}
#mainmenu #searchbox{float:right; border:none; background:#E5E5E5 url(images/main/search_bg.png) repeat-x bottom; height:100%;}
#mainmenu .button-s{border:none; padding:2px}
@@ -295,7 +297,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
#modulemenu .active a {color:#fff; background:#33a52e; padding:4px 4px 2px 4px;}
#modulemenu .right {float:right; font-weight:bold;}
#modulemenu .right a { font-weight:bold}
#modulemenu #mybg{ padding-left:16px; background:url(images/main/ui-gray.png); background-position:-146px 142px;}
#modulemenu #mybg{ padding-left:10px; background:url(images/main/ui-gray.png); background-position:-146px 144px;}
/* Product, project and objects switcher. */
#productID {background:#EDEFF4; border:1px solid #e5e5e5}
@@ -377,15 +379,15 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
.owner {background:#e4e4e4; font-size:smaller}
.emptybg { background:#efefef;}
a { text-decoration:none;}
.icon-search { padding-left:18px; background:url(images/main/ui-green.png) -160px 128px; border:0px;}
.icon-add1 { padding-left:18px; background:url(images/main/ui-green.png) -32px 112px;}
.icon-title { padding-left:16px; background:url(images/main/ui-green.png) 0px 144px;}
.icon-all { padding-left:18px; background:url(images/main/ui-green.png) -176px 112px;}
.icon-copy { padding-left:18px; background:url(images/main/ui-green.png) -48px 160px;}
.icon-add2 { padding-left:18px; background:url(images/main/ui-gray.png) 0px 48px;}
.icon-search { padding-left:16px; background:url(images/main/ui-green.png) -160px 128px; border:0px;}
.icon-add1 { padding-left:16px; background:url(images/main/ui-green.png) -32px 112px;}
.icon-title { padding-left:15px; background:url(images/main/ui-green.png) 2px 144px;}
.icon-all { padding-left:16px; background:url(images/main/ui-green.png) -173px 112px;}
.icon-copy { padding-left:16px; background:url(images/main/ui-green.png) -48px 160px;}
.icon-add2 { padding-left:16px; background:url(images/main/ui-gray.png) 0px 48px;}
.icon-notice { padding-left:16px; background:url(images/main/ui-gray.png) -18px 96px;}
.icon-file { padding-left:16px; background:url(images/main/ui-gray.png) -32px 144px;}
.icon-arrow { padding-left:8px; background:url(images/main/ui-gray.png) -32px 0px;}
.icon-arrow { padding-left:10px; background:url(images/main/ui-gray.png) -32px 0px;}
#form-content { margin:5px 25px; border:none;}
#form-content .button-s{ background:url(images/main/button_95x36.png) left top; border:none; height:36px; width:95px; color:#f1f1f1;}