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

2 years ago · e6eae04a7b
parent a077bca9d4 a3a028772e
commit e6eae04a7b
12 changed files with 1045 additions and 373 deletions
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@ -678,6 +678,33 @@ class Information extends CI_Controller
            }
        }
        // 集合页面反馈标签
        $feedback_city_array = [];
        preg_match_all('^<!--@FEEDBACK-CITY-LIST_(.*)@-->^', $information->ic_content, $feedback_city_array);
        if (!empty($feedback_city_array)) {
            foreach ($feedback_city_array[0] as $index => $tag_name) {
                $city_name_string = $feedback_city_array[1][$index];
                $city_name_list = explode(',', $city_name_string);
                $feedback_city_list = [];
                foreach ($city_name_list as $index => $city_name) {
                    $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 5);
                    $data_name = str_replace(" ", "_", $city_name);
                    $feedback_city_list[$data_name] = $feedback_list;
                }
                $feedback_city_content = $this->load->view(
                    'mobile_first/ch-feedback-city-list',
                    $feedback_city_list,
                    true
                );
                $information->ic_content = str_replace(
                    $tag_name,
                    $feedback_city_content,
                    $information->ic_content
                );
            }
        }
        $feedback_newest = $this->Feedback_model->get_feedback_newest();
        $feedback_newest_content = $this->load->view(
            $template_path . '-feedback-newest',
@ -1434,7 +1461,7 @@ class Information extends CI_Controller
            $information->ic_content = str_replace('<!--@INFO-PAGE-FORM@-->', $info_page_form_content, $information->ic_content);
        } else {
            $tour_form_content = $this->load->view(
-                $template_path . '-tour-form',
+                'mobile_first/gh-tour-form',
                array('information' => $information, 'meta_product_code' => $meta_product_code),
                true
            );
@ -1463,6 +1490,33 @@ class Information extends CI_Controller
            }
        }
        // 集合页面反馈标签
        $feedback_city_array = [];
        preg_match_all('^<!--@FEEDBACK-CITY-LIST_(.*)@-->^', $information->ic_content, $feedback_city_array);
        if (!empty($feedback_city_array)) {
            foreach ($feedback_city_array[0] as $index => $tag_name) {
                $city_name_string = $feedback_city_array[1][$index];
                $city_name_list = explode(',', $city_name_string);
                $feedback_city_list = [];
                foreach ($city_name_list as $index => $city_name) {
                    $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 5);
                    $data_name = str_replace(" ", "_", $city_name);
                    $feedback_city_list[$data_name] = $feedback_list;
                }
                $feedback_city_content = $this->load->view(
                    'mobile_first/gh-feedback-city-list',
                    $feedback_city_list,
                    true
                );
                $information->ic_content = str_replace(
                    $tag_name,
                    $feedback_city_content,
                    $information->ic_content
                );
            }
        }
        $feedback_newest = $this->Feedback_model->get_feedback_newest();
        $feedback_newest_content = $this->load->view(
            $template_path . '-feedback-newest',
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@ -422,6 +422,10 @@
    <div class="bottom_destinations">
        <div class="footerbox">
        <h2 style="
    margin-top: 0;
    text-align: center;
 ">Where Can We Take You Today?</h2>
            <div class="listtour">
                <div class="destination_links">
@ -522,10 +526,8 @@
                    style="width: 70%;"
                    originalsrc="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="Medias"
                    class="img-responsive bottomfeature" style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;">
            </div>
         <div class="clear"></div>
            <div class="bottomaboutuslinks">
                <div class="bottomlinksleft">
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@ -99,8 +99,9 @@
            aria-owns="submenu-8">4-Week Itinerary</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/about-us" data-submenu="submenu-9"
+        <li class="menu__item" role="menuitem"><a class="menu__link" href="/about-us" >About Us</a></li>
-            aria-owns="submenu-9">About Us</a></li>
+            <li class="menu__item" role="menuitem"><a href="/reviews" data-submenu="submenu-9"
            aria-owns="submenu-9" class="menu__link">Reviews</a></li>
      </ul>
      <!-- 4-weeks-itinerary -->
      <ul data-menu="submenu-8" id="submenu-8" class="menu__level" tabindex="-1" role="menu"
@ -397,6 +398,10 @@
    <div class="bottom_destinations">
      <div class="footerbox">
      <h2 style="
    margin-top: 0;
    text-align: center;
 ">Where Can We Take You Today?</h2>
        <div class="listtour">
          <div class="destination_links">
@ -487,6 +492,7 @@
        <span class="followtitle"><a href="/about-us" rel="nofollow">About Us</a></span>
        <ul>
        <li><a href="/travel-agents">Travel Agents</a></li>
        <li><a href="/reviews">Reviews</a></li>
          <li><a href="/about-us/history" rel="nofollow">History</a></li>
          <li><a href="/about-us/our-differences" rel="nofollow">Our Differences</a></li>
          <li><a href="/reviews" rel="nofollow">Reviews</a></li>
--- a/application/views/mobile_first/ch-feedback-city-list.php
+++ b/application/views/mobile_first/ch-feedback-city-list.php
@ -0,0 +1,182 @@
                    <h2 id="thailand">Beijing Travel Reviews</h2>
                    <?php if (!empty($Beijing)) {?>
                    <?php foreach ($Beijing as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                    </div>
                    <?php }?> 
                    <?php }?>                 
                    <h2 id="vietnam">Xi'an Travel Reviews</h2>
                    <?php if (!empty($xian)) {?>
                    <?php foreach ($xian as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                    </div>
                    <?php }?>
                    <?php }?>                    
                    <h2 id="cambodia">Chengdu Travel Reviews</h2>
                    <?php if (!empty($Chengdu)) {?>
                      <?php foreach ($Chengdu as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>
                      <?php }?>                       
                    <h2 id="japan">Guilin Travel Reviews</h2>
                    <?php if (!empty($Guilin)) {?>
                    <?php foreach ($Guilin as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                    </div>
                    <?php }?>
                    <?php }?>                     
                  <h2 id="japan">Tibet Travel Reviews</h2>
                    <?php if (!empty($Lhasa)) {?>
                    <?php foreach ($Lhasa as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                    </div>
                    <?php }?>
                    <?php }?>   
                        <h2 id="myanmar">Suzhou Travel Reviews</h2>
                    <?php if (!empty($Suzhou)) {?>
                      <?php foreach ($Suzhou as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>
                      <?php }?>                     
                        <h2 id="china">Shanghai Travel Reviews</h2>
                    <?php if (!empty($Shanghai)) {?>
                      <?php foreach ($Shanghai as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>  
                      <?php }?>          
                       <h2 id="china">Zhangjiajie Travel Reviews</h2>
                    <?php if (!empty($Zhangjiajie)) {?>
                      <?php foreach ($Zhangjiajie as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>  
                      <?php }?>    
                       <h2 id="china">Lijiang Travel Reviews</h2>
                    <?php if (!empty($Lijiang)) {?>
                      <?php foreach ($Lijiang as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>  
                      <?php }?>    
                       <h2 id="china">Dali Travel Reviews</h2>
                    <?php if (!empty($Dali)) {?>
                      <?php foreach ($Dali as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>  
                      <?php }?>    
                       <h2 id="china">Kunming Travel Reviews</h2>
                    <?php if (!empty($Kunming)) {?>
                      <?php foreach ($Kunming as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>  
                      <?php }?>    
                       <h2 id="china">Huangshan Travel Reviews</h2>
                    <?php if (!empty($Huangshan)) {?>
                      <?php foreach ($Huangshan as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>  
                      <?php }?>    
                       <h2 id="china">Hangzhou Travel Reviews</h2>
                    <?php if (!empty($Hangzhou)) {?>
                      <?php foreach ($Hangzhou as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>  
                      <?php }?>    
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@ -408,6 +408,10 @@
        </div>
        <div class="bottom_destinations">
            <div class="list_content">
            <h2 style="
    margin-top: 0;
    text-align: center;
 ">Where Can We Take You Today?</h2>
                <div class="listtour">
                    <div class="destination_links">
@ -614,19 +618,19 @@
                        class="img-responsive bottomfeature">
                </div>
                <div class="clear"></div>
-                <div class="bottomaboutuslinks">
+                <ul class="withBorder" style="margin-top: 35px;">
                    <div class="bottomlinksleft">
                        <ul class="withBorder">
                    <li><a href="/travel-agents.htm">Travel Agents</a></li>
                        <li><a href="/aboutus/" rel="nofollow">About us</a></li>
                        <li><a href="/reviews.htm">Reviews</a></li>  
                        <li><a href="/contactus/" rel="nofollow">Contact us</a></li>
-                            <li><a href="/feedback/" rel="nofollow">Reviews</a></li>
+                        <li><a href="/aboutus/loyalty-program.htm" rel="nofollow">Loyalty &amp; Referral Program</a></li>
                            <li><a href="/aboutus/loyalty-program.htm" rel="nofollow">Loyalty
                                    &amp; Referral Program</a></li>
                        <li><a href="/partner/" rel="nofollow">Partner</a></li>
                        <li><a href="/privacy.htm" rel="nofollow">Privacy Policy</a></li>
                        <li><a href="/aboutus/terms.htm">Terms</a></li>
                    </ul>
                <div class="bottomaboutuslinks">
                    <div class="bottomlinksleft">
                        <ul class="withBorder">
                            <li><a href="https://www.asiahighlights.com/" target="_blank">Asia</a></li>
                            <li><a href="https://www.globalhighlights.com/" target="_blank">Global</a></li>
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@ -105,6 +105,7 @@
            href="#">Day Tours</a></li>
        <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-7" aria-owns="submenu-7"
            href="#">Asia Tours</a></li>
            <li class="menu__item" role="menuitem"><a class="menu__link" href="/reviews.htm">Reviews</a></li> 
      </ul>
      <!-- China Tours -->
      <ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="China-Tours">
@ -423,7 +424,10 @@
    </div>
    <div class="bottom_destinations" style="margin-bottom: -5px;">
-
+    <h2 style="
    margin-top: 0;
    text-align: center;
 ">Where Can We Take You Today?</h2>
      <div class="listtour">
        <div class="destination_links">
          <ul>
@ -590,6 +594,7 @@
        <span class="followtitle"><a href="/aboutus/">About Us</a></span>
        <ul>
        <li><a href="/travel-agents.htm">Travel Agents</a></li>
        <li><a href="/reviews.htm">Reviews</a></li>       
          <li><a href="/contactus/">Contact Us</a></li>
          <li><a href="/privacy.htm">Privacy</a></li>
          <li><a href="/aboutus/terms.htm">Terms</a></li>
--- a/application/views/mobile_first/gh-feedback-30-list.php
+++ b/application/views/mobile_first/gh-feedback-30-list.php
@ -14,7 +14,7 @@
                        width="175px" class="img-responsive">
                </div>           
            </div>
-<!--单个目的地反馈 展示30条反馈内容，每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->           
+       
              <?php foreach ($feedback_list as $index => $feedback) {?>
                <div class="feedback_content">
                <strong><?php echo $feedback['title'] ?></strong>
@ -24,18 +24,5 @@
              </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>
--- a/application/views/mobile_first/gh-feedback-city-list.php
+++ b/application/views/mobile_first/gh-feedback-city-list.php
@ -0,0 +1,99 @@
                    <!-- Bangkok -->
                    <h2 id="thailand">Thailand Travel Reviews</h2>
                    <?php if (!empty($Bangkok)) {?>
                    <?php foreach ($Bangkok as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                    </div>
                    <?php }?> 
                    <?php }?>                 
                    <!-- Vietnam -->
                    <h2 id="vietnam">Vietnam Travel Reviews</h2>
                    <?php if (!empty($Hanoi)) {?>
                    <?php foreach ($Hanoi as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                    </div>
                    <?php }?>
                    <?php }?>                    
                    <!-- Cambodia -->
                    <h2 id="cambodia">Cambodia Travel Reviews</h2>
                    <?php if (!empty($Siem_Reap)) {?>
                      <?php foreach ($Siem_Reap as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>
                      <?php }?>                       
                    <!-- Japan -->
                    <h2 id="japan">Japan Travel Reviews</h2>
                    <?php if (!empty($Tokyo)) {?>
                    <?php foreach ($Tokyo as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                    </div>
                    <?php }?>
                    <?php }?>                     
                      <!-- India 
                      <h2 id="india">India Travel Reviews</h2>
                    <?php if (!empty($Delhi)) {?>
                      <?php foreach ($Delhi as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?><div class="more_tours"><a href="/reviews/india">More India reviews</a></div> 
                      <?php }?>                       
                        -->
                        <!-- Myanmar -->
                        <h2 id="myanmar">Myanmar Travel Reviews</h2>
                    <?php if (!empty($Yangon)) {?>
                      <?php foreach ($Yangon as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>
                      <?php }?>                     
                        <!-- China -->
                        <h2 id="china">China Travel Reviews</h2>
                    <?php if (!empty($Beijing)) {?>
                      <?php foreach ($Beijing as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?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"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                      </div>
                      <?php }?>  
                      <?php }?>                  
--- a/application/views/mobile_first/gh-info-page-form.php
+++ b/application/views/mobile_first/gh-info-page-form.php
@ -830,10 +830,9 @@
          </script>
      <style>
  .date_select {width: 27.5% !important; margin-bottom: 10px;}
-  .age_range { margin-top: 45px;}
+  .age_range { margin-top: 0;}
  .InquiryFormBox input, textarea { margin-bottom: 15px;}
  @media (max-width: 750px){
  .date_select {width: 93% !important; margin-bottom: 0 !important;}
  .age_range { margin-top: 0;}
  }
          </style>
--- a/application/views/mobile_first/gh-pc.php
+++ b/application/views/mobile_first/gh-pc.php
@ -129,7 +129,7 @@
                                    </ul>
                                </div>
                                <div class="inspirationlist vacationtype">
-                                    <div class="inspirationtitle">Middle East</div>
+                                <div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div>
                                    <ul class="inspiration">
                                        <li><a href="/egypt/tours">Egypt
                                            </a></li>
@ -241,6 +241,7 @@
                        </div>
                    </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="
                            class="p_topnavilink contactbutton">Contact Us</a>
                    </li>
@ -396,6 +397,7 @@
                    <ul class="withBorder">
                        <li><a href="/travel-agents">Travel Agents</a></li>
                        <li><a href="/about" rel="nofollow">About us</a></li>
                        <li><a href="/reviews">Reviews</a></li>
                        <li><a href="/contactus" rel="nofollow">Contact us</a></li>
                        <li>Follow Us <a class="social_media" title="Follow us on Facebook" rel="nofollow"
                                href="https://www.facebook.com/GlobalHighlightsTravel" target="_blank"><svg
@ -441,6 +443,10 @@
    <div class="clear"></div>
    <div class="bottom_destinations">
        <div class="footerbox">
        <h2 style="
    margin-top: 0;
    text-align: center;
 ">Where Can We Take You Today?</h2>
            <div class="listtour">
                <div class="destination_links">
--- a/application/views/mobile_first/gh-tour-form.php
+++ b/application/views/mobile_first/gh-tour-form.php
@ -2,13 +2,180 @@
  <div class="ghwhyus">
    <p class="contactus">Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within
    1 working day.</p>
-            <form action="/forms/inquiry_save" id="bottomInquiryForm" method="post">
+    <form action="/forms/inquiry_save" id="tourForm" method="post">
      <div class="InquiryFormBox">
        <div class="FieldSet">
          <textarea id="additionalrequirements" name="additional_requirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)" style="margin-bottom:20px;"></textarea>
-                        <p><input class="FullName" data-required="Please enter your fullname" id="realname" name="name" placeholder="Your name *" required="" type="text"></p>
+          <div class="selectionBlock">
-                        <p><input class="EmailAddress" data-required="Please enter your e-mail address" data-pattern="Expecting an e-mail address" id="email" name="email" pattern="^[\w\-\.]+@[\w\-\.]+(\.\w+)+$" placeholder="Email *" required="" type="text"></p>
+            <h4 style="margin-bottom: 0;margin-top: 0; font-weight: 400;">
-                        <p><input class="InquiryCalendar form-control input" placeholder="Starting date *" required="" tabindex="0" type="text" readonly="readonly" id='starting_date' name="date_start"></p>
+            How would you travel?
            </h4>
            <div id="group_error_msg" style="display: none">
              <div class="requiredArea" style="margin-top:-10px;">Please select number in your group.</div>
            </div>
            <div class="travel_group">
              <input type="radio" value="Family" id="Family" name="travel_group">
              <label for="Family" class="family">
                Family
              </label>
            </div>
            <div class="travel_group">
              <input type="radio" value="Couple" id="Couple" name="travel_group">
              <label for="Couple" class="couple">
                Couple
              </label>
            </div>
            <div class="travel_group">
              <input type="radio" value="Solo" id="Solo" name="travel_group">
              <label for="Solo" class="solo">
                Solo
              </label>
            </div>
            <div class="travel_group">
              <input type="radio" value="group" id="Other" name="travel_group">
              <label for="Other" class="group">
                Other group
              </label>
            </div>
            <div id="adultBlock" style="display: none">
              <div class="peopleSelect">
                <p style="margin-top: 20px;"><strong>
                  Adults (≥18 years old)
                </strong> </p>
                <button class="minaddBtn reduceadult" id="minusAdult" type="button"
                value="-">-</button>
                <input class="number" type="text" value="2" id="adultNumber" name="adult">
                <button class="minaddBtn addadult" type="button" id="plusAdult" value="+">+</button>
              </div>
              <div class="age_range">
                <p>
                  Adults' ages
                </p>
                <div class="checkYes" style="float:left;">
                  <label for="65+">
                    <input type="checkbox" value="yes" name="age_65_plus" id="65+" class="checkBorder" >65+
                  </label>
                </div>
                <div class="checkYes" style="float:left;">
                  <label for="51-64">
                    <input type="checkbox" value="yes" name="age_51_64" id="51-64" class="checkBorder" >51-64
                  </label>
                </div>
                <div class="checkYes" style="float:left;">
                  <label for="41-50">
                    <input type="checkbox" value="yes" name="age_41_50" id="41-50" class="checkBorder" >41-50
                  </label>
                </div>
                <div class="checkYes" style="float:left;">
                  <label for="31-40">
                    <input type="checkbox" value="yes" name="age_31_40" id="31-40" class="checkBorder" >31-40
                  </label>
                </div>
                <div class="checkYes" style="float:left;">
                  <label for="18-30">
                    <input type="checkbox" value="yes" name="age_18_30" id="18-30" class="checkBorder" >18-30
                  </label>
                </div>
              </div>
            </div>
            <div class="clear"></div>
            <div id="childrenBlock" style="display: none">
              <p style="margin-top: 0;margin-bottom: 0;"><strong>Children</strong></p>
              <div class="kids_age">
                <p style="margin-bottom: 5px;">10-17 yrs old</p>
                <select class="kids_number" id="teenagerNumber" name="teenager_10_17_yrs">
                  <option value="0">0
                  </option>
                  <option value="1">1
                  </option>
                  <option value="2">2
                  </option>
                  <option value="3">3
                  </option>
                  <option value="4">4
                  </option>
                </select>
              </div>
              <div class="kids_age">
                <p style="margin-bottom: 5px;">3-9 yrs old</p>
                <select class="kids_number" id="childrenNumber" name="children_3_9_yrs">
                  <option value="0">0
                  </option>
                  <option value="1">1
                  </option>
                  <option value="2">2
                  </option>
                  <option value="3">3
                  </option>
                  <option value="4">4
                  </option>
                </select>
              </div>
              <div class="kids_age">
                <p style="margin-bottom: 5px;">0-2 yrs old</p>
                <select class="kids_number" id="infantNumber" name="infant_0_2_yrs">
                  <option value="0">0
                  </option>
                  <option value="1">1
                  </option>
                  <option value="2">2
                  </option>
                  <option value="3">3
                  </option>
                  <option value="4">4
                  </option>
                </select>
              </div>
            </div>
          </div>
          <div class="selectionBlock">
            <h4 style="margin-top: 0; margin-bottom: 0;font-weight: 400;">
            When would you travel?
            </h4>
            <div id="date_error_msg" style="display: none">
              <div class="requiredArea" style="margin-top:-10px;">Select your travel data.</div>
            </div>
            <div class="travel_group date_select">
              <input type="radio" value="Exact travel dates" id="exact" name="trip_date">
              <label for="exact" class="family">
                Exact travel dates
              </label>
            </div>
            <div class="travel_group date_select">
              <input type="radio" value="Approximate travel dates" id="approximate" name="trip_date">
              <label for="approximate" class="couple">
                Approximate travel dates
              </label>
            </div>
            <div class="travel_group date_select">
              <input type="radio" value="Undecided travel dates" id="yet" name="trip_date">
              <label for="yet" class="solo">
                Undecided travel dates
              </label>
            </div>
            <div class="trip_date_length" id="tripDateBlock" style="display: none">
              <p style="clear: both;margin-bottom: 10px;" id="trip_date_tip">Select your travel date.</p>
              <div id="dateSelectionBlock">
                <div id='flatpickrBlock'>
                  <input class="InquiryCalendar datepicker" id="starting_date" name="date_start" placeholder="Starting date *" readonly="readonly" type="text" value="" />
                </div>
                <input type="month" id="expectedMonth" name="expected_month" placeholder="Select your expected travel date.">
              </div>
            </div>
          </div>
          <p><input class="FullName" data-required="Please enter your fullname" id="realname" name="name" placeholder="Your name *" type="text"></p>
          <div id="realname_errmsg" style="display: none">
    <div class="requiredArea" style="margin-top:-10px;">Please enter your name.</div>
    </div>
          <p><input class="EmailAddress" data-required="Please enter your e-mail address" data-pattern="Expecting an e-mail address" id="email" name="email" pattern="^[\w\-\.]+@[\w\-\.]+(\.\w+)+$" placeholder="Email *" type="text"></p>
          <div id="email_errmsg" style="display: none">
          <div class="requiredArea" style="margin-top:-10px;">Please enter your email.</div>
          </div>
          <div id="email_verify_errmsg" style="display: none">
          <div class="requiredArea" style="margin-top:-10px;">Please verify your email.</div>
          </div>
          <p>
            <select class="country_code" name="country_code">
              <option style="font-weight: 600;" value="United States +1">United States&nbsp; &nbsp;+1</option>
@ -263,8 +430,10 @@
              <option value="Zimbabwe +263">Zimbabwe&nbsp; &nbsp;+263</option>
              <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+35818</option>
            </select>
-                            <input class="Inquiryphone" name="PhoneNo" placeholder="Phone number including area code (optional)" type="text">
+            <input class="Inquiryphone" name="PhoneNo" id="PhoneNo" placeholder="Phone number" type="text">
          </p>
          <div id="contact_errmsg" style="display: none">
        <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
          <p style="font-size: 17px;font-style:italic;line-height: 20px; color: #555;">Having a phone
            number, especially with WhatsApp/iMessage capability will improve communication
          efficiency.</p>
@ -278,24 +447,18 @@
      <div class="checkYes" style="color:#000;"> <label for="Video"><input class="checkBorder mgr-primary" id="Video" name="contact_via_video_appointment" type="checkbox" value="yes" style="width:auto !important;">Video appointment</label></div>
      <input name="nullemail" placeholder="Your alternative email?" type="hidden">
      <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/>
-                        <input id="sourcetype" name="sourcetype" type="hidden" value="32113">
+      <button class="sendButton" id="tourFormBtn" type="button">
                        <button class="sendButton" id="bottomFormBtn" type="submit">
      Send My Inquiry
      </button>
    </div>
  </div>
 </form>
            <!--
    <div class="contactwechat"><a id="scrollAnchor"></a>         
        <img alt="global highlights' wechat code" height="100px" src="https://data.asiahighlights.com/image/about/asia-highlights-whatsapp-code.jpg" width="100px">
             <div class="wechatinfo">Scan and add us on WhatsApp: <span class="wechatred">+8615807734776</span>
             Email: contact@globalhighlights.com
             </div>
         </div>-->
 </div>
 <script src="https://data.globalhighlights.com/js/jquery-1.8.2.min.js"></script>
 <script src="https://data.globalhighlights.com/js/flatpickr-v4.6.11.min.js"></script>
 <script>
-          document.addEventListener('DOMContentLoaded', () => {
+$(function () {
  flatpickr("#starting_date", {
    dateFormat: "Y-m-d",
    altInput: true,
@ -303,38 +466,197 @@
    disableMobile: true,
    minDate: "today"
  });
  var selectedExpectedDate = '';
  var $adultBlock = $('#adultBlock');
  var $childrenBlock = $('#childrenBlock');
  var $adultNumberInput = $('#adultNumber');
  var adultNumber = $adultNumberInput.val();
  var $teenagerNumberInput = $('#teenagerNumber');
  var teenagerNumber = $teenagerNumberInput.val();
  var $childrenNumberInput = $('#childrenNumber');
  var childrenNumber = $childrenNumberInput.val();
  var $infantNumberInput = $('#infantNumber');
  var infantNumber = $infantNumberInput.val();
  $('input[name="travel_group"]').each((i, groupEle) => {
    $(groupEle).click(function (e) {
      $teenagerNumberInput.val(0);
      $childrenNumberInput.val(0);
      $infantNumberInput.val(0);
      var currentTarget = e.currentTarget;
      if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
        $adultBlock.show();
        $childrenBlock.show();
      } else {
        $adultBlock.show();
        $childrenBlock.hide();
      }
      if (currentTarget.id === 'Couple') {
        $adultNumberInput.val(2);
      } else if (currentTarget.id === 'Solo') {
        $adultNumberInput.val(1);
      }
    })
  });
-      </script>
+
-        <script>
+  var $tripDateBlock = $('#tripDateBlock');
-            (function () {
+  var $expectedDate = $('#flatpickrBlock');
-                String.prototype.lpad = function (padString, length) {
+  var $expectedMonth = $('#expectedMonth');
-                    var str = this;
+  var $dateSelectionBlock = $('#dateSelectionBlock');
-                    while (str.length < length)
+  var $tripDateTip = $('#trip_date_tip');
-                        str = padString + str;
+
-                    return str;
+  $('input[name="trip_date"]').each((i, tripDateEle) => {
    $(tripDateEle).click(function (e) {
      $expectedDate.val('');
      $expectedMonth.val('');
      $tripDateBlock.show();
      var selectedTripDate = e.currentTarget;
      selectedExpectedDate = selectedTripDate.id;
      if (selectedTripDate.id === 'exact') {
        $dateSelectionBlock.show();
        $expectedMonth.hide();
        $expectedDate.show();
        $tripDateTip.show();
      } else if (selectedTripDate.id === 'approximate') {
        $dateSelectionBlock.show();
        $expectedDate.hide();
        $expectedMonth.show();
        $tripDateTip.show();
      } else if (selectedTripDate.id === 'yet') {
        $dateSelectionBlock.hide();
        $tripDateTip.hide();
      }
-                document.getElementById("url").value = (window.location.href);
+    })
-                const required_fields = document.querySelectorAll(":required");
+  });
-                required_fields.forEach(element => {
+
-                    element.addEventListener("input", function (event) {
+  //成人
-                        if (element.validity.valueMissing) {
+  $('#plusAdult').click(function () {
-                            element.setCustomValidity(element.dataset.required);
+    adultNumber++;
-                        } else if (element.validity.patternMismatch) {
+    $adultNumberInput.val(adultNumber);
-                            element.setCustomValidity(element.dataset.pattern);
+  });
-                        } else {
+  $('#minusAdult').click(function () {
-                            element.setCustomValidity("");
+    if (adultNumber > 1) {
      adultNumber--;
      $adultNumberInput.val(adultNumber);
    }
  });
  // 青少年
  $('#plusTeenager').click(function () {
    teenagerNumber++;
    $teenagerNumberInput.val(teenagerNumber);
  });
-                var formEle = document.getElementById('bottomInquiryForm');
+  $('#minusTeenager').click(function () {
-                var submitBtn = document.getElementById('bottomFormBtn');
+    if (teenagerNumber > 0) {
-                formEle.addEventListener('submit', function(evt) {
+      teenagerNumber--;
-                  evt.preventDefault();
+      $teenagerNumberInput.val(teenagerNumber);
-                  formEle.submit();
+    }
                  submitBtn.innerText  = "Submitted successfully";
  });
-            })();
+  // 儿童
-        </script>
+  $('#plusChildren').click(function () {
    childrenNumber++;
    $childrenNumberInput.val(childrenNumber);
  });
  $('#minusChildren').click(function () {
    if (childrenNumber > 0) {
      childrenNumber--;
      $childrenNumberInput.val(childrenNumber);
    }
  });
  // 婴儿
  $('#plusInfant').click(function () {
    infantNumber++;
    $infantNumberInput.val(infantNumber);
  });
  $('#minusInfant').click(function () {
    if (infantNumber > 0) {
      infantNumber--;
      $infantNumberInput.val(infantNumber);
    }
  });
  function validateQuickInquiryForm() {
    var result = true;
    var realnameVal = document.getElementById("realname").value;
    var emailVal = document.getElementById("email").value;
    var expectedDateVal = document.getElementById("starting_date").value;
    var expectedMonthVal = document.getElementById("expectedMonth").value;
    var contactVal = document.getElementById("PhoneNo").value;
    var realnameErrEl = document.getElementById("realname_errmsg");
    var emailErrEl = document.getElementById("email_errmsg");
    var emailVerifyErrEl = document.getElementById("email_verify_errmsg");
    var startingDateErrEl = document.getElementById("date_error_msg");
    var contactErrEl = document.getElementById("contact_errmsg");
    var groupErrEl = document.getElementById("group_error_msg");
    realnameErrEl.style.display = 'none';
    emailErrEl.style.display = 'none';
    emailVerifyErrEl.style.display = 'none';
    startingDateErrEl.style.display = 'none';
    contactErrEl.style.display = 'none';
    groupErrEl.style.display = 'none';
    var travel_group_is_checked = false;
    document.querySelectorAll('input[name="travel_group"]').forEach(function(groupNode) {
      if (groupNode.checked) {
        travel_group_is_checked = true;
      }
    });
    if (travel_group_is_checked === false) {
      groupErrEl.style.display = '';
      result = false;
    }
    var tripDate_is_checked = false;
    if (selectedExpectedDate === 'exact') {
      tripDate_is_checked = expectedDateVal !== '';
    } else if (selectedExpectedDate === 'approximate') {
      tripDate_is_checked = expectedMonthVal !== '';
    } else if (selectedExpectedDate === 'yet') {
      tripDate_is_checked = true;
    }
    //时间选择
    if (!tripDate_is_checked) {
      startingDateErrEl.style.display = '';
      result = false;
    }
    if (realnameVal === '') {
      realnameErrEl.style.display = '';
      result = false;
    }
    if (emailVal === '') {
      emailErrEl.style.display = '';
      result = false;
    } else {
      var emailPattern = /^[\w\-\.]+@[\w\-\.]+(\.\w+)+$/;
      if (!emailPattern.test(emailVal)) {
        emailVerifyErrEl.style.display = '';
        result = false;
      }
    }
    if (contactVal === '') {
      contactErrEl.style.display = '';
      result = false;
    }
    return result;
  }
  var tourFormBtn = document.getElementById("tourFormBtn");
  var tourForm = document.getElementById("tourForm");
  tourFormBtn.addEventListener('click', function(event) {
    var validateResult = validateQuickInquiryForm();
    if (validateResult) {
      tourFormBtn.innerText  = "Submitted successfully";
      tourForm.submit();
    }
  });
 })
 </script>
 </div>
--- a/application/views/mobile_first/gh.php
+++ b/application/views/mobile_first/gh.php
@ -87,7 +87,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-1" aria-owns="submenu-1">North Asia Destinations</a></li>
            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6" aria-owns="submenu-6">Southeast Asia Destinations</a></li>
            <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" data-submenu="submenu-8" aria-owns="submenu-8">Middle East Destinations</a></li>
+            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-8" aria-owns="submenu-8" href="/middle-east/tours">Middle East Destinations</a></li>
            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-9" aria-owns="submenu-9">South America Destinations</a></li>
            <li class="menu__item" role="menuitem"><a class="menu__link" href="/destinations">All Destinations</a></li>
@ -97,6 +97,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
            <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="/about">About Us</a></li>
            <li class="menu__item" role="menuitem"><a href="/reviews" class="menu__link">Reviews</a></li>
        </ul>
        <!-- destinations -->
@ -271,6 +272,7 @@ aria-label="festival">
                        <ul class="withBorder" style="margin-top: 0;     border-bottom: 1px solid #d1d1d1; border-top: none;">
                          <li><a href="/travel-agents">Travel Agents</a></li>
                          <li><a href="/about" rel="nofollow">About us</a></li>
                          <li><a href="/reviews">Reviews</a></li>
                          <li><a href="/contactus" rel="nofollow">Contact us</a></li>
          <li><a class="social_media" title="Follow us on Facebook" rel="nofollow" href="https://www.facebook.com/GlobalHighlightsTravel" target="_blank"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="25px" height="25px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
              <path id="facebook" fill="#ffffff" d="M17.252,11.106V8.65c0-0.922,0.611-1.138,1.041-1.138h2.643V3.459l-3.639-0.015	c-4.041,0-4.961,3.023-4.961,4.961v2.701H10v4.178h2.336v11.823h4.916V15.284h3.316l0.428-4.178H17.252z"></path>
@ -294,6 +296,10 @@ aria-label="festival">
 </div>
 <div class="bottom_destinations">
    <div class="footerbox">
    <h2 style="
    margin-top: 0;
    text-align: center;
 ">Where Can We Take You Today?</h2>
        <div class="listtour">
            <div class="destination_links">