From 8baf9bdde15cd045980aee2d0faf7000cc8c07d0 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 4 Aug 2022 08:54:08 +0800
Subject: [PATCH 1/2] * Optimize the way to display relevant stories.

---
 module/story/view/view.html.php | 39 ++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 07bde22cad..93ce4a18e8 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -494,7 +494,7 @@
                     foreach($builds as $build)
                     {
                         $link = common::hasPriv('build', 'view') ? html::a($this->createLink('build', 'view', "buildID=$build->id"), "#$build->id $build->name", '', "data-app='{$tab}'") : "#$build->id $build->name";
-                        echo "<li title='$build->id $build->name'>$link</li>";
+                        echo "<li title='$build->name'>$link</li>";
                     }
                     ?>
                     </ul>
@@ -510,7 +510,7 @@
                     foreach($releases as $release)
                     {
                         $link = common::hasPriv($releaseModule, 'view') ? html::a($this->createLink($releaseModule, 'view', "release=$release->id"), "#$release->id $release->name", '', "data-app='{$tab}'") : "#$release->id $release->name";
-                        echo "<li title='$release->id $release->name'>$link</li>";
+                        echo "<li title='$release->name'>$link</li>";
                     }
                     ?>
                     </ul>
@@ -519,22 +519,25 @@
                 <tr class='text-top'>
                   <th class='w-90px'><?php echo $lang->story->linkStories;?></th>
                   <td>
-                    <?php
-                    if(isset($story->linkStoryTitles))
-                    {
-                        foreach($story->linkStoryTitles as $linkStoryID => $linkStoryTitle)
-                        {
-                            if($app->user->admin or strpos(",{$app->user->view->products},", ",{$storyProducts[$linkStoryID]},") !== false)
-                            {
-                                echo '[S] ' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID", '', true), "#$linkStoryID $linkStoryTitle", '', "class='iframe' data-width='80%' title='$linkStoryTitle'") . '<br />';
-                            }
-                            else
-                            {
-                                echo "<div title='$linkStoryTitle'>[S] #$linkStoryID $linkStoryTitle</div>";
-                            }
-                        }
-                    }
-                    ?>
+                    <ul class='list-unstyled'>
+                      <?php
+                      if(isset($story->linkStoryTitles))
+                      {
+                          foreach($story->linkStoryTitles as $linkStoryID => $linkStoryTitle)
+                          {
+                              if($app->user->admin or strpos(",{$app->user->view->products},", ",{$storyProducts[$linkStoryID]},") !== false)
+                              {
+                                  $storyLink = html::a($this->createLink('story', 'view', "storyID=$linkStoryID", '', true), "[S] #$linkStoryID $linkStoryTitle", '', "class='iframe' data-width='80%' title='$linkStoryTitle'") . '<br />';
+                              }
+                              else
+                              {
+                                  $storyLink = "[S] #$linkStoryID $linkStoryTitle";
+                              }
+                              echo "<li title='$linkStoryTitle'>$storyLink</li>";
+                          }
+                      }
+                      ?>
+                    </ul>
                   </td>
                 </tr>
                 <tr>

From e0aaa4c18ca7db44c753d5e608403355a61426c5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 4 Aug 2022 09:28:18 +0800
Subject: [PATCH 2/2] * Fix bug #26008.

---
 module/execution/css/all.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index f13f24181c..9c4267f0c4 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -1,10 +1,9 @@
 body {margin-bottom: 25px;}
+.main-table tbody>tr>td {border-bottom: 0px solid #eee;}
 .table-responsive {overflow-y: hidden !important;}
 #product_chosen .chosen-single {width: 180px;}
 
 .table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;}
-.table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
-.table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
 .table td.has-child > a:not(.plan-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 .table td.has-child > .plan-toggle {color: #838a9d; position: relative; top: 1px;overflow: initial !important;}
 .table td.has-child > .plan-toggle:hover {color: #006af1; cursor: pointer;}
@@ -14,7 +13,7 @@ body {margin-bottom: 25px;}
 .table th.hours {padding-right: 8px !important;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: -1px;}
+td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;}
 td.datatable-cell.flex {margin-bottom: -2px;}
 td.flex span.label-badge {margin-left: 5px; min-width: 50px;}
 td.flex span.label-badge.label-light {min-width: 22px;}
@@ -32,7 +31,7 @@ td.flex span.project-type-label {min-width: 40px;}
 
 .c-project{text-overflow: unset !important;}
 canvas {height: 28px;}
-.parent.has-child.c-name.flex, .table-child-bottom > .c-name.flex {border-bottom: 1px solid #cbd0db !important;}
+.parent.has-child.c-name.flex, .table-child-bottom > .c-name.flex {border-bottom: 0px solid #cbd0db !important;}
 .parent.has-child.c-name.flex {margin-bottom: -2px !important;}
 #tableCustomBtn {padding-bottom: 5px;}
 #bysearchTab {margin-left: 5px;}