Merge branch 'master' of https://github.com/easysoft/zentaopms

module/block/view/todoblock.html.php

@@ -50,9 +50,9 @@
         </div>
         <div class="form-group">
           <label for="todoDate" class="col-sm-2"><?php echo $lang->todo->date?></label>
-          <div class="col-sm-9 required">
+          <div class="col-sm-9 ">
             <div class="input-control has-icon-right">
-              <input type="text" class="form-control form-date" id="todoDate" name="date" placeholder="(<?php echo $lang->required;?>)">
+              <input type="text" class="form-control form-date" id="todoDate" name="date" placeholder="">
               <label for='todoDate' class="input-control-icon-right"><i class="icon icon-delay"></i></label>
             </div>
           </div>
@@ -98,7 +98,12 @@
         <span class="todo-check icon icon-check-circle"></span>
         <a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe' <?php echo $appid?>>
           <span class="todo-title"><?php echo $todo->name;?></span>
-          <span class="todo-pri todo-pri-<?php echo $todo->pri?>"><?php echo zget($lang->todo->priList, $todo->pri);?></span><span class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></span>
+          <span class="todo-pri todo-pri-<?php echo $todo->pri?>"><?php echo zget($lang->todo->priList, $todo->pri);?></span>
+          <?php if ($todo->date == '2030-01-01') :?>
+          <span class="c-date"><?php echo $lang->todo->periods['future'] ?></span>
+          <?php else:?>
+          <span class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></span>
+          <?php endif;?>
         </a>
       </li>
       <?php endforeach;?>

module/bug/css/common.css

@@ -7,3 +7,5 @@
 #batchCreateForm .input-group .colorpicker, #batchEditForm .input-group .colorpicker {z-index: 2;}
 #batchCreateForm .input-group .colorpicker.open, #batchEditForm .input-group .colorpicker.open {z-index: 5;}
 
+.table td {overflow:hidden;}
+

module/build/lang/en.php

@@ -58,3 +58,4 @@ $lang->build->placeholder->filePath = ' Path of this Build package for downloadi
 
 $lang->build->action = new stdclass();
 $lang->build->action->buildopened = '$date, created by <strong>$actor</strong>, Build <strong>$extra</strong>.' . "\n";
+$lang->backhome = 'back';

module/build/lang/zh-cn.php

@@ -58,3 +58,4 @@ $lang->build->placeholder->filePath = ' 该版本软件包下载存储地址';
 
 $lang->build->action = new stdclass();
 $lang->build->action->buildopened = '$date, 由 <strong>$actor</strong> 创建版本 <strong>$extra</strong>。' . "\n";
+$lang->backhome = '返回';

module/build/view/create.html.php

@@ -75,7 +75,7 @@
         <tr>
           <td colspan="3" class="text-center form-actions">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
-            <?php echo html::backButton('', '', 'btn btn-wide');?>
+            <?php echo "<a href='/project-build-$projectID.html' class='btn btn-back btn btn-wide'>$lang->backhome</a>";?>
           </td>
         </tr>
       </table>

module/product/css/common.css

@@ -1 +1,2 @@
 #whitelistBox .checkbox-primary, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
+.table td {overflow:hidden;}

module/project/control.php

@@ -1023,6 +1023,7 @@ class project extends control
         $this->view->name          = $name;
         $this->view->code          = $code;
         $this->view->team          = $team;
+        $this->view->projectID    = $projectID;
         $this->view->products      = $products;
         $this->view->productPlan   = array(0 => '') + $productPlan;
         $this->view->whitelist     = $whitelist;

module/project/css/common.css

@@ -13,6 +13,7 @@
 .table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;}
 .table-children.table-child-top {border-top: 2px solid #cbd0db;}
 .table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
+.table td {overflow:hidden;}
 .table td.has-child > .task-toggle {color: #838a9d; position: relative; top: -1px;}
 .table td.has-child > .task-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .task-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s;}