diff --git a/module/block/css/guideblock.ui.css b/module/block/css/guideblock.ui.css index 54ca358647..80977dbff0 100644 --- a/module/block/css/guideblock.ui.css +++ b/module/block/css/guideblock.ui.css @@ -32,3 +32,8 @@ .guide-block .block:hover {box-shadow: 0 0 14px rgba(0, 0, 0, 0.12);} .guide-block .block.active {box-shadow: 0 0 0 2px #2E7FFF; border-radius: 2px;} +.picker-menu-list .menu-item>a.active, .picker-menu-list .menu-item>a.hover, .picker-menu-list .menu-item>a:hover{background: unset} +.picker-menu-list .menu-item>a.active .preference-box{background: var(--menu-active-bg); color: var(--menu-active-color)} +.picker-menu-list .menu-item>a:hover .preference-box, .picker-menu-list .menu-item>a.hover .preference-box{background: var(--menu-active-bg); color: var(--menu-active-color); box-shadow: 0px 0px 1px 1px #2E7FFF;} +.picker-menu-list .menu-item>a.active .preference-box .label, .picker-menu-list .menu-item>a:hover .preference-box .label, .picker-menu-list .menu-item>a.hover .preference-box .label{background: var(--menu-active-bg); color: var(--menu-active-color);} +.ursr-menu > li{width: 50%;} diff --git a/module/block/ui/guideblock.html.php b/module/block/ui/guideblock.html.php index 76cc67cb0e..325a6754a9 100644 --- a/module/block/ui/guideblock.html.php +++ b/module/block/ui/guideblock.html.php @@ -56,7 +56,7 @@ $getGuideTabs = function(string $blockNavCode): array * @param string $blockNavCode * @return array */ -$getGuideInfo = function($blockNavID): array +$getGuideInfo = function($blockNavID, $URSRList): array { global $lang; @@ -70,7 +70,7 @@ $getGuideInfo = function($blockNavID): array ( set('class', 'tab-pane h-full' . ($tab == $selected ? ' active' : '')), set('id', "tab{$blockNavID}Content{$tab}"), - $function() + $function($URSRList) ); } @@ -123,7 +123,7 @@ blockPanel ( set('class', 'tab-content'), set('width', '82%'), - $getGuideInfo($blockNavCode) + $getGuideInfo($blockNavCode, $URSRList) ) ) ); diff --git a/module/block/ui/preference.html.php b/module/block/ui/preference.html.php index 7a0b628f9c..9824e83884 100644 --- a/module/block/ui/preference.html.php +++ b/module/block/ui/preference.html.php @@ -15,10 +15,52 @@ namespace zin; * 展示个性化设置页面。 * Print preference page. */ -function printPreference() +function printPreference(array $URSRList) { global $lang, $config; + $imageList = array(); + $imageList['program-browse'] = 'list'; + $imageList['program-project'] = 'list-recent'; + $imageList['program-kanban'] = 'kanban'; + + $imageList['product-index'] = 'panel-recent-browse'; + $imageList['product-all'] = 'list'; + $imageList['product-dashboard'] = 'panel'; + $imageList['product-browse'] = 'list-recent'; + $imageList['product-kanban'] = 'kanban'; + + $imageList['project-browse'] = 'list'; + $imageList['project-execution'] = 'list-recent'; + $imageList['project-index'] = 'panel-recent-browse'; + $imageList['project-kanban'] = 'kanban'; + + $imageList['execution-all'] = 'list'; + $imageList['execution-task'] = 'list-recent'; + $imageList['execution-executionkanban'] = 'kanban'; + + $URSRItems = array(); + foreach($URSRList as $URSRKey => $URSRValue) + { + $contentHtml = "
