From 59c52d288c164ea83b36ea711add97e5874eeb6a Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 25 Dec 2023 16:22:52 +0800
Subject: [PATCH 1/4] 11

---
 application/views/mobile_first/ah-feedback-newest-10.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ah-feedback-newest-10.php b/application/views/mobile_first/ah-feedback-newest-10.php
index f2c04a47..34b1d837 100644
--- a/application/views/mobile_first/ah-feedback-newest-10.php
+++ b/application/views/mobile_first/ah-feedback-newest-10.php
@@ -6,10 +6,11 @@
         style="width: 140px; display: block; margin: 0 auto; " width="1133"
         src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" />
   </div>
+  <p style="text-align: center;margin-top: 10px;margin-bottom: 0;"><a href="https://www.chinahighlights.com/" target="blank">China Highlights</a>, Asia Highlights, and <a href="https://www.globalhighlights.com/" target="blank">Global Highlights</a> collaborate to provide families and couples with personalized and stress-free experiences in diverse destinations.</p>
   <?php foreach ($feedback_list as $index => $feedback) {?>
   <div class="tour_feedback">
     <div class="feedback_content">
-      <strong><?php echo $feedback['title'] ?></strong>
+      <strong style="height: auto;"><?php echo $feedback['title'] ?></strong>
       <p><?php echo $feedback['content'] ?></p>
       <a href="<?php echo $feedback['url'] ?>" target="_blank">more</a>
       <div class="customer_name">
@@ -20,4 +21,5 @@
 
   </div>
   <?php }?>
+  <p style="text-align: center;"><a href="/reviews">More reviews</a></p>
 </div>
\ No newline at end of file

From aad719abec00d57abb7a305e2a5291169ed9a01a Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 25 Dec 2023 16:27:30 +0800
Subject: [PATCH 2/4] 11

---
 .../views/mobile_first/ah-feedback-newest-10.php       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/views/mobile_first/ah-feedback-newest-10.php b/application/views/mobile_first/ah-feedback-newest-10.php
index 34b1d837..41e416d1 100644
--- a/application/views/mobile_first/ah-feedback-newest-10.php
+++ b/application/views/mobile_first/ah-feedback-newest-10.php
@@ -6,9 +6,13 @@
         style="width: 140px; display: block; margin: 0 auto; " width="1133"
         src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" />
   </div>
-  <p style="text-align: center;margin-top: 10px;margin-bottom: 0;"><a href="https://www.chinahighlights.com/" target="blank">China Highlights</a>, Asia Highlights, and <a href="https://www.globalhighlights.com/" target="blank">Global Highlights</a> collaborate to provide families and couples with personalized and stress-free experiences in diverse destinations.</p>
+  <p style="text-align: center;
+  margin-top: 10px;
+  margin-bottom: 0;
+  font-size: 18px;
+  line-height: 21px;"><a href="https://www.chinahighlights.com/" target="blank">China Highlights</a>, Asia Highlights, and <a href="https://www.globalhighlights.com/" target="blank">Global Highlights</a> collaborate to provide families and couples with personalized and stress-free experiences in diverse destinations.</p>
   <?php foreach ($feedback_list as $index => $feedback) {?>
-  <div class="tour_feedback">
+  <div class="tour_feedback" style="width: auto; height: auto;">
     <div class="feedback_content">
       <strong style="height: auto;"><?php echo $feedback['title'] ?></strong>
       <p><?php echo $feedback['content'] ?></p>
@@ -21,5 +25,5 @@
 
   </div>
   <?php }?>
-  <p style="text-align: center;"><a href="/reviews">More reviews</a></p>
+  <p style="margin-top: 20px;"><a href="/reviews">More reviews</a></p>
 </div>
\ No newline at end of file

From b4b8f26dde0c09ee2d80e83da91a817b1c0973c5 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Tue, 26 Dec 2023 09:49:26 +0800
Subject: [PATCH 3/4] fix

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

diff --git a/application/controllers/information.php b/application/controllers/information.php
index c2c995b1..a7429da0 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1938,8 +1938,8 @@ class Information extends CI_Controller
       true
     );
     $template = str_replace(
-      '<!--@NEWEST_FEEDBACK_10@-->', 
-      $feedback_newest_10_content, 
+      '<!--@NEWEST_FEEDBACK_10@-->',
+      $feedback_newest_10_content,
       $template);
 
     //文中的信息推荐
@@ -3217,7 +3217,7 @@ class Information extends CI_Controller
           }
 
           // GH国际 不发布的时候删除缓存
