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

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>
+                                <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
-                               <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"  ><span class="icon-folder-open"></span></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 } ?>
+                                <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>

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>

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@-->
@@ -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">

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"

application/views/mobile_first/ch-inquiry-form.php

@@ -38,3 +38,5 @@
         </div>
     </form>
 </div>
+
+<script src="https://www.recaptcha.net/recaptcha/api.js?render=6Lf4bfAaAAAAAEZZ9rX0ZIYfPAqACtRldSOFzl9b"></script>