From 85982b6cf01d03ec3200f553f9bf1c0194d19976 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 23 Feb 2022 13:21:37 +0800
Subject: [PATCH] * Modify the style of the migration files page.

---
 module/upgrade/css/moveextfiles.css        | 3 ++-
 module/upgrade/lang/en.php                 | 2 ++
 module/upgrade/lang/zh-cn.php              | 2 ++
 module/upgrade/view/confirmcustom.html.php | 4 ++--
 module/upgrade/view/moveextfiles.html.php  | 5 ++++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/module/upgrade/css/moveextfiles.css b/module/upgrade/css/moveextfiles.css
index 57fc502063..75adcd9dc2 100644
--- a/module/upgrade/css/moveextfiles.css
+++ b/module/upgrade/css/moveextfiles.css
@@ -1,8 +1,9 @@
 .modal-dialog {margin-top: 10px;}
+.modal-header {padding-bottom: 10px;}
 .modal-body {overflow-y: scroll;}
 @media screen and (max-width: 1920px) {.modal-body {height:500px}}
 @media screen and (max-width: 1366px) {.modal-body {height:400px}}
 
 .modal-body .panel-heading {padding: 0px;}
 .modal-body #collapseOne {margin-left: 20px;} 
-.alert {padding: 5px; margin-bottom: 5px !important;}
+.alert {padding: 5px; margin-top: 5px !important;}
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index c29ad5c391..471a3adfef 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -116,6 +116,8 @@ $lang->upgrade->projectName    = 'Project Name';
 $lang->upgrade->moveEXTFiles   = 'Migrate Expansion Files';
 $lang->upgrade->fileName       = 'File Name';
 $lang->upgrade->next           = 'Next';
+$lang->upgrade->yes            = 'Yes';
+$lang->upgrade->no             = 'No';
 
 $lang->upgrade->newProgram         = 'Create';
 $lang->upgrade->editedName         = 'New Name';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 5588f0f33a..6e03a0f152 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -116,6 +116,8 @@ $lang->upgrade->projectName    = '项目名称';
 $lang->upgrade->moveEXTFiles   = '迁移插件文件';
 $lang->upgrade->fileName       = '文件名称';
 $lang->upgrade->next           = '下一步';
+$lang->upgrade->yes            = '是';
+$lang->upgrade->no             = '否';
 
 $lang->upgrade->newProgram         = '新建';
 $lang->upgrade->editedName         = '调整后名称';
diff --git a/module/upgrade/view/confirmcustom.html.php b/module/upgrade/view/confirmcustom.html.php
index f9646bb53c..82418792f9 100644
--- a/module/upgrade/view/confirmcustom.html.php
+++ b/module/upgrade/view/confirmcustom.html.php
@@ -17,8 +17,8 @@
         <strong><?php echo $lang->upgrade->confirmCustomTip;?></strong>
       </div>
       <div class='modal-footer'>
-        <?php echo html::submitButton($lang->confirm);?>
-        <?php echo html::a(inlink('afterExec', "fromVersion=$fromVersion&processed=no&skipConfirm=yes"), $lang->cancel, '', "class='btn btn-back btn-wide'");?>
+        <?php echo html::submitButton($lang->upgrade->yes);?>
+        <?php echo html::a(inlink('afterExec', "fromVersion=$fromVersion&processed=no&skipConfirm=yes"), $lang->upgrade->no, '', "class='btn btn-back btn-wide'");?>
       </div>
     </div>
   </form>
diff --git a/module/upgrade/view/moveextfiles.html.php b/module/upgrade/view/moveextfiles.html.php
index 83f5c4288e..312e9c78d8 100644
--- a/module/upgrade/view/moveextfiles.html.php
+++ b/module/upgrade/view/moveextfiles.html.php
@@ -15,6 +15,9 @@
     <div class='modal-dialog'>
       <div class='modal-header'>
         <strong><?php echo $lang->upgrade->moveEXTFiles;?></strong>
+        <?php if($result == 'success'):?>
+        <div class='alert alert-info no-margin'><?php echo $lang->upgrade->moveExtFileTip?></div>
+        <?php endif;?>
       </div>
       <div class='modal-body'>
         <div>
@@ -41,7 +44,7 @@
         </div>
       </div>
       <div class='modal-footer text-center'>
-        <?php if($result == 'success') echo "<div class='alert alert-info no-margin'>{$lang->upgrade->moveExtFileTip}</div>" . html::submitButton($lang->upgrade->next);?>
+        <?php if($result == 'success') echo html::submitButton($lang->upgrade->next);?>
         <?php if($result == 'fail') echo $errorMessage . html::a('#', $this->lang->refresh, '', "class='btn btn-sm' onclick='refreshPage()'");?></div>
       </div>
     </div>