* Finish task #74676.

2022-11-02 15:21:00 +08:00
parent 315dacdc1d
commit e32a018700
11 changed files with 135 additions and 128 deletions
@@ -177,7 +177,7 @@ $lang->testtask->common      = 'Request';
 $lang->score->common         = 'Score';
 $lang->build->common         = 'Build';
 $lang->testreport->common    = 'Report';
-$lang->automation->common    = 'Automation';
+$lang->automation->common    = 'Automation:';
 $lang->zahost->common        = 'ZAhost';
 $lang->executionnode->common = 'Execution Node';
 $lang->team->common          = 'Team';
@@ -177,7 +177,7 @@ $lang->testtask->common      = 'Request';
 $lang->score->common         = 'Score';
 $lang->build->common         = 'Build';
 $lang->testreport->common    = 'Report';
-$lang->automation->common    = 'Automation';
+$lang->automation->common    = 'Automation:';
 $lang->zahost->common        = 'ZAhost';
 $lang->executionnode->common = 'Execution Node';
 $lang->team->common          = 'Team';
@@ -177,7 +177,7 @@ $lang->testtask->common      = 'Request';
 $lang->score->common         = 'Score';
 $lang->build->common         = 'Build';
 $lang->testreport->common    = 'Report';
-$lang->automation->common    = 'Automation';
+$lang->automation->common    = 'Automation:';
 $lang->zahost->common        = 'ZAhost';
 $lang->executionnode->common = 'Execution Node';
 $lang->team->common          = 'Team';
@@ -383,7 +383,7 @@ $lang->qa->menu->testsuite     = array('link' => "{$lang->testcase->testsuite}|t
 $lang->qa->menu->testtask      = array('link' => "{$lang->testtask->common}|testtask|browse|productID=%s", 'subModule' => 'testtask', 'alias' => 'view,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
 $lang->qa->menu->report        = array('link' => "{$lang->testreport->common}|testreport|browse|productID=%s", 'subModule' => 'testreport');
 $lang->qa->menu->caselib       = array('link' => "{$lang->testcase->caselib}|caselib|browse|libID=0", 'subModule' => 'caselib');
-$lang->qa->menu->automation    = array('link' => "{$lang->automation->common}:|automation|browse|productID=%s", 'subModule' => 'automation', 'alias' => '');
+$lang->qa->menu->automation    = array('link' => "{$lang->automation->common}|automation|browse|productID=%s", 'subModule' => 'automation', 'alias' => '');
 $lang->qa->menu->zahost        = array('link' => "{$lang->zahost->common}|zahost|browse", 'subModule' => 'zahost');
 $lang->qa->menu->executionnode = array('link' => "{$lang->executionnode->common}|executionnode|browse", 'subModule' => 'executionnode');

@@ -177,7 +177,7 @@ $lang->testtask->common      = '测试单';
 $lang->score->common         = '我的积分';
 $lang->build->common         = '版本';
 $lang->testreport->common    = '测试报告';
-$lang->automation->common    = '自动化';
+$lang->automation->common    = '自动化：';
 $lang->zahost->common        = '宿主机';
 $lang->executionnode->common = '执行节点';
 $lang->team->common          = '团队';
@@ -162,7 +162,7 @@ $lang->testtask->common   = '測試單';
 $lang->score->common      = '我的積分';
 $lang->build->common      = '版本';
 $lang->testreport->common = '測試報告';
-$lang->automation->common = '自動化';
+$lang->automation->common = '自動化：';
 $lang->zahost->common     = '宿主機';
 $lang->team->common       = '團隊';
 $lang->user->common       = '用戶';
@@ -95,12 +95,11 @@ class zahost extends control
                if(!empty($changes)) $this->action->logHistory($actionID, $changes);
            }

-            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
-
+            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
        }

-        $this->view->title = $this->lang->zahost->edit;
+        $this->view->title = $this->lang->zahost->editAction;
        $this->view->host  = $this->zahost->getById($hostID);
        $this->display();
    }
@@ -1,3 +1,3 @@
 #unit {padding: 0px !important; width:0px; border-left: 0px;}
