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

module/common/lang/zh-cn.php

@@ -62,6 +62,8 @@ $lang->reverse         = '切换顺序';
 $lang->switchDisplay   = '切换显示';
 $lang->expand          = '展开全部';
 $lang->collapse        = '收起';
+$lang->saveSuccess     = '保存成功';
+$lang->fail            = '失败';
 $lang->addFiles        = '上传了附件 ';
 $lang->files           = '附件 ';
 $lang->pasteText       = '多项录入';

module/product/control.php

@@ -222,12 +222,9 @@ class product extends control
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('product', $productID, 'opened');
 
-            if(isset($this->config->global->flow) and $this->config->global->flow == 'onlyTest')
-            {
-                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($this->moduleName, 'build', "productID=$productID")));
-            }
-
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($this->moduleName, 'browse', "productID=$productID")));
+            $locate = $this->createLink($this->moduleName, 'browse', "productID=$productID");
+            if(isset($this->config->global->flow) and $this->config->global->flow == 'onlyTest') $locate = $this->createLink($this->moduleName, 'build', "productID=$productID");
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 
         $this->product->setMenu($this->products, key($this->products));
@@ -256,7 +253,7 @@ class product extends control
         if(!empty($_POST))
         {
             $changes = $this->product->update($productID); 
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             if($action == 'undelete')
             {
                 $this->loadModel('action');
@@ -269,7 +266,8 @@ class product extends control
                 $actionID = $this->loadModel('action')->create('product', $productID, 'edited');
                 $this->action->logHistory($actionID, $changes);
             }
-            die(js::locate(inlink('view', "product=$productID"), 'parent'));
+
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "product=$productID")));
         }
 
         $this->product->setMenu($this->products, $productID);

module/productplan/control.php

@@ -47,9 +47,9 @@ class productplan extends control
         if(!empty($_POST))
         {
             $planID = $this->productplan->create();
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('productplan', $planID, 'opened');
-            die(js::locate($this->createLink('productplan', 'browse', "productID=$product&branch=$branch"), 'parent'));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('productplan', 'browse', "productID=$product&branch=$branch")));
         }
 
         $this->commonAction($product, $branch);

module/productplan/view/create.html.php

@@ -15,60 +15,54 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('weekend', $config->project->weekend);?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container mw-1400px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['plan']);?></span>
-      <strong><small class='text-muted'><i class='icon icon-plus'></i></small> <?php echo $lang->productplan->create;?></strong>
+<div id='mainContent'class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2> <?php echo $lang->productplan->create;?></h2>
     </div>
+    <form class='load-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
+      <table class='table table-form'> 
+        <tbody>
+          <tr>
+            <th><?php echo $lang->productplan->product;?></th>
+            <td class='muted'><?php echo $product->name;?></td><td></td><td></td>
+          </tr>
+          <?php if($product->type != 'normal'):?>
+          <tr>
+            <th><?php echo $lang->product->branch;?></th>
+            <td><?php echo html::select('branch', $branches, $branch, "class='form-control chosen'");?></td><td></td><td></td>
+          </tr>
+          <?php endif;?>
+          <tr>
+            <th><?php echo $lang->productplan->title;?></th>
+            <td><?php echo html::input('title', '', "class='form-control' autocomplete='off' required");?></td>
+            <td colspan='2' class='muted'><?php if($lastPlan) echo '(' . $lang->productplan->last . ': ' . $lastPlan->title . ')';?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->productplan->begin;?></th>
+            <td><?php echo html::input('begin', $begin, "class='form-control form-date'");?></td><td></td><td></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->productplan->end;?></th>
+            <td><?php echo html::input('end', '', "class='form-control form-date'");?></td>
+            <td colspan='2'><?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->productplan->desc;?></th>
+            <td colspan='3'><?php echo html::textarea('desc', '', "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
+          </tr>
+          <tr>
+            <td colspan='4' class='text-center'>
+              <?php 
+              echo html::submitButton('', '', 'btn btn-wide btn-primary');
+              echo html::backButton('', '', 'btn btn-wide btn-gray');
+              echo html::hidden('product', $product->id);
+              ?>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </form>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-    <table class='table table-form'> 
-      <tr>
-        <th class='w-80px'><?php echo $lang->productplan->product;?></th>
-        <td class='w-p25-f'><?php echo $product->name;?></td><td></td>
-      </tr>
-      <?php if($product->type != 'normal'):?>
-      <tr>
-        <th><?php echo $lang->product->branch;?></th>
-        <td><?php echo html::select('branch', $branches, $branch, "class='form-control'");?></td>
-      </tr>
-      <?php endif;?>
-      <tr>
-        <th><?php echo $lang->productplan->title;?></th>
-        <td><?php echo html::input('title', '', "class='form-control' autocomplete='off'");?></td>
-        <td>
-          <?php if($lastPlan) echo '<span class="help-block"> &nbsp; (' . $lang->productplan->last . ': ' . $lastPlan->title . ')</span>';?>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->productplan->begin;?></th>
-        <td><?php echo html::input('begin', $begin, "class='form-control form-date'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->productplan->end;?></th>
-        <td>
-          <?php echo html::input('end', '', "class='form-control form-date'");?>
-        </td>
-        <td>
-          &nbsp; &nbsp; <?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->productplan->desc;?></th>
-        <td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control'");?></td>
-      </tr>
-      <tr>
-        <td></td>
-        <td colspan='2'>
-          <?php 
-          echo html::submitButton();
-          echo html::backButton();
-          echo html::hidden('product', $product->id);
-          ?>
-        </td>
-      </tr>
-    </table>
-  </form>
 </div>
 <?php include '../../common/view/footer.html.php';?>

module/release/control.php

@@ -60,9 +60,9 @@ class release extends control
         if(!empty($_POST))
         {
             $releaseID = $this->release->create($productID, $branch);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('release', $releaseID, 'opened');
-            die(js::locate(inlink('view', "releaseID=$releaseID"), 'parent'));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
         }
 
         $builds        = $this->loadModel('build')->getProductBuildPairs($productID, $branch, 'notrunk|withbranch', false);