diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 981e496589..2c436ef0cf 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -261,10 +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->product = array('link' => $lang->productCommon . '|doc|browse|type=product'); -$lang->doc->menu->project = array('link' => $lang->projectCommon . '|doc|browse|type=project'); -$lang->doc->menu->custom = array('link' => 'Custom|doc|browse|type=custom'); $lang->doc->menu->index = array('link' => ' Homepage|doc|index|', 'float' => 'right'); $lang->doc->menu->create = array('link' => ' New Library|doc|createLib', 'float' => 'right'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 94b34b8eba..aebee11f84 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -261,10 +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->product = array('link' => $lang->productCommon . '|doc|allLibs|type=product'); -$lang->doc->menu->project = array('link' => $lang->projectCommon . '|doc|allLibs|type=project'); -$lang->doc->menu->custom = array('link' => '自定义|doc|allLibs|type=custom'); $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 279f900bec..c380f4fc6d 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -38,7 +38,7 @@ class doc extends control $products[] = $this->lang->doc->systemLibs['product']; unset($this->lang->doc->menu->index); - $this->doc->setMenu($products); + $this->doc->setMenu(array($this->lang->doclib->select)); $products = $this->doc->getLimitLibs('product'); $projects = $this->doc->getLimitLibs('project'); @@ -46,7 +46,7 @@ class doc extends control $subLibs['product'] = $this->doc->getSubLibGroups('product', array_keys($products)); $subLibs['project'] = $this->doc->getSubLibGroups('project', array_keys($projects)); - $this->view->title = $this->lang->doc->index; + $this->view->title = $this->lang->doc->common . $this->lang->colon . $this->lang->doc->index; $this->view->position[] = $this->lang->doc->index; $this->view->products = $products; $this->view->projects = $projects; @@ -654,7 +654,7 @@ class doc extends control public function allLibs($type, $extra = '', $recTotal = 0, $recPerPage = 21, $pageID = 1) { $libName = isset($this->lang->doc->systemLibs[$type]) ? $this->lang->doc->systemLibs[$type] : $this->lang->doc->custom; - $this->doc->setMenu(array($libName), 0, $type); + $this->doc->setMenu(array($this->lang->doclib->select), 0, $type); $this->view->title = $libName; $this->view->position[] = $libName; diff --git a/module/doc/css/common.css b/module/doc/css/common.css index d1fda38181..8c4221d2a7 100644 --- a/module/doc/css/common.css +++ b/module/doc/css/common.css @@ -12,5 +12,9 @@ .libs.collapsed .libs-heading {background: #ddd;} .libs.collapsed .libs-heading > .icon {opacity: 1} .libs.collapsed .libs-heading > .icon:before {content: '\e726'} -.lib {float: left; width: 200px; display: block; border: 1px solid #ddd; margin: 0 15px 15px 0; padding: 10px 15px; text-align: center; color: #333; border-radius: 1px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.lib {float: left; display: block; margin: 0 15px 0 0; padding: 10px 15px; text-align: center; color: #333; border-radius: 1px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .lib:hover, .lib:focus, .lib:active {border-color: #2e6dad; background-color: #EBF2F9; color: #2e6dad} +.col-md-4{overflow:hidden;} + +#modulemenu .nav > li > .dropdown > a#libType{display:inline-block;} +#modulemenu .nav > li > .dropdown.open > a#libType{background:#e5e5e5;} diff --git a/module/doc/css/index.css b/module/doc/css/index.css new file mode 100644 index 0000000000..5c6fb03f22 --- /dev/null +++ b/module/doc/css/index.css @@ -0,0 +1 @@ +.lib-heading{border-right:1px solid #ddd;} diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index de48e4d151..5809403cf6 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -77,6 +77,9 @@ $lang->doc->aclList['public'] = 'Public'; $lang->doc->aclList['custom'] = 'Custom'; $lang->doc->aclList['private'] = 'Private'; +$lang->doc->types['text'] = 'Text'; +$lang->doc->types['url'] = 'Url'; + $lang->doc->contentTypeList['html'] = 'HTML'; $lang->doc->contentTypeList['markdown'] = 'MarkDown'; @@ -106,3 +109,4 @@ $lang->doclib->group = 'Group'; $lang->doclib->user = 'User'; $lang->doclib->files = 'Files'; $lang->doclib->all = 'All library'; +$lang->doclib->select = 'Select library'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 2fd2b8224d..2776824f17 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -77,6 +77,9 @@ $lang->doc->aclList['public'] = '公开'; $lang->doc->aclList['custom'] = '自定义'; $lang->doc->aclList['private'] = '私有'; +$lang->doc->types['text'] = '网页'; +$lang->doc->types['url'] = '链接'; + $lang->doc->contentTypeList['html'] = 'HTML'; $lang->doc->contentTypeList['markdown'] = 'MarkDown'; @@ -106,3 +109,4 @@ $lang->doclib->group = '分组'; $lang->doclib->user = '用户'; $lang->doclib->files = '附件库'; $lang->doclib->all = '所有文档库'; +$lang->doclib->select = '选择文档库'; diff --git a/module/doc/model.php b/module/doc/model.php index 5b2acc7796..1bab2e47a9 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -38,6 +38,15 @@ class docModel extends model $selectHtml = "{$libs[$libID]}
"; common::setMenuVars($this->lang->doc->menu, 'list', $selectHtml); + + $libTypeSelect = "
{$this->lang->doc->libTypeList[$extra]} {$this->lang->arrow} "; + $libTypeSelect .= "
"; + common::setMenuVars($this->lang->doc->menu, 'type', $libTypeSelect); } /** @@ -659,7 +668,7 @@ class docModel extends model * @access public * @return array */ - public function getLimitLibs($type, $limit = 3) + public function getLimitLibs($type, $limit = 6) { if($type == 'product' or $type == 'project') { diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php index 686d238bbb..79e6523ea7 100644 --- a/module/doc/view/alllibs.html.php +++ b/module/doc/view/alllibs.html.php @@ -14,8 +14,12 @@
doc->systemLibs[$type]) ? $lang->doc->systemLibs[$type] : $lang->doc->custom?>
+ + - id])): ?> + id])): ?> + "?> + +
"?> +
'> name?>
id] as $subLibID => $subLibName):?> @@ -27,8 +31,12 @@
- +
+ +
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index cff4237c89..da6c699ad7 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -13,6 +13,7 @@
doclib->all?>
+ $libs):?> -
-
- - '> - doc->custom : $lang->doc->systemLibs[$libsName]?> - - - -
- doc->custom : $lang->doc->systemLibs[$libsName]?> -
- - -
+
+ + + + + +
doc->libTypeList[$libsName]?> id])):?> -
name?>
-
- id] as $libID => $libName):?> - id"); - elseif($libID == 'files') $libLink = inlink('showFiles', "type=product&objectID=$product->id"); - else $libLink = inlink('browse', "libID=$libID"); - ?> - - +
+
name?>
+
+ id] as $libID => $libName):?> + id"); + elseif($libID == 'files') $libLink = inlink('showFiles', "type=product&objectID=$product->id"); + else $libLink = inlink('browse', "libID=$libID"); + ?> + + +
id])):?> -
name?>
-
- id] as $libID => $libName):?> - id"); - else $libLink = inlink('browse', "libID=$libID"); - ?> - - +
+
name?>
+
+ id] as $libID => $libName):?> + id"); + else $libLink = inlink('browse', "libID=$libID"); + ?> + + +
-
$libName):?> '> -
-
- +
", '', "title='$lang->more' class='more'")?>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php index fc0d9f8782..abff02f5bc 100644 --- a/module/doc/view/showfiles.html.php +++ b/module/doc/view/showfiles.html.php @@ -17,30 +17,31 @@
+ pathname)) continue;?>
id&mouse=left") ?>'> - createLink('file', 'download', "fileID=$file->id&mouse=left"); - if(in_array($file->extension, $config->file->imageExtensions)) - { - echo "
"; - } - else - { - $iconClass = 'icon-file'; - if(strpos('zip,tar,gz,bz2,rar', $file->extension) !== false) $iconClass = 'icon-file-archive'; - else if(strpos('csv,xls,xlsx', $file->extension) !== false) $iconClass = 'icon-file-excel'; - else if(strpos('doc,docx', $file->extension) !== false) $iconClass = 'icon-file-word'; - else if(strpos('ppt,pptx', $file->extension) !== false) $iconClass = 'icon-file-powerpoint'; - else if(strpos('pdf', $file->extension) !== false) $iconClass = 'icon-file-pdf'; - else if(strpos('mp3,ogg,wav', $file->extension) !== false) $iconClass = 'icon-file-audio'; - else if(strpos('avi,mp4,mov', $file->extension) !== false) $iconClass = 'icon-file-movie'; - else if(strpos('txt,md', $file->extension) !== false) $iconClass = 'icon-file-text-o'; - else if(strpos('html,htm', $file->extension) !== false) $iconClass = 'icon-globe'; - echo ""; - } - ?> + createLink('file', 'download', "fileID=$file->id&mouse=left"); + if(in_array($file->extension, $config->file->imageExtensions)) + { + echo "
"; + } + else + { + $iconClass = 'icon-file'; + if(strpos('zip,tar,gz,bz2,rar', $file->extension) !== false) $iconClass = 'icon-file-archive'; + else if(strpos('csv,xls,xlsx', $file->extension) !== false) $iconClass = 'icon-file-excel'; + else if(strpos('doc,docx', $file->extension) !== false) $iconClass = 'icon-file-word'; + else if(strpos('ppt,pptx', $file->extension) !== false) $iconClass = 'icon-file-powerpoint'; + else if(strpos('pdf', $file->extension) !== false) $iconClass = 'icon-file-pdf'; + else if(strpos('mp3,ogg,wav', $file->extension) !== false) $iconClass = 'icon-file-audio'; + else if(strpos('avi,mp4,mov', $file->extension) !== false) $iconClass = 'icon-file-movie'; + else if(strpos('txt,md', $file->extension) !== false) $iconClass = 'icon-file-text-o'; + else if(strpos('html,htm', $file->extension) !== false) $iconClass = 'icon-globe'; + echo ""; + } + ?> objectID"); ?>'>doc->fileObject . ' ' . strtoupper($file->objectType) . ' #' . $file->objectID ?>