admin->sso;?>
diff --git a/module/block/config.php b/module/block/config.php
index 0285d745dc..126e1dcf01 100644
--- a/module/block/config.php
+++ b/module/block/config.php
@@ -13,5 +13,16 @@ $config->block = new stdclass();
$config->block->editor = new stdclass();
$config->block->editor->set = array('id' => 'html', 'tools' => 'simple');
+$config->block->longBlock = array();
+$config->block->longBlock['']['flowchart'] = 'flowchart';
+$config->block->longBlock['']['welcome'] = 'welcome';
+$config->block->longBlock['product']['statistic'] = 'statistic';
+$config->block->longBlock['project']['statistic'] = 'statistic';
+$config->block->longBlock['qa']['statistic'] = 'statistic';
+
+$config->block->shortBlock = array();
+$config->block->shortBlock['product']['overview'] = 'overview';
+$config->block->shortBlock['project']['overview'] = 'overview';
+
$config->statistic = new stdclass();
$config->statistic->storyStages = array('wait', 'planned', 'developing', 'testing', 'released');
diff --git a/module/block/control.php b/module/block/control.php
index 207d841002..655f9afbbf 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -495,11 +495,19 @@ class block extends control
*/
public function printTodoBlock()
{
- $uri = $this->server->http_referer;
+ $limit = $this->viewType == 'json' ? 0 : (int)$this->params->num;
+ $todos = $this->loadModel('todo')->getList('all', $this->app->user->account, 'wait, doing', $limit, $pager = null, $orderBy = 'date, begin');
+ $uri = $this->server->http_referer;
$this->session->set('todoList', $uri);
$this->session->set('bugList', $uri);
$this->session->set('taskList', $uri);
- $this->view->todos = $this->loadModel('todo')->getList('all', $this->app->user->account, 'wait, doing', $this->viewType == 'json' ? 0 : (int)$this->params->num);
+
+ foreach($todos as $key => $todo)
+ {
+ if($todo->date == '2030-01-01') unset($todos[$key]);
+ }
+
+ $this->view->todos = $todos;
}
/**
diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js
index 81adb4d2e1..99aaa8d452 100644
--- a/module/block/js/dashboard.js
+++ b/module/block/js/dashboard.js
@@ -61,6 +61,7 @@ function refreshBlock($panel, afterRefresh)
{
var $data = $(data);
if($data.hasClass('panel')) $panel.empty().append($data.children());
+ else if($panel.find('#assigntomeBlock').length) $panel.find('#assigntomeBlock').empty().append($data.children());
else $panel.find('.panel-body').replaceWith($data);
if($.isFunction(afterRefresh))
{
@@ -107,7 +108,6 @@ function initTableHeader($wrapper)
$panel.toggleClass('with-fixed-header', isFixed);
var $header = $panel.children('.table-header-fixed').toggle(isFixed);
- if ($wrapper) console.log('initTableHeader', isFixed, {$wrapper, $table, $header});
if(!isFixed)
{
$table.find('thead').css('visibility', 'visible');
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 55674b11bc..9616e22104 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -389,8 +389,8 @@ $lang->block->gridOptions[8] = 'Left';
$lang->block->gridOptions[4] = 'Right';
$lang->block->flowchart = array();
-$lang->block->flowchart[] = array('Administlrator', 'Add Departments', 'Add Users', 'Maintain Privileges');
-$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
-$lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks');
+$lang->block->flowchart[] = array('Administlrator', 'Add a Department', 'Add a User', 'Maintain Privileges');
+$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add a ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
+$lang->block->flowchart[] = array('Scrum Master', 'Add a ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks');
$lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs');
diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php
index 675ee3f49d..c41d3900c0 100644
--- a/module/block/view/printassigntomeblock.html.php
+++ b/module/block/view/printassigntomeblock.html.php
@@ -32,5 +32,5 @@
#assigntomeBlock {position: relative;}
#assigntomeBlock .block-todoes {padding-top: 10px}
#assigntomeBlock > .nav {position: absolute; top: -41px; left: 120px;}
-#assigntomeBlock .block-todoes .todoes-form{top: -55px;}
+#assigntomeBlock .block-todoes .todoes-form{top: -50px;}
diff --git a/module/block/view/publicform.html.php b/module/block/view/publicform.html.php
index 19966c6ca3..b0159cc09c 100644
--- a/module/block/view/publicform.html.php
+++ b/module/block/view/publicform.html.php
@@ -17,6 +17,26 @@
diff --git a/module/block/view/qastatisticblock.html.php b/module/block/view/qastatisticblock.html.php
index db222d537d..d464865033 100644
--- a/module/block/view/qastatisticblock.html.php
+++ b/module/block/view/qastatisticblock.html.php
@@ -38,7 +38,7 @@
-