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 6859e44716 15d586b1bf
commit 0d67631292
8 changed files with 132 additions and 53 deletions
Show Stats Download Patch File Download Diff File

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

@ -695,12 +695,20 @@ class Information extends CI_Controller
} else {
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
}
// 火车票首页搜索框
$template_TrainSearch = "";
if ($information->ic_url =="/china-trains/hometest.htm" || $information->ic_url=="/china-trains/"){
$template_TrainSearch = $this->load->view($template_path . '-train-index', null, TRUE);
}
$meta_addon_picture_url = get_meta($information->ic_id, 'meta_addon_picture_url');
if (!empty($meta_addon_picture)) {
if (!empty($meta_addon_picture_url)) {
$template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner"><a href="' . $meta_addon_picture_url . '"> <img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '"></a></div>', $template);
} else {
$template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner"><img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '"></div>', $template);
$template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner"><img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '">'.$template_TrainSearch.'</div>', $template);
}
}
//顶部视频

31
application/controllers/welcome.php
Unescape Escape View File

@ -218,37 +218,6 @@ class Welcome extends CI_Controller {
}
}
// $information->ic_content = $htm_doc->saveHTML();
// $this->InfoContents_model->Update(
// $information->ic_id,
// $information->ic_url,
// $information->ic_url_title,
// $information->ic_type,
// $information->ic_title,
// $information->ic_content,
// $information->ic_summary,
// $information->ic_seo_title,
// $information->ic_seo_description,
// $information->ic_seo_keywords,
// $information->ic_show_bread_crumbs,
// $information->ic_status,
// $information->ic_template,
// $information->ic_photo,
// $information->ic_photo_width,
// $information->ic_photo_height,
// $information->ic_recommend_tours,
// $information->ic_recommend_packages,
// $information->ic_ht_area_id,
// $information->ic_ht_area_type,
// $information->ic_ht_product_id,
// $information->ic_ht_product_type,
// $information->ic_author);
// $this->echo_json(array(
// 'status' => 'ok',
// 'infoId' => $info_id,
// 'message' => 'success',
// 'date' => date('Y-m-d h:i:s')
// ));
}
public function count_redirect_nofollow() {

2
application/helpers/info_helper.php
Unescape Escape View File

@ -103,7 +103,7 @@ function is_mobile_first()
{
$CI = &get_instance();
$sitecode = $CI->config->item('site_code');
if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode=='chinatravel') {
if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode=='chinatravel' || $sitecode == 'gh') {
return true;
} else {
return false;

38
application/third_party/recommend/views/templates.php vendored
Unescape Escape View File

@ -1,24 +1,14 @@
<p>完整的文中广告代码：</p>
<H3>完整的文中广告代码：</H3>
<div class="info_ad_title">Recommended Itinerary</div>
<div class="info_ad"><a href="/myanmar/tours/myanmar-essence" rel="nofollow"><img alt="7-Day Myanmar Essence Tour"
class="img-responsive"
src="https://data.asiahighlights.com/image/tour/pagodas-of-bagan-at-sunset.jpg"/>
</a>
<div class="info_ad_content">
<div class="info_ad_name"><a href="/myanmar/tours/myanmar-essence"><strong>7-Day Myanmar Essence Tour</strong>
Yangon, Mandalay, Bagan Tour with e-Visa </a></div>
<div class="info_ad_button"><a href="/myanmar/tours/myanmar-essence" rel="nofollow"><i aria-hidden="true"
class="fa fa-angle-right"></i></a>
</div>
</div>
<div class="info_reco_tours"><em>Recommended</em> Tour</div>
<div class="righttour"><a href="/tour/jiuzhaigoutour/jzg-1/"><img alt="Jiuzhaigou" class="img-responsive" src="//images.chinahighlights.com/allpicture/2020/08/826a518ea9fc46d4b5adcc38_cut_600x550_77.jpg" /></a>
<div class="rightinfo">
<h4><a href="/tour/jiuzhaigoutour/jzg-1/">Time-Smart Jiuzhaigou Discovery</a></h4>
<span class="rightdestination">3-Day Jiuzhaigou and Huanglong Highlights Tour</span> <span class="tourbutton"> <a href="/tour/jiuzhaigoutour/jzg-1/">View more <i class="fa fa-angle-right"></i></a></span></div>
</div>
<hr/>
<p>完整的右侧广告代码：</p>
<H3>CH 完整的右侧广告代码：</H3>
<div class="expatstour" style="
margin: 30px 0; width:auto;
@ -30,3 +20,17 @@ margin: 30px 0; width:auto;
<div class="tourbutton"><a href="/tour/zhangjiajietour/hun-3/" rel="nofollow">View More</a></div>
</div>
</div>
<h3>AH 右侧和文中广告代码模板</h3>
<div class="info_ad_title">Recommended Itinerary</div>
<div class="info_ad"><a href="/southeast-asia/tours/vietnam-cambodia-and-laos" rel="nofollow"><img alt="14-Day Vietnam, Cambodia and Laos Tour" class="img-responsive" src="https://data.asiahighlights.com/image/tour/young-monks-in-angkor-wat.jpg" /> </a>
<div class="info_ad_content">
<div class="info_ad_name"><a href="/southeast-asia/tours/vietnam-cambodia-and-laos"><strong>14-Day Vietnam, Cambodia and Laos Tour</strong> Sync with Indochina's Heartbeat </a></div>
<div class="info_ad_button"><a href="/southeast-asia/tours/vietnam-cambodia-and-laos" rel="nofollow"><i aria-hidden="true" class="fa fa-angle-right"></i></a></div>
</div>
</div>

82
application/views/mobile_first/ch-train-index.php
Unescape Escape View File

@ -0,0 +1,82 @@
<div id="loader" style="display: none;">
<div id="loading"></div>
</div>
<div class="trainSearchBox">
<p class="trainSear-title">China Highlights Train Ticket Service</p>
<div class="searchBox autocomplete" id="searchbox">
<ul class="nav nav-tabs2" id="navtraintop">
<li role="presentation" class="mainland active"><a href="javascript:;">China Train</a></li>
<li role="presentation" class="intel"><a href="javascript:;">Int’l Train from China</a></li>
</ul>
<form action="https://biz.chinahighlights.com/china-trains/search-result.asp" method="POST" name="ZZform1" target="_self" class="formWrap form-inline jsbox" onsubmit="return Chk_InnerTrainForm();">
<div class="searchList">
<label class="searchLabel">Journey:</label>
<div class="search-row">
<div class="flex-row">
<div class="flex-col-3">
<input name="Txt_FZ_1" id="Txt_FZ_1" type="text" class="inputBox form-control" autocomplete="off" placeholder="From">
</div>
<div class="flex-col-3">
<input name="Txt_DZ_1" id="Txt_DZ_1" type="text" class="inputBox form-control" autocomplete="off" placeholder="To">
</div>
<div class="flex-col-3">
<input class="calendar form-control departtime " id="stationDate_1" name="stationDate_1" placeholder="Date" type="text" readonly />
</div>
</div>
</div>
</div>
<div id="aR_tr" class="addTr">
<div class="searchBtn"><button type="submit" name="button" id="SearchTrainButton" value="" class="searchButtonLong">SEARCH</button>
<a class="shopcart hidden-xs" href="https://biz.chinahighlights.com/china-trains/shopcart.asp" ><span id="shoppingnum" class="shopping-num default">0</span>Cart <i class="downarrow"></i></a>
</div>
</div>
<input type="hidden" name="si" id="si" value="1">
<input type="hidden" name="utm_source" id="utm_source" value="">
</form>
<form action="https://biz.chinahighlights.com/intl-trains/search_result/" method="POST" name="ZZform1" target="_self" class="formWrap form-inline jsbox hidden" onsubmit="return Chk_IntelTrainForm();">
<div id="IterTrain" class="searchList">
<label class="searchLabel">Train:</label>
<div class="search-row">
<div class="flex-row">
<div class="flex-col-3">
<select class="inputBox form-control intel-input" name="IT_Txt_FZ_1" id="IT_Txt_FZ_1">
<option value="Lao Cai">Lao Cai</option>
<option value="Beijing">Beijing</option>
<option value="Manzhouli">Manzhouli</option>
<option value="Harbin">Harbin</option>
<option value="Erlian">Erlian</option>
<option value="Jining South">Jining South</option>
<option value="Urumqi">Urumqi</option>
</select>
</div>
<div class="flex-col-3">
<select class="inputBox form-control intel-input" name="IT_Txt_DZ_1" id="IT_Txt_DZ_1">
<option value="">Please Select</option>
<option value="Nanning" data="">Nanning</option>
</select>
</div>
<div class="flex-col-3">
<input class="form-control calendar departtime " id="stationDate_IT_1" name="stationDate_IT_1" placeholder="Date" type="text" />
</div>
</div>
</div>
</div>
<div id="aR_tr" class="addTr">
<span id="ItelMsg_1"></span>
<div class="searchBtn"><button type="submit" name="button" id="SearchTrainButton2" value="" class="searchButtonLong">SEARCH</button>
</div>
</div>
<input type="hidden" name="ItelTrain" id="ItelTrain" value="0">
<input type="hidden" name="utm_source" id="utm_source2" value="">
</form>
</div>
</div>
<link href="https://data.chinahighlights.com/js/train-mobile/train-search-index.css" rel="stylesheet" type="text/css" />
<script defer type="text/javascript" src="https://data.chinahighlights.com/js/train-mobile/train.js"></script>
<script defer type="text/javascript" src="https://data.chinahighlights.com/js/train/StationInfo.js"></script>

2
application/views/mobile_first/chinatravel-add-this.php
Unescape Escape View File

@ -1 +1 @@
<script>document.addEventListener("DOMContentLoaded",()=>{setTimeout(function(){loadScriptByAsync("https://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5be3dae48059b706")},5e3)});</script>
<script>document.addEventListener("DOMContentLoaded",()=>{setTimeout(function(){loadScriptByAsync("https://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5be3dae48059b706")},10e3)});</script>

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

@ -26,6 +26,8 @@
<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">
<link rel=preload href='https://data.chinatravel.com/css/newcss3/fonts/fontawesome-webfont.woff2?v=4.7.0' as=font type='font/woff2' crossorigin />
<link rel=preload href='https://data.chinatravel.com//css/newcss3/fonts/feather.woff2?1gafuo' as=font type='font/woff2' crossorigin />
<!--@MAIN-CSS@--><?php echo $MAINCSS ?>
<!--@ADDON-CSS@--><?php echo $ADDONCSS ?>
<!--@CONSTRUCTION-CODE@--><?php echo $ConstructionCode ?>
@ -288,7 +290,13 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a
</script>
<?php if ($ISPRODUCT=="no") { ?>
<!-- Google AD-->
<script data-ad-client="ca-pub-3275214174607898" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- <script data-ad-client="ca-pub-3275214174607898" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> -->
<script>
function throttle(e,o,t){var n=null,c=new Date;return function(){var a=new Date;clearTimeout(n),a-c>=t?(e(),c=a):n=setTimeout(e,o)}}function createLazyloader(){return function(){var e=window.innerHeight;(document.documentElement&&document.documentElement.scrollTop||document.body&&document.body.scrollTop)>=e+100&&loadScriptByAsync("https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js")}}
var lazyloader = createLazyloader();window.addEventListener('scroll', throttle(lazyloader, 500, 500), false);
</script>
<ins class="adsbygoogle" style="display:block; text-align:center;" data-ad-layout="in-article" data-ad-format="fluid" data-ad-client="ca-pub-3275214174607898" ></ins>
<script> (adsbygoogle = window.adsbygoogle || []).push({});</script>
<?php } ?>
<!-- End Google -->
<!--@IN-ARTICLE-GOOGLE@-->

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

@ -26,6 +26,8 @@
<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">
<link rel=preload href='https://data.chinatravel.com/css/newcss3/fonts/fontawesome-webfont.woff2?v=4.7.0' as=font type='font/woff2' crossorigin />
<link rel=preload href='https://data.chinatravel.com//css/newcss3/fonts/feather.woff2?1gafuo' as=font type='font/woff2' crossorigin />
<!--@MAIN-CSS@--><?php echo $MAINCSS ?>
<!--@ADDON-CSS@--><?php echo $ADDONCSS ?>
<!--@CONSTRUCTION-CODE@--><?php echo $ConstructionCode ?>
@ -288,7 +290,13 @@
</script>
<?php if ($ISPRODUCT=="no") { ?>
<!-- Google AD-->
<script data-ad-client="ca-pub-3275214174607898" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- <script data-ad-client="ca-pub-3275214174607898" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> -->
<script>
function throttle(e,o,t){var n=null,c=new Date;return function(){var a=new Date;clearTimeout(n),a-c>=t?(e(),c=a):n=setTimeout(e,o)}}function createLazyloader(){return function(){var e=window.innerHeight;(document.documentElement&&document.documentElement.scrollTop||document.body&&document.body.scrollTop)>=e+100&&loadScriptByAsync("https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js")}}
var lazyloader = createLazyloader();window.addEventListener('scroll', throttle(lazyloader, 500, 500), false);
</script>
<ins class="adsbygoogle" style="display:block; text-align:center;" data-ad-layout="in-article" data-ad-format="fluid" data-ad-client="ca-pub-3275214174607898" ></ins>
<script> (adsbygoogle = window.adsbygoogle || []).push({});</script>
<?php } ?>
<!-- End Google -->
<!--@IN-ARTICLE-GOOGLE@-->

Write Preview
Loading…
Cancel
Save