Merge branch 'master' of github.com:hainatravel/information-system into master

application/controllers/information.php

@@ -1290,7 +1290,7 @@ class Information extends CI_Controller
     var_dump($feedback_newest);
   }
 
-  public function test_feedback30()
+  public function test_ch_feedback30()
   {
     $feedback30_array = [];
     preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', '<div><!--@FEEDBACK-30_Bangkok@--></div>', $feedback30_array);
@@ -1299,7 +1299,7 @@ class Information extends CI_Controller
         $city_name = $feedback30_array[1][$index];
         $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 2);
         $feedback_content = $this->load->view(
-          'mobile_first/ah-feedback-30-list',
+          'mobile_first/ch-feedback-30-list',
           array('feedback_list' => $feedback_list),
           true
         );

application/views/mobile_first/ch-feedback-30-list.php

@@ -1,42 +1,44 @@
 
-               <p style="text-align: center;margin-top: 80px;margin-bottom: 0;padding-bottom: 0;">Discover real reviews of <a href="/aboutus/highlights-travel-family.htm">Highlights Travel Family</a>'s best-rated service across trusted platforms.</p> 
+<p style="text-align: center;margin-top: 80px;margin-bottom: 0;padding-bottom: 0;">China Highlights, <a href="https://www.asiahighlights.com/" target="blank">Asia Highlights</a>, 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> 
                 
-<div class="listtour">
-                <div style="margin: 0 10px;"> <img alt="" class="img-responsive" height="69"
-                        src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"
-                        width="175">
-                    <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png"
-                        class="img-responsive" style="margin: 5px auto;">
-                    </div>
-                    <div style="margin: 0 10px;">
-                    <img alt="Tour Review" class="img-responsive" height="278"
-                        src="https://data.asiahighlights.com/image/about/logo-black.png" width="175px">
-                    <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png"
-                        width="175px" class="img-responsive">
-                </div>           
-            </div>
-<!--单个目的地反馈 展示30条反馈内容，每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->           
+                <div class="listtour">
+                                <div style="margin: 0 10px;"> <img alt="" class="img-responsive" height="69"
+                                        src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"
+                                        width="175">
+                                    <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png"
+                                        class="img-responsive" style="margin: 5px auto;">
+                                    </div>
+                                    <div style="margin: 0 10px;">
+                                    <img alt="Tour Review" class="img-responsive" height="278"
+                                        src="https://data.asiahighlights.com/image/about/logo-black.png" width="175px">
+                                    <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png"
+                                        width="175px" class="img-responsive">
+                                </div>           
+                            </div>        
               <?php foreach ($feedback_list as $index => $feedback) {?>
-                <div class="feedback_content">
+              <div class="feedback_content">
                 <strong><?php echo $feedback['title'] ?></strong>
+                <p class="feedback_rating"><img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://data.asiahighlights.com/pic/trustpilot-new-icon.png'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://data.chinahighlights.com/image/aboutus/feedback/five-star.png'; }  ?>"></p>
                 <p><?php echo $feedback['content'] ?></p>
                 <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
                 <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
               </div>
               <?php }?>
 
-              <div class="skipBox">
-                <div class="headerText">Asia Highlights Reviews</div>
-                
-                <div class="skipAhead">
-                <ul>
-                    <li><a href="#thailand">Thailand reviews</a></li>
-                    <li><a href="#where">Vietnam reviews</a></li>
-                    <li><a href="#itinerary">Cambodia reviews</a></li>
-                    <li><a href="#avoid">Japan reviews</a></li>
-                    <li><a href="#budget">India reviews</a></li>
-                    <li><a href="#budget">Myanmar reviews</a></li>
-                </ul>
-                </div>
-                </div>
+              <h3>Other Destinations' Feedbacks</h3>
+                           <ul class="infolist">
+                <li><a href="/reviews/guilin.htm">Guilin</a></li>
+                <li><a href="/reviews/beijing.htm">Beijing</a></li>
+                <li><a href="/reviews/xian.htm">Xi'an</a></li>
+                <li><a href="/reviews/shanghai.htm">Shanghai</a></li>
+                <li><a href="/reviews/chengdu.htm">Chengdu</a></li>
+                <li><a href="/reviews/hangzhou.htm">Hangzhou</a></li>
+                <li><a href="/reviews/huangshan.htm">Huangshan</a></li>
+                <li><a href="/reviews/zhangjiajie.htm">Zhangjiajie</a></li>
+                <li><a href="/reviews/suzhou.htm">Suzhou</a></li>
+                <li><a href="/reviews/lijiang.htm">Lijiang</a></li>
+                <li><a href="/reviews/tibet.htm">Tibet</a></li>
+                <li><a href="/reviews/hongkong.htm">Hong Kong</a></li>
+                <li><a href="/reviews/taiwan.htm">Taiwan</a></li>
+                           </ul>