diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css index 731c5fbc73..4294353518 100644 --- a/module/block/css/dashboard.css +++ b/module/block/css/dashboard.css @@ -5,19 +5,21 @@ body {background: #fafafa;} .dashboard {position: relative;} .dashboard .row {margin: 0 auto;} .dashboard .panel-actions {margin-top: 0; margin-right: 0;} -.dashboard .table tr[data-url] td {cursor: pointer;} .dashboard .panel-heading {line-height: 17px; height: 30px; position: relative;} .dashboard .panel-actions {position: absolute; top: 0; right: 0; height: 30px;} .dashboard .panel-action {display: block; float: left; height: 30px; width: 26px; text-align: center; line-height: 30px;} .dashboard .panel-action:hover, .dashboard .panel-actions > .dropdown > a:hover {color: #333; background-color: #ddd; background-color: rgba(0,0,0,0.1)} .dashboard .panel-title {font-size: 13px; color: #333} +.dashboard a.panel-title > .icon-double-angle-right {position: relative; opacity: 0; transition: opacity .2s, left .2s; left: -5px} +.dashboard .panel:hover a.panel-title > .icon-double-angle-right {opacity: 1; left: 0} .dashboard a.panel-title:hover {color: #1a53ff} -.dashboard .panel {box-shadow: none; position: relative} +.dashboard .panel {box-shadow: 0 1px 3px rgba(0,0,0,.05); position: relative;} .dashboard .panel-heading + .panel-body {position: absolute; left: 0; top: 30px; right: 0; bottom: 0} .dashboard .panel-dragging-shadow {position: absolute;} .dashboard-empty-message {text-align: center; margin-top: 100px;} .dashboard-empty-message > h5 {margin-bottom: 20px;} +.outer {background-color: #fafafa} .outer > .dashboard {margin-left: -10px; margin-right: -10px;} /* panel style */ @@ -28,11 +30,6 @@ body {background: #fafafa;} .panel-primary > .panel-heading, .panel-info > .panel-heading, .panel-danger > .panel-heading {color: #333; border: none; border-bottom: 1px solid rgba(0,0,0,.04);} -.panel-success > .panel-body, -.panel-warning > .panel-body, -.panel-primary > .panel-body, -.panel-info > .panel-body, -.panel-danger > .panel-body {box-shadow: inset 0 1px 100px rgba(255,255,255,.6);} .panel-success {background: #d1fecb!important; border-color: #b0e4ac!important} .panel-success > .panel-heading {background: #c5f7c1!important; } .panel-warning {background: #fdfdc7!important; border-color: #e1e09a!important} diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index 5014670465..0ac2b97e95 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -66,6 +66,7 @@ $(function() }); $dashboard.find('ul.dashboard-actions').addClass('hide').children('li').addClass('right').appendTo($('#modulemenu > .nav')); + $dashboard.find('[data-toggle=tooltip]').tooltip({container: 'body'}); checkEmpty(); }); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index df14cc1dde..c86558fc3d 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -31,6 +31,7 @@ $lang->block->editBlock = 'Edit block'; $lang->block->ordersSaved = 'Sort have been saved'; $lang->block->confirmRemoveBlock = 'Are you sure remove block [{0}] ?'; $lang->block->emptyMessage = 'Nothing here, custom it now!'; +$lang->block->dynamicInfo = "%s, %s %s %s %s."; $lang->block->default['product']['1']['title'] = $lang->productCommon . ' list'; $lang->block->default['product']['1']['block'] = 'list'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 5d99908548..624822af90 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -31,6 +31,8 @@ $lang->block->editBlock = '编辑区块'; $lang->block->ordersSaved = '排序已保存'; $lang->block->confirmRemoveBlock = '确定移除区块【{0}】吗?'; $lang->block->emptyMessage = '这里什么也没有。快来定制你的页面!'; +$lang->block->refresh = '刷新'; +$lang->block->dynamicInfo = "%s, %s %s %s %s。"; $lang->block->default['product']['1']['title'] = $lang->productCommon . '列表'; $lang->block->default['product']['1']['block'] = 'list'; diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index ae55040b3d..7cb4e65897 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -27,7 +27,7 @@ if(isset($pageCSS)) css::internal($pageCSS);
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>' data-url='blockLink?>'>
- +
moreLink)):?> - moreLink, $block->title . " ", null, "class='panel-title drag-disabled' title='$lang->more'"); ?> + moreLink, $block->title . " ", null, "class='panel-title drag-disabled' title='$lang->more' data-toggle='tooltip' data-placement='right'"); ?> title;?> diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 3e7969d603..866e3bf07c 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -10,41 +10,80 @@ * @link http://www.zentao.net */ ?> - - - - - - - - - - - - - - - - get->entry}'" : "class='text-center'"; - $viewLink = $this->createLink('project', 'task', 'project=' . $project->id); - ?> - > - - - delay)):?> - - - - - - - - - - - -
project->name;?>
project->end;?>statusAB;?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progess;?>
name;?>end;?>project->delayed;?>project->statusList[$project->status];?>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?>hours->progress;?>%
+ +
+ + + + + + + + + + + + + + + + + get->entry}'" : "class='text-center'"; + $viewLink = $this->createLink('project', 'task', 'project=' . $project->id); + ?> + > + + + delay)):?> + + + + + + + + + + + + +
project->name;?>
project->end;?>statusAB;?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progess;?>project->burn;?>
createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title='$project->name'");?>end;?>project->delayed;?>project->statusList[$project->status];?>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?> + + hours->progress;?>% + burns);?>'>
+