From 39c95c823d2ee87678425f65d9a504bc257b03c4 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 10 May 2018 17:15:06 +0800
Subject: [PATCH]  * finish task #4078.

---
 module/block/view/todoblock.html.php    |  4 ++--
 module/entry/view/create.html.php       | 13 ++++---------
 module/entry/view/edit.html.php         | 12 ++++--------
 module/productplan/view/create.html.php | 12 ++++--------
 module/productplan/view/edit.html.php   | 14 +++++---------
 module/project/view/fixfirst.html.php   | 11 +++++++++--
 6 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index 470e9c002b..4c1b433287 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -10,7 +10,6 @@
  * @link        http://www.ranzhi.org
  */
 ?>
-<?php echo ($block->id)?>
 <div class='block-todoes' id="block <?php echo ($block->block)?>">
   <div class='panel-body'>
     <div class="todoes-input">
@@ -18,7 +17,8 @@
       <form class="form-horizontal todoes-form layer" method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'create', 'date=today&account=&from=block');?>'>
         <h3><?php echo $lang->todo->create . $lang->todo->common;?></h3>
         <div class="form-group">
-          <div class="col-sm-12"><input required type="text" placeholder="<?php echo $lang->todo->name?>" class="form-control" name="name"></div>
+          <label for="todoName" class="col-sm-2"><?php echo $lang->todo->name?></label>
+          <div class="col-sm-9 required"><input type="text" class="form-control" name="name"></div>
         </div>
         <div class="form-group">
           <label for="todoPri" class="col-sm-2"><?php echo $lang->todo->pri?></label>
diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php
index ad0de79bbc..8ad386a2ce 100644
--- a/module/entry/view/create.html.php
+++ b/module/entry/view/create.html.php
@@ -39,18 +39,13 @@
         </tr>
         <tr>
           <th><?php echo $lang->entry->ip;?></th>
+          <td><?php echo html::input('ip', '', "class='form-control' title='{$lang->entry->note->ip}' placeholder='{$lang->entry->note->ip}'");?></td>
           <td>
-            <div class='input-group'>
-              <?php echo html::input('ip', '', "class='form-control' title='{$lang->entry->note->ip}' placeholder='{$lang->entry->note->ip}'");?>
-              <div class='input-group-addon'>
-                <div class='checkbox-primary'>
-                  <input type="checkbox" id="allIP" name="allIP" value="1" />
-                  <label for='allIP'><?php echo $lang->entry->note->allIP;?></label>
-                </div>
-              </div>
+            <div class='checkbox-primary'>
+              <input type="checkbox" id="allIP" name="allIP" value="1" />
+              <label for='allIP'><?php echo $lang->entry->note->allIP;?></label>
             </div>
           </td>
-          <td></td>
         </tr>
         <tr>
           <th><?php echo $lang->entry->desc;?></th>
diff --git a/module/entry/view/edit.html.php b/module/entry/view/edit.html.php
index 81d96f909a..c356642f55 100644
--- a/module/entry/view/edit.html.php
+++ b/module/entry/view/edit.html.php
@@ -38,15 +38,11 @@
       </tr>
       <tr>
         <th><?php echo $lang->entry->ip;?></th>
+        <td><?php echo html::input('ip', $entry->ip, "class='form-control' title='{$lang->entry->note->ip}' placeholder='{$lang->entry->note->ip}'");?></td>
         <td>
-          <div class='input-group'>
-            <?php echo html::input('ip', $entry->ip, "class='form-control' title='{$lang->entry->note->ip}' placeholder='{$lang->entry->note->ip}'");?>
-            <div class='input-group-addon'>
-              <div class='checkbox-primary'>
-                <input type="checkbox" id="allIP" name="allIP" value="1" />
-                <label for='allIP'><?php echo $lang->entry->note->allIP;?></label>
-              </div>
-            </div>
+          <div class='checkbox-primary'>
+            <input type="checkbox" id="allIP" name="allIP" value="1" />
+            <label for='allIP'><?php echo $lang->entry->note->allIP;?></label>
           </div>
         </td>
       </tr>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index aaab4a34fd..990e70a989 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -39,15 +39,11 @@
           </tr>
           <tr>
             <th><?php echo $lang->productplan->begin;?></th>
