From f1d51e5a0dcdb8fcdcdc20343090b3e3042dbffc Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Mon, 26 Sep 2022 06:02:47 +0000
Subject: [PATCH] * Finish task #70191.

---
 module/upgrade/css/to18guide.css       |   3 +-
 module/upgrade/view/to18guide.html.php | 198 +++++++++++++------------
 2 files changed, 102 insertions(+), 99 deletions(-)

diff --git a/module/upgrade/css/to18guide.css b/module/upgrade/css/to18guide.css
index 56221c51cc..9e206b7d42 100644
--- a/module/upgrade/css/to18guide.css
+++ b/module/upgrade/css/to18guide.css
@@ -1,4 +1,5 @@
-.panel {width: 1200px; margin: auto; padding: 0px 40px 40px 40px;}
+.modal-dialog {width: 1200px;}
+.panel {padding: 0px 40px 40px 40px;}
 .panel h1 {margin-top: 20px; margin-bottom: 20px;}
 .panel .icon {font-size: 20px;}
 
diff --git a/module/upgrade/view/to18guide.html.php b/module/upgrade/view/to18guide.html.php
index f1e316b327..53bead6f5f 100644
--- a/module/upgrade/view/to18guide.html.php
+++ b/module/upgrade/view/to18guide.html.php
@@ -12,105 +12,107 @@
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
 <div class='container'>
-  <div class='panel'>
-    <form method='post'>
-      <h1 class='text-center'><?php echo $title;?></h1>
-      <div class='main-row' id='mainContent'>
-        <div class='main-col main-table'>
-          <table class="table datatable">
-            <thead>
-              <tr>
-                <th colspan='2'><?php echo $this->lang->upgrade->mode;?></th>
-                <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['lean'];?></th>
-                <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['new'];?></th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->usage;?></td>
-                <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->leanUsage;?></td>
-                <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->newUsage;?></td>
-              </tr>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->program;?></td>
-                <td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->productRR;?></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <?php $icon = $ur ? 'icon-check' : 'icon-close'?>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->productUR;?></td>
-                <td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->productLine;?></td>
-                <td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->projectScrum;?></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <?php if($edition == 'max'):?>
-              <?php $icon = $cmmi ? 'icon-check' : 'icon-close'?>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->scrumDetail;?></td>
-                <td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <?php endif;?>
-              <?php $icon = $waterfall ? 'icon-check' : 'icon-close'?>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->projectWaterfall;?></td>
-                <td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->projectKanban;?></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->execution;?></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <?php if($edition == 'max'):?>
-              <?php $icon = $assetlib ? 'icon-check' : 'icon-close'?>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->assetlib;?></td>
-                <td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <?php endif;?>
-              <?php if($edition == 'biz' or $edition == 'max'):?>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->oa;?></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-                <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
-              </tr>
-              <?php endif;?>
-              <tr>
-                <td colspan='2' style="font-weight:bold;font-size:14px;"><?php echo $this->lang->upgrade->selectUsage;?></td>
-                <td colspan='2' class="text-center"><button class="btn" type="button" id='useLean'><?php echo $this->lang->upgrade->useLean;?></button></td>
-                <td colspan='2' class="text-center"><button class="btn" type="button" id='useNew'><?php echo $this->lang->upgrade->useNew;?></button></td>
-              </tr>
-              <tr>
-                <td colspan='2'><?php echo $this->lang->upgrade->remark;?></td>
-                <td colspan='4'><?php echo $this->lang->upgrade->remarkDesc;?></td>
-              </tr>
-            </tbody>
-            <?php echo html::hidden('mode','')?>
-          </table>
+  <div class='modal-dialog'>
+    <div class='panel'>
+      <form method='post'>
+        <h1 class='text-center'><?php echo $title;?></h1>
+        <div class='main-row' id='mainContent'>
+          <div class='main-col main-table'>
+            <table class="table datatable">
+              <thead>
+                <tr>
+                  <th colspan='2'><?php echo $this->lang->upgrade->mode;?></th>
+                  <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['lean'];?></th>
+                  <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['new'];?></th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->usage;?></td>
+                  <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->leanUsage;?></td>
+                  <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->newUsage;?></td>
+                </tr>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->program;?></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->productRR;?></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <?php $icon = $ur ? 'icon-check' : 'icon-close'?>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->productUR;?></td>
+                  <td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->productLine;?></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-close"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->projectScrum;?></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <?php if($edition == 'max'):?>
+                <?php $icon = $cmmi ? 'icon-check' : 'icon-close'?>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->scrumDetail;?></td>
+                  <td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <?php endif;?>
+                <?php $icon = $waterfall ? 'icon-check' : 'icon-close'?>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->projectWaterfall;?></td>
+                  <td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->projectKanban;?></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->execution;?></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <?php if($edition == 'max'):?>
+                <?php $icon = $assetlib ? 'icon-check' : 'icon-close'?>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->assetlib;?></td>
+                  <td colspan='2' class="text-center"><i class="icon <?php echo $icon?>"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <?php endif;?>
+                <?php if($edition == 'biz' or $edition == 'max'):?>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->oa;?></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                  <td colspan='2' class="text-center"><i class="icon icon-check"></i></td>
+                </tr>
+                <?php endif;?>
+                <tr>
+                  <td colspan='2' style="font-weight:bold;font-size:14px;"><?php echo $this->lang->upgrade->selectUsage;?></td>
+                  <td colspan='2' class="text-center"><button class="btn" type="button" id='useLean'><?php echo $this->lang->upgrade->useLean;?></button></td>
+                  <td colspan='2' class="text-center"><button class="btn" type="button" id='useNew'><?php echo $this->lang->upgrade->useNew;?></button></td>
+                </tr>
+                <tr>
+                  <td colspan='2'><?php echo $this->lang->upgrade->remark;?></td>
+                  <td colspan='4'><?php echo $this->lang->upgrade->remarkDesc;?></td>
+                </tr>
+              </tbody>
+              <?php echo html::hidden('mode','')?>
+            </table>
+          </div>
         </div>
-      </div>
-    </form>
+      </form>
+    </div>
   </div>
 </div>
 <?php include '../../common/view/footer.lite.html.php';?>