From c53b1dfe75e9be3cb7755b28884e35f3f1ea61f7 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 27 Jun 2013 09:10:14 +0000
Subject: [PATCH]  * change to table.

---
 module/my/view/m.story.html.php       |  3 +-
 module/product/view/m.browse.html.php |  3 +-
 module/story/view/m.activate.html.php | 26 ---------
 module/story/view/m.close.html.php    | 42 +++++++++------
 module/story/view/m.review.html.php   | 78 ++++++++++++++++-----------
 module/user/view/m.login.html.php     | 29 ++++++----
 6 files changed, 93 insertions(+), 88 deletions(-)
 delete mode 100755 module/story/view/m.activate.html.php

diff --git a/module/my/view/m.story.html.php b/module/my/view/m.story.html.php
index dc0355e9df..ff2a1cbfcd 100755
--- a/module/my/view/m.story.html.php
+++ b/module/my/view/m.story.html.php
@@ -38,8 +38,7 @@
         if(!$story->deleted)
         {
             common::printIcon('story', 'review',     "storyID=$story->id", $story);
-            common::printIcon('story', 'close',      "storyID=$story->id", $story, '', '', '', 'iframe');
-            common::printIcon('story', 'activate',   "storyID=$story->id", $story, '', '', '', 'iframe');
+            common::printIcon('story', 'close',      "storyID=$story->id", $story);
             common::printIcon('story', 'delete', "storyID=$story->id", '', '', '', 'hiddenwin');
         }
         ?>
diff --git a/module/product/view/m.browse.html.php b/module/product/view/m.browse.html.php
index 0b7a8f2cf0..aac96e75a9 100755
--- a/module/product/view/m.browse.html.php
+++ b/module/product/view/m.browse.html.php
@@ -14,8 +14,7 @@
         if(!$story->deleted)
         {
             common::printIcon('story', 'review',     "storyID=$story->id", $story);
-            common::printIcon('story', 'close',      "storyID=$story->id", $story, '', '', '', 'iframe');
-            common::printIcon('story', 'activate',   "storyID=$story->id", $story, '', '', '', 'iframe');
+            common::printIcon('story', 'close',      "storyID=$story->id", $story);
             common::printIcon('story', 'delete', "storyID=$story->id", '', '', '', 'hiddenwin');
         }
         ?>
diff --git a/module/story/view/m.activate.html.php b/module/story/view/m.activate.html.php
deleted file mode 100755
index 25730e534e..0000000000
--- a/module/story/view/m.activate.html.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * The activate view file of story 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     story
- * @version     $Id: activate.html.php 4129 2013-01-18 01:58:14Z wwccss $
- * @link        http://www.zentao.net
- */
-?>
-<?php include '../../common/view/m.header.html.php';?>
-</div>
-<form method='post' target='hiddenwin'>
-  <h3><?php echo $lang->story->activate;?></h3>
-    <span><?php echo $lang->story->assignedTo;?></span>
-    <?php echo html::select('assignedTo', $users, $story->closedBy, 'class="select-3"');?>
-    <span><?php echo $lang->story->comment;?></span>
-    <?php echo html::textarea('comment', '', 'rows=5 class="area-1"');?>
-    <p class='a-center'>
-    <?php echo html::submitButton('', "data-inline='true' data-theme='b'");?>
-    <?php echo html::backButton("data-inline='true'");?>
-    </p>
-</form>
-<?php include '../../common/view/m.footer.html.php';?>
diff --git a/module/story/view/m.close.html.php b/module/story/view/m.close.html.php
index 0cdc40ae0b..ccdc97e282 100755
--- a/module/story/view/m.close.html.php
+++ b/module/story/view/m.close.html.php
@@ -13,22 +13,30 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
 <form method='post' target='hiddenwin'>
