From a1aa671bb22c61d218b5d2b2960a90032be2cfd8 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 6 Feb 2023 10:35:12 +0800 Subject: [PATCH 01/13] * Finish task #83745. --- module/group/control.php | 7 ++++++- module/group/lang/de.php | 1 + module/group/lang/en.php | 1 + module/group/lang/fr.php | 1 + module/group/lang/resource.php | 20 +++++++++----------- module/group/lang/zh-cn.php | 1 + 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/module/group/control.php b/module/group/control.php index 462bd14904..df405316d0 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -199,7 +199,12 @@ class group extends control */ public function managePriv($type = 'byGroup', $param = 0, $menu = '', $version = '') { - if($type == 'byGroup') $groupID = $param; + if($type == 'byGroup') + { + $groupID = $param; + $this->lang->custom->common = $this->lang->group->config; + } + $this->view->type = $type; foreach($this->lang->resource as $moduleName => $action) { diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 15e565c248..6054a38372 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -64,6 +64,7 @@ $lang->group->outside = 'Andere Benutzer'; $lang->group->limited = 'Limited Users'; $lang->group->other = 'Andere'; $lang->group->all = 'Alle'; +$lang->group->config = 'Config'; $lang->group->copyOptions['copyPriv'] = 'Rechte kopieren'; $lang->group->copyOptions['copyUser'] = 'Benutzer kopieren'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 3f5a031f85..ae6e06027a 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -64,6 +64,7 @@ $lang->group->outside = 'Other Users'; $lang->group->limited = 'Limited Users'; $lang->group->other = 'Others'; $lang->group->all = 'All Privileges'; +$lang->group->config = 'Config'; $lang->group->copyOptions['copyPriv'] = 'Copy Privileges'; $lang->group->copyOptions['copyUser'] = 'Copy Users'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 0e0ba4b355..81e58e3c78 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -64,6 +64,7 @@ $lang->group->outside = 'Autres utilisateurs'; $lang->group->limited = 'Limited Users'; $lang->group->other = 'Autres'; $lang->group->all = 'Tous les Privilèges'; +$lang->group->config = 'Config'; $lang->group->copyOptions['copyPriv'] = 'Copier Privilèges'; $lang->group->copyOptions['copyUser'] = 'Copier Utilisateurs'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 37b350c0d9..53604e35ce 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1418,7 +1418,6 @@ $lang->resource->custom->execution = 'execution'; $lang->resource->custom->required = 'required'; $lang->resource->custom->restore = 'restore'; $lang->resource->custom->flow = 'flow'; -$lang->resource->custom->working = 'working'; $lang->resource->custom->setPublic = 'setPublic'; $lang->resource->custom->timezone = 'timezone'; $lang->resource->custom->setStoryConcept = 'setStoryConcept'; @@ -1436,16 +1435,15 @@ $lang->custom->methodOrder[20] = 'execution'; $lang->custom->methodOrder[25] = 'required'; $lang->custom->methodOrder[30] = 'restore'; $lang->custom->methodOrder[35] = 'flow'; -$lang->custom->methodOrder[40] = 'working'; -$lang->custom->methodOrder[45] = 'setPublic'; -$lang->custom->methodOrder[50] = 'timezone'; -$lang->custom->methodOrder[55] = 'setStoryConcept'; -$lang->custom->methodOrder[60] = 'editStoryConcept'; -$lang->custom->methodOrder[65] = 'browseStoryConcept'; -$lang->custom->methodOrder[70] = 'setDefaultConcept'; -$lang->custom->methodOrder[75] = 'deleteStoryConcept'; -$lang->custom->methodOrder[80] = 'kanban'; -$lang->custom->methodOrder[85] = 'code'; +$lang->custom->methodOrder[40] = 'setPublic'; +$lang->custom->methodOrder[45] = 'timezone'; +$lang->custom->methodOrder[50] = 'setStoryConcept'; +$lang->custom->methodOrder[55] = 'editStoryConcept'; +$lang->custom->methodOrder[60] = 'browseStoryConcept'; +$lang->custom->methodOrder[65] = 'setDefaultConcept'; +$lang->custom->methodOrder[70] = 'deleteStoryConcept'; +$lang->custom->methodOrder[75] = 'kanban'; +$lang->custom->methodOrder[80] = 'code'; $lang->resource->datatable = new stdclass(); $lang->resource->datatable->setGlobal = 'setGlobal'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index e4d9550abe..1781a61aaf 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -64,6 +64,7 @@ $lang->group->outside = '组外用户'; $lang->group->limited = '受限用户组'; $lang->group->other = '其他模块'; $lang->group->all = '所有权限'; +$lang->group->config = '配置'; $lang->group->copyOptions['copyPriv'] = '复制权限'; $lang->group->copyOptions['copyUser'] = '复制用户'; From 6e345d75257ed2bb36466a7c33ac3cf138ea83b0 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 6 Feb 2023 10:40:25 +0800 Subject: [PATCH 02/13] * Code for change pd-l in a to pd-r in icon --- module/program/css/browse.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/program/css/browse.css b/module/program/css/browse.css index 5b3190538a..fae35ad361 100644 --- a/module/program/css/browse.css +++ b/module/program/css/browse.css @@ -10,7 +10,7 @@ tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;} .has-prefix {position: relative; display: flex; align-items: center;} .has-prefix > span {flex: none;} -.has-prefix > a {padding-left: 5px;} +.has-prefix > .icon-cards-view {padding-right: 4px;} .has-suffix > a {max-width: calc(100% - 100px); padding-right: 5px; color: #0c60e1; display: inline-block;} From 5b6978ed8b9cda0e07bd35a31f11fdd1c49efd6d Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 6 Feb 2023 12:02:31 +0800 Subject: [PATCH 03/13] * Finish task #83744. --- module/group/control.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/module/group/control.php b/module/group/control.php index df405316d0..6885e94cde 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -199,11 +199,7 @@ class group extends control */ public function managePriv($type = 'byGroup', $param = 0, $menu = '', $version = '') { - if($type == 'byGroup') - { - $groupID = $param; - $this->lang->custom->common = $this->lang->group->config; - } + if($type == 'byGroup') $groupID = $param; $this->view->type = $type; foreach($this->lang->resource as $moduleName => $action) @@ -239,6 +235,9 @@ class group extends control if(version_compare($currentVersion, $realVersion, '>=')) $changelog[] = join(',', $currentChangeLog); } + $this->lang->custom->common = $this->lang->group->config; + if($this->config->edition == 'max') $this->lang->baseline->common = $this->lang->group->docTemplate; + $this->view->group = $group; $this->view->changelogs = ',' . join(',', $changelog) . ','; $this->view->groupPrivs = $groupPrivs; From 34e4445859861c05c1d055b8d59c7218e4d5babf Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Mon, 6 Feb 2023 13:07:03 +0800 Subject: [PATCH 04/13] * Fix the bug of not updating the weekly report. --- module/weekly/control.php | 6 +++--- module/weekly/model.php | 14 ++++++++------ module/weekly/view/index.html.php | 1 - 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/module/weekly/control.php b/module/weekly/control.php index 5c90c1c552..e6f55275a3 100755 --- a/module/weekly/control.php +++ b/module/weekly/control.php @@ -61,9 +61,9 @@ class weekly extends control $data = $this->weekly->getReportData($projectID, $date); foreach($data as $key => $val) $this->view->$key = $val; - $this->view->title = $this->lang->weekly->common; - $this->view->date = $date; - + $this->view->title = $this->lang->weekly->common; + $this->view->date = $date; + $this->view->projectCost = zget($this->config->custom, 'cost', 1); $this->lang->modulePageNav = $this->weekly->getPageNav($this->view->project, $date); $this->display(); } diff --git a/module/weekly/model.php b/module/weekly/model.php index 3277419cc8..8dbbc819be 100755 --- a/module/weekly/model.php +++ b/module/weekly/model.php @@ -117,11 +117,11 @@ class weeklyModel extends model { $weekStart = $this->getThisMonday($date); $report = new stdclass(); - $PVEV = $this->getPVEV($project, $date); + $PVEV = $this->getPVEV($project, $date, $mode = 'new'); $report->pv = $PVEV['PV']; $report->ev = $PVEV['EV']; - $report->ac = $this->getAC($project, $date); + $report->ac = $this->getAC($project, $date, $mode = 'new'); $report->sv = $this->getSV($report->ev, $report->pv); $report->cv = $this->getCV($report->ev, $report->ac); $report->project = $project; @@ -372,13 +372,14 @@ class weeklyModel extends model * * @param int $project * @param string $date + * @param string $mode * @access public * @return array */ - public function getPVEV($projectID, $date = '') + public function getPVEV($projectID, $date = '', $mode = 'old') { $report = $this->getFromDB($projectID, $date); - if(!empty($report)) return array('PV' => $report->pv, 'EV' => $report->ev); + if(!empty($report) && $mode == 'old') return array('PV' => $report->pv, 'EV' => $report->ev); if(!$date) $date = date('Y-m-d'); $lastDay = $this->getLastDay($date); @@ -434,13 +435,14 @@ class weeklyModel extends model * * @param int $project * @param string $date + * @param string $mode * @access public * @return int */ - public function getAC($project, $date = '') + public function getAC($project, $date = '', $mode = 'old') { $report = $this->getFromDB($project, $date); - if(!empty($report)) return $report->ac; + if(!empty($report) && $mode == 'old') return $report->ac; if(!$date) $date = date('Y-m-d'); $lastDay = $this->getLastDay($date); diff --git a/module/weekly/view/index.html.php b/module/weekly/view/index.html.php index 668beb1f1b..aa8a3d95c6 100644 --- a/module/weekly/view/index.html.php +++ b/module/weekly/view/index.html.php @@ -71,7 +71,6 @@ $(function(){$('#exportreport').modalTrigger();}); weekly->cv;?> weekly->cost;?> - config->custom, 'cost', 1);?> From 33fc8fd62012b429bd104140bd56ed4abeec9df9 Mon Sep 17 00:00:00 2001 From: Yagami Date: Mon, 6 Feb 2023 13:24:02 +0800 Subject: [PATCH 05/13] * Code for php version bug. --- module/story/model.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index 0286aa293e..45ce2b584b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -910,8 +910,10 @@ class storyModel extends model if(!empty($_POST['plan'])) $storyPlan = is_array($_POST['plan']) ? array_filter($_POST['plan']) : array($_POST['plan']); if(count($storyPlan) > 1) { - $oldStoryPlan = !empty($oldStory->planTitle) ? array_keys($oldStory->planTitle) : array(); - if(!empty(array_diff($storyPlan, $oldStoryPlan)) or !empty(array_diff($oldStoryPlan, $storyPlan))) + $oldStoryPlan = !empty($oldStory->planTitle) ? array_keys($oldStory->planTitle) : array(); + $oldPlanDiff = array_diff($storyPlan, $oldStoryPlan); + $storyPlanDiff = array_diff($oldStoryPlan, $storyPlan); + if(!empty($oldPlanDiff) or !empty($storyPlanDiff)) { dao::$errors[] = $this->lang->story->notice->changePlan; return false; From 775c16402c155f1ce14ffea54655d9d65e398401 Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Mon, 6 Feb 2023 13:24:45 +0800 Subject: [PATCH 06/13] * Optimize code. --- module/weekly/control.php | 6 +++--- module/weekly/view/index.html.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/weekly/control.php b/module/weekly/control.php index e6f55275a3..5c90c1c552 100755 --- a/module/weekly/control.php +++ b/module/weekly/control.php @@ -61,9 +61,9 @@ class weekly extends control $data = $this->weekly->getReportData($projectID, $date); foreach($data as $key => $val) $this->view->$key = $val; - $this->view->title = $this->lang->weekly->common; - $this->view->date = $date; - $this->view->projectCost = zget($this->config->custom, 'cost', 1); + $this->view->title = $this->lang->weekly->common; + $this->view->date = $date; + $this->lang->modulePageNav = $this->weekly->getPageNav($this->view->project, $date); $this->display(); } diff --git a/module/weekly/view/index.html.php b/module/weekly/view/index.html.php index aa8a3d95c6..a1d6538182 100644 --- a/module/weekly/view/index.html.php +++ b/module/weekly/view/index.html.php @@ -71,7 +71,8 @@ $(function(){$('#exportreport').modalTrigger();}); weekly->cv;?> weekly->cost;?> - + config->custom, 'cost', 1);?> +

