From 6473e52976d551ec0d0b8e7cc7b398146c63ff41 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 14 May 2018 16:03:43 +0800
Subject: [PATCH]  * Rewrite activate page.

---
 module/testtask/control.php            |  6 ++--
 module/testtask/js/common.js           |  2 +-
 module/testtask/view/activate.html.php | 45 ++++++++++++--------------
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index b5fb5c2968..9d7cb4d064 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -525,7 +525,7 @@ class testtask extends control
         if(!empty($_POST))
         {
             $changes = $this->testtask->activate($taskID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -533,8 +533,8 @@ class testtask extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            if(isonlybody()) die(js::reload('parent.parent'));
-            die(js::locate($this->createLink('testtask', 'view', "taskID=$taskID"), 'parent'));
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); 
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
         }
 
         /* Get task info. */
diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js
index 31d2bf42c6..312e9b143f 100644
--- a/module/testtask/js/common.js
+++ b/module/testtask/js/common.js
@@ -1,6 +1,6 @@
 $(document).ready(function()
 {    
-    $('#startForm, #closeForm').ajaxForm(
+    $('#startForm, #closeForm, #activateForm').ajaxForm(
     {
         finish:function(response)
         {
diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php
index 20ee5fe6d5..5ea910797a 100644
--- a/module/testtask/view/activate.html.php
+++ b/module/testtask/view/activate.html.php
@@ -12,31 +12,28 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php include '../../common/view/datepicker.html.php';?>
-<div class='container mw-800px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['testtask']);?> <strong><?php echo $testtask->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?></strong>
-      <small class='text-success'> <?php echo $lang->testtask->activate;?> <?php echo html::icon($lang->icons['start']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $testtask->id;?></span>
+        <?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?>
+        <small><?php echo $lang->arrow . $lang->testtask->activate;?></small>
+      </div>
     </div>
-  </div>
-
-  <form class='form-condensed' method='post' target='hiddenwin'>
-    <table class='table table-form'>
-      <tr>
-        <th class='text-left'><?php echo $lang->comment;?></th>
-      </tr>
-      <tr>
-        <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-      </tr>
-      <tr>
-        <td class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
-      </tr>
-    </table>
-  </form>
-  <div class='main'>
-    <?php include '../../common/view/action.html.php';?>
+    <form class='load-indicator main-form' method='post' id='activateForm'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-45px'><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+        </tr>
+        <tr>
+          <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>