-    <h3><?php echo $story->title;?></h3>
-    <span><?php echo $lang->story->closedReason;?></span>
-    <?php echo html::select('closedReason', $lang->story->reasonList, '', 'onchange="setStory(this.value)"');?>
-    <div id='duplicateStoryBox' class='hidden'>
-      <span><?php echo $lang->story->duplicateStory;?></span>
-      <?php echo html::input('duplicateStory', '');?>
-    </div>
-    <div id='childStoriesBox' class='hidden'>
-      <span><?php echo $lang->story->childStories;?></span>
-      <?php echo html::input('childStories', '');?>
-    </div>
-    <span><?php echo $lang->story->comment;?></span>
-    <?php echo html::textarea('comment', '');?>
-    <p class='a-center'>
-    <?php echo html::submitButton('', "data-inline='true' data-theme='b'");?>
-    <?php echo html::backButton("data-inline='true'");?>
-    </p>
+  <h3><?php echo $story->title;?></h3>
+  <table class='table-1'>
+    <tr>
+      <td class='w-70px'><?php echo $lang->story->closedReason;?></td>
+      <td><?php echo html::select('closedReason', $lang->story->reasonList, '', 'onchange="setStory(this.value)"');?></td>
+    </tr>
+    <tr id='duplicateStoryBox' class='hidden'>
+      <td><?php echo $lang->story->duplicateStory;?></td>
+      <td><?php echo html::input('duplicateStory', '');?></td>
+    </tr>
+    <tr id='childStoriesBox' class='hidden'>
+      <td><?php echo $lang->story->childStories;?></td>
+      <td><?php echo html::input('childStories', '');?></td>
+    </tr>
+    <tr>
+      <td><?php echo $lang->story->comment;?></td>
+      <td><?php echo html::textarea('comment', '');?></td>
+    </tr>
+    <tr>
+      <td class='a-center' colspan='2'>
+        <?php echo html::submitButton('', "data-inline='true' data-theme='b'");?>
+        <?php echo html::backButton("data-inline='true'");?>
+      </td>
+    </tr>
+  </table>
 </form>
 <?php include '../../common/view/m.footer.html.php';?>
diff --git a/module/story/view/m.review.html.php b/module/story/view/m.review.html.php
index aa7aabc1f8..69c27e4671 100755
--- a/module/story/view/m.review.html.php
+++ b/module/story/view/m.review.html.php
@@ -14,37 +14,51 @@
 </div>
 <h3><?php echo $story->title?></h3>
 <form method='post' target='hiddenwin'>
-  <span><?php echo $lang->story->reviewedDate;?></span>
-  <?php echo html::input('reviewedDate', helper::today(), 'class=text-3');?>
-  <span><?php echo $lang->story->reviewResult;?></span>
-  <?php echo html::select('result', $lang->story->reviewResultList, '', 'class=select-3 onchange="switchShow(this.value)"');?>
-  <div id='rejectedReasonBox' class='hidden'>
-    <span><?php echo $lang->story->rejectedReason;?></span>
-    <?php echo html::select('closedReason', $lang->story->reasonList, '', 'class=select-3 onchange="setStory(this.value)"');?>
-  </div>
-  <div id='duplicateStoryBox' class='hidden'>
-    <span><?php echo $lang->story->duplicateStory;?></span>
-    <?php echo html::input('duplicateStory', '', 'class=text-3');?>
-  </div>
-  <div id='childStoriesBox' class='hidden'>
-    <span><?php echo $lang->story->childStories;?></span>
-    <?php echo html::input('childStories', '', 'class=text-3');?>
-  </div>
-  <?php if($story->status == 'changed' or ($story->status == 'draft' and $story->version > 1)):?>
-  <div id='preVersionBox' class='hidden'>
-    <span><?php echo $lang->story->preVersion;?></span>
-    <?php echo html::radio('preVersion', array_combine(range($story->version - 1, 1), range($story->version - 1, 1)), $story->version - 1);?>
-  </div>
-  <?php endif;?>
-  <span><?php echo $lang->story->assignedTo;?></span>
-  <?php echo html::select('assignedTo', $users, $story->lastEditedBy ? $story->lastEditedBy : $story->openedBy, 'class=select-3');?>
-  <span><?php echo $lang->story->reviewedBy;?></span>
-  <?php echo html::input('reviewedBy', $app->user->account . ', ', 'class=text-1');?>
-  <span><?php echo $lang->story->comment;?></span>
-  <?php echo html::textarea('comment', '', "rows='8' class='area-1'");?>
-  <p class='a-center'>
-  <?php echo html::submitButton('', "data-inline='true' data-theme='b'");?>
-  <?php echo html::backButton("data-inline='true'");?>
-  </p>
+  <table class='table-1'>
+    <tr>
+      <td class='w-70px'><?php echo $lang->story->reviewedDate;?></td>
+      <td><?php echo html::input('reviewedDate', helper::today());?></td>
+    </tr>
+    <tr>
+      <td><?php echo $lang->story->reviewResult;?></td>
+      <td><?php echo html::select('result', $lang->story->reviewResultList, '', 'onchange="switchShow(this.value)"');?></td>
+    </tr>
+    <tr id='rejectedReasonBox' class='hidden'>
+      <td><?php echo $lang->story->rejectedReason;?></td>
+      <td><?php echo html::select('closedReason', $lang->story->reasonList, '', 'onchange="setStory(this.value)"');?></td>
+    </tr>
+    <tr id='duplicateStoryBox' class='hidden'>
+      <td><?php echo $lang->story->duplicateStory;?></td>
+      <td><?php echo html::input('duplicateStory', '');?></td>
+    </tr>
+    <tr id='childStoriesBox' class='hidden'>
+      <td><?php echo $lang->story->childStories;?></td>
+      <td><?php echo html::input('childStories', '');?></td>
+    </tr>
+    <?php if($story->status == 'changed' or ($story->status == 'draft' and $story->version > 1)):?>
+    <tr id='preVersionBox' class='hidden'>
+      <td><?php echo $lang->story->preVersion;?></td>
+      <td><?php echo html::radio('preVersion', array_combine(range($story->version - 1, 1), range($story->version - 1, 1)), $story->version - 1);?></td>
+    </tr>
+    <?php endif;?>
+    <tr>
+      <td><?php echo $lang->story->assignedTo;?></td>
+      <td><?php echo html::select('assignedTo', $users, $story->lastEditedBy ? $story->lastEditedBy : $story->openedBy);?></td>
+    </tr>
+    <tr>
+      <td><?php echo $lang->story->reviewedBy;?></td>
+      <td><?php echo html::input('reviewedBy', $app->user->account . ', ');?></td>
+    </tr>
+    <tr>
+      <td><?php echo $lang->story->comment;?></td>
+      <td><?php echo html::textarea('comment', '');?></td>
+    </tr>
+    <tr>
+      <td class='a-center' colspan='2'>
+      <?php echo html::submitButton('', "data-inline='true' data-theme='b'");?>
+      <?php echo html::backButton("data-inline='true'");?>
+      </td>
+    <tr>
+  </table>
 </form>
 <?php include '../../common/view/m.footer.html.php';?>
