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

* finish task #5446.

Browse Source
This commit is contained in:
wangyidong
2019-05-30 11:50:21 +08:00
parent 52e0bea0c0
commit a3b6cfc687
7 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/control.class.php
+1 -1
View File
@@ -740,7 +740,7 @@ class baseControl
*/
if(!is_file($file2Included)) $this->app->triggerError("The control file $file2Included not found", __FILE__, __LINE__, $exit = true);
chdir(dirname($file2Included));
helper::import($file2Included);
if(!class_exists($moduleName)) helper::import($file2Included);
/**
* 设置调用的类名。
module/doc/control.php
+5 -3
View File
@@ -114,9 +114,11 @@ class doc extends control
$this->project->setMenu($this->project->getPairs('nocode'), $lib->project);
$this->lang->set('menugroup.doc', 'project');
}
$menuType = (!$type && (in_array($browseType, array_keys($this->lang->doc->fastMenuList)) || $browseType == 'bysearch')) ? $browseType : $type;
$this->doc->setMenu($menuType, $libID, $moduleID, $productID, $projectID);
else
{
$menuType = (!$type && (in_array($browseType, array_keys($this->lang->doc->fastMenuList)) || $browseType == 'bysearch')) ? $browseType : $type;
$this->doc->setMenu($menuType, $libID, $moduleID, $productID, $projectID);
}
$this->session->set('docList', $this->app->getURI(true));
/* Set header and position. */
module/doc/view/browse.html.php
+1 -1
View File
@@ -21,7 +21,7 @@ var browseType = '<?php echo $browseType;?>';
<?php $spliter = (empty($this->app->user->feedback) && !$this->cookie->feedbackView && $this->from == 'doc') ? true : false;?>
<div class="main-row fade <?php if($spliter) echo 'split-row';?>" id="mainRow">
<?php include './side.html.php';?>
<?php if($this->from == 'doc') include './side.html.php';?>
<?php if($this->cookie->browseType == 'bygrid'):?>
<?php include dirname(__FILE__) . '/browsebygrid.html.php';?>
<?php else:?>
module/doc/view/objectlibs.html.php
+3 -1
View File
@@ -26,8 +26,10 @@
<div class="panel block-files block-sm no-margin">
<div class="panel-heading">
<div class="panel-title font-normal">
<?php if($this->from == 'doc'):?>
<i class="icon icon-folder-open-o text-muted"></i> <?php echo $object->name;?>
<div class="btn-group">
<?php endif;?>
<div class="btn-group pull-right">
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
</div>
module/doc/view/objectlibsbylist.html.php
+3 -1
View File
@@ -3,8 +3,10 @@
<div class="panel block-files block-sm no-margin">
<div class="panel-heading">
<div class="panel-title font-normal">
<?php if($this->from == 'doc'):?>
<i class="icon icon-folder-open-o text-muted"></i> <?php echo $object->name;?>
<div class="btn-group">
<?php endif;?>
<div class="btn-group pull-right">
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
</div>
www/theme/default/bindranzhi.css
+1
View File
@@ -3,6 +3,7 @@ body.has-fixed-footer{padding-bottom:20px;}
#header{padding-top:0px;}
#header #heading{display:none !important;}
#header #navbar{text-align:left !important;}
#header #navbar ul.nav{padding-left:10px !important;}
.datatable .scroll-wrapper .scroll-slide {bottom:-55px !important;}
.table-footer.fixed-footer{bottom:0px !important;}
#footer{display:none;}
www/theme/default/style.css
+2
View File
@@ -12,6 +12,8 @@
.main-table .table{cursor:pointer;}
.table-striped > tbody > tr:nth-child(2n+1) > td, .table-striped > tbody > tr:nth-child(2n+1) > th{background:none;}
#pageNav .btn-group.angle-btn{margin-right:10px !important;}
#dropMenu.show-right-col{width:502px;max-width:520px;}
#dropMenu.has-search-text{width:250px;max-width:260px;}
#dropMenu.has-search-text .col-right{margin-left:0px;}