From ca96ce81e03a61397280499f0f8c453c78841a64 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 8 Apr 2021 13:52:05 +0800
Subject: [PATCH 1/4] * Fix icon size.

---
 www/theme/default/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index d32407ea85..9ceddf34c5 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -47,6 +47,7 @@ a.showMoreImage:hover {opacity: 1;}
 #header #toolbar a {color: #3c4353; font-size: 13px;}
 #header #toolbar a:hover, .selected a {color: #fff!important;}
 #header #toolbar i {font-size: 16px;}
+#header .header-btn i {font-size: 16px;}
 
 #toolbar {top: 0px; height: 50px;}
 #userNav {float: none; margin: 0;}

From b9736fc551822303d58362ed4e7ce6479a9e9d9d Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 8 Apr 2021 15:02:34 +0800
Subject: [PATCH 2/4] * Code for task #37122.

---
 module/execution/view/all.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 5440ed85da..f0758b5ce6 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -21,7 +21,7 @@
 .table td.has-child > .plan-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .plan-toggle > .icon:before {text-align: left;}
 .table td.has-child > .plan-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);}
-.table td.hours {padding-right: 12px;}
+.table td.hours {padding-right: 20px;}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 .hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}

From 1bdc85422983525e7f09b1c7088a8c1416359d98 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 8 Apr 2021 15:08:25 +0800
Subject: [PATCH 3/4]  * Fix edit doc error.

---
 module/doc/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index 7441707e1d..2e2c82ce55 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -956,7 +956,7 @@ class doc extends control
         {
             $libs = $this->doc->getLibsByObject('book', 0);
             $this->app->rawMethod = 'book';
-            if($libID == 0) $libID = reset($libs)->id;
+            if($libID == 0 and !empty($libs)) $libID = reset($libs)->id;
             $this->lang->modulePageNav = $this->doc->select($type, $objects, $objectID, $libs, $libID);
 
             if(!$docID) $docID = $this->dao->select('id')->from(TABLE_DOC)

From ba89a451501093882fdaaeb369abca0ecb8c833f Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 8 Apr 2021 15:13:48 +0800
Subject: [PATCH 4/4] * Fix icon.

---
 module/common/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/common/model.php b/module/common/model.php
index 44f67edc9a..b8e08a2c93 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -551,6 +551,7 @@ class commonModel extends model
             if($openApp == 'product') $currentMethod = 'all';
         }
 
+        if($config->systemMode == 'classic' and $openApp == 'execution') $icon = zget($lang->navIcons, 'project', '');
         $link = ($openApp != 'execution' or ($config->systemMode == 'classic')) ? helper::createLink($currentModule, $currentMethod) : '';
         $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}";