From 34babef3d2e884ed4b8e2ca5ab233bfca0a3843c Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 4 Mar 2021 16:22:38 +0800 Subject: [PATCH] * update icons. --- module/common/lang/de.php | 4 ++-- module/common/lang/en.php | 4 ++-- module/common/lang/fr.php | 4 ++-- module/common/lang/vi.php | 4 ++-- module/common/lang/zh-cn.php | 4 ++-- module/common/lang/zh-tw.php | 6 +++--- module/mail/view/save.html.php | 2 +- module/my/view/story.html.php | 2 +- module/program/model.php | 4 ++-- module/project/model.php | 2 +- module/story/model.php | 2 +- www/theme/zui/css/min.css | 4 ++-- www/theme/zui/fonts/ZentaoIcon.eot | Bin 48100 -> 49120 bytes www/theme/zui/fonts/ZentaoIcon.svg | 9 ++++++--- www/theme/zui/fonts/ZentaoIcon.ttf | Bin 47924 -> 48944 bytes www/theme/zui/fonts/ZentaoIcon.woff | Bin 48000 -> 49020 bytes 16 files changed, 27 insertions(+), 24 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 6d54c26ac3..f8c3aaba9a 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -154,7 +154,7 @@ $lang->mainNav->doc = ' Doc|doc|index|'; $lang->mainNav->report = " Statistic|report|productsummary|"; $lang->mainNav->system = ' System|custom|estimate|'; $lang->mainNav->admin = ' Admin|admin|index|'; -if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; +if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; $lang->reporting = new stdclass(); $lang->dividerMenu = ',qa,report,admin,'; @@ -815,7 +815,7 @@ $lang->icons['product'] = 'cube'; $lang->icons['bug'] = 'bug'; $lang->icons['task'] = 'check-sign'; $lang->icons['tasks'] = 'tasks'; -$lang->icons['program'] = 'folder-open-o'; +$lang->icons['program'] = 'program'; $lang->icons['project'] = 'project'; $lang->icons['stage'] = 'waterfall'; $lang->icons['sprint'] = 'sprint'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 9b09c76ba9..cd82a2da33 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -155,7 +155,7 @@ $lang->mainNav->doc = ' Doc|doc|index|'; $lang->mainNav->report = " Statistic|report|productsummary|"; $lang->mainNav->system = ' System|custom|estimate|'; $lang->mainNav->admin = ' Admin|admin|index|'; -if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; +if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; $lang->reporting = new stdclass(); $lang->dividerMenu = ',qa,report,admin,'; @@ -824,7 +824,7 @@ $lang->icons['product'] = 'cube'; $lang->icons['bug'] = 'bug'; $lang->icons['task'] = 'check-sign'; $lang->icons['tasks'] = 'tasks'; -$lang->icons['program'] = 'folder-open-o'; +$lang->icons['program'] = 'program'; $lang->icons['project'] = 'project'; $lang->icons['stage'] = 'waterfall'; $lang->icons['sprint'] = 'sprint'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 03b230d1b6..f529c0ce9d 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -154,7 +154,7 @@ $lang->mainNav->doc = ' Doc|doc|index|'; $lang->mainNav->report = " Statistic|report|productsummary|"; $lang->mainNav->system = ' System|custom|estimate|'; $lang->mainNav->admin = ' Admin|admin|index|'; -if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; +if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; $lang->reporting = new stdclass(); $lang->dividerMenu = ',qa,report,admin,'; @@ -815,7 +815,7 @@ $lang->icons['product'] = 'cube'; $lang->icons['bug'] = 'bug'; $lang->icons['task'] = 'check-sign'; $lang->icons['tasks'] = 'tasks'; -$lang->icons['program'] = 'folder-open-o'; +$lang->icons['program'] = 'program'; $lang->icons['project'] = 'project'; $lang->icons['stage'] = 'waterfall'; $lang->icons['sprint'] = 'sprint'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index c6e87d5e4b..8f54924d75 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -154,7 +154,7 @@ $lang->mainNav->doc = ' Doc|doc|index|'; $lang->mainNav->report = " Statistic|report|productsummary|"; $lang->mainNav->system = ' System|custom|estimate|'; $lang->mainNav->admin = ' Admin|admin|index|'; -if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; +if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; $lang->reporting = new stdclass(); $lang->dividerMenu = ',qa,report,admin,'; @@ -815,7 +815,7 @@ $lang->icons['product'] = 'cube'; $lang->icons['bug'] = 'bug'; $lang->icons['task'] = 'check-sign'; $lang->icons['tasks'] = 'tasks'; -$lang->icons['program'] = 'folder-open-o'; +$lang->icons['program'] = 'program'; $lang->icons['project'] = 'project'; $lang->icons['stage'] = 'waterfall'; $lang->icons['sprint'] = 'sprint'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 54dd4ff83e..550fedea60 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -155,7 +155,7 @@ $lang->mainNav->doc = ' 文档|doc|index|'; $lang->mainNav->report = " 统计|report|productSummary|"; $lang->mainNav->system = ' 组织|custom|browsestoryconcept|'; $lang->mainNav->admin = ' 后台|admin|index|'; -if($config->systemMode == 'new') $lang->mainNav->program = " 项目集|$programModule|$programMethod|"; +if($config->systemMode == 'new') $lang->mainNav->program = " 项目集|$programModule|$programMethod|"; $lang->dividerMenu = ',qa,report,admin,'; @@ -822,7 +822,7 @@ $lang->icons['product'] = 'product'; $lang->icons['bug'] = 'bug'; $lang->icons['task'] = 'check-sign'; $lang->icons['tasks'] = 'tasks'; -$lang->icons['program'] = 'folder-open-o'; +$lang->icons['program'] = 'program'; $lang->icons['project'] = 'project'; $lang->icons['stage'] = 'waterfall'; $lang->icons['sprint'] = 'sprint'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 4411b9dc2b..c01b5b7300 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -139,7 +139,7 @@ list($projectModule, $projectMethod) = explode('-', $config->projectLink); /* 主導航菜單。*/ $lang->mainNav = new stdclass(); $lang->mainNav->my = ' 地盤|my|index|'; -$lang->mainNav->program = " 項目集|$programModule|$programMethod|"; +$lang->mainNav->program = " 項目集|$programModule|$programMethod|"; $lang->mainNav->product = " 產品|$productModule|$productMethod|"; $lang->mainNav->project = " 項目|$projectModule|$projectMethod|"; $lang->mainNav->qa = ' 测试|qa|index|'; @@ -843,7 +843,7 @@ $lang->icons['product'] = 'product'; $lang->icons['bug'] = 'bug'; $lang->icons['task'] = 'check-sign'; $lang->icons['tasks'] = 'tasks'; -$lang->icons['program'] = 'folder-open-o'; +$lang->icons['program'] = 'program'; $lang->icons['project'] = 'project'; $lang->icons['stage'] = 'waterfall'; $lang->icons['sprint'] = 'sprint'; @@ -965,7 +965,7 @@ $lang->waterfall->subMenu->other->risk = array('link' => '風險|risk|bro $lang->waterfall->subMenu->other->stakeholder = array('link' => '干係人|stakeholder|browse|', 'subModule' => 'stakeholder'); $lang->waterfall->setMenu = new stdclass(); -$lang->waterfall->setMenu = $lang->scrum->setMenu; +$lang->waterfall->setMenu = $lang->scrum->setMenu; $lang->waterfallproduct = new stdclass(); $lang->workestimation = new stdclass(); diff --git a/module/mail/view/save.html.php b/module/mail/view/save.html.php index 53fdaeb515..cba2aeab3f 100755 --- a/module/mail/view/save.html.php +++ b/module/mail/view/save.html.php @@ -24,7 +24,7 @@ mail->successSaved;?> post->turnon):?> - mail->test . ' ', '', "class='btn btn-primary btn-sm'");?> + mail->test . ' ', '', "class='btn btn-primary btn-sm'");?> mail->setForUser;?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 53a2342629..7718ac475d 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -95,7 +95,7 @@ if($canBeChanged) { $vars = "story={$story->id}"; - common::printIcon('story', 'change', $vars, $story, 'list', 'fork'); + common::printIcon('story', 'change', $vars, $story, 'list', 'alter'); common::printIcon('story', 'review', $vars, $story, 'list', 'glasses'); common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); common::printIcon('story', 'edit', $vars, $story, 'list'); diff --git a/module/program/model.php b/module/program/model.php index 44f3f5a5f9..939ad41e1f 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -195,7 +195,7 @@ class programModel extends model ->orderBy($orderBy) ->page($pager) ->fetchAll(); - } + } /** * Get stakeholders by program id list. @@ -451,7 +451,7 @@ class programModel extends model } $dropMenuLink = helper::createLink('program', 'ajaxGetDropMenu', "objectID=$programID&module=$currentModule&method=$currentMethod"); - $output = "