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

Browse Source
hotfix/paypal-note
赵鹏 5 years ago
parent 4fc4f30f31 5412018e37
commit 4092538385
7 changed files with 70 additions and 56 deletions
Show Stats Download Patch File Download Diff File

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

@ -747,7 +747,7 @@ class Information extends CI_Controller
$template = str_replace('<!--@CUSTOM-CONENT@-->', $information->ic_content, $template);
//Google广告代码
//if (!empty(get_meta($information->ic_id, 'meta_google_ad_content'))) {
$template = str_replace('<!--@Match-Content-GOOGLE@-->', '<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:block" data-ad-format="autorelaxed" data-ad-client="ca-pub-4231674166786366" data-ad-slot="1447610161" data-matched-content-rows-num="2,2" data-matched-content-columns-num="1,3" data-matched-content-ui-type="image_stacked,image_stacked"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script>', $template);
$template = str_replace('<!--@Match-Content-GOOGLE@-->', '<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:block" data-ad-format="autorelaxed" data-ad-client="ca-pub-4231674166786366" data-ad-slot="2509031466" data-matched-content-rows-num="2,2" data-matched-content-columns-num="1,3" data-matched-content-ui-type="image_stacked,image_stacked"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script>', $template);
//}
if (!empty(get_meta($information->ic_id, 'meta_google_ad_article'))) {
$in_article_google = $this->load->view($template_path . '-google-ad', false, true);

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

@ -98,9 +98,15 @@ class Welcome extends CI_Controller {
}
//获取某个信息节点和子节点url
//$is_parent_id 结构id或者是url
public function create_infomation_urls($is_parent_id, $view = false) {
$this->output->enable_profiler(FALSE);
$structure = $this->InfoStructures_model->Detail($is_parent_id);
$ic_url=$this->input->get_post('ic_url');
if(!empty($ic_url)){
$structure = $this->Information_model->Detail($ic_url);
}else{
$structure = $this->InfoStructures_model->Detail($is_parent_id);
}
if (empty($structure)) {
show_404();
return false;

24
application/third_party/advertise/controllers/index.php vendored
Unescape Escape View File

@ -103,6 +103,9 @@ class Index extends CI_Controller
if (!$result) {
$data[] = array('name' => 'no', 'value' => '关联失败，请联系管理员！');
echo json_encode($data);
}else{
$data[] = array('name' => 'ok', 'value' => '关联成功!');
echo json_encode($data);
}
}
@ -166,4 +169,25 @@ class Index extends CI_Controller
}
echo $result;
}
//批量更新广告相关静态页面
//$ad_is_id 广告的结构ID
/*
public function update_www_cache($ad_is_id){
$data = array();
$data['ad_is_id']=$ad_is_id;
$data['advertise'] = $this->advertise_model->get_advertise_treeid($data['ad_is_id']);
if(empty($data['advertise'])){
show_404();
return false;
}
//广告绑定的页面
$data['webpage_list'] = $this->advertise_model->get_advertise_page($data['ad_is_id']);
if(!empty($data['webpage_list'])){
foreach ($data['webpage_list'] as $item){
echo $item->adp_ic_url.'<br/>';
}
}
}
*/
}

15
application/third_party/advertise/views/advertise.php vendored
Unescape Escape View File

