From 782520e7b7cbae81400f58b7ed6960cbfc54398b Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 20 Jun 2013 03:16:07 +0000
Subject: [PATCH]  * finish task #1394.

---
 lib/pager/pager.class.php            |  2 ++
 module/common/view/m.footer.html.php | 14 +++++++++++++-
 module/my/config.php                 |  5 +++--
 module/my/view/m.story.html.php      | 20 ++++++++++++++++++--
 module/my/view/m.task.html.php       |  1 +
 module/my/view/m.todo.html.php       |  1 +
 6 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/lib/pager/pager.class.php b/lib/pager/pager.class.php
index 84f3aaddd2..cf99b58f89 100755
--- a/lib/pager/pager.class.php
+++ b/lib/pager/pager.class.php
@@ -312,6 +312,8 @@ class pager
             $pager .= $this->createLastPage();
         }
 
+        if($type != 'full') $pager = $this->pageID . '/' . $this->pageTotal . ' ' . $pager;
+
         /* Only the full type . */
         if($type == 'full')
         {
diff --git a/module/common/view/m.footer.html.php b/module/common/view/m.footer.html.php
index 196500fe6a..340819553b 100755
--- a/module/common/view/m.footer.html.php
+++ b/module/common/view/m.footer.html.php
@@ -1,6 +1,6 @@
 </div>
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='<?php print($config->debug ? 'debugwin' : 'hidden');?>'></iframe>
+<iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='hidden'></iframe>
 </div>
 <?php
 if(isset($pageJS)) js::execute($pageJS);  // load the js for current page.
@@ -11,5 +11,17 @@ $extHookRule  = $extPath . 'm.footer.*.hook.php';
 $extHookFiles = glob($extHookRule);
 if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
 ?>
+<script>
+$(function()
+{
+    $('#navbar li a').click(function(event)
+     {
+         // Prevent the usual navigation behavior
+         //event.preventDefault();
+         //location.hash = $(this).attr("href");
+         //$.mobile.loadPage($(this).attr("href"));
+    });
+});
+</script>
 </body>
 </html>
diff --git a/module/my/config.php b/module/my/config.php
index a4a985ca7d..357472761d 100644
--- a/module/my/config.php
+++ b/module/my/config.php
@@ -10,5 +10,6 @@ $config->my->bugCounts     = 10;
 $config->my->storyCounts   = 10; 
 
 $config->mobile = new stdclass();
-$config->mobile->todoBar = array('today', 'yesterday', 'thisWeek', 'lastWeek', 'all');
-$config->mobile->taskBar = array('assignedTo', 'openedBy');
+$config->mobile->todoBar  = array('today', 'yesterday', 'thisWeek', 'lastWeek', 'all');
+$config->mobile->taskBar  = array('assignedTo', 'openedBy');
+$config->mobile->storyBar = array('assignedTo', 'openedBy', 'reviewedBy');
diff --git a/module/my/view/m.story.html.php b/module/my/view/m.story.html.php
index eda5edff28..1c673917c1 100755
--- a/module/my/view/m.story.html.php
+++ b/module/my/view/m.story.html.php
@@ -1,14 +1,30 @@
 <?php
 /**
- * The todo view file of dashboard module of ZenTaoPMS.
+ * The story view file of dashboard module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2013 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)
  * @author      Yidong Wang <yidong@cnezsoft.com>
  * @package     my
- * @version     $Id: todo.html.php 4735 2013-05-03 08:30:02Z chencongzhi520@gmail.com $
+ * @version     $Id: story.html.php 4735 2013-05-03 08:30:02Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 ?>
 <?php include '../../common/view/m.header.html.php';?>
+<div data-role='navbar' style='margin:-15px 0 15px 0;'>
+  <ul>
+    <?php foreach($config->mobile->storyBar as $menu):?>
+    <?php $active = $type == $menu ? 'ui-btn-active' : ''?>
+    <li><?php echo html::a($this->createLink('my', 'story', "type=$menu"), $lang->my->storyMenu->{$menu . 'Me'}, '', "class='$active'")?></li>
+    <?php endforeach;?>
+  </ul>
+</div>
+<ul data-role='listview'>
+    <?php foreach($stories as $story):?>
+    <li><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title)?></li>
+    <?php endforeach;?>
+</ul>
+<p>
+<?php $pager->show('right', 'short')?>
+</p>
 <?php include '../../common/view/m.footer.html.php';?>
diff --git a/module/my/view/m.task.html.php b/module/my/view/m.task.html.php
index 8ba73a1e03..055603123e 100755
--- a/module/my/view/m.task.html.php
+++ b/module/my/view/m.task.html.php
@@ -24,4 +24,5 @@
     <li><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name)?></li>
     <?php endforeach;?>
 </ul>
+<p><?php $pager->show('right', 'short')?></p>
 <?php include '../../common/view/m.footer.html.php';?>
diff --git a/module/my/view/m.todo.html.php b/module/my/view/m.todo.html.php
index 5e3a0ca6ed..7cc3702b67 100755
--- a/module/my/view/m.todo.html.php
+++ b/module/my/view/m.todo.html.php
@@ -24,6 +24,7 @@
     <li><?php echo html::a($this->createLink('todo', 'view', "todoID=$todo->id&from=my"), $todo->name)?></li>
     <?php endforeach;?>
 </ul>
+<p><?php echo $pager->show('right', 'short')?></p>
 <div data-role='footer' data-position='fixed'>
   <div data-role='navbar'>
     <ul>