-
-
@@ -147,7 +151,7 @@ $(function()
$(this).parent().siblings('li').find('span').hide();
})
- $('#tabContent [data-ride="tree"]').tree('expand');
+ $('#swapper [data-ride="tree"]').tree('expand');
$('#swapper #dropMenu .search-box').on('onSearchChange', function(event, value)
{
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 73e0f99c97..14ee1190b5 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -12,17 +12,17 @@
#navTabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
#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>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
-#tabContent .tab-pane>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
-#tabContent li a i.icon {font-size: 15px !important;}
-#tabContent li a i.icon:before {min-width: 16px !important;}
-#tabContent li .label {position: unset; margin-bottom: 0;}
-#tabContent li>a, #tabContent li>div>a {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;}
-#tabContent .tree li>.list-toggle {line-height: 24px;}
-#tabContent .tree li.has-list.open:before {content: unset;}
+.productTree ul {list-style: none; margin: 0}
+.productTree .products>ul {padding-left: 7px;}
+.productTree .products>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
+.productTree .products>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
+.productTree li a i.icon {font-size: 15px !important;}
+.productTree li a i.icon:before {min-width: 16px !important;}
+.productTree li .label {position: unset; margin-bottom: 0;}
+.productTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
+.productTree li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
+.productTree .tree li>.list-toggle {line-height: 24px;}
+.productTree .tree li.has-list.open:before {content: unset;}
#swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
a.productName:focus, a.productName:hover {background: #0c64eb; color: #fff !important;}
@@ -30,12 +30,12 @@ a.productName:focus, a.productName:hover {background: #0c64eb; color: #fff !impo
#swapper li > a {padding-top: 4px; padding-bottom: 4px;}
#swapper li {padding-top: 0; padding-bottom: 0;}
#swapper .tree li>.list-toggle {top: -1px;}
+
+.col-right {padding-top: 30px;}
$programProducts)
{
-
$productCounts[$programID]['myProduct'] = 0;
$productCounts[$programID]['others'] = 0;
+ $productCounts[$programID]['closed'] = 0;
foreach($programProducts as $product)
{
if($product->status == 'normal' and $product->PO == $this->app->user->account) $productCounts[$programID]['myProduct'] ++;
if($product->status == 'normal' and !($product->PO == $this->app->user->account)) $productCounts[$programID]['others'] ++;
- if($product->status == 'closed') $closeds ++;
+ if($product->status == 'closed') $productCounts[$programID]['closed'] ++;
$productNames[] = $product->name;
}
}
@@ -59,6 +59,7 @@ $productsPinYin = common::convert2Pinyin($productNames);
$myProductsHtml = $config->systemMode == 'new' ? '
' : '';
$normalProductsHtml = $config->systemMode == 'new' ? '' : '';
+$closedProductsHtml = $config->systemMode == 'new' ? '' : '';
foreach($products as $programID => $programProducts)
{
@@ -66,10 +67,10 @@ foreach($products as $programID => $programProducts)
if($programID and $config->systemMode == 'new')
{
$programName = zget($programs, $programID);
- $preFix = $programName . ' / ';
if($productCounts[$programID]['myProduct']) $myProductsHtml .= '';
if($productCounts[$programID]['others']) $normalProductsHtml .= '';
+ if($productCounts[$programID]['closed']) $closedProductsHtml .= '';
}
foreach($programProducts as $index => $product)
@@ -96,7 +97,7 @@ foreach($products as $programID => $programProducts)
}
else if($product->status == 'closed')
{
- $closedProductsHtml .= html::a($linkHtml, $preFix . $productName, '', "class='$selected' title='" . $preFix . $productName . "' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'");
+ $closedProductsHtml .= '- ' . html::a($linkHtml, $productName, '', "class='$selected' title='$productName' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'") . '
';
if($selected == 'selected') $tabActive = 'closed';
}
@@ -106,11 +107,13 @@ foreach($products as $programID => $programProducts)
{
if($productCounts[$programID]['myProduct']) $myProductsHtml .= '
';
if($productCounts[$programID]['others']) $normalProductsHtml .= '
';
+ if($productCounts[$programID]['closed']) $closedProductsHtml .= '
';
}
}
}
$myProductsHtml .= '
';
$normalProductsHtml .= '
';
+$closedProductsHtml .= '
';
?>
@@ -122,11 +125,11 @@ $normalProductsHtml .= '';
- product->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?>
-
-
-
-
@@ -154,7 +157,7 @@ $(function()
$(this).parent().siblings('li').find('span').hide();
})
- $('#tabContent [data-ride="tree"]').tree('expand');
+ $('#swapper [data-ride="tree"]').tree('expand');
$('#swapper #dropMenu .search-box').on('onSearchChange', function(event, value)
{
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index c2272d0d37..62b26e9abd 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -11,17 +11,17 @@
#navTabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
#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>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
-#tabContent .tab-pane>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
-#tabContent li a i.icon {font-size: 15px !important;}
-#tabContent li a i.icon:before {min-width: 16px !important;}
-#tabContent li .label {position: unset; margin-bottom: 0;}
-#tabContent li>a, #tabContent li>div>a {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;}
-#tabContent .tree li>.list-toggle {line-height: 24px;}
-#tabContent .tree li.has-list.open:before {content: unset;}
+.projectTree ul {list-style: none; margin: 0}
+.projectTree .projects>ul {padding-left: 7px;}
+.projectTree .projects>ul>li>div {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
+.projectTree .projects>ul>li label {background: rgba(255,255,255,0.5); line-height: unset; color: #838a9d; border: 1px solid #d8d8d8; border-radius: 2px; padding: 1px 4px;}
+.projectTree li a i.icon {font-size: 15px !important;}
+.projectTree li a i.icon:before {min-width: 16px !important;}
+.projectTree li .label {position: unset; margin-bottom: 0;}
+.projectTree li>a, div.hide-in-search>a {display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
+.projectTree li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
+.projectTree .tree li>.list-toggle {line-height: 24px;}
+.projectTree .tree li.has-list.open:before {content: unset;}
#swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
a.projectName:focus, a.projectName:hover {background: #0c64eb; color: #fff !important;}
@@ -29,12 +29,12 @@ a.projectName:focus, a.projectName:hover {background: #0c64eb; color: #fff !impo
#swapper li > a {padding-top: 4px; padding-bottom: 4px;}
#swapper li {padding-top: 0; padding-bottom: 0;}
#swapper .tree li>.list-toggle {top: -1px;}
+
+.col-right {padding-top: 30px;}
$programProjects)
{
$projectCounts[$programID]['myProject'] = 0;
$projectCounts[$programID]['others'] = 0;
+ $projectCounts[$programID]['closed'] = 0;
foreach($programProjects as $project)
{
if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account) $projectCounts[$programID]['myProject'] ++;
if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account)) $projectCounts[$programID]['others'] ++;
- if($project->status == 'done' or $project->status == 'closed') $dones ++;
+ if($project->status == 'done' or $project->status == 'closed') $projectCounts[$programID]['closed'] ++;
$projectNames[] = $project->name;
}
}
@@ -57,6 +58,7 @@ $projectsPinYin = common::convert2Pinyin($projectNames);
$myProjectsHtml = $config->systemMode == 'new' ? '
' : '';
$normalProjectsHtml = $config->systemMode == 'new' ? '