From 55cfd3deaf92a271b475a2ff65bd6d542c7f1cfb Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Wed, 1 Mar 2023 11:50:49 +0800
Subject: [PATCH 1/8] =?UTF-8?q?GH=20=E7=BB=9F=E4=B8=80=20product=5Fcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index ac157edc..9816802c 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1075,8 +1075,8 @@ class Information extends CI_Controller
         $template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
 
         if (!empty($meta_product_code)) {
-            // <input name="cli_no" type="hidden" value="cht-63">
-            $product_code_input = "<input name='cli_no' type='hidden' value='$meta_product_code'>";
+            // <input name="product_code" type="hidden" value="cht-63">
+            $product_code_input = "<input name='product_code' type='hidden' value='$meta_product_code'>";
             $template = str_replace('<!--@INPUT_PRODUCT_CODE@-->', $product_code_input, $template);
         }
 

From 44de1268d0336b41a49a375f2ba6310dacd757d9 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 2 Mar 2023 09:21:35 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=B8=B8=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=89=87=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bootstrap3/information_edit.php     | 85 ++++++++++++++++++-
 1 file changed, 82 insertions(+), 3 deletions(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 833a93a3..dc199ddb 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -959,7 +959,10 @@ if (!empty($setting_website_nav)) {
                         <label><a href="javascript:void(0);" onclick="$('#customize').toggle();">自定义选项</a>　</label>
                         <?php if ($information->ic_sitecode == "trippest") {?>
                             <label><a class="btn default" data-toggle="modal" id="aBokunData"> 管理TPBokun数据 </a> </label>
-                        <?php }?>
+                        <?php }?>                        
+                        <label><a class="btn default" data-toggle="modal" id="btnFeedback">TA/TP反馈标签</a>　</label>
+                        <label><a class="btn default" data-toggle="modal" id="btnFormTag">Inquiry表单标签</a>　</label>
+                        <label><a class="btn default" data-toggle="modal" id="btnTemplate">特殊代码模板</a>　</label>
                     </div>
 
                     <div id="customize" class="col-xs-24" style="display:none;">
@@ -2070,6 +2073,65 @@ foreach ($author_list as $author_item) {
         </div>
     </div>
 </div>
+<!-- Trippest bokun窗口 -->
+
+<div class="modal fade" id="modalFeedback">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="NoPermissionModalLabel">TA/TP反馈标签</h4>
+            </div>
+            <div class="modal-body" style="height:650px;">
+              <label>
+                泰国：&lt;--@FEEDBACK_Bangkok@--&gt; 
+              </label>
+              <label>
+                越南：&lt;--@FEEDBACK_Saigon@--&gt; 
+              </label>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default " data-dismiss="modal"> 关 闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="modalFormTag">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="NoPermissionModalLabel">Inquiry表单标签</h4>
+            </div>
+            <div class="modal-body" style="height:650px;">
+              <label>
+              Inquiry表单：&lt;--@INFO-PAGE-FORM@--&gt; 
+              </label>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default " data-dismiss="modal"> 关 闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal fade" id="btnTemplate">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="NoPermissionModalLabel">特殊代码模板</h4>
+            </div>
+            <div class="modal-body" style="height:650px;">
+              <code>
+                <td>Years</td>
+              </code>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default " data-dismiss="modal"> 关 闭</button>
+            </div>
+        </div>
+    </div>
+</div>
 <script>
     $(function() {
         $("#aBokunData").click(function() {
@@ -2080,6 +2142,23 @@ foreach ($author_list as $author_item) {
                 backdrop: 'static'
             });
         })
+        $("#btnFeedback").click(function() {
+          $('#modalFeedback').modal({
+            show: true,
+            backdrop: 'static'
+          });
+        })
+        $("#btnFormTag").click(function() {
+          $('#modalFormTag').modal({
+            show: true,
+            backdrop: 'static'
+          });
+        })
+        $("#btnTemplate").click(function() {
+          $('#modalTemplate').modal({
+            show: true,
+            backdrop: 'static'
+          });
+        })
     });
-</script>
-<!-- Trippest bokun窗口 -->
\ No newline at end of file
+</script>
\ No newline at end of file

From 44cec1c020563fb95f411da0d101bde3475ab630 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 2 Mar 2023 09:28:42 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9C=A8=20HTML=20?=
 =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=20HTML?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bootstrap3/information_edit.php     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index dc199ddb..b808165d 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2114,6 +2114,18 @@ foreach ($author_list as $author_item) {
         </div>
     </div>
 </div>
+<div style="display:none" id="htmlTemplate">
+  <div class="table-responsive">
+  <table class="infotable">
+    <tbody>
+      <tr>
+        <td>Chinese Zodiac Sign</td>
+        <td>Years</td>
+      </tr>
+    </tbody>
+  </table>
+  </div>
+</div>
 <div class="modal fade" id="btnTemplate">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
@@ -2122,9 +2134,10 @@ foreach ($author_list as $author_item) {
                 <h4 class="modal-title" id="NoPermissionModalLabel">特殊代码模板</h4>
             </div>
             <div class="modal-body" style="height:650px;">
-              <code>
-                <td>Years</td>
-              </code>
+              <pre>
+                <code id="codeBody">
+                </code>
+              </pre>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default " data-dismiss="modal"> 关 闭</button>

From e5b769b98d03bc583cba31183a4b19bf5c4bf4d5 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 2 Mar 2023 09:32:14 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap3/information_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index b808165d..d9f0d5c3 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2126,7 +2126,7 @@ foreach ($author_list as $author_item) {
   </table>
   </div>
 </div>
-<div class="modal fade" id="btnTemplate">
+<div class="modal fade" id="modalTemplate">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">

From 6bea4ea76646ec018db1c67dd4f41a97938f10a0 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 2 Mar 2023 09:44:33 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B8=B8=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bootstrap3/information_edit.php     | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index d9f0d5c3..34aafe8f 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2115,6 +2115,7 @@ foreach ($author_list as $author_item) {
     </div>
 </div>
 <div style="display:none" id="htmlTemplate">
+  CH/GH表格：
   <div class="table-responsive">
   <table class="infotable">
     <tbody>
@@ -2125,6 +2126,39 @@ foreach ($author_list as $author_item) {
     </tbody>
   </table>
   </div>
+  AH表格：
+  <div class="table-responsive">
+  <table class="InfoTable">
+    <tbody>
+      <tr>
+        <td>Festivals of India</td>
+        <td>Date</td>
+        <td>Public Holiday</td>
+      </tr>
+    </tbody>
+  </table>
+  </div>
+  CH无序列表：
+  <ul class="drop1">
+    <li>Average temperature</li>
+    <li>Sunny days</li>
+  </ul>
+  AH无序列表：
+  <ul class="InfoList">
+    <li>Average temperature</li>
+    <li>Sunny days</li>
+  </ul>
+  GH无序列表：
+  <ul class="ghlist">
+    <li>Average temperature</li>
+    <li>Sunny days</li>
+  </ul>
+  What’s New广告框：
+  <div class="whatsnew"><img alt="Guilin Hotel upgrade" class="img-responsive" src="https://data.chinahighlights.com/image/tour-detail/china-tour/whats-new-info-tag-pic.png" width="170px" />
+  <div>
+  <p>After three years...</p>
+  </div>
+  </div>
 </div>
 <div class="modal fade" id="modalTemplate">
     <div class="modal-dialog modal-lg">
@@ -2145,6 +2179,11 @@ foreach ($author_list as $author_item) {
         </div>
     </div>
 </div>
+<script>
+  $(function() {
+    $('#codeBody').append($('<div>').text($('#htmlTemplate').html()).html());
+  });
+</script>
 <script>
     $(function() {
         $("#aBokunData").click(function() {

From b3605d973b906fc3124773012201233e4d5a134d Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 2 Mar 2023 09:52:02 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AD=E5=9B=BD=20TA?=
 =?UTF-8?q?=20=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bootstrap3/information_edit.php     | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 34aafe8f..487dce8c 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2089,6 +2089,22 @@ foreach ($author_list as $author_item) {
               <label>
                 越南：&lt;--@FEEDBACK_Saigon@--&gt; 
               </label>
+
+              中国：
+              <pre><code>
+              北京：<!--@FEEDBACK_Beijing@-->
+              西安：<!--@FEEDBACK_Xian@-->
+              桂林：<!--@FEEDBACK_Guilin@-->
+              成都：<!--@FEEDBACK_Chengdu@-->
+              黄山：<!--@FEEDBACK_Huangshan@-->
+              苏州：<!--@FEEDBACK_Suzhou@-->
+              杭州：<!--@FEEDBACK_Hangzhou@-->
+              上海：<!--@FEEDBACK_Shanghai@-->
+              张家界：<!--@FEEDBACK_Zhangjiajie@-->
+              丽江：<!--@FEEDBACK_Lijiang@-->
+              大理：<!--@FEEDBACK_Dali@-->
+              熊猫：<!--@FEEDBACK_Chengdu@-->
+              </code></pre>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default " data-dismiss="modal"> 关 闭</button>
@@ -2126,6 +2142,7 @@ foreach ($author_list as $author_item) {
     </tbody>
   </table>
   </div>
+
   AH表格：
   <div class="table-responsive">
   <table class="InfoTable">
@@ -2138,27 +2155,32 @@ foreach ($author_list as $author_item) {
     </tbody>
   </table>
   </div>
+
   CH无序列表：
   <ul class="drop1">
     <li>Average temperature</li>
     <li>Sunny days</li>
   </ul>
+
   AH无序列表：
   <ul class="InfoList">
     <li>Average temperature</li>
     <li>Sunny days</li>
   </ul>
+
   GH无序列表：
   <ul class="ghlist">
     <li>Average temperature</li>
     <li>Sunny days</li>
   </ul>
+
   What’s New广告框：
   <div class="whatsnew"><img alt="Guilin Hotel upgrade" class="img-responsive" src="https://data.chinahighlights.com/image/tour-detail/china-tour/whats-new-info-tag-pic.png" width="170px" />
   <div>
   <p>After three years...</p>
   </div>
   </div>
+
 </div>
 <div class="modal fade" id="modalTemplate">
     <div class="modal-dialog modal-lg">
@@ -2167,7 +2189,7 @@ foreach ($author_list as $author_item) {
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                 <h4 class="modal-title" id="NoPermissionModalLabel">特殊代码模板</h4>
             </div>
-            <div class="modal-body" style="height:650px;">
+            <div class="modal-body" style="height:650px; overflow: scroll">
               <pre>
                 <code id="codeBody">
                 </code>

From b7f368d2e153db77620044b130ea2fce0c1d1689 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 2 Mar 2023 10:00:10 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E5=9B=BD=E5=86=85=20TA=20=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bootstrap3/information_edit.php     | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 487dce8c..8efa4773 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2075,6 +2075,30 @@ foreach ($author_list as $author_item) {
 </div>
 <!-- Trippest bokun窗口 -->
 
+<div style="display:none" id="templateFeedback">
+海外
+泰国：<!--@FEEDBACK_Bangkok@--> 
+越南：<!--@FEEDBACK_Saigon@-->
+柬埔寨：<!--@FEEDBACK_Siem Reap@-->
+日本：<!--@FEEDBACK_Tokyo,Siem Reap@-->
+缅甸：<!--@FEEDBACK_Yangon,Siem Reap@-->
+印度：<!--@FEEDBACK_Delhi,Bangkok@--> 
+
+中国：
+北京：<!--@FEEDBACK_Beijing@-->
+西安：<!--@FEEDBACK_Xian@-->
+桂林：<!--@FEEDBACK_Guilin@-->
+成都：<!--@FEEDBACK_Chengdu@-->
+黄山：<!--@FEEDBACK_Huangshan@-->
+苏州：<!--@FEEDBACK_Suzhou@-->
+杭州：<!--@FEEDBACK_Hangzhou@-->
+上海：<!--@FEEDBACK_Shanghai@-->
+张家界：<!--@FEEDBACK_Zhangjiajie@-->
+丽江：<!--@FEEDBACK_Lijiang@-->
+大理：<!--@FEEDBACK_Dali@-->
+熊猫：<!--@FEEDBACK_Chengdu@-->
+</div>
+
 <div class="modal fade" id="modalFeedback">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
@@ -2083,27 +2107,7 @@ foreach ($author_list as $author_item) {
                 <h4 class="modal-title" id="NoPermissionModalLabel">TA/TP反馈标签</h4>
             </div>
             <div class="modal-body" style="height:650px;">
-              <label>
-                泰国：&lt;--@FEEDBACK_Bangkok@--&gt; 
-              </label>
-              <label>
-                越南：&lt;--@FEEDBACK_Saigon@--&gt; 
-              </label>
-
-              中国：
-              <pre><code>
-              北京：<!--@FEEDBACK_Beijing@-->
-              西安：<!--@FEEDBACK_Xian@-->
-              桂林：<!--@FEEDBACK_Guilin@-->
-              成都：<!--@FEEDBACK_Chengdu@-->
-              黄山：<!--@FEEDBACK_Huangshan@-->
-              苏州：<!--@FEEDBACK_Suzhou@-->
-              杭州：<!--@FEEDBACK_Hangzhou@-->
-              上海：<!--@FEEDBACK_Shanghai@-->
-              张家界：<!--@FEEDBACK_Zhangjiajie@-->
-              丽江：<!--@FEEDBACK_Lijiang@-->
-              大理：<!--@FEEDBACK_Dali@-->
-              熊猫：<!--@FEEDBACK_Chengdu@-->
+              <pre><code id='codeFeedback'>
               </code></pre>
             </div>
             <div class="modal-footer">
@@ -2130,7 +2134,7 @@ foreach ($author_list as $author_item) {
         </div>
     </div>
 </div>
-<div style="display:none" id="htmlTemplate">
+<div style="display:none" id="templateHTML">
   CH/GH表格：
   <div class="table-responsive">
   <table class="infotable">
@@ -2191,7 +2195,7 @@ foreach ($author_list as $author_item) {
             </div>
             <div class="modal-body" style="height:650px; overflow: scroll">
               <pre>
-                <code id="codeBody">
+                <code id="codeHTML">
                 </code>
               </pre>
             </div>
@@ -2203,7 +2207,8 @@ foreach ($author_list as $author_item) {
 </div>
 <script>
   $(function() {
-    $('#codeBody').append($('<div>').text($('#htmlTemplate').html()).html());
+    $('#codeHTML').append($('<div>').text($('#templateHTML').html()).html());
+    $('#feedbackHTML').append($('<div>').text($('#templateFeedback').html()).html());
   });
 </script>
 <script>

From 50ab0f9330b50be6c2907d0cfdfba587aeada60e Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 2 Mar 2023 10:03:11 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTA=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap3/information_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 8efa4773..a48a1a96 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2107,7 +2107,7 @@ foreach ($author_list as $author_item) {
                 <h4 class="modal-title" id="NoPermissionModalLabel">TA/TP反馈标签</h4>
             </div>
             <div class="modal-body" style="height:650px;">
-              <pre><code id='codeFeedback'>
+              <pre><code id='feedbackHTML'>
               </code></pre>
             </div>
             <div class="modal-footer">