diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 806186714b..fdbb61d59d 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -75,6 +75,7 @@ $lang->execution->storyTitle = "Story Name";
$lang->execution->all = "All {$lang->executionCommon}s";
$lang->execution->undone = 'Unfinished ';
$lang->execution->unclosed = 'Unclosed';
+$lang->execution->closedExecution = 'Closed Execution';
$lang->execution->typeDesc = "OPS {$lang->executionCommon} has no {$lang->SRCommon}, Bug, Build, or Test features.";
$lang->execution->mine = 'Mine: ';
$lang->execution->involved = 'Mine';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index b8c43a0442..c896f7b8ae 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -75,6 +75,7 @@ $lang->execution->storyTitle = "{$lang->SRCommon}名称";
$lang->execution->all = '所有';
$lang->execution->undone = '未完成';
$lang->execution->unclosed = '未关闭';
+$lang->execution->closedExecution = '已关闭的执行';
$lang->execution->typeDesc = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。";
$lang->execution->mine = '我负责:';
$lang->execution->involved = '我参与';
diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 980945cb00..2b1a1165f5 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -22,6 +22,9 @@
#swapper li > a {margin-top: 4px; margin-bottom: 4px;}
#swapper li {padding-top: 0; padding-bottom: 0;}
#swapper .tree li>.list-toggle {top: -1px;}
+
+#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
+#gray-line {height: 1px; margin-left: 10px; margin-bottom:2px; background-color: #ddd;}
';
execution->doneExecutions;?>
+
+ execution->closedExecution?>
@@ -165,6 +170,27 @@ $(function()
$('li.has-list div.hide-in-search').removeClass('hidden');
$('.nav-tabs li.active').find('span').show();
}
- })
+ if($('.form-control.search-input').val().length > 0)
+ {
+ $('#closed').attr("hidden", false);
+ $('#gray-line').attr("hidden", false);
+ }
+ else
+ {
+ $('#closed').attr("hidden", true);
+ $('#gray-line').attr("hidden", true);
+ }
+
+ });
+
+ $('#swapper #dropMenu').on('onSearchComplete', function(event, value)
+ {
+ if($('.list-group.executions').height() == 0)
+ {
+ $('#closed').attr("hidden", true);
+ $('#gray-line').attr("hidden", true);
+ }
+ });
+
})
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 5edd2eba56..993aa7e9fd 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -23,6 +23,7 @@ $lang->product->select = "Select {$lang->productCommon}";
$lang->product->mine = 'Mine';
$lang->product->other = 'Others';
$lang->product->closed = 'Closed';
+$lang->product->closedProduct = 'Closed Product';
$lang->product->updateOrder = 'Order';
$lang->product->all = "{$lang->productCommon} List";
$lang->product->manageLine = "Manage {$lang->productCommon} Line";
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 7037f41660..5f193d2015 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -177,10 +177,12 @@ $(function()
if($('.form-control.search-input').val().length > 0)
{
$('#closed').attr("hidden", false);
+ $('#gray-line').attr("hidden", false);
}
else
{
$('#closed').attr("hidden", true);
+ $('#gray-line').attr("hidden", true);
}
});
@@ -196,6 +198,11 @@ $(function()
{
$("#navTabs a[href='#other']").tab('show');
}
+ if($('ul.tree-angles').height() == 0)
+ {
+ $('#closed').attr("hidden", true);
+ $('#gray-line').attr("hidden", true);
+ }
});
})
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index d104f2d7f6..a0242864a5 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -171,6 +171,7 @@ $lang->project->waitProjects = 'Waiting Projects';
$lang->project->doingProjects = 'Ongoing Projects';
$lang->project->doingExecutions = 'Ongoing Executions';
$lang->project->closedProjects = 'Closed Projects(The recent two projects)';
+$lang->project->closedProject = 'Closed Projects';
$lang->project->noProgram = 'Independent Projects';
$lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 3ae051878d..32fbdf7612 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -171,6 +171,7 @@ $lang->project->waitProjects = '未开始的项目';
$lang->project->doingProjects = '进行中的项目';
$lang->project->doingExecutions = '进行中的执行(最近1个)';
$lang->project->closedProjects = '已关闭的项目(最近2个)';
+$lang->project->closedProject = '已关闭的项目';
$lang->project->noProgram = '无项目集归属项目';
$lang->project->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#FFC20E', '#00A78E', '#7FBB00', '#424BAC', '#C0E9FF', '#EC2761');
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index ad6392a567..e018d40d62 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -23,6 +23,9 @@
#swapper li > a {margin-top: 4px; margin-bottom: 4px;}
#swapper li {padding-top: 0; padding-bottom: 0;}
#swapper .tree li>.list-toggle {top: -1px;}
+
+#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
+#gray-line {height: 1px; margin-left: 10px; margin-bottom:2px; background-color: #ddd;}
';
project->doneProjects?>
+
+ project->closedProject?>
@@ -169,6 +174,26 @@ $(function()
$('li.has-list div.hide-in-search').removeClass('hidden');
$('.nav-tabs li.active').find('span').show();
}
- })
+ if($('.form-control.search-input').val().length > 0)
+ {
+ $('#closed').attr("hidden", false);
+ $('#gray-line').attr("hidden", false);
+ }
+ else
+ {
+ $('#closed').attr("hidden", true);
+ $('#gray-line').attr("hidden", true);
+ }
+ });
+
+ $('#swapper #dropMenu').on('onSearchComplete', function(event, value)
+ {
+ if($('.list-group.projects').height() == 0)
+ {
+ $('#closed').attr("hidden", true);
+ $('#gray-line').attr("hidden", true);
+ }
+ });
+
})