diff --git a/module/user/view/m.login.html.php b/module/user/view/m.login.html.php
index c5d9be0473..16b282b3ce 100755
--- a/module/user/view/m.login.html.php
+++ b/module/user/view/m.login.html.php
@@ -15,15 +15,26 @@ include '../../common/view/m.header.lite.html.php';
 </div>
 <div data-role="content" >
 <form method='post' target='hiddenwin'>
-  <?php
-  echo html::input('account', '', "placeholder='{$lang->user->account}'");
-  echo html::password('password', '', "placeholder='{$lang->user->password}'");
-  echo html::select('lang', $config->langs, $this->app->getClientLang(), 'onchange=selectLang(this.value)');
-  echo html::checkBox('keepLogin', $lang->user->keepLogin, $keepLogin);
-  echo html::submitButton($lang->login, "data-inline='true' data-theme='b'");
-  if($app->company->guest) echo html::linkButton($lang->user->asGuest, $this->createLink($config->default->module), '', "data-inline='true'");
-  echo html::hidden('referer', $referer);
-  ?>
+  <table class='table-1'> 
+    <tr>
+      <td class='rowhead'><?php echo $lang->user->account;?>：</td>  
+      <td><input type='text' name='account' id='account' /></td>
+    </tr>  
+    <tr>
+      <td class='rowhead'><?php echo $lang->user->password;?>：</td>  
+      <td><input type='password' name='password' /></td>
+    </tr>
+    <tr><td></td><td id='keeplogin'><?php echo html::checkBox('keepLogin', $lang->user->keepLogin, $keepLogin);?></td></tr>
+    <tr>
+      <td colspan='2' align='center'>
+      <?php 
+      echo html::submitButton($lang->login, "data-inline='true' data-theme='b'");
+      if($app->company->guest) echo html::linkButton($lang->user->asGuest, $this->createLink($config->default->module), '', "data-inline='true'");
+      echo html::hidden('referer', $referer);
+      ?>
+      </td>
+    </tr>  
+  </table>
 </form>
 </div>
 <?php include '../../common/view/m.footer.lite.html.php';?>