diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 19092c1b80..1befa3ba9d 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,56 @@ +2018-09-25 10.4.stable +完成的需求 +3298 详情页面还原我们之前的排版布局 +3297 恢复浏览器默认的访问过链接的颜色功能 +3296 搜索表单里面下拉菜单的选项不要用灰色 +3295 列表页面的模块名称改用灰色显示 +3172 项目日历的时间线太窄了。 +3191 火狐下面组织视图日志批量选中编辑，页面为空 +3186 重构添加用户页面的表单 +3228 创建文档库库的时候能够根据当前选中的产品或者项目自动选中 +3227 调整创建文档库时的表单宽度 +3253 附件图标显示不正常 +3293 调整整体的行间距 +3292 1280下面屏幕不要出横向的滚动条 +3291 还原页面右上角搜索的逻辑 +3074 用户机器休眠登录失效后，重新刷新session +3119 编辑器不要出横向的滚动条 +3122 操作区域图标分量过重 +3127 垃圾筐图标换成x +3128 模块树缺少联系 +3134 统计区块中，改成横向两行 +3153 没有必要再额外增加小圆点 +3158 去掉前面的首字母 +3166 调整分组视图页面标题的长度 +3167 分组查看页面左侧的分组需求控制在两行显示，统计信息控制在两行 +3168 树状图查看的时候，类型标签不要如此突出 +3169 树状图里面的模块标签去掉 +3177 调整动态信息里面的组织方式 +3180 组织浏览用户的时候部门没有高亮 +3181 组织用户的待办和日志合并成日程 +3183 用户所属的项目的表头对齐方式调整 +3184 用户项目列表默认的排序修改。id字段和项目代号字段的对齐方式调整 +3188 组织用户信息导航菜单不要这样宽 +3189 批量添加用户页面系统登录密码字段缩短 +3190 组织视图日志，菜单没有高亮，工作内容字段太短 +3193 部门组织项目应当有间距 +3194 权限列表页面新增分组也要突出 +3206 去掉中间的线 +3207 检查集成到然之里面的区块排版 +3208 调整集成到然之里面的样式 +3217 文档搜索之后标题做高亮 +3242 bug提交页面点击加载所有用户之后用户下拉无法自动隐藏 +3243 加载所有用户应当突出 +3252 如果用户手工选择了通过，写结果的时候不要更新用例状态 +3255 调整用例的编辑表单前置条件不用那么高表格不要换行 +3256 调整创建测试套件的表单 +3266 测试单关联用例的时候搜索表单需要都出现吗？ +3269 任务列表将其他的视图单独出来一个菜单 +3275 提升现有的接口机制 +3151 调整详情页面操作按钮栏的交互规则 +3150 详情页面返回按钮和上一个下一个偏弱 +3149 黑色的感觉偏重了 + 2018-09-11 10.3.1 修复的Bug 1938 测试-bug，编辑bug，选择所属项目后，解决版本只能选择这个项目下的版本 diff --git a/module/block/config.php b/module/block/config.php index efc0372658..a446c201ca 100644 --- a/module/block/config.php +++ b/module/block/config.php @@ -1,13 +1,13 @@ - * @package block + * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ $config->block = new stdclass(); $config->block->version = 2; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 620e6016fd..4a1542f7d1 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ $lang->block = new stdclass(); $lang->block->common = 'Block'; @@ -367,20 +367,24 @@ $lang->block->typeList->testtask['blocked'] = 'Blocked'; $lang->block->typeList->testtask['done'] = 'Done'; $lang->block->typeList->testtask['all'] = 'All'; -$lang->block->modules['product']->moreLinkList = new stdclass(); +$lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); + +$lang->block->modules['project']->moreLinkList = new stdclass(); $lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; $lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; -$lang->block->modules['qa']->moreLinkList = new stdclass(); + +$lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; $lang->block->modules['qa']->moreLinkList->case = 'my|testcase|type=%s'; $lang->block->modules['qa']->moreLinkList->testtask = 'testtask|browse|type=%s'; -$lang->block->modules['todo']->moreLinkList = new stdclass(); + +$lang->block->modules['todo']->moreLinkList = new stdclass(); $lang->block->modules['todo']->moreLinkList->list = 'my|todo|type=all'; -$lang->block->modules['common'] = new stdclass(); -$lang->block->modules['common']->moreLinkList = new stdclass(); + +$lang->block->modules['common'] = new stdclass(); +$lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; $lang->block->welcomeList['06:00'] = 'Good morning, %s'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 3449c71af5..d439067687 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -1,13 +1,13 @@ - * @package block + * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ $lang->block = new stdclass(); $lang->block->common = '区块'; @@ -367,20 +367,24 @@ $lang->block->typeList->testtask['blocked'] = '阻塞版本'; $lang->block->typeList->testtask['done'] = '已测版本'; $lang->block->typeList->testtask['all'] = '全部'; -$lang->block->modules['product']->moreLinkList = new stdclass(); +$lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); + +$lang->block->modules['project']->moreLinkList = new stdclass(); $lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; $lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; -$lang->block->modules['qa']->moreLinkList = new stdclass(); + +$lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; $lang->block->modules['qa']->moreLinkList->case = 'my|testcase|type=%s'; $lang->block->modules['qa']->moreLinkList->testtask = 'testtask|browse|type=%s'; -$lang->block->modules['todo']->moreLinkList = new stdclass(); + +$lang->block->modules['todo']->moreLinkList = new stdclass(); $lang->block->modules['todo']->moreLinkList->list = 'my|todo|type=all'; -$lang->block->modules['common'] = new stdclass(); -$lang->block->modules['common']->moreLinkList = new stdclass(); + +$lang->block->modules['common'] = new stdclass(); +$lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; $lang->block->welcomeList['06:00'] = '%s，早上好！'; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 8a4f399770..da1385a104 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ $lang->block = new stdclass(); $lang->block->common = '區塊'; diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 4ba0f4d1d3..869a26e989 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ ?> * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php index 4526c1a3fe..ed71ec61a2 100644 --- a/module/block/view/buildblock.html.php +++ b/module/block/view/buildblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index cd531ac5d8..5b00e0ce94 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -1,14 +1,14 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 5ec91b0e86..3e10f3b097 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();} $webRoot = $config->webRoot; diff --git a/module/block/view/listblock.html.php b/module/block/view/listblock.html.php index 6b24331725..9e9cf211e4 100644 --- a/module/block/view/listblock.html.php +++ b/module/block/view/listblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/main.html.php b/module/block/view/main.html.php index 6e431f437f..0cadfe729d 100644 --- a/module/block/view/main.html.php +++ b/module/block/view/main.html.php @@ -7,7 +7,7 @@ * @author Yidong Wang * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.pms */ $viewDir = dirname(__FILE__); $file2Include = file_exists(dirname($viewDir) . "/ext/view/{$code}block.html.php") ? dirname($viewDir) . "/ext/view/{$code}block.html.php" : "{$viewDir}/{$code}block.html.php"; diff --git a/module/block/view/overviewblock.html.php b/module/block/view/overviewblock.html.php index b6a9326c5e..66bec1b5fb 100644 --- a/module/block/view/overviewblock.html.php +++ b/module/block/view/overviewblock.html.php @@ -1,6 +1,6 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/productoverviewblock.html.php b/module/block/view/productoverviewblock.html.php index 4f72669bfb..637cdddba0 100644 --- a/module/block/view/productoverviewblock.html.php +++ b/module/block/view/productoverviewblock.html.php @@ -1,6 +1,6 @@ li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;} .block-statistic .nav-secondary > li.active > a {color: #3C4353; background: transparent; box-shadow: none;} .block-statistic .nav-secondary > li.active > a:hover, .block-statistic .nav-secondary > li.active > a:focus, -.block-statistic .nav-secondary > li > a:hover {box-shadow: none;} -.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} +.block-statistic .nav-secondary > li > a:hover {box-shadow: none; border-radius: 4px 0 0 4px;} +.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; right: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} .block-statistic .nav-secondary > li.switch-icon {display: none;} .block-statistic.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px;} .block-statistic.block-sm .panel-body > .table-row, @@ -87,6 +87,15 @@ $(function()

block->noData;?>

+
+ +
@@ -217,15 +226,6 @@ $(function()
-
- -
diff --git a/module/block/view/projectoverviewblock.html.php b/module/block/view/projectoverviewblock.html.php index d1b298ad98..be25c017b2 100644 --- a/module/block/view/projectoverviewblock.html.php +++ b/module/block/view/projectoverviewblock.html.php @@ -1,6 +1,6 @@ li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;} .block-statistic .nav-secondary > li.active > a {color: #3C4353; background: transparent; box-shadow: none;} .block-statistic .nav-secondary > li.active > a:hover, .block-statistic .nav-secondary > li.active > a:focus, -.block-statistic .nav-secondary > li > a:hover {box-shadow: none;} -.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} +.block-statistic .nav-secondary > li > a:hover {box-shadow: none; border-radius: 4px 0 0 4px;} +.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; right: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} .block-statistic .nav-secondary > li.switch-icon {display: none;} .block-statistic.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px; border-radius: 3px;} .block-statistic.block-sm .panel-body > .table-row, @@ -73,6 +73,15 @@ $(function()

block->noData;?>

+
+ +
@@ -170,15 +179,6 @@ $(function()
-
- -
diff --git a/module/block/view/qaoverviewblock.html.php b/module/block/view/qaoverviewblock.html.php index 7aade3e58e..347043424e 100644 --- a/module/block/view/qaoverviewblock.html.php +++ b/module/block/view/qaoverviewblock.html.php @@ -1,11 +1,11 @@ - * @package block + * @package block * @version $Id$ * @link http://www.zentao.net */ diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index 95ceab0272..6e8dbbdf5d 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/set.html.php b/module/block/view/set.html.php index 6126c66360..70b92e4475 100644 --- a/module/block/view/set.html.php +++ b/module/block/view/set.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ ?> - * @package block + * @package block * @version $Id: html.php 7488 2013-12-26 07:26:10Z zhujinyong $ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ ?> * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index c23489bc0a..e8c796aeea 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index 178b02a977..b4327a7afb 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -1,20 +1,20 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?>
block->emptyTip;?>
- +
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 5a84f7afc6..c96ac2d450 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ if(!$selfCall) die(include('./todolist.html.php')); ?> @@ -73,7 +73,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
- +
@@ -124,7 +124,7 @@ if(!$selfCall) die(include('./todolist.html.php')); $block.data('blockTodoes', 1); var $form = $block.find('form'); var $titleInput = $form.find('[name="name"]'); - + var toggleForm = function(toggle) { if(toggle === undefined) @@ -172,7 +172,7 @@ if(!$selfCall) die(include('./todolist.html.php')); var $todoes = $(obj).closest('.block-todoes'); var $form = $(obj).closest('form'); var $name = $form.find("input[name='name']").val(); - if($name == '') + if($name == '') { $("input[name='name']").addClass('has-error'); $('#nameLabel').remove(); diff --git a/module/block/view/todolist.html.php b/module/block/view/todolist.html.php index 69c8e6ca09..4738582b66 100644 --- a/module/block/view/todolist.html.php +++ b/module/block/view/todolist.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?>