From 5707226b82b1aed98d4356a2a896f33eb3618656 Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 27 Apr 2016 17:13:03 +0800 Subject: [PATCH 1/3] * change tutorial UI. --- module/tutorial/css/index.css | 8 ++++---- module/tutorial/css/start.css | 3 ++- module/tutorial/lang/zh-cn.php | 2 +- module/tutorial/view/index.html.php | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/module/tutorial/css/index.css b/module/tutorial/css/index.css index 607645392f..25c73091e2 100644 --- a/module/tutorial/css/index.css +++ b/module/tutorial/css/index.css @@ -1,11 +1,11 @@ #pageContainer {position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: hidden;} #iframeWrapper {position: absolute; left: 0; top: 0; bottom: 0; right: 300px; display: block} #sidebar {position: absolute; right: 0; top: 0; bottom: 0; width: 300px; background: #f5f5f5; overflow-y: auto; padding-top: 66px; border-left: 1px solid #ddd} -#sidebar > header {background: #EBF2F9; padding: 15px; position: fixed; top: 0; right: 0; z-index: 10; width: 300px; border-bottom: 1px solid #ddd} -#sidebar > header > h2 {margin: 0 0 0 40px; font-size: 18px; padding: 0; line-height: 36px;} +#sidebar > header {background: #3280FC; color: #fff; padding: 15px; position: fixed; top: 0; right: 0; z-index: 10; width: 300px; border-bottom: 1px solid #ddd} +#sidebar > header > h2 {margin: 0 0 0 40px; font-size: 18px; padding: 0; line-height: 36px; color: #fff} #sidebar > header .start-icon {position: absolute; left: 12px; top: 15px; width: 36px; height: 36px; text-align: center; margin-right: 5px;} -#sidebar > header .start-icon > .icon-front {color: #fff; position: absolute; width: 36px; height: 36px; line-height: 36px; top: 0; left: 0} -#sidebar > header .start-icon > .icon-back {font-size: 35px; color: #114f8e; line-height: 36px;} +#sidebar > header .start-icon > .icon-front {color: #3280FC; position: absolute; width: 36px; height: 36px; line-height: 36px; top: 0; left: 0; font-size: 12px} +#sidebar > header .start-icon > .icon-back {font-size: 35px; color: #fff; line-height: 36px;} #sidebar > header > .actions {position: absolute; right: 15px; top: 15px} #sidebar > section {padding: 20px 10px; border-top: 1px solid #ddd} #sidebar > section > h4 {margin: 0 0 10px 0; font-size: 14px; color: #808080; font-weight: normal} diff --git a/module/tutorial/css/start.css b/module/tutorial/css/start.css index ccc5479f90..a207c2af7c 100644 --- a/module/tutorial/css/start.css +++ b/module/tutorial/css/start.css @@ -1,6 +1,7 @@ #start {background: #EBF2F9; padding: 40px; text-align: center;} .start-icon {position: relative; width: 140px; height: 140px; margin: 0 auto; line-height: 140px;} -.start-icon > .icon-back {font-size: 140px; color: #114f8e} +.start-icon > .icon-back {font-size: 140px; color: #145CCD} .start-icon > .icon-front {font-size: 56px; position: absolute; top: 35px; left: 35px; color: #EBF2F9; z-index: 10; width: 70px; height: 70px; text-align: center; line-height: 70px;} .start-icon > .icon-spin {-moz-animation: spin 15s infinite linear;-o-animation: spin 15s infinite linear;-webkit-animation: spin 15s infinite linear;animation: spin 15s infinite linear;} +#start > h1 {color: #145CCD} #start > h1, #start > p {margin-bottom: 20px} diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index aa7ac6742d..fc0292a318 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -14,7 +14,7 @@ $lang->tutorial = new stdclass(); $lang->tutorial->common = '新手教程'; $lang->tutorial->desc = '通过完成一系列任务，快速了解禅道的基本使用方法。这可能会花费您10分钟，你可以随时退出任务。'; $lang->tutorial->start = '立即开始'; -$lang->tutorial->exit = '退出任务'; +$lang->tutorial->exit = '退出教程'; $lang->tutorial->congratulation = '恭喜，你已完成了所有任务！'; $lang->tutorial->restart = '重新开始'; $lang->tutorial->currentTask = '当前任务'; diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php index b42f8f91ae..5be9defb3d 100644 --- a/module/tutorial/view/index.html.php +++ b/module/tutorial/view/index.html.php @@ -206,9 +206,9 @@ $(function() { trigger: 'manual', title: text, - placement: 'top', + placement: $e.offset().left > ($(window).width()*2/3) ? 'left' : 'top', container: 'body', - tipClass: 'tooltip-warning' + tipClass: 'tooltip-warning tooltip-max' }, options); $e = $e.first(); if($lastTooltip) $lastTooltip.tooltip('hide'); From 6b2375b028418ee771d3c2fbaed41fe5c0d84c14 Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 27 Apr 2016 17:13:19 +0800 Subject: [PATCH 2/3] * change menu UI. --- module/custom/css/menu.css | 1 + module/custom/js/menu.js | 4 ++-- module/custom/lang/zh-cn.php | 2 +- module/custom/view/menu.html.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/custom/css/menu.css b/module/custom/css/menu.css index eeef639254..2439f7b8df 100644 --- a/module/custom/css/menu.css +++ b/module/custom/css/menu.css @@ -7,6 +7,7 @@ #mainmenu {padding-left: 10px; padding-right: 10px;} #featurebar {border-top: 1px solid #ddd} #featurebar > .nav {width: 100%} +#menuEditor .nav > li > a {cursor: move} #menuEditor .nav > li > a .item-hidden-icon {display: none} #menuEditor .nav > li.menu-hidden > a .item-hidden-icon {display: inline-block; margin-left: 5px;} #menuEditor .nav > li.menu-hidden {opacity: 0.5;} diff --git a/module/custom/js/menu.js b/module/custom/js/menu.js index 202f59e35d..a7f4500f1a 100644 --- a/module/custom/js/menu.js +++ b/module/custom/js/menu.js @@ -62,9 +62,9 @@ $(function() currentModule = moduleName; currentMethod = methodName; $mainMenu.find('li.active').removeClass('active'); - $mainMenu.find('li[data-id="' + moduleName + '"]').addClass('active'); + $mainMenu.find('li[data-id="' + moduleName + '"]:not(.right)').addClass('active'); $moduleMenu.find('li.active').removeClass('active'); - $moduleMenu.find('li[data-id="' + methodName + '"]').addClass('active'); + $moduleMenu.find('li[data-id="' + methodName + '"]:not(.right)').addClass('active'); }; var loadData = function(moduleName, methodName, type, callback) diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 57a69c16c4..038c2919af 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -81,5 +81,5 @@ $lang->custom->productproject->relation['1_1'] = '项目 - 迭代'; $lang->custom->productproject->notice = '请根据实际情况选择适合自己团队的概念。'; -$lang->custom->menuTip = '点击导航项目来切换显示或隐藏，拖动导航项目来更改显示顺序。'; +$lang->custom->menuTip = '点击显示或隐藏导航条目，拖拽来更改显示顺序。'; $lang->custom->saveFail = '保存失败！'; diff --git a/module/custom/view/menu.html.php b/module/custom/view/menu.html.php index 71fd5a1420..f5883f70d7 100644 --- a/module/custom/view/menu.html.php +++ b/module/custom/view/menu.html.php @@ -18,7 +18,7 @@