Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms
This commit is contained in:
zhujinyong
@@ -2,25 +2,25 @@
|
||||
<?php js::set('method', $method);?>
|
||||
<?php js::set('extra', $extra);?>
|
||||
<style>
|
||||
.table-row .table-col .list-group .nav-tabs {position: sticky; top: 0; background: #fff; z-index: 950;}
|
||||
.table-row .table-col .list-group .nav-tabs>li>span {display: inline-block; margin-left: -6px;}
|
||||
.table-row .table-col .list-group .nav-tabs>li>a {padding: 8px 10px; display: inline-block}
|
||||
.table-row .table-col .list-group .nav-tabs>li.active>a, .nav-tabs>li.active>span {font-weight: 700; color: #0c64eb;}
|
||||
.table-row .table-col .list-group .nav-tabs>li.active>a:before {position: absolute; right: 0; bottom: -1px; left: 0; display: block; height: 2px; content: ' '; background: #0c64eb; }
|
||||
.nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
|
||||
#navTabs {position: sticky; top: 0; background: #fff; z-index: 950;}
|
||||
#navTabs>li>span {display: inline-block; margin-left: -6px;}
|
||||
#navTabs>li>a {padding: 8px 10px; display: inline-block}
|
||||
#navTabs>li.active>a, .nav-tabs>li.active>span {font-weight: 700; color: #0c64eb;}
|
||||
#navTabs>li.active>a:before {position: absolute; right: 0; bottom: -1px; left: 0; display: block; height: 2px; content: ' '; background: #0c64eb; }
|
||||
#navTabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
|
||||
|
||||
.table-row .table-col .list-group .tab-content {margin-top: 10px; z-index: 900;}
|
||||
.table-row .table-col .list-group .tab-content ul {list-style: none; margin: 0}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul {padding-left: 7px;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li.hide-in-search {position: relative;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li>label+a {padding-left: 45px;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li label {background: rgba(131,138,157,0.5); position: absolute; top: 0; left: 5px;}
|
||||
.table-row .table-col .list-group .tab-content li a i.icon {font-size: 15px !important;}
|
||||
.table-row .table-col .list-group .tab-content li a i.icon:before {min-width: 16px !important;}
|
||||
.table-row .table-col .list-group .tab-content li .label {margin-top: 2px; position: unset;}
|
||||
.table-row .table-col .list-group .tab-content li ul {padding-left: 15px;}
|
||||
.table-row .table-col .list-group .tab-content li>a {margin-top: 5px;display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
|
||||
.table-row .table-col .list-group .tab-content li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
|
||||
#tabContent {margin-top: 10px; z-index: 900;}
|
||||
#tabContent ul {list-style: none; margin: 0}
|
||||
#tabContent .tab-pane>ul {padding-left: 7px;}
|
||||
#tabContent .tab-pane>ul>li.hide-in-search {position: relative;}
|
||||
#tabContent .tab-pane>ul>li>label+a {padding-left: 45px;}
|
||||
#tabContent .tab-pane>ul>li label {background: rgba(131,138,157,0.5); position: absolute; top: 0; left: 5px;}
|
||||
#tabContent li a i.icon {font-size: 15px !important;}
|
||||
#tabContent li a i.icon:before {min-width: 16px !important;}
|
||||
#tabContent li .label {margin-top: 2px; position: unset;}
|
||||
#tabContent li ul {padding-left: 15px;}
|
||||
#tabContent li>a {margin-top: 5px;display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
|
||||
#tabContent li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
|
||||
|
||||
#swapper li.hide-in-search>a:focus, #swapper li.hide-in-search>a:hover {color: #838a9d; cursor: default;}
|
||||
#swapper li ul li a:focus, #swapper li ul li a:hover, .noProject li a:focus, .noProject li a:hover {background: #0c64eb; color: #fff;}
|
||||
@@ -32,7 +32,7 @@ $myExecutionsHtml = '';
|
||||
$normalExecutionsHtml = '';
|
||||
$closedExecutionsHtml = '';
|
||||
$tabActive = '';
|
||||
$iCharges = 0;
|
||||
$myExecutions = 0;
|
||||
$others = 0;
|
||||
$dones = 0;
|
||||
|
||||
@@ -76,7 +76,7 @@ foreach($executions as $projectID => $projectExecutions)
|
||||
|
||||
if($selected == 'selected') $tabActive = 'myExecution';
|
||||
|
||||
$iCharges++;
|
||||
$myExecutions++;
|
||||
}
|
||||
else if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account]))
|
||||
{
|
||||
@@ -108,14 +108,14 @@ foreach($executions as $projectID => $projectExecutions)
|
||||
<div class="table-row">
|
||||
<div class="table-col col-left">
|
||||
<div class='list-group'>
|
||||
<?php $tabActive = ($iCharges and ($tabActive == 'closed' or $tabActive == 'myExecution')) ? 'myExecution' : 'other';?>
|
||||
<?php if($iCharges): ?>
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="<?php if($tabActive == 'myExecution') echo 'active';?>"><?php echo html::a('#myExecution', $lang->execution->involved, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $iCharges;?></span><li>
|
||||
<?php $tabActive = ($myExecutions and ($tabActive == 'closed' or $tabActive == 'myExecution')) ? 'myExecution' : 'other';?>
|
||||
<?php if($myExecutions): ?>
|
||||
<ul class="nav nav-tabs" id="navTabs">
|
||||
<li class="<?php if($tabActive == 'myExecution') echo 'active';?>"><?php echo html::a('#myExecution', $lang->execution->involved, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $myExecutions;?></span><li>
|
||||
<li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="text-muted"><?php echo $others;?></span><li>
|
||||
</ul>
|
||||
<?php endif;?>
|
||||
<div class="tab-content">
|
||||
<div class="tab-content" id="tabContent">
|
||||
<div class="tab-pane <?php if($tabActive == 'myExecution') echo 'active';?>" id="myExecution">
|
||||
<?php echo $myExecutionsHtml;?>
|
||||
</div>
|
||||
|
||||
@@ -3,25 +3,25 @@
|
||||
<?php js::set('method', $method);?>
|
||||
<?php js::set('extra', $extra);?>
|
||||
<style>
|
||||
.table-row .table-col .list-group .nav-tabs {position: sticky; top: 0; background: #fff; z-index: 950;}
|
||||
.table-row .table-col .list-group .nav-tabs>li>span {display: inline-block; margin-left: -6px;}
|
||||
.table-row .table-col .list-group .nav-tabs>li>a {padding: 8px 10px; display: inline-block}
|
||||
.table-row .table-col .list-group .nav-tabs>li.active>a, .nav-tabs>li.active>span {font-weight: 700; color: #0c64eb;}
|
||||
.table-row .table-col .list-group .nav-tabs>li.active>a:before {position: absolute; right: 0; bottom: -1px; left: 0; display: block; height: 2px; content: ' '; background: #0c64eb; }
|
||||
.nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
|
||||
#navTabs {position: sticky; top: 0; background: #fff; z-index: 950;}
|
||||
#navTabs>li>span {display: inline-block; margin-left: -6px;}
|
||||
#navTabs>li>a {padding: 8px 10px; display: inline-block}
|
||||
#navTabs>li.active>a, .nav-tabs>li.active>span {font-weight: 700; color: #0c64eb;}
|
||||
#navTabs>li.active>a:before {position: absolute; right: 0; bottom: -1px; left: 0; display: block; height: 2px; content: ' '; background: #0c64eb; }
|
||||
#navTabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
|
||||
|
||||
.table-row .table-col .list-group .tab-content {margin-top: 10px;}
|
||||
.table-row .table-col .list-group .tab-content ul {list-style: none; margin: 0}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul {padding-left: 7px;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li.hide-in-search {position: relative;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li>label+a {padding-left: 55px;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li label {background: rgba(131,138,157,0.5); position: absolute; top: 0; left: 5px;}
|
||||
.table-row .table-col .list-group .tab-content li a i.icon {font-size: 15px !important;}
|
||||
.table-row .table-col .list-group .tab-content li a i.icon:before {min-width: 16px !important;}
|
||||
.table-row .table-col .list-group .tab-content li .label {margin-top: 2px; position: unset;}
|
||||
.table-row .table-col .list-group .tab-content li ul {padding-left: 15px;}
|
||||
.table-row .table-col .list-group .tab-content li>a {margin-top: 5px;display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
|
||||
.table-row .table-col .list-group .tab-content li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
|
||||
#tabContent {margin-top: 10px;}
|
||||
#tabContent ul {list-style: none; margin: 0}
|
||||
#tabContent .tab-pane>ul {padding-left: 7px;}
|
||||
#tabContent .tab-pane>ul>li.hide-in-search {position: relative;}
|
||||
#tabContent .tab-pane>ul>li>label+a {padding-left: 55px;}
|
||||
#tabContent .tab-pane>ul>li label {background: rgba(131,138,157,0.5); position: absolute; top: 0; left: 5px;}
|
||||
#tabContent li a i.icon {font-size: 15px !important;}
|
||||
#tabContent li a i.icon:before {min-width: 16px !important;}
|
||||
#tabContent li .label {margin-top: 2px; position: unset;}
|
||||
#tabContent li ul {padding-left: 15px;}
|
||||
#tabContent li>a {margin-top: 5px;display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
|
||||
#tabContent li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
|
||||
|
||||
#swapper li.hide-in-search a:focus, #swapper li.hide-in-search a:hover {color: #838a9d; cursor: default;}
|
||||
#swapper li ul li a:focus, #swapper li ul li a:hover, .noProgram li a:focus, .noProgram li a:hover {background: #0c64eb; color: #fff;}
|
||||
@@ -33,7 +33,7 @@ $myProductsHtml = '';
|
||||
$normalProductsHtml = '';
|
||||
$closedProductsHtml = '';
|
||||
$tabActive = '';
|
||||
$iCharges = 0;
|
||||
$myProducts = 0;
|
||||
$others = 0;
|
||||
$closeds = 0;
|
||||
|
||||
@@ -81,7 +81,7 @@ foreach($products as $programID => $programProducts)
|
||||
|
||||
if($selected == 'selected') $tabActive = 'myProduct';
|
||||
|
||||
$iCharges++;
|
||||
$myProducts++;
|
||||
}
|
||||
else if($product->status == 'normal' and !($product->PO == $this->app->user->account))
|
||||
{
|
||||
@@ -113,14 +113,14 @@ foreach($products as $programID => $programProducts)
|
||||
<div class="table-row">
|
||||
<div class="table-col col-left">
|
||||
<div class='list-group'>
|
||||
<?php $tabActive = ($iCharges and ($tabActive == 'closed' or $tabActive == 'myProduct')) ? 'myProduct' : 'other';?>
|
||||
<?php if($iCharges): ?>
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="<?php if($tabActive == 'myProduct') echo 'active';?>"><?php echo html::a('#myProduct', $lang->product->mine, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $iCharges;?></span><li>
|
||||
<?php $tabActive = ($myProducts and ($tabActive == 'closed' or $tabActive == 'myProduct')) ? 'myProduct' : 'other';?>
|
||||
<?php if($myProducts): ?>
|
||||
<ul class="nav nav-tabs" id="navTabs">
|
||||
<li class="<?php if($tabActive == 'myProduct') echo 'active';?>"><?php echo html::a('#myProduct', $lang->product->mine, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $myProducts;?></span><li>
|
||||
<li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->product->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="text-muted"><?php echo $others;?></span><li>
|
||||
</ul>
|
||||
<?php endif;?>
|
||||
<div class="tab-content">
|
||||
<div class="tab-content" id="tabContent">
|
||||
<div class="tab-pane <?php if($tabActive == 'myProduct') echo 'active';?>" id="myProduct">
|
||||
<?php echo $myProductsHtml;?>
|
||||
</div>
|
||||
|
||||
@@ -2,25 +2,25 @@
|
||||
<?php js::set('module', $module);?>
|
||||
<?php js::set('method', $method);?>
|
||||
<style>
|
||||
.table-row .table-col .list-group .nav-tabs {position: sticky; top: 0; background: #fff; z-index: 950;}
|
||||
.table-row .table-col .list-group .nav-tabs>li>span {display: inline-block; margin-left: -6px;}
|
||||
.table-row .table-col .list-group .nav-tabs>li>a {padding: 8px 10px; display: inline-block}
|
||||
.table-row .table-col .list-group .nav-tabs>li.active>a, .nav-tabs>li.active>span {font-weight: 700; color: #0c64eb;}
|
||||
.table-row .table-col .list-group .nav-tabs>li.active>a:before {position: absolute; right: 0; bottom: -1px; left: 0; display: block; height: 2px; content: ' '; background: #0c64eb; }
|
||||
.nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
|
||||
#navTabs {position: sticky; top: 0; background: #fff; z-index: 950;}
|
||||
#navTabs>li>span {display: inline-block; margin-left: -6px;}
|
||||
#navTabs>li>a {padding: 8px 10px; display: inline-block}
|
||||
#navTabs>li.active>a, .nav-tabs>li.active>span {font-weight: 700; color: #0c64eb;}
|
||||
#navTabs>li.active>a:before {position: absolute; right: 0; bottom: -1px; left: 0; display: block; height: 2px; content: ' '; background: #0c64eb; }
|
||||
#navTabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
|
||||
|
||||
.table-row .table-col .list-group .tab-content {margin-top: 10px; z-index: 900;}
|
||||
.table-row .table-col .list-group .tab-content ul {list-style: none; margin: 0}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul {padding-left: 7px;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li.hide-in-search {position: relative;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li>label+a {padding-left: 55px;}
|
||||
.table-row .table-col .list-group .tab-content .tab-pane>ul>li label {background: rgba(131,138,157,0.5); position: absolute; top: 0; left: 5px;}
|
||||
.table-row .table-col .list-group .tab-content li a i.icon {font-size: 15px !important;}
|
||||
.table-row .table-col .list-group .tab-content li a i.icon:before {min-width: 16px !important;}
|
||||
.table-row .table-col .list-group .tab-content li .label {margin-top: 2px; position: unset;}
|
||||
.table-row .table-col .list-group .tab-content li ul {padding-left: 15px;}
|
||||
.table-row .table-col .list-group .tab-content li>a {margin-top: 5px;display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
|
||||
.table-row .table-col .list-group .tab-content li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
|
||||
#tabContent {margin-top: 10px; z-index: 900;}
|
||||
#tabContent ul {list-style: none; margin: 0}
|
||||
#tabContent .tab-pane>ul {padding-left: 7px;}
|
||||
#tabContent .tab-pane>ul>li.hide-in-search {position: relative;}
|
||||
#tabContent .tab-pane>ul>li>label+a {padding-left: 55px;}
|
||||
#tabContent .tab-pane>ul>li label {background: rgba(131,138,157,0.5); position: absolute; top: 0; left: 5px;}
|
||||
#tabContent li a i.icon {font-size: 15px !important;}
|
||||
#tabContent li a i.icon:before {min-width: 16px !important;}
|
||||
#tabContent li .label {margin-top: 2px; position: unset;}
|
||||
#tabContent li ul {padding-left: 15px;}
|
||||
#tabContent li>a {margin-top: 5px;display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
|
||||
#tabContent li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
|
||||
|
||||
#swapper li.hide-in-search>a:focus, #swapper li.hide-in-search>a:hover {color: #838a9d; cursor: default;}
|
||||
#swapper li ul li a:focus, #swapper li ul li a:hover, .noProgram li a:focus, .noProgram li a:hover {background: #0c64eb; color: #fff;}
|
||||
@@ -32,7 +32,7 @@ $myProjectsHtml = '';
|
||||
$normalProjectsHtml = '';
|
||||
$closedProjectsHtml = '';
|
||||
$tabActive = '';
|
||||
$iCharges = 0;
|
||||
$myProjects = 0;
|
||||
$others = 0;
|
||||
$dones = 0;
|
||||
|
||||
@@ -82,7 +82,7 @@ foreach($projects as $programID => $programProjects)
|
||||
|
||||
if($selected == 'selected') $tabActive = 'myProject';
|
||||
|
||||
$iCharges++;
|
||||
$myProjects++;
|
||||
}
|
||||
else if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account))
|
||||
{
|
||||
@@ -115,14 +115,14 @@ foreach($projects as $programID => $programProjects)
|
||||
<div class="table-row">
|
||||
<div class="table-col col-left">
|
||||
<div class='list-group'>
|
||||
<?php $tabActive = ($iCharges and ($tabActive == 'closed' or $tabActive == 'myProject')) ? 'myProject' : 'other';?>
|
||||
<?php if($iCharges): ?>
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="<?php if($tabActive == 'myProject') echo 'active';?>"><?php echo html::a('#myProject', $lang->project->myProject, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $iCharges;?></span><li>
|
||||
<?php $tabActive = ($myProjects and ($tabActive == 'closed' or $tabActive == 'myProject')) ? 'myProject' : 'other';?>
|
||||
<?php if($myProjects): ?>
|
||||
<ul class="nav nav-tabs" id="navTabs">
|
||||
<li class="<?php if($tabActive == 'myProject') echo 'active';?>"><?php echo html::a('#myProject', $lang->project->myProject, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $myProjects;?></span><li>
|
||||
<li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="text-muted"><?php echo $others;?></span><li>
|
||||
</ul>
|
||||
<?php endif;?>
|
||||
<div class="tab-content">
|
||||
<div class="tab-content" id="tabContent">
|
||||
<div class="tab-pane <?php if($tabActive == 'myProject') echo 'active';?>" id="myProject">
|
||||
<?php echo $myProjectsHtml;?>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user