Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
hotfix/paypal-note
candice 4 years ago
parent 87ff06aaff 0d8bec8fca
commit d6612aede7
7 changed files with 92 additions and 63 deletions
Show Stats Download Patch File Download Diff File

6
application/controllers/information.php
Unescape Escape View File

@ -594,8 +594,8 @@ class Information extends CI_Controller
$template = str_replace('<!--@KEYWORDS@-->', $information->ic_seo_keywords, $template);
$template = str_replace('<!--@CANONICAL@-->', $this->config->item('site_url') . $information->ic_url, $template);
//非产品页面
if (empty(get_meta($information->ic_id, 'meta_product_code'))) {
$meta_product_code=get_meta($information->ic_id, 'meta_product_code');
if (empty($meta_product_code)) {
//H1模板替换
$data_H1 = array();
$data_H1['infocategory'] = $this->Information_model->get_detail_by_path($information->is_path, 1); //信息所属分类，获取信息顶级节点内容
@ -612,6 +612,8 @@ class Information extends CI_Controller
$template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template);
} else {
$template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template);
$inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code'=>$meta_product_code), true);
$information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content);
}
//顶部全屏大图
if ($device == 'mobile') { //移动端读取移动大图

3
application/third_party/ctmobilefirst/libraries/Currency.php vendored
Unescape Escape View File

@ -165,11 +165,12 @@ class Currency {
if (empty($value)) return 0;
if (!is_numeric($value)) return $value;
$val_len = strlen($value);
$val_len = strlen(floatval($value));
if ($val_len == 1) return 9;
$discount = 16;
//$discount =6;
$val_pow = pow(10, $val_len - 1);
$min_val = $val_pow - 1;

8
application/views/bootstrap/header.php
Unescape Escape View File

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

6
application/views/bootstrap3/header.php
Unescape Escape View File

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

42
application/views/mobile_first/ch-inquiry-form.php
Unescape Escape View File

@ -0,0 +1,42 @@
<div class="tmbottom">
<div class="contactwechat"><img alt="" height="100px"
src="https://data.chinahighlights.com/image/forms/follow-us-wechat-2020.png"
width="100px"/>
<div class="wechatinfo">Quickly inquire about this tour via our WeChat: <span class="wechatred">chinahighlightstour</span>
</div>
</div>
<p>Or Submit an Inquiry Below</p>
<form action="https://www.chinahighlights.com/secureforms/qi_save" id="quick_inquiry_form" method="post"
name="quick_inquiry_form" novalidate="" onsubmit="return validateQuickInquiryForm()">
<div class="InquiryBox">
<p><input class="FullName" id="realname" name="realname" placeholder="Full name" type="text"/> <span
id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your full name</span></span>
</p>
<p><input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/> <span
id="email_errmsg" style="display: none"><span
class="requiredArea">Please enter your email</span></span></p>
<p><input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
placeholder="Any other way to reach you (optional)" style="padding-left: 50px;" type="tel"/></p>
<p class="InquiryDate"><input class="InquiryCalendar" data-min-date="7" id="starting_date"
name="starting_date" placeholder="Starting date" readonly="readonly"
type="text"/><span id="starting_date_errmsg" style="display: none"><span
class="requiredArea">Please verify your email</span></span></p>
<p>
<textarea id="form_additionalrequirements" name="form_additionalrequirements"
placeholder="Tell us your travel ideas/interests, how many people, your hotel style…"></textarea>
</p>
<input type="hidden" name="nullemail">
<input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/>
<button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="submit">Send My
Inquiry <i aria-hidden="true" class="fa fa-angle-right"></i></button>
</div>
</form>
</div>
<script src="https://www.recaptcha.net/recaptcha/api.js?render=6Lf4bfAaAAAAAEZZ9rX0ZIYfPAqACtRldSOFzl9b"></script>

37
application/views/mobile_first/chinatravel-pc.php
Unescape Escape View File

@ -24,6 +24,8 @@
<link rel="dns-prefetch" href="//www.google-analytics.com">
<link rel="dns-prefetch" href="//connect.facebook.net">
<link rel="dns-prefetch" href="//www.facebook.com">
<link rel="dns-prefetch" href="//googleads.g.doubleclick.net">
<link rel="dns-prefetch" href="//stats.g.doubleclick.net">
<!--@MAIN-CSS@--><?php echo $MAINCSS ?>
<!--@ADDON-CSS@--><?php echo $ADDONCSS ?>
<!--@CONSTRUCTION-CODE@--><?php echo $ConstructionCode ?>
@ -60,10 +62,6 @@
<span class="container">
<li><a href="/tour/top-china-tour">Top 10 China Tours</a></li>
<li><a href="/tour/panda-tour">China Panda Tours</a></li>
<li><a href="/china-tours/theme/family-tours/">Family Tours</a></li>
<li><a href="/china-tours/theme/silk-road-adventure/">Silk Road</a></li>
<li><a href="/china-tours/theme/china-train-travel/">China Train Travel</a></li>
<li><a href="/china-tours/theme/honeymoon-tours/">Honeymoon Tours</a></li>
</span>
</ul>
</li>
@ -77,8 +75,8 @@
<li><a href="/zhangjiajie/tour">Zhangjiajie</a></li>
<li><a href="/xian/tour">Xi'an</a></li>
<li><a href=" /huangshan/tour">Huangshan</a></li>
<li><a href="/china-tours/theme/tibet-impression/">Tibet</a></li>
<li><a href="/suzhou/tour">Suzhou</a></li>
<li><a href="/hangzhou/tour">Hangzhou</a></li>
</span>
</ul>
@ -91,7 +89,7 @@
<li><a href="/chengdu/daytour">Chengdu Day Trips</a></li>
<li><a href="/guilin/daytour">Guilin Day Trips</a></li>
<li><a href="/xian/daytour">Xi'an Day Trips</a></li>
<li><a href="/china-day-trips/hong-kong/">Hong Kong Day Trips</a></li>
<li><a href="/zhangjiajie/daytour">Zhangjiajie Day Trips</a></li>
</span>
</ul>
</li>
@ -99,11 +97,10 @@
<ul>
<span class="container">
<li><a href="/guide/how-to-plan-a-trip-to-china">Plan Your China Trip</a></li>
<li><a href="/guide/weather">China Weather </a></li>
<li><a href="/guide/visa">China Visas</a></li>
<li><a href="/china-map/">China Maps</a></li>
<li><a href="/beijing">Beijing Travel Guide</a></li>
<li><a href="/shanghai">Shanghai Travel Guide</a></li><br>
<li><a href="/guide/best-time-to-go-china">China Weather </a></li>
<li><a href="/guide/transport">China Transport</a></li>
<li><a href="/guide/visa">China Visas</a></li>
<li><a href="/great-wall-of-china">Great Wall Of China</a></li>
</span>
</ul>
</li>
@ -111,26 +108,16 @@
<ul>
<span class="container">
<li><a href="/chinese-food">Chinese Food </a></li>
<li><a href="/culture/chinese-tea">Chinese Tea</a></li>
<li><a href="/chinese-zodiac">Chinese Zodiac</a></li>
<li><a href="/chinese-new-year">Chinese New Year</a></li>
<li><a href="/facts/chinese-history.htm">Chinese History</a></li>
<li><a href="/culture/chinese-tea">Chinese Tea</a></li>
<li><a href="/facts/chinese-kung-fu.htm">Chinese Kong Fu</a></li><br>
<li><a href="/culture/top-chinese-festival">Chinese Festivals</a></li>
<li><a href="/chinese-new-year">Chinese New Year</a></li>
<li><a href="/culture/kungfu">Chinese Kung Fu</a></li><br>
</span>
</ul>
</li>
<li><a href="/forms/customize">Create My Trip</a></li>
<li><a href="/about-china-travel">About Us<i class="fa fa-angle-down" aria-hidden="true"></i></a>
<ul class="topnav-down">
<span class="container">
<li><a href="/about-china-travel/team.html">Meet the Team</a></li>
<li><a href="/about-china-travel/why-choose-us.html">Why Choose Us?</a></li>
<li><a href="/about-china-travel/award.html">Our Licenses and Awards</a></li>
<li><a href="/about-china-travel/china-travel-terms-conditions.html">Terms and Conditions</a></li>
<li><a href="/about-china-travel/privacy-policy.html">Privacy Police</a></li>
<li><a href="/about-china-travel/world-vip-choose-us.html">World VIPs Choose Us</a></li>
</span>
</ul>
</li>
</ul>
</nav>

53
application/views/mobile_first/chinatravel.php
Unescape Escape View File

@ -24,6 +24,8 @@
<link rel="dns-prefetch" href="//www.google-analytics.com">
<link rel="dns-prefetch" href="//connect.facebook.net">
<link rel="dns-prefetch" href="//www.facebook.com">
<link rel="dns-prefetch" href="//googleads.g.doubleclick.net">
<link rel="dns-prefetch" href="//stats.g.doubleclick.net">
<!--@MAIN-CSS@--><?php echo $MAINCSS ?>
<!--@ADDON-CSS@--><?php echo $ADDONCSS ?>
<!--@CONSTRUCTION-CODE@--><?php echo $ConstructionCode ?>
@ -51,28 +53,24 @@
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4" href="/guide">China Guide</a><a class="menu__link" href="/guide">China Guide</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5" aria-owns="submenu-5" href="/culture">Culture</a><a class="menu__link" href="/culture">Culture</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/forms/customize">Create My Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6" aria-owns="submenu-6" href="/about-china-travel">About Us</a><a class="menu__link" href="/about-china-travel">About Us</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-china-travel">About Us</a></li>
</ul>
<!-- China Tours -->
<ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="china-Tours">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/top-china-tour">Top 10 China Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/panda-tour">China Panda Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-tours/theme/family-tours/">Family Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-tours/theme/silk-road-adventure/">Silk Road</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-tours/theme/china-train-travel/">China Train Travel</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-tours/theme/honeymoon-tours/">Honeymoon Tours</a></li>
</ul>
<!-- City Tours -->
<ul data-menu="submenu-2" id="submenu-2" class="menu__level" tabindex="-1" role="menu" aria-label="city-tours">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/beijing/tour">Beijing </a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/shanghai/tour">Shanghai</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guilin/tour">Guilin </a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/hengdu/chengdu">Chengdu</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/chengdu/tour">Chengdu</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/zhangjiajie/tour">Zhangjaijie</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/xian/tour">Xi'an</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/huangshan/tour">Huangshan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-tours/theme/tibet-impression/">Tibet</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/huangshan/tour">Huangshan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/suzhou/tour">Suzhou</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/hangzhou/tour">Hangzhou</a></li>
</ul>
<!-- Day Tours -->
<ul data-menu="submenu-3" id="submenu-3" class="menu__level" tabindex="-1" role="menu" aria-label="day-tours">
@ -80,35 +78,26 @@
<li class="menu__item" role="menuitem"><a class="menu__link" href="/beijing/daytour">Beijing Day Trips</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/chengdu/daytour">Chengdu Day Trips</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guilin/daytour">Guilin Day Trips</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-day-trips/hong-kong/">Hong Kong Day Trips</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/xian/daytour">Xi'an Day Trips</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/zhangjiajie/daytour">Zhangjiajie Day Trips</a></li>
</ul>
<!-- Travel Guide -->
<ul data-menu="submenu-4" id="submenu-4" class="menu__level" tabindex="-1" role="menu" aria-label="travel-guide">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/how-to-plan-a-trip-to-china">Plan Your China Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/weather">China Weather</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/visa">China Visas</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-map/">China Maps</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/beijing">Beijing Travel Guide</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/shanghai">Shanghai Travel Guide</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/best-time-to-go-china">China Weather</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/transport">China Transport</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/visa">China Visas</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/great-wall-of-china">Great Wall Of China</a></li>
</ul>
<!-- Culture -->
<ul data-menu="submenu-5" id="submenu-5" class="menu__level" tabindex="-1" role="menu" aria-label="culture">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/chinese-food">Chinese Food</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/chinese-zodiac">Chinese Zodiac</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/chinese-new-year">Chinese New Year</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/facts/chinese-history.htm">Chinese History</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/culture/chinese-tea">Chinese Tea</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/facts/chinese-kung-fu.htm">Chinese Kong Fu</a></li>
</ul>
<!-- About Us -->
<ul data-menu="submenu-6" id="submenu-6" class="menu__level" tabindex="-1" role="menu" aria-label="about-us">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-china-travel/team.html">Meet the Team</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-china-travel/why-choose-us.html">Why Choose Us?</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-china-travel/award.html">Our Licenses and Awards</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-china-travel/china-travel-terms-conditions.html">Terms and Conditions</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-china-travel/privacy-policy.html">Privacy Police</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-china-travel/world-vip-choose-us.html">World VIPs Choose Us</a></li>
</ul>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/chinese-zodiac">Chinese Zodiac</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/culture/top-chinese-festival">Chinese Festivals</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/chinese-new-year">Chinese New Year</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/culture/kungfu">Chinese Kung Fu</a></li>
</ul>
</div>
</nav>
<!--nav end-->
@ -124,10 +113,10 @@
<button type="submit" class="submits" name="searchbtn" aria-label="Search"><i class="fa fa-search" aria-hidden="true"></i></button>
</form>
<ul class="circle-ul font20 m-top30">
<li><a href="/china-tours/theme/china-panda-tours/">China Panda</a></li>
<li><a href="/facts/china-visa.htm ">China Visa</a></li>
<li><a href="/focus/the-chinese-zodiac/ ">Chinese Zodiac</a></li>
<li><a href="/focus/great-wall-of-china/ ">Great Wall of China</a></li>
<li><a href="/tour/panda-tour">China Panda</a></li>
<li><a href="/guide/visa">China Visa</a></li>
<li><a href="/chinese-zodiac">Chinese Zodiac</a></li>
<li><a href="/great-wall-of-china">Great Wall of China</a></li>
</ul>
</div>
</div>

Write Preview
Loading…
Cancel
Save