weekly->finished;?>

From 1aaa267cffb3ddb19e18dc9b56067473ffdd218a Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Mon, 6 Feb 2023 06:43:02 +0000 Subject: [PATCH 07/13] * Add the comment. --- tools/prepareupdate.php | 116 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/tools/prepareupdate.php b/tools/prepareupdate.php index b58a09dc0c..e63de0e5c2 100755 --- a/tools/prepareupdate.php +++ b/tools/prepareupdate.php @@ -6,6 +6,12 @@ class prepareUpdate public $internalZT; public $mysqlConfig; + /** + * Construct. + * + * @access public + * @return void + */ public function __construct() { $this->initZT(); @@ -21,6 +27,12 @@ class prepareUpdate $this->checkLang(); } + /** + * Init mysql config. + * + * @access public + * @return void + */ public function initMysql() { $this->mysqlConfig = new stdclass(); @@ -29,6 +41,12 @@ class prepareUpdate $this->mysqlConfig->databaseName = 'zentaostandard'; } + /** + * Init zentao config. + * + * @access public + * @return void + */ public function initZT() { $this->internalZT = new stdclass(); @@ -44,6 +62,12 @@ class prepareUpdate $this->getLatestVersion(); } + /** + * Get zentao token. + * + * @access public + * @return void + */ public function getZTToken() { $tokenUrl = "{$this->internalZT->apiRoot}/tokens"; @@ -55,6 +79,12 @@ class prepareUpdate return $response->token; } + /** + * Add the changelog of the newest release. + * + * @access public + * @return void + */ public function addChangelog() { $relatedStoriesAndBugs = $this->getRelatedStoriesAndBugs(); @@ -62,6 +92,12 @@ class prepareUpdate file_put_contents('../doc/CHANGELOG', $relatedStoriesAndBugs . "\n" . $oldChangelog); } + /** + * Get stories and bugs of the releases for changelog. + * + * @access public + * @return string + */ public function getRelatedStoriesAndBugs() { $latestReleases = $this->getLatestRelease(); @@ -92,6 +128,12 @@ class prepareUpdate return $releaseHeader . $doneStories . $fixedBugs; } + /** + * Get the title of story or bug. + * + * @access public + * @return string + */ public function getStoryOrBugTitle($objectType, $objectID) { $type = $objectType == 'story' ? 'stories' : 'bugs'; @@ -104,6 +146,12 @@ class prepareUpdate return $response ? $response->title : ''; } + /** + * Get pms, biz and max latest version. + * + * @access public + * @return void + */ public function getLatestVersion() { $releases = $this->getLatestRelease(); @@ -115,6 +163,13 @@ class prepareUpdate } } + /** + * Get last max version. + * + * @param object $lastMaxRelease + * @access public + * @return array + */ public function getLastMaxVersion($lastMaxRelease) { $releaseParse = explode(' ', $lastMaxRelease->name); @@ -122,6 +177,12 @@ class prepareUpdate $this->internalZT->lastMaxVersionAB = str_replace('.', '_', $this->internalZT->lastMaxVersion); } + /** + * Get pms, biz and max latest release. + * + * @access public + * @return array + */ public function getLatestRelease() { $pmsReleases = $this->getReleases($this->internalZT->pmsProductID); @@ -137,6 +198,13 @@ class prepareUpdate return array('pms' => $pmsLatestRelease, 'biz' => $bizLatestRelease, 'max' => $maxLatestRelease); } + /** + * Get releases by api. + * + * @param int $productID + * @access public + * @return array + */ public function getReleases($productID) { $releaseUrl = "{$this->internalZT->apiRoot}/products/{$productID}/releases"; @@ -148,6 +216,12 @@ class prepareUpdate return $response->releases; } + /** + * Update the newest version. + * + * @access public + * @return void + */ public function changeVersion() { $lastVersion = file_get_contents('../VERSION'); @@ -160,6 +234,12 @@ class prepareUpdate `sed -i "s/\$config->version = '$lastVersion'/\$config->version = '{$this->internalZT->pmsVersion}'/" ../config/config.php`; } + /** + * Add the release's detail. + * + * @access public + * @return void + */ public function addReleaseDetail() { $date = date('Y-m-d'); @@ -174,6 +254,12 @@ class prepareUpdate /* Other lang. */ } + /** + * Add the last version for update. + * + * @access public + * @return void + */ public function addLastVersion() { `sed -i "s/ \/\/ pms insert position\.$/\\n\\\$lang->upgrade->fromVersions['{$this->internalZT->pmsVersionAB}'] = '{$this->internalZT->pmsVersion}'; \/\/ pms insert position\./" ../module/upgrade/lang/version.php`; @@ -181,17 +267,35 @@ class prepareUpdate `sed -i "s/ \/\/ max insert position\.$/\\n\\\$lang->upgrade->fromVersions['max{$this->internalZT->lastMaxVersionAB}'] = 'Max{$this->internalZT->lastMaxVersion}'; \/\/ max insert position\./" ../module/upgrade/lang/version.php`; } + /** + * Add the version correspondence between open source and business. + * + * @access public + * @return void + */ public function addVersionCorrespondence() { `sed -i "s/ \/\/ biz insert position\.$/\\n\\\$config->upgrade->bizVersion['biz{$this->internalZT->bizVersionAB}'] = '{$this->internalZT->pmsVersionAB}'; \/\/ biz insert position\./" ../module/upgrade/config.php`; `sed -i "s/ \/\/ max insert position\.$/\\n\\\$config->upgrade->maxVersion['max{$this->internalZT->maxVersionAB}'] = '{$this->internalZT->pmsVersionAB}'; \/\/ max insert position\./" ../module/upgrade/config.php`; } + /** + * Add the confirm sql for update. + * + * @access public + * @return void + */ public function addConfirmedSql() { `sed -i "s/ \/\/ confirm insert position\.$/\\n case '{$this->internalZT->lastPmsVersionAB}':\\n \\\$confirmContent .= file_get_contents(\\\$this->getUpgradeFile('{$this->internalZT->lastPmsVersion}')); \/\/ confirm insert position\./" ../module/upgrade/model.php`; } + /** + * Export standard sql. + * + * @access public + * @return void + */ public function exportStandardSql() { $lastStandardSql = file_get_contents("../db/standard/zentao{$this->internalZT->lastPmsVersion}.sql"); @@ -209,6 +313,12 @@ class prepareUpdate file_put_contents("../db/standard/zentao{$this->internalZT->pmsVersion}.sql", $content); } + /** + * Check whether update sql and install sql are consistent. + * + * @access public + * @return void + */ public function checkInstallSql() { $updateSql = file_get_contents("../db/update{$this->internalZT->lastPmsVersion}.sql"); @@ -259,6 +369,12 @@ class prepareUpdate echo $errorSql; } + /** + * Check lang. + * + * @access public + * @return void + */ public function checkLang() { `php check.php`; From b37af3c3a7d93f8a9d224c8057ffe160390d07d0 Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Mon, 6 Feb 2023 15:35:33 +0800 Subject: [PATCH 08/13] * Fix bug #84089. --- module/story/control.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/story/control.php b/module/story/control.php index 2c743d9b1e..632789009f 100755 --- a/module/story/control.php +++ b/module/story/control.php @@ -73,7 +73,11 @@ class story extends control if(empty($objectID)) $objectID = $this->session->project; $projectID = $objectID; - if(!$this->session->multiple) $projectID = $this->session->project; + if(!$this->session->multiple) + { + $projectID = $this->session->project; + $objectID = $this->execution->getNoMultipleID($projectID); + } $projectID = isset($objects[$projectID]) ? $projectID : $this->session->project; $projectID = $this->project->saveState($projectID, $objects); $this->project->setMenu($projectID); From 91efd857834cbbcd397d89ef2a670c18e40804c8 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Mon, 6 Feb 2023 15:56:49 +0800 Subject: [PATCH 09/13] * Code for task#83681. --- module/weekly/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/weekly/control.php b/module/weekly/control.php index 5c90c1c552..4a9ec4c8e9 100755 --- a/module/weekly/control.php +++ b/module/weekly/control.php @@ -79,6 +79,7 @@ class weekly extends control $projects = $this->dao->select('id, name')->from(TABLE_PROJECT) ->where('deleted')->eq(0) ->andWhere('type')->eq('project') + ->andWhere('status')->ne('closed') ->fetchPairs(); $date = helper::today(); From 36bd3f3384dfe53df41a808c41b011f8e8e9b6fc Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 6 Feb 2023 16:52:51 +0800 Subject: [PATCH 10/13] * Code for task #83731 --- module/admin/css/index.css | 29 ++++++++++++- module/admin/lang/zh-cn.php | 6 +++ module/admin/view/index.html.php | 71 ++++++++++++++++++++++++++++++-- 3 files changed, 100 insertions(+), 6 deletions(-) diff --git a/module/admin/css/index.css b/module/admin/css/index.css index d052effbd4..f5523031fb 100755 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -1,3 +1,17 @@ +/* atomic class */ +.flex {display: flex;} +.align-center {align-items: center;} +.justify-between {justify-content: space-between;} +.title-color {color: #313C52} +.font-13 {font-size: 13px;} +.color-gray {color: #5E626D;} +.border-gray {border: 1px solid #E3E4E9;} +.h-56 {height: 56px;} +.h-40 {height: 40px;} +.pl-16 {padding-left: 16px;} +.px-16 {padding: 0 16px;} +.mb-16 {margin-bottom: 16px;} + #notice {margin: -20px -20px 20px; padding: 20px;} #zentaoLinks {margin-top: 20px;} #zentaoLinks .panel .panel-heading {padding: 6px 10px;} @@ -7,7 +21,6 @@ .admin > .main {flex: 1 1 70%;} .admin > .side {flex: 1 1 30%; padding-left: 10px; margin-left: 16px;} .panel-title {padding: 10px 0px;} -.flex {display: flex;} .panel {padding: 0 0 0 16px;} .settings.panel, .plug.panel {margin-bottom: 16px;} @@ -19,7 +32,6 @@ .settings-list > .setting-box > h4 > img {padding-right: 8px; padding-bottom: 3px; width: 32px; height: 27px;} .settings-list > .setting-box > .setting-desc {padding-bottom: 16px; color: #5E626D;} .settings-list.lite-setting > .setting-box {flex: 1 1 30%;} -.panel-title > a {display: flex; align-items: center;} .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;} .plugin-list > .plugin-item {flex: 1 1 26%; padding: 16px 10px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 10px; margin-bottom: 16px; width: 0px; cursor: pointer;} @@ -38,6 +50,7 @@ .official-content > .content {color: #838A9D; font-size: 12px; line-height: 22px; padding-top: 6px;} .official-content > .title {color: #313C52; font-size: 13px; line-height: 14px;} +.classList {aspect-ratio: 4/1;} .classList > .classItem {flex: 1 1 30%; margin: 5px; border: 1px solid rgba(227, 228, 233, 0.6); border-radius: 4px; margin-bottom: 16px; align-items: center;} .classItem > .imgBack {flex: 1 1 50%;} .classItem > .imgBack > .classImg {background-repeat: no-repeat; background-size: contain; aspect-ratio: 16 / 9; background-position: center; margin: 0px; border-top-left-radius: 4px; border-top-right-radius: 4px;} @@ -55,3 +68,15 @@ .main.without-internet > .plug.panel {flex: 1 1 60%; margin-bottom: unset; margin-right: 16px;} .main.without-internet > .bottom > .official.panel {margin-right: unset;} .main.without-internet > .bottom > .official.panel > .main-panel {flex-direction: row-reverse;} + +/* css in side */ +.time-block {background: #EDEEF2; padding: 4px; border-radius: 4px; color: #0B0F18; font-size: 15px;} +.dynamic-block {height: 64px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;} +.dynamic-time {white-space: nowrap; position: absolute; right: 28px; bottom: 12px;} + +.patch-block {padding: 12px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;} +.patch-content {height: 40px; overflow: hidden;} + +.upgrade-block {padding: 16px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;} +.upgrade-content {height: 20px; padding-left: 20px; position: relative; margin: 5px 0;} +.upgrade-content:before {content: ' '; width: 10px; height: 10px; background: #E3E4E9; border-radius: 50%; position: absolute; left: 0px; top: 5px;} diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 05e63ed117..20e7e67adc 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -170,4 +170,10 @@ $lang->admin->menuSetting['dev']['desc'] = '支持对系统进行二次开 $lang->admin->menuSetting['convert']['name'] = '数据导入'; $lang->admin->menuSetting['convert']['desc'] = '第三方系统的数据导入。'; +$lang->admin->mon = '月'; +$lang->admin->day = '日'; +$lang->admin->updateDynamics = '更新动态'; +$lang->admin->updatePatch = '补丁更新'; +$lang->admin->upgradeRecommend = '推荐升级'; + include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index a293e99564..5576e65c40 100755 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -32,7 +32,7 @@
admin->pluginRecommendation;?> - admin->extensionURL, "{$lang->more} ", '_blank', 'class="more text-muted"');?> + admin->extensionURL, "{$lang->more} ", '_blank', 'class="more text-muted flex align-center"');?>
> @@ -68,7 +68,7 @@
admin->publicClass;?> - admin->classURL, "{$lang->more} ", '_blank', 'class="more text-muted"');?> + admin->classURL, "{$lang->more} ", '_blank', 'class="more text-muted flex align-center"');?>
@@ -87,8 +87,71 @@
- From 1a1f8d3a07b18cfb6899f20c1496621868f10642 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 6 Feb 2023 17:05:37 +0800 Subject: [PATCH 11/13] * Put holiday permissions in the open source edition. --- module/common/lang/common.php | 1 + module/group/lang/resource.php | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/module/common/lang/common.php b/module/common/lang/common.php index 3959e83492..ab497700c7 100644 --- a/module/common/lang/common.php +++ b/module/common/lang/common.php @@ -87,6 +87,7 @@ $lang->sonarqube = new stdclass(); $lang->app = new stdclass(); $lang->zahost = new stdclass(); $lang->zanode = new stdclass(); +$lang->holiday = new stdclass(); $lang->projectbuild = new stdclass(); $lang->projectrelease = new stdclass(); diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 53604e35ce..53f4afc3e4 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1915,6 +1915,19 @@ $lang->message->methodOrder[5] = 'index'; $lang->message->methodOrder[10] = 'browser'; $lang->message->methodOrder[15] = 'setting'; +/* Holiday. */ +$lang->resource->holiday = new stdclass(); +$lang->resource->holiday->create = 'createAction'; +$lang->resource->holiday->edit = 'editAction'; +$lang->resource->holiday->delete = 'deleteAction'; +$lang->resource->holiday->browse = 'browse'; + +$lang->holiday->methodOrder[0] = 'browse'; +$lang->holiday->methodOrder[5] = 'create'; +$lang->holiday->methodOrder[10] = 'edit'; +$lang->holiday->methodOrder[15] = 'delete'; + +/* Action. */ $lang->resource->action = new stdclass(); $lang->resource->action->trash = 'trash'; $lang->resource->action->undelete = 'undeleteAction'; From 07960c45a0e44cf0f2a6283f5ff3c383c54e3edd Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 6 Feb 2023 17:10:28 +0800 Subject: [PATCH 12/13] * Code for admin refactors --- module/admin/css/index.css | 3 ++- module/admin/view/index.html.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/admin/css/index.css b/module/admin/css/index.css index f5523031fb..bb34529ba2 100755 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -72,7 +72,8 @@ /* css in side */ .time-block {background: #EDEEF2; padding: 4px; border-radius: 4px; color: #0B0F18; font-size: 15px;} .dynamic-block {height: 64px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;} -.dynamic-time {white-space: nowrap; position: absolute; right: 28px; bottom: 12px;} +.dynamic-content {height: 40px; overflow: hidden;} +.dynamic-time {white-space: nowrap; position: absolute; right: 20px; bottom: 10px; padding-right: 12px; background: white;} .patch-block {padding: 12px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;} .patch-content {height: 40px; overflow: hidden;} diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index 5576e65c40..173f0167f1 100755 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -135,7 +135,7 @@
禅道企业版
-
查看详情
+
查看详情
工时管理、甘特图、导入导出
40+内置统计报表、自定义报表功能
@@ -144,7 +144,7 @@
禅道旗舰版
-
查看详情
+
查看详情
工时管理、甘特图、导入导出
40+内置统计报表、自定义报表功能
From c14a0f505a273ff28c52b0f88e22bad028e7b71f Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 6 Feb 2023 17:14:18 +0800 Subject: [PATCH 13/13] * Code for add lang in admin --- module/admin/lang/de.php | 6 ++++++ module/admin/lang/en.php | 6 ++++++ module/admin/lang/fr.php | 6 ++++++ module/admin/lang/vi.php | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index ca1e6c6c96..67e77b6ae4 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -170,4 +170,10 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm $lang->admin->menuSetting['convert']['name'] = 'Data Import'; $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.'; +$lang->admin->mon = 'month'; +$lang->admin->day = 'day'; +$lang->admin->updateDynamics = 'updateDynamics'; +$lang->admin->updatePatch = 'updatePatch'; +$lang->admin->upgradeRecommend = 'upgradeRecommend'; + include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index c808ebf358..2314b2dd83 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -170,4 +170,10 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm $lang->admin->menuSetting['convert']['name'] = 'Data Import'; $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.'; +$lang->admin->mon = 'month'; +$lang->admin->day = 'day'; +$lang->admin->updateDynamics = 'updateDynamics'; +$lang->admin->updatePatch = 'updatePatch'; +$lang->admin->upgradeRecommend = 'upgradeRecommend'; + include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 760eb8f74d..2bda8e62e3 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -170,4 +170,10 @@ $lang->admin->menuSetting['dev']['desc'] = 'Support for secondary developm $lang->admin->menuSetting['convert']['name'] = 'Data Import'; $lang->admin->menuSetting['convert']['desc'] = 'Data import from third-party systems.'; +$lang->admin->mon = 'month'; +$lang->admin->day = 'day'; +$lang->admin->updateDynamics = 'updateDynamics'; +$lang->admin->updatePatch = 'updatePatch'; +$lang->admin->upgradeRecommend = 'upgradeRecommend'; + include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/vi.php b/module/admin/lang/vi.php index 96edcc1521..9752f9ff71 100755 --- a/module/admin/lang/vi.php +++ b/module/admin/lang/vi.php @@ -93,4 +93,10 @@ $lang->admin->safe->noticeMode = 'Mật khẩu sẽ được kiểm tra khi ng $lang->admin->safe->noticeStrong = ''; $lang->admin->safe->noticeGd = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.'; +$lang->admin->mon = 'month'; +$lang->admin->day = 'day'; +$lang->admin->updateDynamics = 'updateDynamics'; +$lang->admin->updatePatch = 'updatePatch'; +$lang->admin->upgradeRecommend = 'upgradeRecommend'; + include dirname(__FILE__) . '/menu.php';