From 2ec73329fce62fc77f28967b0e8804ae1c4feabd Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 20 Jul 2023 16:51:32 +0800
Subject: [PATCH] * Optimize style on testtask edit and view.

---
 module/testtask/ui/edit.html.php |   9 +-
 module/testtask/ui/view.html.php | 137 ++++++++++++++++---------------
 2 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/module/testtask/ui/edit.html.php b/module/testtask/ui/edit.html.php
index 30eb067508..de5c46af49 100644
--- a/module/testtask/ui/edit.html.php
+++ b/module/testtask/ui/edit.html.php
@@ -124,18 +124,13 @@ formPanel
         editor
         (
             set::name('desc'),
-            set::rows(10),
-            set::value(htmlSpecialString($task->desc))
+            html($task->desc)
         )
     ),
     formGroup
     (
         set::label($lang->comment),
-        editor
-        (
-            set::name('comment'),
-            set::rows(5),
-        )
+        editor(set::name('comment'))
     ),
     formGroup
     (
diff --git a/module/testtask/ui/view.html.php b/module/testtask/ui/view.html.php
index c858db95bc..372a74958b 100644
--- a/module/testtask/ui/view.html.php
+++ b/module/testtask/ui/view.html.php
@@ -23,10 +23,10 @@ detailHeader
     ),
 );
 
-$taskBuild = array
+$taskBuild = a
 (
-    'text' => $task->buildName,
-    'url' => createLink('build', 'view', "buildID=$task->build"),
+    set::href(createLink('build', 'view', "buildID=$task->build")),
+    $task->buildName,
 );
 if($isInModal)              $taskBuild = $task->buildName;
 if($task->build == 'trunk') $taskBuild = $lang->trunk;
@@ -100,74 +100,79 @@ detailBody
     ),
     detailSide
     (
-        panel
+        tabs
         (
-            set::title($lang->testtask->legendBasicInfo),
-            tableData
+            set::collapse(true),
+            tabPane
             (
-                !empty($execution->multiple) ? item
+                set::title($lang->testtask->legendBasicInfo),
+                set::active(true),
+                tableData
                 (
-                    set::name($lang->testtask->execution),
-                    $isInModal ? $task->executionName : a
+                    !empty($execution->multiple) ? item
                     (
-                        set('href', createLink('execution', 'story', "executionID=$task->execution")),
-                        set('title', $task->executionName),
-                        $task->executionName,
-                    ),
-                ) : null,
-                item
-                (
-                    set::name($lang->testtask->build),
-                    item(set($taskBuild)),
-                ),
-                item
-                (
-                    set::name($lang->testtask->type),
-                    $taskType
-                ),
-                item
-                (
-                    set::name($lang->testtask->owner),
-                    zget($users, $task->owner)
-                ),
-                item
-                (
-                    set::name($lang->testtask->mailto),
-                    $mailto 
-                ),
-                item
-                (
-                    set::name($lang->testtask->pri),
-                    priLabel(zget($lang->testtask->priList, $task->pri))
-                ),
-                item
-                (
-                    set::name($lang->testtask->begin),
-                    $task->begin
-                ),
-                item
-                (
-                    set::name($lang->testtask->end),
-                    $task->end
-                ),
-                item
-                (
-                    set::name($lang->testtask->realFinishedDate),
-                    !helper::isZeroDate($task->realFinishedDate) ? $task->realFinishedDate : ''
-                ),
-                item
-                (
-                    set::name($lang->testtask->status),
-                    $this->processStatus('testtask', $task)
-                ),
-                item
-                (
-                    set::name($lang->testtask->testreport),
-                    !empty($task->testreport) ? a
-                    (
-                        set('href', createLink('testreport', 'view', "reportID=$task->testreport")),
-                        $testreportTitle
+                        set::name($lang->testtask->execution),
+                        $isInModal ? $task->executionName : a
+                        (
+                            set('href', createLink('execution', 'story', "executionID=$task->execution")),
+                            set('title', $task->executionName),
+                            $task->executionName,
+                        ),
                     ) : null,
+                    item
+                    (
+                        set::name($lang->testtask->build),
+                        span($taskBuild),
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->type),
+                        $taskType
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->owner),
+                        zget($users, $task->owner)
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->mailto),
+                        $mailto
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->pri),
+                        priLabel(zget($lang->testtask->priList, $task->pri))
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->begin),
+                        $task->begin
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->end),
+                        $task->end
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->realFinishedDate),
+                        !helper::isZeroDate($task->realFinishedDate) ? $task->realFinishedDate : ''
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->status),
+                        $this->processStatus('testtask', $task)
+                    ),
+                    item
+                    (
+                        set::name($lang->testtask->testreport),
+                        !empty($task->testreport) ? a
+                        (
+                            set('href', createLink('testreport', 'view', "reportID=$task->testreport")),
+                            $testreportTitle
+                        ) : null,
+                    )
                 )
             )
         )