-
-
diff --git a/module/my/control.php b/module/my/control.php
index 550223e11b..d5491d26c3 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -104,7 +104,6 @@ class my extends control
/* Assign. */
$this->view->todos = $this->loadModel('todo')->getList($type, $account, $status, 0, $pager, $sort);
- $this->view->todoCount = $this->todo->getCount();
$this->view->date = (int)$type == 0 ? date(DT_DATE1) : date(DT_DATE1, strtotime($type));
$this->view->type = $type;
$this->view->recTotal = $recTotal;
@@ -568,7 +567,6 @@ class my extends control
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
- $this->view->allCount = $this->action->getCount();
$this->view->direction = $direction;
$this->display();
}
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index de99428d74..abf7fa4abe 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -13,15 +13,18 @@
+ action->periods as $period => $label):?>
{$lang->action->dynamic->all} {$allCount}", '', "class='btn btn-link " . ($type == 'all' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "type=today"), "{$lang->action->dynamic->today}", '', "class='btn btn-link " . ($type == 'today' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "type=yesterday"), "{$lang->action->dynamic->yesterday}", '', "class='btn btn-link " . ($type == 'yesterday' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "type=thisweek"), "{$lang->action->dynamic->thisWeek}", '', "class='btn btn-link " . ($type == 'thisweek' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "type=lastweek"), "{$lang->action->dynamic->lastWeek}", '', "class='btn btn-link " . ($type == 'lastweek' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "type=thismonth"), "{$lang->action->dynamic->thisMonth}", '', "class='btn btn-link " . ($type == 'thismonth' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "type=lastmonth"), "{$lang->action->dynamic->lastMonth}", '', "class='btn btn-link " . ($type == 'lastmonth' ? 'btn-active-text' : '') . "'");
+ $label = "$label";
+ $active = '';
+ if($period == $type)
+ {
+ $active = 'btn-active-text';
+ $label .= " {$pager->recTotal}";
+ }
+ echo html::a(inlink('dynamic', "type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
?>
+
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 38ba09613f..7b7cce7779 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -19,8 +19,13 @@
user->account}&status=undone";
- $label = $period == 'all' ? "$label {$todoCount}" : "$label";
- $active = $period == $type ? 'btn-active-text' : '';
+ $label = "$label";
+ $active = '';
+ if($period == $type)
+ {
+ $active = 'btn-active-text';
+ $label .= " {$pager->recTotal}";
+ }
echo html::a(inlink('todo', $vars), $label, '', "class='btn btn-link $active' id='{$period}'")
?>
diff --git a/module/product/control.php b/module/product/control.php
index b6a3d38c6b..e0797ef202 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -204,7 +204,6 @@ class product extends control
$this->view->storyCases = $storyCases;
$this->view->param = $param;
$this->view->products = $this->products;
- $this->view->allCount = $this->story->getCount($productID);
$this->display();
}
@@ -516,7 +515,6 @@ class product extends control
$this->view->param = $param;
$this->view->pager = $pager;
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
- $this->view->allCount = $this->action->getCount('product', $productID);
$this->view->direction = $direction;
$this->display();
}
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index d3f912a6de..b11e313c33 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -47,7 +47,7 @@
echo '
';
?>
- inlink('browse', "productID=$productID&branch=$branch&browseType=$menuBrowseType" . $queryParam), "
$menuItem->text" . ($menuItem->name == 'allstory' ? '
' . $allCount . '' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItem->name ? ' btn-active-text' : '') . "'");?>
+ inlink('browse', "productID=$productID&branch=$branch&browseType=$menuBrowseType" . $queryParam), "
$menuItem->text" . ($menuItem->name == $this->session->storyBrowseType ? '
' . $pager->recTotal . '' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItem->name ? ' btn-active-text' : '') . "'");?>
product->searchStory;?>
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php
index 09c10f78a6..ca45bdf890 100755
--- a/module/product/view/dynamic.html.php
+++ b/module/product/view/dynamic.html.php
@@ -13,15 +13,18 @@
+ action->periods as $period => $label):?>
{$lang->action->dynamic->all}
{$allCount}", '', "class='btn btn-link " . ($type == 'all' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "productID=$productID&type=today"), "
{$lang->action->dynamic->today}", '', "class='btn btn-link " . ($type == 'today' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "productID=$productID&type=yesterday"), "
{$lang->action->dynamic->yesterday}", '', "class='btn btn-link " . ($type == 'yesterday' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "productID=$productID&type=thisweek"), "
{$lang->action->dynamic->thisWeek}", '', "class='btn btn-link " . ($type == 'thisweek' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "productID=$productID&type=lastweek"), "
{$lang->action->dynamic->lastWeek}", '', "class='btn btn-link " . ($type == 'lastweek' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "productID=$productID&type=thismonth"), "
{$lang->action->dynamic->thisMonth}", '', "class='btn btn-link " . ($type == 'thismonth' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "productID=$productID&type=lastmonth"), "
{$lang->action->dynamic->lastMonth}", '', "class='btn btn-link " . ($type == 'lastmonth' ? 'btn-active-text' : '') . "'");
+ $label = "
$label";
+ $active = '';
+ if($period == $type)
+ {
+ $active = 'btn-active-text';
+ $label .= "
{$pager->recTotal}";
+ }
+ echo html::a(inlink('dynamic', "productID=$productID&type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
?>
+
diff --git a/module/project/control.php b/module/project/control.php
index 46252bc6ae..8c602a128f 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1346,6 +1346,7 @@ class project extends control
$this->view->realnames = $this->loadModel('user')->getPairs('noletter');
$this->view->orderBy = $orderBy;
$this->view->projectID = $projectID;
+ $this->view->browseType = '';
$this->view->project = $project;
$this->view->type = $type;
$this->view->kanbanGroup = $kanbanGroup;
@@ -1965,7 +1966,6 @@ class project extends control
$this->view->pager = $pager;
$this->view->param = $param;
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction);
- $this->view->allCount = $this->action->getCount('project', $projectID);
$this->view->direction = $direction;
$this->display();
}
diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css
index 84f0c953b8..320029ac0f 100644
--- a/module/project/css/kanban.css
+++ b/module/project/css/kanban.css
@@ -1,11 +1,9 @@
table th.col-closed {width:14%}
+#kanbanHeader{margin-bottom:0px;}
#kanbanHeader th{border: 1px solid #ddd; padding:8px;}
#kanbanHeader .dropdown {display: inline-block;}
#kanbanHeader .dropdown > a {color: #036}
#kanbanHeader th{position: relative}
-#kanbanHeader .actions {position: absolute; right: 0; top: 0; padding: 0px; background: #f1f1f1; border-left: 1px solid #ccc}
-#kanbanHeader .actions .btn {display: block; border-radius: 0; width: 34px; height: 36px; position: relative; text-align: center; padding: 5px 0; color: #036}
-#kanbanHeader .actions .btn-text {display: none}
#kanbanWrapper {table-layout: fixed; border-top: none}
#kanbanWrapper > tbody > tr:first-child > td {border-top: none}
diff --git a/module/project/model.php b/module/project/model.php
index c15a5e7127..a5189186d9 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -127,13 +127,19 @@ class projectModel extends model
$replace = "';
$replace = "
$dropTitle " . $replace;
- $this->lang->project->menu->$key['class'] = 'dropdown';
- if($hasActive) $this->lang->project->menu->$key['class'] .= ' active';
+ $this->lang->project->menu->{$key}['class'] = 'dropdown';
+ if($hasActive) $this->lang->project->menu->{$key}['class'] .= ' active';
}
common::setMenuVars($this->lang->project->menu, $key, $replace);
}
diff --git a/module/project/view/ajaxkanbansetting.html.php b/module/project/view/ajaxkanbansetting.html.php
index 4d9f9edddc..689e318fec 100644
--- a/module/project/view/ajaxkanbansetting.html.php
+++ b/module/project/view/ajaxkanbansetting.html.php
@@ -11,52 +11,48 @@
*/
?>
-
-
- project->kanbanSetting;?>
-
-
-
-
+
+
+
+
project->kanbanSetting;?>
+
+
+
+
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
index 1553caecb4..ae23f065eb 100755
--- a/module/project/view/dynamic.html.php
+++ b/module/project/view/dynamic.html.php
@@ -13,15 +13,18 @@
- {$lang->action->dynamic->all}
{$allCount}", '', "class='btn btn-link " . ($type == 'all' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "projectID=$projectID&type=today"), "
{$lang->action->dynamic->today}", '', "class='btn btn-link " . ($type == 'today' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "projectID=$projectID&type=yesterday"), "
{$lang->action->dynamic->yesterday}", '', "class='btn btn-link " . ($type == 'yesterday' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "projectID=$projectID&type=thisweek"), "
{$lang->action->dynamic->thisWeek}", '', "class='btn btn-link " . ($type == 'thisweek' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "projectID=$projectID&type=lastweek"), "
{$lang->action->dynamic->lastWeek}", '', "class='btn btn-link " . ($type == 'lastweek' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "projectID=$projectID&type=thismonth"), "
{$lang->action->dynamic->thisMonth}", '', "class='btn btn-link " . ($type == 'thismonth' ? 'btn-active-text' : '') . "'");
- echo html::a(inlink('dynamic', "projectID=$projectID&type=lastmonth"), "
{$lang->action->dynamic->lastMonth}", '', "class='btn btn-link " . ($type == 'lastmonth' ? 'btn-active-text' : '') . "'");
+ action->periods as $period => $label):?>
+ $label";
+ $active = '';
+ if($period == $type)
+ {
+ $active = 'btn-active-text';
+ $label .= "
{$pager->recTotal}";
+ }
+ echo html::a(inlink('dynamic', "projectID=$projectID&type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
?>
+
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index c00a2ed20b..fe7af0978c 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -9,7 +9,47 @@
*/
?>
-
+