Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasy into Dev

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">

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,18 +51,18 @@
                         </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">
                             <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">