From 7ec3d49ca9bd68aa990ecbc93af1bc38057caea0 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 18 May 2021 13:59:45 +0800
Subject: [PATCH 1/7] 11

---
 application/views/mobile_first/ah-pc.php | 2 +-
 application/views/mobile_first/ah.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index cbd7a131..098e7f3d 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -9,7 +9,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta content="yes" name="apple-mobile-web-app-capable">
-    <meta name="apple-mobile-web-app-title" content="China Highlights - Since 1998!">
+    <meta name="apple-mobile-web-app-title" content="Asia Highlights - Since 2016!">
     <meta name="keywords" content="<!--@KEYWORDS@-->">
     <meta name="description" content="<!--@DESCRIPTION@-->">
     <!--@OG:IMAGE@-->
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index 24c4caee..ab929b5a 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -33,7 +33,7 @@
 <header class="headerbar  flex justify-start items-center top-0 left-0 right-0 pl2 pr4 pt2 md-pt0" id="header">
     <div>
         
-        <a href="/"> <img src="https://data.asiahighlights.com/pic/ah-bottom-logo-mobile.png" alt="chinahighlights logo"
+        <a href="/"> <img src="https://data.asiahighlights.com/pic/ah-bottom-logo-mobile.png" alt="Asia Highlights logo"
                           class="chinahighlightslogo img-responsive"></a>
         <div class="topnavitailor">
             <a href="/contact-us" class="infocustomize">Contact Us <i aria-hidden="true"

From dbdcc677d73bb6aa1d9f0fa1b3ef8838186fa61a Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 26 May 2021 12:47:03 +0800
Subject: [PATCH 2/7] ok

---
 application/views/bootstrap3/header.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 1204310f..7b0880cc 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -162,7 +162,11 @@
 
                             <span class="input-group-btn">
                                 <button class="btn btn-default btn-sm" type="submit">搜索</button>
-                                <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
+                                <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" class="btn btn-default btn-sm" title="图片管理"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                <?php } else { ?>
+                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                <?php } ?>
                                 <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"  ><span class="glyphicon glyphicon-folder-open"></span></a>
                                 <a href="#" title="静态化更新" class="btn btn-default btn-sm"  data-toggle="modal" data-target="#cache_refresh_modal" ><span class="glyphicon glyphicon-repeat"></span></a>
 								<a href="#" title="cdn缓存清理" class="btn btn-default btn-sm"  data-toggle="modal" data-target="#cdncache_refresh_modal" ><span class="glyphicon glyphicon-refresh"></span></a>

From c859983c1a220df3dec7a645002b5627b1599c22 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 26 May 2021 13:00:14 +0800
Subject: [PATCH 3/7] fix

---
 application/views/bootstrap/header.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php
index 6bb72d76..945717e2 100644
--- a/application/views/bootstrap/header.php
+++ b/application/views/bootstrap/header.php
@@ -110,8 +110,12 @@
                                 </span>
                                 <input type="text" class="input-xlarge" name="keywords" id="keywords"  value="<?php echo isset($keywords) ? $keywords : false; ?>">
                                 <button class="btn">搜索</button>
-                                <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"  ><i class="icon-picture"></i></a>
-                               <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"  ><span class="icon-folder-open"></span></a>
+                                <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
+                                <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" class="btn btn-default btn-sm" title="图片管理"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                <?php } else { ?>
+                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                <?php } ?>
+                                <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"  ><span class="icon-folder-open"></span></a>
                                 <a href="#" title="静态化更新" class="btn"  data-toggle="modal" data-target="#cache_refresh_modal" ><i class="icon-repeat"></i></a>
 								<a href="#" title="cdn缓存清理" class="btn btn-default btn-sm"  data-toggle="modal" data-target="#cdncache_refresh_modal" ><span class="icon-refresh"></span></a>
                             </div>

From 722cb129c25b2dab07228b7f4e164b80fa87d7c4 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 26 May 2021 13:02:28 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php
index 945717e2..080164a5 100644
--- a/application/views/bootstrap/header.php
+++ b/application/views/bootstrap/header.php
@@ -111,9 +111,9 @@
                                 <input type="text" class="input-xlarge" name="keywords" id="keywords"  value="<?php echo isset($keywords) ? $keywords : false; ?>">
                                 <button class="btn">搜索</button>
                                 <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
-                                <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" class="btn btn-default btn-sm" title="图片管理"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                    <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
                                 <?php } else { ?>
-                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"  ><i class="icon-picture"></i></a>
                                 <?php } ?>
                                 <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"  ><span class="icon-folder-open"></span></a>
                                 <a href="#" title="静态化更新" class="btn"  data-toggle="modal" data-target="#cache_refresh_modal" ><i class="icon-repeat"></i></a>

From 39f3ddadfcc58a8a3d75b80aa551f003a7168589 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 26 May 2021 13:03:46 +0800
Subject: [PATCH 5/7] =?UTF-8?q?+1=20=E6=96=B0=E7=AA=97=E5=8F=A3=E6=89=93?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php
index 080164a5..d0540637 100644
--- a/application/views/bootstrap/header.php
+++ b/application/views/bootstrap/header.php
@@ -111,7 +111,7 @@
                                 <input type="text" class="input-xlarge" name="keywords" id="keywords"  value="<?php echo isset($keywords) ? $keywords : false; ?>">
                                 <button class="btn">搜索</button>
                                 <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
-                                    <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
+                                    <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" target="_blank" class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
                                 <?php } else { ?>
                                     <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"  ><i class="icon-picture"></i></a>
                                 <?php } ?>

From 0d8bec8fca14f39ebba16dca650b6eabbf9d09be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Wed, 26 May 2021 14:56:30 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=98=B2=E5=9E=83=E5=9C=BE=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=20gogole=20reCaptcha=20V3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-inquiry-form.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 68bb0e30..76f031e2 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -37,4 +37,6 @@
                 Inquiry <i aria-hidden="true" class="fa fa-angle-right"></i></button>
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
+
+<script src="https://www.recaptcha.net/recaptcha/api.js?render=6Lf4bfAaAAAAAEZZ9rX0ZIYfPAqACtRldSOFzl9b"></script>
\ No newline at end of file

From 19ee8b6027a89d725f97079403ff74fc632c58e0 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 26 May 2021 15:43:49 +0800
Subject: [PATCH 7/7] 11

---
 application/views/mobile_first/ah-pc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index 098e7f3d..138ed945 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -136,7 +136,7 @@
                     </div>
                 </li>
                 <li class="dropdown"><a href="/about-us" class="p_topnavilink" >About Us</a></li>
-                <li class="dropdown" style="    padding-top: 55px"><a href="/contact-us" class="p_topnavilink contactbutton" >Contact Us</a>
+                <li class="dropdown" style="    padding-top: 25px"><a href="/contact-us" class="p_topnavilink contactbutton" >Contact Us</a>
                 </li>
                 <li class="dropdown" style="    margin-right: 0;">
                     <div class="siteSearch">
@@ -145,7 +145,7 @@
                             <input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
                             <input type="hidden" value="FORID:9" name="cof">
                             <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search"
-                                   name="q" style="width: 165px;">
+                                   name="q" style="width: 170px;">
                             <input type="image" class="submits"
                                    src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png"
                                    width="25px">