-          if (!$information->ic_status) {
+          if (isset($information) && !$information->ic_status) {
             $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $tmp;
           }
 

From 8d4c002b60a39dfea333f2b851bd1d17a3c3944b Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 26 Dec 2023 10:14:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AAitinera?=
 =?UTF-8?q?ry=20ideas=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/gh-pc.php | 94 +-----------------------
 application/views/mobile_first/gh.php    | 74 +------------------
 2 files changed, 2 insertions(+), 166 deletions(-)

diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php
index c3dab8e0..2dc5e7c3 100644
--- a/application/views/mobile_first/gh-pc.php
+++ b/application/views/mobile_first/gh-pc.php
@@ -137,99 +137,7 @@
                         </div>
                     </li>
 
-                    <li class="dropdown"><a class="p_topnavilink">Itinerary Ideas</a>
-                        <div class="destinationspc dropdown-content">
-                            <div class="inspirationinfo">
-                                <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">1 Week</div>
-                                    <div class="listtour">
-                                        <ul class="inspiration">
-                                            <li><a href="/egypt/one-week-in-egypt">Egypt</a></li>
-                                            <li><a href="https://www.chinahighlights.com/travelguide/one-week-china-itinerary.htm"
-                                                    target="_blank">China</a>
-                                            </li>
-                                            <li><a href="https://www.asiahighlights.com/japan/1-week-itinerary"
-                                                    target="_blank">Japan</a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </div>
-
-                                <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">10 Days</div>
-                                    <div class="listtour">
-                                        <ul class="inspiration">
-                                            <li><a href="https://www.asiahighlights.com/southeast-asia/10-days-itinerary"
-                                                    target="_blank">Southeast
-                                                    Asia</a></li>
-                                            <li><a href="https://www.asiahighlights.com/japan/10-day-itineraries"
-                                                    target="_blank">Japan</a>
-                                            </li>
-                                            <li><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm"
-                                                    target="_blank">China</a>
-                                            </li>
-                                        </ul>
-
-                                    </div>
-                                </div>
-                                <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">2 Weeks</div>
-                                    <div class="listtour">
-                                        <ul class="inspiration">
-                                            <li><a href="https://www.asiahighlights.com/southeast-asia/2-weeks-itinerary"
-                                                    target="_blank">
-                                                    Southeast Asia</a></li>
-                                            <li><a href="https://www.asiahighlights.com/japan/2-week-itineraries"
-                                                    target="_blank">Japan</a>
-                                            </li>
-                                            <li><a href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"
-                                                    target="_blank">Japan
-                                                    and South Korea</a></li>
-                                            <li><a href="https://www.asiahighlights.com/asia/tours/japan-china-discovery"
-                                                    target="_blank">Japan
-                                                    and China</a></li>
-                                            <li><a href="https://www.chinahighlights.com/travelguide/2-weeks-china-itinerary.htm"
-                                                    target="_blank">China</a>
-                                            </li>
-                                            <li><a href="https://www.asiahighlights.com/india/2-week-itinerary"
-                                                    target="_blank">India</a>
-                                            </li>
-                                            <li><a href="/egypt/2-week-itinerary">Egypt</a></li>
-                                            <li><a href="/middle-east/tours/egypt-jordan">Egypt and
-                                                    Jordan</a></li>
-                                            <li><a href="/peru/2-week-itinerary">Peru</a></li>
-                                        </ul>
-
-                                    </div>
-                                </div>
-                                <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">3 Weeks</div>
-                                    <ul class="inspiration">
-                                        <li><a href="/egypt/3-week-itinerary">Egypt</a></li>
-                                        <li><a href="https://www.asiahighlights.com/southeast-asia/3-weeks-itinerary"
-                                                target="_blank">Southeast Asia</a></li>
-                                        <li><a href="https://www.asiahighlights.com/japan/3-week-itineraries"
-                                                target="_blank">Japan</a></li>
-                                        <li><a href="https://www.chinahighlights.com/travelguide/3-weeks-china-itinerary.htm"
-                                                target="_blank">China</a></li>
-                                        <li><a href="https://www.asiahighlights.com/asia/tours/china-and-vietnam"
-                                                target="_blank">China and Vietnam</a></li>
-                                        <li><a href="https://www.asiahighlights.com/asia/tours/nepal-tibet-bhutan"
-                                                target="_blank">Tibet, Nepal, and Bhutan</a></li>
-                                    </ul>
-                                </div>
-                                <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">4 Weeks</div>
-                                    <ul class="inspiration">
-                                        <li><a href="https://www.chinahighlights.com/travelguide/4-week-china-itinerary.htm"
-                                                target="_blank">China</a></li>
-                                        <li><a href="https://www.asiahighlights.com/southeast-asia/4-weeks-itinerary"
-                                                target="_blank">Southeast Asia</a></li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                    </li>
+                    <li class="dropdown"><a class="p_topnavilink" href="/itinerary-ideas">Itinerary Ideas</a></li>
                     <li class="dropdown"><a href="/about" class="p_topnavilink">About Us</a></li>
                     <li class="dropdown"><a href="/reviews" class="p_topnavilink">Reviews</a></li>
                     <li class="dropdown" style="padding-top: 20px;"><a href="/contactus?product_code="
diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php
index 1f70375b..b788884c 100644
--- a/application/views/mobile_first/gh.php
+++ b/application/views/mobile_first/gh.php
@@ -105,11 +105,7 @@
         <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-7"
             aria-owns="submenu-7">Central Asia Destinations</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/destinations">All Destinations</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-2" aria-owns="submenu-2">1 Week Itinerary</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-3" aria-owns="submenu-3">10 Days Itinerary</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4">2 Weeks Itinerary</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5" aria-owns="submenu-5">3 Weeks Itinerary</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5" aria-owns="submenu-10">4 Weeks Itinerary</a></li>
+        <li class="menu__item" role="menuitem"><a class="menu__link" href="/itinerary-ideas">Itinerary Ideas</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/about">About Us</a></li>
         <li class="menu__item" role="menuitem"><a href="/reviews" class="menu__link">Reviews</a></li>
       </ul>
@@ -153,74 +149,6 @@
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/peru/2-week-itinerary">Peru</a></li>
       </ul>
       <!-- inspiration -->
-      <ul data-menu="submenu-2" id="submenu-2" class="menu__level" tabindex="-1" role="menu" aria-label="best-time">
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/egypt/one-week-in-egypt">Egypt</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.chinahighlights.com/travelguide/one-week-china-itinerary.htm" target="_blank">China</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/japan/1-week-itinerary" target="_blank">Japan</a></li>
-      </ul>
-
-      <ul data-menu="submenu-3" id="submenu-3" class="menu__level" tabindex="-1" role="menu" aria-label="top-things">
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/southeast-asia/10-days-itinerary" target="_blank">Southeast Asia</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/japan/10-day-itineraries" target="_blank">Japan</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank">China</a>
-        </li>
-      </ul>
-
-      <ul data-menu="submenu-4" id="submenu-4" class="menu__level" tabindex="-1" role="menu" aria-label="vacation-type">
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/southeast-asia/2-weeks-itinerary" target="_blank">Southeast Asia</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/japan/2-week-itineraries" target="_blank">Japan</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"
-            target="_blank">Japan and South Korea</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/asia/tours/japan-china-discovery" target="_blank">Japan and China</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.chinahighlights.com/travelguide/2-weeks-china-itinerary.htm" target="_blank">China</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/india/2-week-itinerary" target="_blank">India</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/egypt/2-week-itinerary">Egypt</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/middle-east/tours/egypt-jordan">Egypt and
-            Jordan</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/peru/2-week-itinerary">Peru</a></li>
-      </ul>
-
-      <ul data-menu="submenu-5" id="submenu-5" class="menu__level" tabindex="-1" role="menu" aria-label="festival">
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/egypt/3-week-itinerary">Egypt</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/southeast-asia/3-weeks-itinerary" target="_blank">Southeast Asia</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/japan/3-week-itineraries" target="_blank">Japan</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.chinahighlights.com/travelguide/3-weeks-china-itinerary.htm" target="_blank">China</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/asia/tours/china-and-vietnam" target="_blank">China and Vietnam</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/asia/tours/nepal-tibet-bhutan" target="_blank">Tibet, Nepal, and
-            Bhutan</a></li>
-      </ul>
-
-      <ul data-menu="submenu-10" id="submenu-10" class="menu__level" tabindex="-1" role="menu" aria-label="festival">
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.chinahighlights.com/travelguide/4-week-china-itinerary.htm" target="_blank">China</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.asiahighlights.com/southeast-asia/4-weeks-itinerary" target="_blank">Southeast Asia</a>
-        </li>
-      </ul>
     </div>
   </nav>