@ -41,7 +41,8 @@
<div class="col-xs-8 form-group nopadding">
<div class="col-xs-24 nopadding">广告位置</div>
<select class="form-control col-xs-24" name="ad_place" id="ad_place" style="display:block !important;">
<select class="form-control col-xs-18" name="ad_place" id="ad_place" style="display:block !important;">
<option value="right_row" <?php echo $advertise->ad_place == 'right_row' ? 'selected' : ''; ?>>页面右侧</option>
<option value="left_nav_top" <?php echo $advertise->ad_place == 'left_nav_top' ? 'selected' : ''; ?>>左导航顶部</option>
<option value="left_nav_bottom" <?php echo $advertise->ad_place == 'left_nav_bottom' ? 'selected' : ''; ?>>左导航底部</option>
<option value="right_nav_top" <?php echo $advertise->ad_place == 'right_nav_top' ? 'selected' : ''; ?>>右导航顶部</option>
@ -82,9 +83,11 @@
<div class="webpage_list">
<div id="webpage_list">
<?php foreach ($webpage_list as $key => $p) { ?>
<a href="javascript:void(0);" class="col-xs-24" id="<?php echo 'page_info_box' . $key; ?>" style="border:1px dashed #666;height:100px;margin-bottom:20px;padding:0px">
<span class="col-xs-24" id="<?php echo 'page_info_box' . $key; ?>" style="border:1px dashed #666;height:100px;margin-bottom:20px;padding:0px">
<a href="<?php echo site_url('/welcome/create_infomation_urls/0/mobile-first?ic_url=').$p->adp_ic_url; ?>" target="_blank"> <em title="更新静态页面" class=" glyphicon glyphicon-refresh text-danger pull-right"></em></a>
<em data-adpid="<?php echo $p->adp_id; ?>" title="删除" class="delete-page glyphicon glyphicon-minus-sign text-danger pull-left"></em><br/>
<div class="col-xs-24 edit_pageinfo" style="height:100%;padding:10px 10px;overflow:hidden;">
<em data-adpid="<?php echo $p->adp_id; ?>" class="delete-page glyphicon glyphicon-minus-sign text-danger pull-right"></em>
<span class="text-muted urlinfo" data-adpid="<?php echo $p->adp_id; ?>" data-urlinfo="<?php echo $p->adp_ic_url; ?>"><?php echo $p->adp_ic_url; ?></span>
<span class="col-xs-24 nopadding text-muted forselfinfo" style="font-size:12px;" data-forself="<?php echo $p->adp_forself; ?>">
<?php
@ -106,7 +109,7 @@
?>
</span>
</div>
</a>
</span>
<?php } ?>
</div>
</div>
@ -140,8 +143,8 @@
<form class="col-xs-24" data-flag="form_pageinfo_edit" method="post" action="<?php echo site_url('thirdparty/advertise/index/page_edit'); ?>">
<div class="col-xs-24 btn-lg"></div>
<div class="form-group">
<label for="exampleInputEmail1">页面链接URL、信息内容ID</label>
<input type="text" class="form-control adp_ic_url" name="adp_ic_url" placeholder="要关联的信息页面url 或信息标题ID,如:/beijing/或5362">
<label for="exampleInputEmail1">页面链接URL</label>
<input type="text" class="form-control adp_ic_url" name="adp_ic_url" placeholder="要关联的信息页面url 或信息标题ID,如:/beijing/">
</div>
<div class="col-xs-24 btn-sm"></div>

6
application/views/mobile_first/ah-google-ad.php
Unescape Escape View File

@ -0,0 +1,6 @@
<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-4231674166786366" data-ad-slot="1889535627"></ins>
<script> (adsbygoogle = window.adsbygoogle || []).push({});</script>

43
application/views/mobile_first/ah-pc.php
Unescape Escape View File

@ -14,41 +14,28 @@
<meta name="description" content="<!--@DESCRIPTION@-->">
<!--@OG:IMAGE@-->
<link rel="canonical" href="<!--@CANONICAL@-->">
<link rel="shortcut icon" href="/favicon.ico">
<link rel="preconnect" href="//data.asiahighlights.com">
<link rel="dns-prefetch" href="//data.asiahighlights.com">
<link rel="dns-prefetch" href="//images.asiahighlights.com">
<link rel="dns-prefetch" href="//www.googletagmanager.com">
<link rel="dns-prefetch" href="//www.googleadservices.com">
<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="shortcut icon" href="https://data.asiahighlights.com/favicon.ico"/>
<link rel="dns-prefetch" href="https://data.asiahighlights.com">
<link rel="dns-prefetch" href="https://images.asiahighlights.com">
<link rel="dns-prefetch" href="https://www.googletagmanager.com">
<!--@MAIN-CSS@-->
<!--@ADDON-CSS@-->
<!-- Google Tag Manager -->
<script>(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({
'gtm.start':
new Date().getTime(), event: 'gtm.js'
});
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src =
'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-T75N4LL');</script>
})(window, document, 'script', 'dataLayer', 'GTM-56CMWN3');</script>
<!-- End Google Tag Manager -->
</head>
<body>
<!-- Google Tag Manager (noscript) -->
<noscript>
<iframe src="https://www.googletagmanager.com/ns.html?id=GTM-T75N4LL" height="0" width="0"
style="display:none;visibility:hidden"></iframe>
</noscript>
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-56CMWN3" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
<!--PC头部-->
@ -188,13 +175,11 @@
</div>
<!--PC右侧广告 结束-->
<div class="inforightad">
<a href="/tours/ah-1.htm"><img alt="Hoi An Woman" class="img-responsive"
src="https://data.asiahighlights.com/image/travel-guide/hoi-an-woman.jpg"
style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;"></a>
<a href="/tours/ah-7.htm"><img class="img-responsive" alt="Myanmar Novices" src="https://data.asiahighlights.com/image/travel-guide/myanmar/myanmar-novices.jpg" style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;"></a>
</div>
<!--PC右侧广告 结束-->
<!--PC底部线路和文章推荐-->
<!--PC底部线路和文章推荐
<div class="nextcontext">
<h2 class="nexttitle">Visit Vietnam with Asia Highlights</h2>
<p class="nextinfo">Asia Highlights welcomes the chance to help you design your perfect trip to Vietnam.
@ -266,7 +251,7 @@
</div>
</div>
</div>
<!--PC底部线路和文章推荐 结束-->
PC底部线路和文章推荐 结束-->
</div>
<!--PC正文 结束-->
@ -291,9 +276,7 @@
<div class="bottomaboutus">
<div class="bottompctitle">About Us</div>
<div class="aboutusinfo">At Asia Highlights, we create your kind of journey – your dates,
destinations, at your pace. Not just any journey, but the unique trip with exceptional
experience you're looking for. <a href="/about-us/">more
<div class="aboutusinfo">At Asia Highlights, we create your kind of journey — your dates, your destinations, at your pace. Not just any journey, but the unique trip with the exceptional experiences you're looking for — whether it's a family vacation, a honeymoon, or your annual break. <a href="/about-us/">more
...</a>
<div class="trustPilotIconBig">
<img class="img-responsive"

