diff --git a/module/block/control.php b/module/block/control.php index d880121b34..184afe5d7c 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -210,6 +210,7 @@ class block extends control if($this->block->initBlock($module)) die(js::reload()); } + $shortBlocks = $longBlocks = array(); foreach($blocks as $key => $block) { if($this->config->global->flow == 'onlyStory' and $block->source != 'product' and $block->source != 'todo' and $block->block != 'dynamic') unset($blocks[$key]); @@ -231,15 +232,15 @@ class block extends control { $block->moreLink = $this->createLink('company', 'dynamic'); } + if($block->grid >= 6) $longBlocks[$key] = $block; + if($block->grid < 6) $shortBlocks[$key] = $block; } - $this->view->blocks = $blocks; - $this->view->module = $module; + $this->view->longBlocks = $longBlocks; + $this->view->shortBlocks = $shortBlocks; + $this->view->module = $module; - if($this->app->getViewType() == 'json') - { - die(json_encode($blocks)); - } + if($this->app->getViewType() == 'json') die(json_encode($blocks)); $this->display(); } diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 7e491e96b8..af901b54b0 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -18,45 +18,79 @@ $useGuest = $this->app->user->account == 'guest'; ?>
- -
-
- block->createBlock?> -
-
- $block):?> - block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?> -
-
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>' data-url='blockLink?>' height) echo "data-height='$block->height'";?>> -
-
- moreLink)):?> - moreLink, " ", null, "class='panel-action drag-disabled panel-action-more'"); ?> - -
- - +
+ $block):?> + block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?> +
+
+
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>' data-url='blockLink?>' height) echo "data-height='$block->height'";?>> +
+
+ moreLink)):?> + moreLink, " ", null, "class='panel-action drag-disabled panel-action-more'"); ?> + +
+ + +
+
+ title;?>
+
- title;?>
-
+ +
+
+ $block):?> + block->closed) and strpos(",{$config->block->closed},", ",{$block->source}|{$block->block},") !== false) continue;?> +
+
+
params->color;?>' id='blockid?>' data-id='id?>' data-name='title?>' data-url='blockLink?>' height) echo "data-height='$block->height'";?>> +
+
+ moreLink)):?> + moreLink, " ", null, "class='panel-action drag-disabled panel-action-more'"); ?> + +
+ + +
+
+ title;?> +
+
+
+
+
+
-
getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> - \ No newline at end of file + diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index acf66b64cc..0e9ef50327 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -109,7 +109,10 @@ $lang->menu->qa = '测试|qa|index'; $lang->menu->doc = '文档|doc|index'; $lang->menu->report = '统计|report|index'; $lang->menu->company = '组织|company|index'; -$lang->menu->admin = '后台|admin|index'; + +$lang->adminMenu = '后台|admin|index'; + +$lang->dividerMenu = ',qa,'; /* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; @@ -163,7 +166,6 @@ $lang->index->menu->project = "浏览{$lang->projectCommon}|project|browse"; $lang->my = new stdclass(); $lang->my->menu = new stdclass(); -$lang->my->menu->account = array('link' => ' %s' . $lang->arrow . '', 'fixed' => true); $lang->my->menu->index = '首页|my|index'; $lang->my->menu->todo = array('link' => '待办|my|todo|', 'subModule' => 'todo'); $lang->my->menu->task = array('link' => '任务|my|task|', 'subModule' => 'task'); diff --git a/module/common/model.php b/module/common/model.php index 51533490bd..68a1a373c0 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -236,7 +236,7 @@ class commonModel extends model { $isGuest = $app->user->account == 'guest'; - echo "