+            <td><?php echo html::input('begin', formatTime($begin), "class='form-control form-date'");?></td>
             <td>
-              <div class='input-group'>
-                <?php echo html::input('begin', formatTime($begin), "class='form-control form-date'");?>
-                <span class='input-group-addon'>
-                  <div class='checkbox-primary'> 
-                    <input type='checkbox' id='future' name='future' value='1' />
-                    <label for='future'><?php echo $lang->productplan->future;?></label>
-                  </div>
-                </span>
+              <div class='checkbox-primary'> 
+                <input type='checkbox' id='future' name='future' value='1' />
+                <label for='future'><?php echo $lang->productplan->future;?></label>
               </div>
             </td>
           </tr>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 0a130837b8..20f3cc0ef6 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -42,16 +42,12 @@
           </tr>
           <tr>
             <th><?php echo $lang->productplan->begin;?></th>
+            <td><?php echo html::input('begin', $plan->begin != '2030-01-01' ? formatTime($plan->begin) : '', "class='form-control form-date'");?></td>
             <td>
-              <div class='input-group'>
-                <?php echo html::input('begin', $plan->begin != '2030-01-01' ? formatTime($plan->begin) : '', "class='form-control form-date'");?>
-                <?php $checked = $plan->begin == '2030-01-01' || $plan->end == '2030-01-01' ? "checked='checked'" : '';?>
-                <span class='input-group-addon'>
-                  <div class='checkbox-primary'>
-                    <input type='checkbox' id='future' name='future' value='1' <?php echo $checked;?> />
-                    <label for='future'><?php echo $lang->productplan->future;?></label>
-                  </div>
-                </span>
+              <?php $checked = $plan->begin == '2030-01-01' || $plan->end == '2030-01-01' ? "checked='checked'" : '';?>
+              <div class='checkbox-primary'>
+                <input type='checkbox' id='future' name='future' value='1' <?php echo $checked;?> />
+                <label for='future'><?php echo $lang->productplan->future;?></label>
               </div>
             </td>
           </tr>
diff --git a/module/project/view/fixfirst.html.php b/module/project/view/fixfirst.html.php
index 3efc0f3f5e..7b2ec1f4a6 100644
--- a/module/project/view/fixfirst.html.php
+++ b/module/project/view/fixfirst.html.php
@@ -12,6 +12,9 @@
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
 <div id='mainContent' class='main-content'>
+<div class='main-header'>
+<h2><?php echo $lang->project->fixFirst;?></h2>
+</div>
   <form target='hiddenwin' method='post'>
     <table class='table table-form'>
       <tr>
@@ -21,12 +24,16 @@
             <?php echo html::input('estimate', !empty($firstBurn->estimate) ? $firstBurn->estimate : (!empty($firstBurn->left) ? $firstBurn->left : ''), "class='form-control' placeholder='{$lang->project->placeholder->totalLeft}' autocomplete='off'")?>
             <span class='input-group-addon fix-border'>
               <div class='checkbox-primary'>
-                 <input id='withLeft' type='checkbox' checked name='withLeft' value='1' />
-                 <label for='withLeft'><?php echo $lang->project->fixFirstWithLeft?></label>
+                <input id='withLeft' type='checkbox' checked name='withLeft' value='1' />
+                <label for='withLeft'><?php echo $lang->project->fixFirstWithLeft?></label>
               </div>
             </span>
             <span class='input-group-btn'><?php echo html::submitButton();?></span>
           </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
           <div class='alert alert-info'><?php echo $lang->project->totalEstimate . ' : ' . $project->totalEstimate . $lang->project->workHour;?></div>
         </td>
       </tr>