From 67dd9e5e32b06ab2f150a83faeedff390af113d7 Mon Sep 17 00:00:00 2001
From: 18300102974 <tony.lin@origtek.cn>
Date: Wed, 14 Dec 2022 14:00:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E8=AA=9E?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EuroTran/WebApp/Page/ShowEasy/BasicInfo.html         | 9 ++++-----
 EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/EuroTran/WebApp/Page/ShowEasy/BasicInfo.html b/EuroTran/WebApp/Page/ShowEasy/BasicInfo.html
index 381e13f..38b80e2 100644
--- a/EuroTran/WebApp/Page/ShowEasy/BasicInfo.html
+++ b/EuroTran/WebApp/Page/ShowEasy/BasicInfo.html
@@ -38,9 +38,9 @@
                 <div class="panel-body">
                     <form id="form_main" class="form-horizontal">
                         <div class="form-group">
-                            <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="BasicInfo.Slogan">標題</span>：</label>
+                            <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="common.Language_Set">多語系設定</span>：</label>
                             <div class="col-sm-5">
-                                <input type="text" class="form-control w100p" name="Slogan" id="Slogan" maxlength="200" required data-msg="BasicInfo.Slogan_required" datamsg="請輸入標題">
+                                <select class="form-control w100p" name="Language" id="Language" required data-msg="common.Language_required" datamsg="請選擇語系"></select>
                             </div>
                         </div>
                         <div class="form-group">
@@ -48,12 +48,11 @@
                             <div class="col-sm-8">
                                 <input type="file" class="displayNone" name="files[]" id="fileInput" multiple required data-msg="BasicInfo.Image_required" datamsg="請上傳圖片">
                             </div>
-
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="common.Language_Set">多語系設定</span>：</label>
+                            <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="BasicInfo.Slogan">標題</span>：</label>
                             <div class="col-sm-5">
-                                <select class="form-control w100p" name="Language" id="Language" required data-msg="common.Language_required" datamsg="請選擇語系"></select>
+                                <input type="text" class="form-control w100p" name="Slogan" id="Slogan" maxlength="200" required data-msg="BasicInfo.Slogan_required" datamsg="請輸入標題">
                             </div>
                         </div>
                         <div class="form-group">
diff --git a/EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html b/EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html
index 9e84628..748d4a7 100644
--- a/EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html
+++ b/EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html
@@ -36,9 +36,9 @@
                     <form id="form_main" class="form-horizontal">
 
                         <div class="form-group">
-                            <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="ThemeMaintain_Upd.Title">標題</span>：</label>
+                            <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="common.Language_Set">多語系設定</span>：</label>
                             <div class="col-sm-3">
-                                <input type="text" class="form-control w100p" name="Title" id="Title" maxlength="200" required data-msg="ThemeMaintain_Upd.Title_required" datamsg="請輸入標題">
+                                <select class="form-control w100p" name="Language" id="Language" required data-msg="common.Language_required" datamsg="請選擇語系"></select>
                             </div>
                         </div>
 
@@ -51,9 +51,9 @@
                         </div>
 
                         <div class="form-group">
-                            <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="common.Language_Set">多語系設定</span>：</label>
+                            <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="ThemeMaintain_Upd.Title">標題</span>：</label>
                             <div class="col-sm-3">
-                                <select class="form-control w100p" name="Language" id="Language" required data-msg="common.Language_required" datamsg="請選擇語系"></select>
+                                <input type="text" class="form-control w100p" name="Title" id="Title" maxlength="200" required data-msg="ThemeMaintain_Upd.Title_required" datamsg="請輸入標題">
                             </div>
                         </div>
                         <div class="form-group">

From 8a87c6f7945400f2076e153aa79f05b737b39fb9 Mon Sep 17 00:00:00 2001
From: 18300102974 <tony.lin@origtek.cn>
Date: Wed, 14 Dec 2022 14:11:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=93=E7=94=A8?=
 =?UTF-8?q?=E5=81=9C=E7=94=A8=E7=8B=80=E6=85=8B=E8=AA=9E=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html b/EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html
index 748d4a7..3f2e980 100644
--- a/EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html
+++ b/EuroTran/WebApp/Page/ShowEasy/ThemeMaintain_Upd.html
@@ -60,9 +60,9 @@
                             <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="common.Status">狀態</span>：</label>
                             <div class="col-sm-3">
                                 <input id="radio_0" type="radio" name="Effective" value="Y" checked="checked" required data-msg="common.Status_required" datamsg="請選擇狀態" />
-                                <label for="radio_0" data-i18n="common.Effective">有效</label>
+                                <label for="radio_0" data-i18n="common.Effective">啓用</label>
                                 <input id="radio_1" type="radio" name="Effective" value="N" />
-                                <label for="radio_1" data-i18n="common.Invalid">無效</label>
+                                <label for="radio_1" data-i18n="common.Invalid">停用</label>
                             </div>
                         </div>
                         <div class="form-group">