26
application/views/mobile_first/ah.php
Unescape Escape View File

@ -8,8 +8,10 @@
<link rel="canonical" href="<!--@CANONICAL@-->">
<meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
<!--@OG:IMAGE@-->
<link rel="shortcut icon" href="https://data.asiahighlights.com/favicon.ico"/>
<link rel="dns-prefetch" href="https://data.asiahighlights.com">
<link rel="dns-prefetch" href="https://images.asiahighlights.com">
<link rel="dns-prefetch" href="https://www.googletagmanager.com">
<!--@MAIN-CSS@-->
<!--@ADDON-CSS@-->
<!-- Google Tag Manager -->
@ -26,11 +28,7 @@
</head>
<body>
<!-- Google Tag Manager (noscript) -->
<noscript>
<iframe
src="https://www.googletagmanager.com/ns.html?id=GTM-56CMWN3" height="0" width="0"
style="display:none;visibility:hidden"></iframe>
</noscript> <!-- End Google Tag Manager (noscript) -->
<noscript> <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-56CMWN3" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) -->
<header class="headerbar flex justify-start items-center top-0 left-0 right-0 pl2 pr4 pt2 md-pt0" id="header">
<div role="button" tabindex="0">
@ -47,9 +45,7 @@
<nav id="ml-menu" class="menu">
<button class="menu__back menu__back--hidden" aria-label="Go back"><span class="icon icon--arrow-left"></span>
</button>
<nav class="menu__breadcrumbs" aria-label="You are here"><a href="#">all</a></nav>
<div class="siteSearch">
<form id="searchbox_001281624266240652297:cl1fy1cxepi" name="googlesreach"
@ -63,7 +59,6 @@
value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a"></form>
</div>
<button class="action action--close" aria-label="Close Menu"><span class="icon icon--cross"></span></button>
<div class="menu__wrap">
<ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All">
@ -177,15 +172,13 @@
<!--右侧广告-->
<div class="inforightad">
<a href="/tours/ah-1.htm"><img alt="Hoi An Woman" class="img-responsive"
src="https://data.asiahighlights.com/image/travel-guide/hoi-an-woman.jpg"
style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;"></a>
<a href="/tours/ah-7.htm"><img class="img-responsive" alt="Myanmar Novices" src="https://data.asiahighlights.com/image/travel-guide/myanmar/myanmar-novices.jpg" style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;"></a>
</div>
<!--右侧广告结束-->
</div>
<!--底部推荐-->
<!--底部推荐
<div class="nextcontext">
<h2 class="nexttitle">Visit Vietnam with Asia Highlights</h2>
<p class="nextinfo">Asia Highlights welcomes the chance to help you design your perfect trip to Vietnam. Check out
@ -257,7 +250,7 @@
</div>
</div>
</div>
<!--底部推荐 结束-->
底部推荐 结束-->
<!--MOBILE 正文 结束-->
@ -272,8 +265,7 @@
</div>
<div class="infobottom">
<div class="bottomlogoinfo">At Asia Highlights, we create your kind of journey – your dates, destinations, at
your pace. Not just any journey, but the unique trip with exceptional experience you're looking for. <a
<div class="bottomlogoinfo">At Asia Highlights, we create your kind of journey — your dates, your destinations, at your pace. Not just any journey, but the unique trip with the exceptional experiences you're looking for — whether it's a family vacation, a honeymoon, or your annual break. <a
href="/aboutus/">more
...</a>
<img src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png"

Write Preview
Loading…
Cancel
Save