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

* adjust for index and alllibs page.

Browse Source
This commit is contained in:
wangyidong
2016-11-02 16:13:11 +08:00
parent 599c8985e1
commit e37a0aac7c
11 changed files with 93 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/en.php
+1 -3
View File
@@ -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' => '<i class="icon-home"></i>&nbsp;Homepage|doc|index|', 'float' => 'right');
$lang->doc->menu->create = array('link' => '<span class="icon-plus">&nbsp;</span>New Library|doc|createLib', 'float' => 'right');
module/common/lang/zh-cn.php
+1 -3
View File
@@ -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' => '<i class="icon-home"></i>&nbsp;文档主页|doc|index|', 'float' => 'right');
$lang->doc->menu->create = array('link' => '<i class="icon-plus"></i>&nbsp;添加文档库|doc|createLib', 'float' => 'right');
module/doc/control.php
+3 -3
View File
@@ -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;
module/doc/css/common.css
+5 -1
View File
@@ -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;}
module/doc/css/index.css
+1
View File
@@ -0,0 +1 @@
.lib-heading{border-right:1px solid #ddd;}
module/doc/lang/en.php
+4
View File
@@ -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';
module/doc/lang/zh-cn.php
+4
View File
@@ -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 = '选择文档库';
module/doc/model.php
+10 -1
View File
@@ -38,6 +38,15 @@ class docModel extends model
$selectHtml = "<a id='currentItem' href=\"javascript:showDropMenu('doc', '$libID', '$currentModule', '$currentMethod', '$extra')\">{$libs[$libID]} <span class='icon-caret-down'></span></a><div id='dropMenu'><i class='icon icon-spin icon-spinner'></i></div>";
common::setMenuVars($this->lang->doc->menu, 'list', $selectHtml);
$libTypeSelect = "<div class='dropdown'><a id='libType' class='dropdown-toggle' data-toggle='dropdown' href='###'>{$this->lang->doc->libTypeList[$extra]} <span class='icon-caret-down'></span></a> {$this->lang->arrow} ";
$libTypeSelect .= "<ul class='dropdown-menu' role='menu'>";
foreach($this->lang->doc->libTypeList as $libType => $libName)
{
$libTypeSelect .= '<li>' . html::a(helper::createLink('doc', 'allLibs', "type=$libType"), $libName) . '</li>';
}
$libTypeSelect .= "</ul></div>";
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')
{
module/doc/view/alllibs.html.php
+10 -2
View File
@@ -14,8 +14,12 @@
<div id='featurebar'><strong><?php echo isset($lang->doc->systemLibs[$type]) ? $lang->doc->systemLibs[$type] : $lang->doc->custom?></strong></div>
<div class='libs'>
<?php if(($type == 'project' or $type == 'product')):?>
<?php $i = 0;?>
<table class='table'>
<?php foreach($libs as $lib):?>
<?php if(isset($subLibs[$lib->id])): ?>
<?php if(isset($subLibs[$lib->id])): ?>
<?php if($i % 3 == 0) echo "<tr><td class='row'>"?>
<div class='col-md-4'>
<div class='libs-group-heading libs-<?php echo $type?>-heading'><i class='icon <?php echo $type == 'product' ? 'icon-cube-alt' : 'icon-folder-close-alt'?>'></i> <strong><?php echo $lib->name?></strong></div>
<div class='libs-group clearfix'>
<?php foreach($subLibs[$lib->id] as $subLibID => $subLibName):?>
@@ -27,8 +31,12 @@
<a class='lib' title='<?php echo $subLibName?>' href='<?php echo $libLink ?>'><?php echo $subLibName?></a>
<?php endforeach; ?>
</div>
<?php endif; ?>
</div>
<?php $i++;?>
<?php if($i % 3 == 0) echo "</td></tr>"?>
<?php endif; ?>
<?php endforeach; ?>
</table>
<?php else: ?>
<div class='libs-group clearfix'>
<?php foreach($libs as $lib):?>
module/doc/view/index.html.php
+32 -37
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<div id='featurebar'><strong><?php echo $lang->doclib->all?></strong></div>
<div id='libs'>
<table class='table'>
<?php
$libs = array();
$libs['product'] = $products;
@@ -20,59 +21,53 @@
$libs['custom'] = $customLibs;
?>
<?php foreach ($libs as $libsName => $libs):?>
<div class='libs'>
<div class='libs-heading'>
<?php if(common::hasPriv('doc', 'allLibs')):?>
<a class='libs-heading-text' href='<?php echo inlink('allLibs', "type=$libsName"); ?>'>
<?php echo $libsName == 'custom' ? $lang->doc->custom : $lang->doc->systemLibs[$libsName]?>
<i class='icon icon-double-angle-right'></i>
</a>
<?php else: ?>
<div class="text-libs-heading">
<?php echo $libsName == 'custom' ? $lang->doc->custom : $lang->doc->systemLibs[$libsName]?>
</div>
<?php endif; ?>
<i class='icon icon-collapse'></i>
</div>
<tr>
<th class='w-100px lib-heading'><?php echo $lang->doc->libTypeList[$libsName]?></th>
<td class='row'>
<?php if($libsName === 'product'): ?>
<?php foreach($libs as $product):?>
<?php if(isset($subLibs['product'][$product->id])):?>
<div class='libs-group-heading libs-product-heading'><i class='icon icon-cube-alt'></i> <strong><?php echo $product->name?></strong></div>
<div class='libs-group clearfix'>
<?php foreach($subLibs['product'][$product->id] as $libID => $libName):?>
<?php
if($libID == 'project') $libLink = inlink('allLibs', "type=project&extra=product=$product->id");
elseif($libID == 'files') $libLink = inlink('showFiles', "type=product&objectID=$product->id");
else $libLink = inlink('browse', "libID=$libID");
?>
<a class='lib' title='<?php echo $libName?>' href='<?php echo $libLink ?>'><?php echo $libName?></a>
<?php endforeach; ?>
<div class='col-md-4'>
<div class='libs-group-heading libs-product-heading'><i class='icon icon-cube-alt'></i> <strong><?php echo $product->name?></strong></div>
<div class='libs-group clearfix'>
<?php foreach($subLibs['product'][$product->id] as $libID => $libName):?>
<?php
if($libID == 'project') $libLink = inlink('allLibs', "type=project&extra=product=$product->id");
elseif($libID == 'files') $libLink = inlink('showFiles', "type=product&objectID=$product->id");
else $libLink = inlink('browse', "libID=$libID");
?>
<a class='lib' title='<?php echo $libName?>' href='<?php echo $libLink ?>'><?php echo $libName?></a>
<?php endforeach; ?>
</div>
</div>
<?php endif; ?>
<?php endforeach; ?>
<?php elseif($libsName === 'project'): ?>
<?php foreach($libs as $project):?>
<?php if(isset($subLibs['project'][$project->id])):?>
<div class='libs-group-heading libs-project-heading'><i class='icon icon-folder-close-alt'></i> <strong><?php echo $project->name?></strong></div>
<div class='libs-group clearfix'>
<?php foreach($subLibs['project'][$project->id] as $libID => $libName):?>
<?php
if($libID == 'files') $libLink = inlink('showFiles', "type=project&objectID=$project->id");
else $libLink = inlink('browse', "libID=$libID");
?>
<a class='lib' title='<?php echo $libName?>' href='<?php echo $libLink ?>'><?php echo $libName?></a>
<?php endforeach; ?>
<div class='col-md-4'>
<div class='libs-group-heading libs-project-heading'><i class='icon icon-folder-close-alt'></i> <strong><?php echo $project->name?></strong></div>
<div class='libs-group clearfix'>
<?php foreach($subLibs['project'][$project->id] as $libID => $libName):?>
<?php
if($libID == 'files') $libLink = inlink('showFiles', "type=project&objectID=$project->id");
else $libLink = inlink('browse', "libID=$libID");
?>
<a class='lib' title='<?php echo $libName?>' href='<?php echo $libLink ?>'><?php echo $libName?></a>
<?php endforeach; ?>
</div>
</div>
<?php endif; ?>
<?php endforeach; ?>
<?php else: ?>
<div class='libs-group clearfix'>
<?php foreach($libs as $libID => $libName):?>
<a class='lib' title='<?php echo $libName?>' href='<?php echo inlink('browse', "libID=$libID") ?>'><?php echo $libName?></a>
<?php endforeach; ?>
</div>
<?php endif; ?>
</div>
<?php endforeach; ?>
</td>
<td><?php echo html::a(inlink('allLibs', "type=$libsName"), "<i class='icon icon-double-angle-right'></i>", '', "title='$lang->more' class='more'")?></td>
</tr>
<?php endforeach;?>
</table>
</div>
<?php include '../../common/view/footer.html.php';?>
module/doc/view/showfiles.html.php
+22 -21
View File
@@ -17,30 +17,31 @@
</div>
<div class='lib-files cards'>
<?php foreach($files as $file):?>
<?php if(empty($file->pathname)) continue;?>
<div class='col-md-3'>
<div class='card lib-file'>
<a class='media-wrapper' target='_blank' href='<?php echo $this->createLink('file', 'download', "fileID=$file->id&mouse=left") ?>'>
<?php
$downloadLink = $this->createLink('file', 'download', "fileID=$file->id&mouse=left");
if(in_array($file->extension, $config->file->imageExtensions))
{
echo "<div class='img-holder' style='background-image: url($file->webPath)'><img src='$file->webPath'/></div>";
}
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 "<i class='icon-holder icon $iconClass'></i>";
}
?>
<?php
$downloadLink = $this->createLink('file', 'download', "fileID=$file->id&mouse=left");
if(in_array($file->extension, $config->file->imageExtensions))
{
echo "<div class='img-holder' style='background-image: url($file->webPath)'><img src='$file->webPath'/></div>";
}
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 "<i class='icon-holder icon $iconClass'></i>";
}
?>
<i class='icon icon-download'></i>
</a>
<a class='card-heading' href='<?php echo $this->createLink($file->objectType, 'view', "objectID=$file->objectID"); ?>'><?php echo $lang->doc->fileObject . ' ' . strtoupper($file->objectType) . ' #' . $file->objectID ?> <i class='icon icon-chevron-right pull-right'></i></a>