From 1beee1808f423d88f616f50316ddbb4f176e8f51 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 9 Nov 2016 16:06:53 +0800 Subject: [PATCH] * adjust for doc. --- module/common/lang/en.php | 3 +-- module/common/lang/zh-cn.php | 1 - module/doc/control.php | 1 - module/doc/css/common.css | 12 ++++++------ module/doc/css/index.css | 2 +- module/doc/js/common.js | 4 ++-- module/doc/lang/en.php | 4 ++-- module/doc/lang/zh-cn.php | 2 +- module/doc/view/index.html.php | 4 ++-- module/doc/view/view.html.php | 1 + 10 files changed, 16 insertions(+), 18 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index bf7d20e2ee..364eb23590 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -261,9 +261,8 @@ $lang->testtask->menu = $lang->testcase->menu; $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); -$lang->doc->menu->type = array('link' => "%s", 'fixed' => true); $lang->doc->menu->list = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->index = array('link' => ' Homepage|doc|index|', 'float' => 'right'); +$lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); $lang->doc->menu->create = array('link' => ' Add Doc Lib|doc|createLib', 'float' => 'right'); /* 统计视图菜单设置。*/ diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 15a528ef41..48f2012440 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -263,7 +263,6 @@ $lang->doc->menu = new stdclass(); $lang->doc->menu->list = array('link' => '%s', 'fixed' => true); $lang->doc->menu->crumb = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->index = array('link' => ' 文档主页|doc|index|', 'float' => 'right'); $lang->doc->menu->create = array('link' => ' 添加文档库|doc|createLib', 'float' => 'right'); /* 统计视图菜单设置。*/ diff --git a/module/doc/control.php b/module/doc/control.php index 6329b9bdbd..547d0357f2 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -38,7 +38,6 @@ class doc extends control { $products[] = $this->lang->doc->systemLibs['product']; - unset($this->lang->doc->menu->index); $this->doc->setMenu(array($this->lang->doclib->select)); $products = $this->doc->getLimitLibs('product', '9'); diff --git a/module/doc/css/common.css b/module/doc/css/common.css index bc8e8e1ecc..20dc8d226b 100644 --- a/module/doc/css/common.css +++ b/module/doc/css/common.css @@ -26,14 +26,14 @@ .lib-menu-list-heading {background-color: #fafafa; color: #808080; padding: 0 10px; text-align: center; display: inline-block; margin: 0 0 10px 10px; border: 1px solid #ddd; line-height: 20px; border-radius: 10px;} .lib-menu-list-heading:hover {border-color: #114f8e; cursor: pointer; color: #114f8e;} .lib-menu-list-heading > .icon {display: none} -.lib-menu-list {max-height: 500px; overflow-y: auto; min-height: 100px;} -.list-menu-item-heading {padding: 0 10px; font-weight: bold; color: #141414; white-space: nowrap; text-overflow: ellipsis; overflow:hidden; float: left; max-width:50%} +.lib-menu-list {max-height: 500px; overflow-y: auto; min-height: 100px; line-height:25px;} +.list-menu-item-heading {padding: 0 3px 0 0px; color: #141414; white-space: nowrap; overflow:hidden; float: left; width:35%;text-align:right;} .list-menu-item-heading > .icon {display: inline-block; width: 18px;} -.list-menu-item {padding: 0 8px 0 10px; display: block; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; float: left} -.list-menu-item.current {background-color: #EBF2F9;} +.list-menu-item {padding: 0 8px 0 5px; display: block; overflow: hidden; white-space: nowrap; float: left; color:#3280FC;} +.list-menu-item.current {background-color: #EBF2F9; color:red} .list-menu-item.active, -.list-menu-item:hover {background-color: #e5e5e5; color: #1a53ff} -.list-menu-item-footer {clear:left; border-top: 1px dotted #ddd;} +.list-menu-item:hover {color: #1a53ff} +.list-menu-item-footer {clear:left} #searchLib {padding: 2px 8px; height: 28px; max-width: 190px;} #dropMenu[data-filter] #libMenuGroups {table-layout: auto;} diff --git a/module/doc/css/index.css b/module/doc/css/index.css index 89bc233945..7465593b61 100644 --- a/module/doc/css/index.css +++ b/module/doc/css/index.css @@ -4,7 +4,7 @@ #libs .libs-group{border:1px solid #ddd; border-top:0px; margin-bottom:20px;} #libs .libs-group.lib-more{border:0px; text-align:center; height:120px; line-height:110px;} #libs .libs-group.lib-more:hover{background-color: #EBF2F9} -#libs .libs-custom-heading{text-align:center; height:120px; line-height:110px; position: relative;} +#libs .libs-custom-heading{text-align:center; height:120px; line-height:110px; position: relative; margin-bottom:20px;} #libs .libs-custom-heading:hover{background-color: #EBF2F9} #libs .libs-custom-heading a{display:block;height:100%;} #libs .libs-custom-heading .lable-custom{position: absolute;left:8px;} diff --git a/module/doc/js/common.js b/module/doc/js/common.js index caf24dafe3..024246a034 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -21,7 +21,7 @@ function showLibMenu() var productCount = 0, projectCount = 0, customCount = 0; $.each(data.product, function(idx, product) { - $list.append('
' + product.name + '
'); + $list.append('
[ ' + product.name + ' ]
'); $.each(product.libs, function(libId, libName) { var url = libId === 'files' ? createLink('doc', 'showFiles', 'type=product&objectID=' + product.id) : createLink('doc', 'browse', 'libID=' + libId); @@ -38,7 +38,7 @@ function showLibMenu() $list = $('#libMenuProjectGroup > .lib-menu-list'); $.each(data.project, function(idx, project) { - $list.append('
' + project.name + '
'); + $list.append('
[ ' + project.name + ' ]
'); $.each(project.libs, function(libId, libName) { var url = libId === 'files' ? createLink('doc', 'showFiles', 'type=project&objectID=' + project.id) : createLink('doc', 'browse', 'libID=' + libId); diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 6b88812422..0ce3674033 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -58,7 +58,7 @@ $lang->doc->addType = 'Add Type'; $lang->doc->libName = 'Library Name'; $lang->doc->libType = 'Library Type'; $lang->doc->custom = 'Custom Library'; -$lang->doc->customAB = 'Custom'; +$lang->doc->customAB = 'Custom Library'; $lang->doc->createLib = 'Create Library'; $lang->doc->allLibs = 'Library List'; $lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon} Library List"; @@ -108,7 +108,7 @@ $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = 'Url'; $lang->doclib = new stdclass(); -$lang->doclib->name = 'Library Name'; +$lang->doclib->name = 'Library Name'; $lang->doclib->control = 'Access Control'; $lang->doclib->group = 'Group'; $lang->doclib->user = 'User'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 13e9dd7626..14eecb78a3 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -58,7 +58,7 @@ $lang->doc->addType = '增加分类'; $lang->doc->libName = '文档库名称'; $lang->doc->libType = '文档库类型'; $lang->doc->custom = '自定义文档库'; -$lang->doc->customAB = '自定义'; +$lang->doc->customAB = '自定义库'; $lang->doc->createLib = '创建文档库'; $lang->doc->allLibs = '文档库列表'; $lang->doc->objectLibs = "{$lang->productCommon}/{$lang->projectCommon}库列表"; diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index 91b28aae92..5590221b80 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -42,7 +42,7 @@ ?>
{$lang->productCommon} " : ''; + $label = $objectNum == 1 ? "{$lang->doclib->main['product']} " : ''; echo html::a(inlink('objectLibs', "type=product&objectID=$product->id&from=doc"), $label . $product->name, '', "title='{$product->name}'"); if($subLibCount > 3) echo html::a(inlink('objectLibs', "type=product&objectID=$product->id&from=doc"), "{$lang->more}", '', "title='{$lang->more}' class='pull-right'"); ?> @@ -96,7 +96,7 @@ ?>
{$lang->projectCommon} " : ''; + $label = $objectNum == 1 ? "{$lang->doclib->main['project']} " : ''; echo html::a(inlink('objectLibs', "type=project&objectID=$project->id&from=doc"), $label . $project->name, '', "title='{$project->name}'"); if($subLibCount > 3) echo html::a(inlink('objectLibs', "type=project&objectID=$project->id&from=doc"), "{$lang->more}", '', "title='{$lang->more}' class='pull-right'"); ?> diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index 7b1884f10f..4a315ca92d 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -16,6 +16,7 @@
icons['doc']);?> id;?> + title;?> deleted):?> doc->deleted;?>