-.input-group-addon {border: 0px;}
+.input-group-addon {border: 0px; width: 100px;}
 #unit_chosen a {border-left: 0px; border-radius: 0 2px;}
@@ -1,4 +1,4 @@
 #unit {padding: 0px !important; width:0px; border-left: 0px;}
-.input-group-addon {border: 0px;}
+.input-group-addon {border: 0px; width: 100px;}
 #unit_chosen a {border-left: 0px; border-radius: 0 2px;}
 html[lang='en'] .table-form > tbody > tr > th {width: 120px;}
@@ -11,65 +11,69 @@
 */
 ?>
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
-<div id='mainContent' class='main-content'>
-  <div class='main-header'>
-    <h2><?php echo $lang->zahost->create;?></h2>
+<div id='mainContent' class='main-row'>
+  <div class='main-col main-content'>
+    <div class='center-block'>
+      <div class='main-header'>
+        <h2><?php echo $lang->zahost->create;?></h2>
+      </div>
+      <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
+        <table class='table table-form'>
+          <tr>
+            <th><?php echo $lang->zahost->zaHostType;?></th>
+            <td><?php echo html::select('hostType', $lang->zahost->zaHostTypeList, 'virtual', "class='form-control chosen'");?></td>
+            <td></td>
+          </tr>
+          <tr>
+            <th class='w-150px'><?php echo $lang->zahost->name;?></th>
+            <td><?php echo html::input('name', '', "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->IP;?></th>
+            <td><?php echo html::input('publicIP', '', "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->cpuCores;?></th>
+            <td><?php echo html::input('cpuCores', '', "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->memory;?></th>
+            <td>
+              <div class='input-group'>
+                <?php echo html::input('memory', '', "class='form-control'");?>
+                <span class="input-group-addon"><?php echo $lang->zahost->unitList['GB'];?></span>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->diskSize;?></th>
+            <td>
+              <div class='input-group'>
+                <?php echo html::input('diskSize', '', "class='form-control'");?>
+                <span class='input-group-addon fix-border fix-padding' id='unit'>
+                  <?php echo html::select('unit', $lang->zahost->unitList, 'GB', "class='form-control chosen w-50px'");?>
+                </span>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->virtualSoftware;?></th>
+            <td><?php echo html::select('virtualSoftware', $lang->zahost->softwareList, '', "class='form-control chosen'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->instanceNum?></th>
+            <td><?php echo html::input('instanceNum', '', "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <td colspan='2' class='text-center form-actions'>
+              <?php echo html::submitButton();?>
+              <?php echo html::backButton();?>
+              <?php echo html::hidden('type', 'za');?>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </div>
  </div>
-  <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
-    <table class='table table-form'>
-      <tr>
-        <th class='w-150px'><?php echo $lang->zahost->name;?></th>
-        <td><?php echo html::input('name', '', "class='form-control'");?></td>
-        <td></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->zaHostType;?></th>
-        <td><?php echo html::select('hostType', $lang->zahost->zaHostTypeList, 'virtual', "class='form-control chosen'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->IP;?></th>
-        <td><?php echo html::input('publicIP', '', "class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->cpuCores;?></th>
-        <td><?php echo html::input('cpuCores', '', "class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->memory;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::input('memory', '', "class='form-control'");?>
-            <span class="input-group-addon"><?php echo $lang->zahost->unitList['GB'];?></span>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->diskSize;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::input('diskSize', '', "class='form-control'");?>
-            <span class='input-group-addon fix-border fix-padding' id='unit'>
-              <?php echo html::select('unit', $lang->zahost->unitList, 'GB', "class='form-control chosen w-50px'");?>
-            </span>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->virtualSoftware;?></th>
-        <td><?php echo html::select('virtualSoftware', $lang->zahost->softwareList, '', "class='form-control chosen'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->instanceNum?></th>
-        <td><?php echo html::input('instanceNum', '', "class='form-control'");?></td>
-      </tr>
-      <tr>
-        <td colspan='2' class='text-center form-actions'>
-          <?php echo html::submitButton();?>
-          <?php echo html::backButton();?>
-          <?php echo html::hidden('type', 'za');?>
-        </td>
-      </tr>
-    </table>
-  </form>
 </div>
 <?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>
@@ -11,64 +11,68 @@
 */
 ?>
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
-<div id='mainContent' class='main-content'>
-  <div class='main-header'>
-    <h2><?php echo $lang->zahost->editAction;?></h2>
+<div id='mainContent' class='main-row'>
+  <div class='main-col main-content'>
+    <div class='center-block'>
+      <div class='main-header'>
+        <h2><?php echo $lang->zahost->editAction;?></h2>
+      </div>
+      <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
+        <table class='table table-form'>
+          <tr>
+            <th><?php echo $lang->zahost->zaHostType;?></th>
+            <td><?php echo html::select('hostType', $lang->zahost->zaHostTypeList, $host->hostType, "class='form-control chosen'");?></td>
+            <td></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->name;?></th>
+            <td><?php echo html::input('name', $host->name, "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->IP;?></th>
+            <td><?php echo html::input('publicIP', $host->publicIP, "class='form-control' disabled");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->cpuCores;?></th>
+            <td><?php echo html::input('cpuCores', $host->cpuCores, "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->memory;?></th>
+            <td>
+              <div class='input-group'>
+                <?php echo html::input('memory', $host->memory, "class='form-control'");?>
+                <span class="input-group-addon"><?php echo $lang->zahost->unitList['GB'];?></span>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->diskSize;?></th>
+            <td>
+              <div class='input-group'>
+                <?php echo html::input('diskSize', $host->diskSize, "class='form-control'");?>
+                <span class='input-group-addon fix-border fix-padding' id='unit'>
+                  <?php echo html::select('unit', $lang->zahost->unitList, $host->unit, "class='form-control chosen w-50px'");?>
+                </span>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->virtualSoftware;?></th>
+            <td><?php echo html::select('virtualSoftware', $lang->zahost->softwareList, $host->virtualSoftware, "class='form-control chosen'");?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->zahost->instanceNum?></th>
+            <td><?php echo html::input('instanceNum', $host->instanceNum, "class='form-control'");?></td>
+          </tr>
+          <tr>
+            <td colspan='2' class='text-center form-actions'>
+              <?php echo html::submitButton();?>
+              <?php echo html::backButton();?>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </div>
  </div>
-  <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
-    <table class='table table-form'>
-      <tr>
-        <th><?php echo $lang->zahost->name;?></th>
-        <td><?php echo html::input('name', $host->name, "class='form-control'");?></td>
-        <td></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->zaHostType;?></th>
-        <td><?php echo html::select('hostType', $lang->zahost->zaHostTypeList, $host->hostType, "class='form-control chosen'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->IP;?></th>
-        <td><?php echo html::input('publicIP', $host->publicIP, "class='form-control' disabled");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->cpuCores;?></th>
-        <td><?php echo html::input('cpuCores', $host->cpuCores, "class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->memory;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::input('memory', $host->memory, "class='form-control'");?>
-            <span class="input-group-addon"><?php echo $lang->zahost->unitList['GB'];?></span>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->diskSize;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::input('diskSize', $host->diskSize, "class='form-control'");?>
-            <span class='input-group-addon fix-border fix-padding' id='unit'>
-              <?php echo html::select('unit', $lang->zahost->unitList, $host->unit, "class='form-control chosen w-50px'");?>
-            </span>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->virtualSoftware;?></th>
-        <td><?php echo html::select('virtualSoftware', $lang->zahost->softwareList, $host->virtualSoftware, "class='form-control chosen'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->instanceNum?></th>
-        <td><?php echo html::input('instanceNum', $host->instanceNum, "class='form-control'");?></td>
-      </tr>
-      <tr>
-        <td colspan='2' class='text-center form-actions'>
-          <?php echo html::submitButton();?>
-          <?php echo html::backButton();?>
-        </td>
-      </tr>
-    </table>
-  </form>
 </div>
 <?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>