diff --git a/module/block/view/preference.html.php b/module/block/view/preference.html.php
index 47adb02464..3f93a22484 100644
--- a/module/block/view/preference.html.php
+++ b/module/block/view/preference.html.php
@@ -9,12 +9,21 @@
border: 1px solid #EDEEF2;
}
.preference-border > .preference-img {
- flex: 0 0 160px;
+ flex: 0 0 80px;
}
.preference.picker-option-active >.preference-border {
border: 2px solid #2E7FFF;
}
.preference.picker-option-active {
+ background: unset!important;
+}
+.preference.picker-option-active > .preference-border {
+ background: rgba(230,240,255, 0.4)!important;
+}
+.picker-option.picker-option-selected.preference {
+ background: unset!important;
+}
+.picker-option.picker-option-selected.preference > .preference-border {
background: rgba(230,240,255, 0.4)!important;
}
.preference-text {
@@ -34,17 +43,25 @@
white-space: normal;
}
-#pickerDropMenu-pk_URSR > .picker-option-list{
+.picker-option.picker-option-active,
+.picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr,
+.picker-option.picker-option-selected.option-ursr {
+ background: unset!important;
+ color: unset;
+}
+.picker-option.picker-option-active > .border,
+.picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border,
+.picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border {
+ background: rgba(230,240,255, 0.4)!important;
+ border: 1px solid #2E7FFF;
+}
+#pickerDropMenu-pk_URSR > .picker-option-list {
display: flex;
flex-wrap: wrap;
}
.option-ursr {
flex: 1 1 50%;
}
-.option-ursr.picker-option-selected > .border,
-.option-ursr.picker-option-active> .border {
- border: none;
-}
.option-ursr > .border {
height: 46px;
display: flex;
@@ -116,8 +133,8 @@ function initPreference() {
'project-kanban': 'kanban',
'execution-all': 'list',
- 'execution-task': 'kanban',
- 'execution-executionkanban': 'list-recent',
+ 'execution-task': 'list-recent',
+ 'execution-executionkanban': 'kanban',
}
function optionRenderProgram($option, b)
{
diff --git a/module/my/css/preference.css b/module/my/css/preference.css
index 0da4d22df9..f8de654a74 100644
--- a/module/my/css/preference.css
+++ b/module/my/css/preference.css
@@ -1,6 +1,7 @@
+
+.preference .table-form > tbody > tr > th {font-weight: 400; color: #0B0F18;}
+.preference .chosen-container-single .chosen-single > span {color: #313C52;}
.tip {margin-top: 10px;}
-.table-form>tbody>tr>th {white-space: nowrap!important}
-.table-form>tbody>tr>td {width: 75%!important}
.preference > .preference-border {
display: flex;
@@ -8,12 +9,21 @@
border: 1px solid #EDEEF2;
}
.preference-border > .preference-img {
- flex: 0 0 160px;
+ flex: 0 0 80px;
}
.preference.picker-option-active >.preference-border {
border: 2px solid #2E7FFF;
}
.preference.picker-option-active {
+ background: unset!important;
+}
+.preference.picker-option-active > .preference-border {
+ background: rgba(230,240,255, 0.4)!important;
+}
+.picker-option.picker-option-selected.preference {
+ background: unset!important;
+}
+.picker-option.picker-option-selected.preference > .preference-border {
background: rgba(230,240,255, 0.4)!important;
}
.preference-text {
@@ -33,17 +43,25 @@
white-space: normal;
}
-#pickerDropMenu-pk_URSR > .picker-option-list{
+.picker-option.picker-option-active,
+.picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr,
+.picker-option.picker-option-selected.option-ursr {
+ background: unset!important;
+ color: unset;
+}
+.picker-option.picker-option-active > .border,
+.picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border,
+.picker-single .picker-option.picker-option-selected.picker-option-active.option-ursr > .border {
+ background: rgba(230,240,255, 0.4)!important;
+ border: 1px solid #2E7FFF;
+}
+#pickerDropMenu-pk_URSR > .picker-option-list {
display: flex;
flex-wrap: wrap;
}
.option-ursr {
flex: 1 1 50%;
}
-.option-ursr.picker-option-selected > .border,
-.option-ursr.picker-option-active> .border {
- border: none;
-}
.option-ursr > .border {
height: 46px;
display: flex;
@@ -61,4 +79,4 @@
.option-ursr > .border > .value > p {
line-height: 20px;
text-align: center;
-}
+}
\ No newline at end of file
diff --git a/module/my/js/preference.js b/module/my/js/preference.js
index 7a0dc9e4fc..b2cb786eba 100644
--- a/module/my/js/preference.js
+++ b/module/my/js/preference.js
@@ -16,8 +16,8 @@ function initPreference() {
'project-kanban': 'kanban',
'execution-all': 'list',
- 'execution-task': 'kanban',
- 'execution-executionkanban': 'list-recent',
+ 'execution-task': 'list-recent',
+ 'execution-executionkanban': 'kanban',
}
function optionRenderProgram($option, b)
{
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 61e75f75a0..545768b7ea 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -131,22 +131,22 @@ $lang->my->programLinkList['program-kanban'] = '项目集看板/可以可视化
$lang->my->programLinkList['program-project'] = '最近一个项目集的项目列表/可以查看当前项目集下所有项目';
$lang->my->productLinkList = array();
-$lang->my->productLinkList['product-all'] = '产品列表/可以查看所有的产品';
-$lang->my->productLinkList['product-kanban'] = '产品看板/可以可视化的查看到所有产品的进展情况';
-$lang->my->productLinkList['product-index'] = '所有产品仪表盘/可以查看所有产品的统计';
-$lang->my->productLinkList['product-dashboard'] = '最近一个产品仪表盘/可以查看当前产品概况';
-$lang->my->productLinkList['product-browse'] = '最近一个产品的需求列表/可以查看当前产品下的需求信息';
+$lang->my->productLinkList['product-all'] = '产品列表/可以查看所有产品';
+$lang->my->productLinkList['product-kanban'] = '产品看板/以可视化的方式查看到所有产品的整体情况';
+$lang->my->productLinkList['product-index'] = '所有产品仪表盘/可以查看所有产品的统计,概况,总览等';
+$lang->my->productLinkList['product-dashboard'] = '最近一个产品仪表盘/可以查看最近查看过的一个产品仪表盘';
+$lang->my->productLinkList['product-browse'] = '最近一个产品的需求列表/可以进入最近查看过的一个产品下的研发需求列表';
$lang->my->projectLinkList = array();
-$lang->my->projectLinkList['project-browse'] = '项目列表/可以查看所有的项目';
-$lang->my->projectLinkList['project-execution'] = '项目下所有执行列表/查看所有执行信息';
-$lang->my->projectLinkList['project-index'] = '最近一个项目仪表盘/可以查看当前项目概况';
-$lang->my->projectLinkList['project-kanban'] = '项目看板/可以可视化的查看到所有项目的进展情况';
+$lang->my->projectLinkList['project-browse'] = '项目列表/可以查看所有项目';
+$lang->my->projectLinkList['project-kanban'] = '项目看板/以可视化的查看到所有项目的整体情况';
+$lang->my->projectLinkList['project-execution'] = '最近一个项目执行列表/可以查看项目下所有的执行列表';
+$lang->my->projectLinkList['project-index'] = '最近一个项目仪表盘/可以进入最近查看过的一个项目的仪表盘';
$lang->my->executionLinkList = array();
-$lang->my->executionLinkList['execution-all'] = '执行列表/可以查看所有的执行';
-$lang->my->executionLinkList['execution-task'] = '最近一个执行的任务列表/可以查看当前迭代下的任务信息';
-$lang->my->executionLinkList['execution-executionkanban'] = '执行看板/可以查看进行中项目的执行情况';
+$lang->my->executionLinkList['execution-all'] = '执行列表/可以查看所有执行';
+$lang->my->executionLinkList['execution-executionkanban'] = '执行看板/以可视化的方式查看所有执行的整体情况';
+$lang->my->executionLinkList['execution-task'] = '最近一个执行的任务列表/可以查看最近创建的一个执行下的任务';
$lang->my->confirmReview['pass'] = '您确定要执行通过操作吗?';
$lang->my->guideChangeTheme = <<