From 05eebf3ccc3aa21a7dca32e31f297503cbe59247 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 14 Jul 2021 14:20:30 +0800
Subject: [PATCH] * Adjust the label in front of the project name or program
 name.

---
 module/execution/view/ajaxgetdropmenu.html.php |  9 +++++----
 module/product/view/ajaxgetdropmenu.html.php   | 10 ++++++----
 module/project/view/ajaxgetdropmenu.html.php   | 10 ++++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 9a8f6f0999..64c3bcbb97 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -13,8 +13,8 @@
 .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 a {padding-left: 5px; padding-right: 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; right: 0;}
+.table-row .table-col .list-group .tab-content .tab-pane>ul>li>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;}
@@ -50,9 +50,10 @@ $executionsPinYin = common::convert2Pinyin($executionNames);
 
 foreach($executions as $projectID => $projectExecutions)
 {
+    $projectName = zget($projects, $projectID);
 
-    if($executionCounts[$projectID]['myExecution']) $myExecutionsHtml .= '<ul><li class="hide-in-search"><a class="text-muted">' . zget($projects, $projectID) . '</a> <label class="label">' . $lang->project->common . '</label></li><li><ul>';
-    if($executionCounts[$projectID]['others']) $normalExecutionsHtml .= '<ul><li class="hide-in-search"><span class="text-muted">' . zget($projects, $projectID) . '</span> <label class="label">' . $lang->project->common . '</label></li><li><ul>';
+    if($executionCounts[$projectID]['myExecution']) $myExecutionsHtml .= '<ul><li class="hide-in-search"><label class="label">' . $lang->project->common . '</label><a class="text-muted" title="' . $projectName . '">' . $projectName . '</a></li><li><ul>';
+    if($executionCounts[$projectID]['others']) $normalExecutionsHtml .= '<ul><li class="hide-in-search"><label class="label">' . $lang->project->common . '</label><a class="text-muted" title="' . $projectName . '">' . $projectName . '</a></li><li><ul>';
 
     foreach($projectExecutions as $index => $execution)
     {
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 2babe05de0..2af18fe644 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -14,8 +14,8 @@
 .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 a {padding-left: 5px; padding-right: 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; right: 0;}
+.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;}
@@ -55,8 +55,10 @@ foreach($products as $programID => $programProducts)
     /* Add the program name before project. */
     if($programID)
     {
-        if($productCounts[$programID]['myProduct']) $myProductsHtml .= '<ul><li class="hide-in-search"><a class="text-muted">' . zget($programs, $programID) . '</a> <label class="label">' . $lang->program->common . '</label></li><li><ul>';
-        if($productCounts[$programID]['others']) $normalProductsHtml .= '<ul><li class="hide-in-search"><span class="text-muted">' . zget($programs, $programID) . '</span> <label class="label">' . $lang->program->common . '</label></li><li><ul>';
+        $programName = zget($programs, $programID);
+
+        if($productCounts[$programID]['myProduct']) $myProductsHtml  .= '<ul><li class="hide-in-search"><label class="label">' . $lang->program->common . '</label> <a class="text-muted" title="' . $programName . '">' . $programName . '</a></li><li><ul>';
+        if($productCounts[$programID]['others']) $normalProductsHtml .= '<ul><li class="hide-in-search"><label class="label">' . $lang->program->common . '</label> <a class="text-muted" title="' . $programName . '">' . $programName . '</a></li><li><ul>';
     }
     else
     {
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 7a259ce1bd..84b80cf2da 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -13,8 +13,8 @@
 .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 a {padding-left: 5px; padding-right: 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; right: 0;}
+.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;}
@@ -53,8 +53,10 @@ foreach($projects as $programID => $programProjects)
     /* Add the program name before project. */
     if($programID)
     {
-        if($projectCounts[$programID]['myProject']) $myProjectsHtml .= '<ul><li class="hide-in-search"><a class="text-muted">' . zget($programs, $programID) . '</a> <label class="label">' . $lang->program->common . '</label></li><li><ul>';
-        if($projectCounts[$programID]['others']) $normalProjectsHtml .= '<ul><li class="hide-in-search"><span class="text-muted">' . zget($programs, $programID) . '</span> <label class="label">' . $lang->program->common . '</label></li><li><ul>';
+        $programName = zget($programs, $programID);
+
+        if($projectCounts[$programID]['myProject']) $myProjectsHtml  .= '<ul><li class="hide-in-search"><label class="label">' . $lang->program->common . '</label> <a class="text-muted" title="' . $programName . '">' . $programName . '</a></li><li><ul>';
+        if($projectCounts[$programID]['others']) $normalProjectsHtml .= '<ul><li class="hide-in-search"><label class="label">' . $lang->program->common . '</label>  <a class="text-muted" title="' . $programName . '">' . $programName . '</a></li><li><ul>';
     }
     else
     {