From 78a2f85b21415ef113f5e5a88c83f18526f7aeee Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 28 Jun 2013 02:27:23 +0000
Subject: [PATCH]  * change for my-story use ajax  * add title for
 project-index and product-index.

---
 module/common/view/m.header.html.php |  2 +-
 module/my/view/m.story.html.php      | 13 ++++---------
 module/my/view/m.todo.html.php       |  2 +-
 module/product/control.php           |  1 +
 module/product/view/m.index.html.php | 14 +++++++++-----
 module/project/control.php           |  1 +
 module/story/view/m.close.html.php   |  2 +-
 module/story/view/m.review.html.php  |  2 +-
 www/theme/default/m.style.css        |  3 +--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/module/common/view/m.header.html.php b/module/common/view/m.header.html.php
index 9c0d90ad02..b6964287bf 100755
--- a/module/common/view/m.header.html.php
+++ b/module/common/view/m.header.html.php
@@ -3,7 +3,7 @@ if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::
 include 'm.header.lite.html.php';
 ?>
 <div data-role="header" data-position='fixed'>
-  <h1><?php echo $app->company->name?></h1>
+  <h1 style='margin-left:0px;text-align:left'><?php echo $app->company->name?></h1>
   <?php echo html::a($this->createLink('user', 'logout'), $lang->logout, '', "data-icon='delete' class='ui-btn-right'")?>
   <div data-role="navbar" id='mainMenu'>
     <?php commonModel::printMainmenu($this->moduleName, $this->methodName)?>
diff --git a/module/my/view/m.story.html.php b/module/my/view/m.story.html.php
index 8095365280..20422adaf2 100755
--- a/module/my/view/m.story.html.php
+++ b/module/my/view/m.story.html.php
@@ -23,15 +23,10 @@
 <?php foreach($stories as $story):?>
 <div  data-role="collapsible-set">
   <div data-role="collapsible" data-collapsed="true">
-    <h1><?php echo $story->title;?></h1>
-    <div>
-      <p><strong><?php echo $lang->story->spec?><strong></p>
-      <?php echo $story->spec?>
-    </div>
-    <div>
-      <p><strong><?php echo $lang->story->verify?><strong></p>
-      <?php echo $story->verify?>
-    </div>
+    <?php if($this->session->storyID == $story->id) echo "<script>showDetail('story', $story->id);</script>";?>
+    <h1 onClick="showDetail('story', <?php echo $story->id;?>)"><?php echo $story->title;?></h1>
+
+    <div id='item<?php echo $story->id;?>'></div>
     <div data-role='navbar'>
       <ul>
         <?php
diff --git a/module/my/view/m.todo.html.php b/module/my/view/m.todo.html.php
index e761931b27..c12d087860 100755
--- a/module/my/view/m.todo.html.php
+++ b/module/my/view/m.todo.html.php
@@ -47,7 +47,7 @@
 <div data-role='footer' data-position='fixed'>
   <div data-role='navbar'>
     <ul>
-      <li><?php echo html::a($this->createLink('todo', 'batchCreate'), $lang->todo->create)?></li>
+      <li><?php echo html::a($this->createLink('todo', 'batchCreate'), $lang->todo->create, '', "data-icon='plus'")?></li>
     </ul>
   </div>
 </div>
diff --git a/module/product/control.php b/module/product/control.php
index 9778bbfb94..50ad317c0f 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -51,6 +51,7 @@ class product extends control
         $this->product->setMenu($this->products, $productID);
 
         $this->app->loadLang('my');
+        $this->view->title        = $this->lang->product->allProduct;
         $this->view->productStats = $this->product->getStats();
         $this->display();
     }
diff --git a/module/product/view/m.index.html.php b/module/product/view/m.index.html.php
index 64f16dc28a..9f5ca2c7ca 100755
--- a/module/product/view/m.index.html.php
+++ b/module/product/view/m.index.html.php
@@ -14,11 +14,15 @@
 <ul data-role='listview'>
   <?php foreach($productStats as $product):?>
   <li>
-    <h3><?php echo $product->name?></h3>
-    <div style='text-align:right'>
-      <span><?php echo html::a($this->createLink('product', 'browse', "productID=$product->id"), $lang->story->browse, '', "data-role='button' data-mini='true' data-inline='true'")?></span>
-      <span><?php echo html::a($this->createLink('bug', 'browse', "productID=$product->id"), $lang->bug->browse, '', "data-role='button' data-mini='true' data-inline='true'")?></span>
-    </div>
+    <table class='table-1 fixed'>
+      <tr>
+        <td><h3><?php echo $product->name?></h3></td>
+        <td width='120'>
+          <?php echo html::a($this->createLink('product', 'browse', "productID=$product->id"), $lang->story->common, '', "data-role='button' data-mini='true' data-inline='true'")?>
+          <?php echo html::a($this->createLink('bug', 'browse', "productID=$product->id"), $lang->bug->common, '', "data-role='button' data-mini='true' data-inline='true'")?>
+        </td>
+      </tr>
+    </table>
   </li>
   <?php endforeach;?>
 </ul>
diff --git a/module/project/control.php b/module/project/control.php
index fc577cf796..c9bc5cddec 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -46,6 +46,7 @@ class project extends control
         $this->session->set('projectList', $this->app->getURI(true));
 
         $this->app->loadLang('my');
+        $this->view->title         = $this->lang->project->allProject;
         $this->view->projectStats  = $this->project->getProjectStats($status);
 
         $this->display();
diff --git a/module/story/view/m.close.html.php b/module/story/view/m.close.html.php
index ccdc97e282..293b474fdf 100755
--- a/module/story/view/m.close.html.php
+++ b/module/story/view/m.close.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
 <form method='post' target='hiddenwin'>
-  <h3><?php echo $story->title;?></h3>
+  <h3><?php echo $lang->story->close . $lang->colon . $story->title;?></h3>
   <table class='table-1'>
     <tr>
       <td class='w-70px'><?php echo $lang->story->closedReason;?></td>
diff --git a/module/story/view/m.review.html.php b/module/story/view/m.review.html.php
index 69c27e4671..4ca2112e58 100755
--- a/module/story/view/m.review.html.php
+++ b/module/story/view/m.review.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/m.header.html.php';?>
 </div>
-<h3><?php echo $story->title?></h3>
+<h3><?php echo $lang->story->review . $lang->colon . $story->title?></h3>
 <form method='post' target='hiddenwin'>
   <table class='table-1'>
     <tr>
diff --git a/www/theme/default/m.style.css b/www/theme/default/m.style.css
index 734665be2d..8c03ffe12d 100644
--- a/www/theme/default/m.style.css
+++ b/www/theme/default/m.style.css
@@ -31,7 +31,7 @@
 .a-right  {text-align: right;}
 .a-left   {text-align: left;}
 
-.table-1 {width:100%; margin-bottom:10px}
+.table-1 {width:100%;}
 .rowhead {font-weight:bold; text-align:right; width:80px; border:none}
 
 .w-20px {width:20px}
@@ -50,4 +50,3 @@
 .w-150px {width:150px}
 .w-160px {width:160px}
 .w-200px {width:200px}
-