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
赵鹏 4 years ago
parent 4362edd646 1dd1760959
commit 21e86a8c19
8 changed files with 97 additions and 50 deletions
Show Stats Download Patch File Download Diff File

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

@ -714,20 +714,27 @@ 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 ($device == 'mobile') { //移动端读取移动大图
$data['meta_addon_picture'] = get_meta($information->ic_id, 'meta_addon_picture_mobile');
} else {
$data['meta_addon_picture'] = get_meta($information->ic_id, 'meta_addon_picture');
//顶部视频
$data['meta_news_video'] = get_meta($information->ic_id, 'meta_news_video');
$data['meta_video_picture'] = get_meta($information->ic_id, 'meta_video_picture');
if (empty($data['meta_news_video']) && empty($data['meta_video_picture'])) {
//没有顶部视频时候才读取全屏大图
//顶部全屏大图
if ($device == 'mobile') { //移动端读取移动大图
$data['meta_addon_picture'] = get_meta($information->ic_id, 'meta_addon_picture_mobile');
} else {
$data['meta_addon_picture'] = get_meta($information->ic_id, 'meta_addon_picture');
}
$data['meta_addon_picture_url'] = get_meta($information->ic_id, 'meta_addon_picture_url');
}
$data['meta_addon_picture_url'] = get_meta($information->ic_id, 'meta_addon_picture_url');
$data['author'] = $this->Operator_model->get_author_nikename($information->ic_author); //获取作者信息
$template_H1 = $this->load->view($template_path . '-h1', $data, TRUE);
$template = str_replace('<!--@HEAD_1@-->', $template_H1, $template);
//推荐信息或者产品
//信息推荐 暂时不用，未来用广告系统替代
//信息推荐
$template_recommand = $this->recommand_information($information);
$template = str_replace('<!--@ARTICLENEXT@-->', $this->load->view($template_path . '-next', array('recommands'=>$template_recommand), TRUE), $template);
//广告，改叫tips，防止被插件屏蔽

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

@ -368,4 +368,10 @@ function compress_css($buffer)
/* remove tabs, spaces, newlines, etc. */
$buffer = str_replace(array("\r\n", "\r", "\n", "\t", ' ', ' ', ' '), '', $buffer);
return $buffer;
}
//把临时多媒体中心预览图片地址替换为网前地址
function replace_image_url($ic_content){
$CI = &get_instance();
return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'),$ic_content);
}

2
application/third_party/recommend/controllers/tips.php vendored
Unescape Escape View File

@ -77,7 +77,7 @@ class Tips extends CI_Controller
$infoTip->it_title = $this->input->post('it_title');
$infoTip->it_expires = strtotime($this->input->post('it_expires'));
$infoTip->it_code = $this->input->post('it_code');
$infoTip->it_content = $this->input->post('it_content');
$infoTip->it_content = replace_image_url($this->input->post('it_content'));
$infoTip->it_datetime = time();
$infoTip->it_id = $this->infoTips_model->update('infoTips', $infoTip, 'it_id=' . $it_id);
$data[] = array('name' => 'ok', 'value' => '保存成功！');

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

@ -142,7 +142,7 @@
<li><a href="<?php echo site_url('tools/amp_check') ?>">AMP转化检查</a></li>
<li><a target="_blank" href="http://www.arachina.com/html-tag-quick-query.htm">Html基础知识</a></li>
<li><a target="_blank" href="https://docs.google.com/presentation/d/1YN9P8j837SCHenpK_UApHU04K6evV1-GLULhsdmdtWM/edit?usp=sharing">AMP知识</a></li>
<li><a href="<?php echo site_url('city/addnode/-99') ?>">添加信息分组</a></li>
<!--<li><a href="<?php echo site_url('city/addnode/-99') ?>">添加信息分组</a></li>-->
<li><a target="_blank" href="https://docs.google.com/presentation/d/1E9dbrANxtvgsOTkJWWab-UNaBgRJyQwNYu9Tw5k5jUI/edit?usp=sharing">AMP操作SOP</a></li>
<li><a target="_blank" href="https://docs.google.com/presentation/d/1_SN8Eo3EFmigfyYrtX7WTkiGKqgvc0EBBS3YoXeZSBc/edit#slide=id.g45b539c835_4_61">HTML构建工具V3</a></li>
<li><a target="_blank" href="https://docs.google.com/presentation/d/1zPc7832vManRsCgkgO5XoMVKe6deIHC9zsmLPWihxrA/edit?usp=sharing">PS基础课件</a></li>

9
application/views/mobile_first/ah-h1.php
Unescape Escape View File

@ -1,8 +1,13 @@
<div class=topcontent>
<div class="infotopimage">
<img src="<?php echo $meta_addon_picture; ?>"
alt="<?php echo !empty($information->ic_title)?$information->ic_title:'H1 title asiahighlights mobile first template'; ?>" class="img-responsive">
<?php if (!empty($meta_news_video) && !empty($meta_video_picture)) { ?>
<video autoplay="" controls="controls" id="bgvid" poster="<?php echo $meta_video_picture; ?>" src="<?php echo $meta_news_video; ?>" style="position: inherit;"> </video>
<?php }else{ ?>
<img src="<?php echo $meta_addon_picture; ?>"
alt="<?php echo !empty($information->ic_title)?$information->ic_title:'H1 title asiahighlights mobile first template'; ?>" class="img-responsive">
<?php } ?>
<div class="topbannerbg">
<div class="infotoptitle">

47
application/views/mobile_first/ah-next.php
Unescape Escape View File

@ -1,9 +1,15 @@
<div class="nextcontext">
<?php if(!empty($recommands['Article A']) || !empty($recommands['Article B']) || !empty($recommands['Article C']) || !empty($recommands['Article D'])){ ?>
<h2 class="nexttitle">More Travel Ideas and Inspiration</h2>
<div class="table-responsive">
<table class="info_reco_table">
<tbody>
<tr>
<?php if(!empty($recommands['Article A'])){ ?>
<?php if(!empty($recommands['Article A'])){ ?>
<td>
<div class="nextarticle">
<a href="<?php echo $recommands['Article A']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy"
@ -14,10 +20,11 @@
<a href="<?php echo $recommands['Article A']->ic_url; ?>"> <?php echo $recommands['Article A']->ic_title; ?> </a>
</div>
</div>
</div>
</div></td>
<?php } ?>
<?php if(!empty($recommands['Article B'])){ ?>
<td>
<div class="nextarticle">
<a href="<?php echo $recommands['Article B']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy"
@ -28,10 +35,11 @@
<a href="<?php echo $recommands['Article B']->ic_url; ?>"> <?php echo $recommands['Article B']->ic_title; ?> </a>
</div>
</div>
</div>
</div></td>
<?php } ?>
<?php if(!empty($recommands['Article C'])){ ?>
<td>
<div class="nextarticle">
<a href="<?php echo $recommands['Article C']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy"
@ -42,10 +50,11 @@
<a href="<?php echo $recommands['Article C']->ic_url; ?>"> <?php echo $recommands['Article C']->ic_title; ?> </a>
</div>
</div>
</div>
</div></td>
<?php } ?>
<?php if(!empty($recommands['Article D'])){ ?>
<td>
<div class="nextarticle">
<a href="<?php echo $recommands['Article D']->ic_url; ?>"> <img
src="https://data.asiahighlights.com/grey.gif" loader="lazy"
@ -57,14 +66,26 @@
</div>
</div>
</div>
</td>
<?php } ?>
</tr>
</tbody>
</table>
</div>
<?php } ?>
<?php if(!empty($recommands['Tour A']) || !empty($recommands['Tour B']) || !empty($recommands['Tour C']) || !empty($recommands['Tour D'])){ ?>
<h2 class="nexttitle">Get Inspired with Our Sample Itineraries</h2>
<p class="nextinfo">At Asia Highlights, we create your kind of journey — your dates, your destinations, at your pace. You can have any trip tailor made for your travel.</p>
<div class="table-responsive">
<table class="info_reco_table">
<tbody>
<tr>
<td>
<?php if(!empty($recommands['Tour A'])){ ?>
<div class="tournext">
<img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
@ -77,7 +98,8 @@
</div>
</div>
<?php } ?>
</td>
<td>
<?php if(!empty($recommands['Tour B'])){ ?>
<div class="tournext">
<img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
@ -90,7 +112,8 @@
</div>
</div>
<?php } ?>
</td>
<td>
<?php if(!empty($recommands['Tour C'])){ ?>
<div class="tournext">
<img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
@ -103,7 +126,8 @@
</div>
</div>
<?php } ?>
</td>
<td>
<?php if(!empty($recommands['Tour D'])){ ?>
<div class="tournext">
<img src="https://data.asiahighlights.com/grey.gif" loader="lazy"
@ -116,8 +140,13 @@
</div>
</div>
<?php } ?>
<?php } ?>
</td>
</tr>
</tbody>
</table>
</div>
<?php } ?>
</div>
</div>

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

@ -51,18 +51,18 @@
<div class="listtour">
<ul class="inspiration">
<li><a href="/thailand/travel-guide" >Thailand</a></li>
<li><a href="/japan/travel-guide" >Japan</a></li>
<li><a href="/india/travel-guide" >India</a></li>
<li><a href="/vietnam/travel-guide" >Vietnam</a></li>
<li><a href="/thailand" >Thailand</a></li>
<li><a href="/japan" >Japan</a></li>
<li><a href="/india" >India</a></li>
<li><a href="/vietnam" >Vietnam</a></li>
</ul>
<ul class="inspiration">
<li><a href="/cambodia/travel-guide" >Cambodia</a></li>
<li><a href="/myanmar/travel-guide" >Myanmar</a></li>
<li><a href="/laos/travel-guide" >Laos</a></li>
<li><a href="/cambodia" >Cambodia</a></li>
<li><a href="/myanmar" >Myanmar</a></li>
<li><a href="/laos" >Laos</a></li>
</ul>
<ul class="inspiration">
<li><a href="/tours/" >Top Asia Tours</a></li>
<li><a href="/tours" >Top Asia Tours</a></li>
</ul>
</div>
@ -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.htm" class="p_topnavilink contactbutton" >Contact Us</a>
<li class="dropdown" style=" padding-top: 55px"><a href="/contact-us" class="p_topnavilink contactbutton" >Contact Us</a>
</li>
<li class="dropdown" style=" margin-right: 0;">
<div class="siteSearch">
@ -205,7 +205,7 @@
<div class="bottomaboutus">
<div class="bottompctitle">About Us</div>
<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
<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"
@ -238,9 +238,9 @@
<div class="bottomlinksleft">
<ul class="withBorder">
<li><a href="/about-us" rel="nofollow" >About us</a></li>
<li><a href="/about-us/history.htm" rel="nofollow" >History</a></li>
<li><a href="/about-us/our-differences.htm" rel="nofollow" >Our Differences</a></li>
<li><a href="/contact-us.htm" rel="nofollow" >Contact Us</a></li>
<li><a href="/about-us/history" rel="nofollow" >History</a></li>
<li><a href="/about-us/our-differences" rel="nofollow" >Our Differences</a></li>
<li><a href="/contact-us" rel="nofollow" >Contact Us</a></li>
</ul>
</div>

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

@ -36,7 +36,7 @@
<a href="/"> <img src="https://data.asiahighlights.com/pic/ah-bottom-logo-mobile.png" alt="chinahighlights logo"
class="chinahighlightslogo img-responsive"></a>
<div class="topnavitailor">
<a href="/contact-us.htm" class="infocustomize">Contact Us <i aria-hidden="true"
<a href="/contact-us" class="infocustomize">Contact Us <i aria-hidden="true"
class="fa fa-caret-right toptailorarrow"></i></a>
<i class="fa fa-bars navimenu topnaviarrowdown action--open"></i>
</div>
@ -78,14 +78,14 @@
<!-- destinations -->
<ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu"
aria-label="destinations">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/travel-guide">Thailand</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/travel-guide">Japan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/india/travel-guide">India</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/vietnam/travel-guide">Vietnam</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/cambodia/travel-guide">Cambodia</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/myanmar/travel-guide">Myanmar</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/laos/travel-guide">Laos</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tours/">Top Asia Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand">Thailand</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan">Japan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/india">India</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/vietnam">Vietnam</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/cambodia">Cambodia</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/myanmar">Myanmar</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/laos">Laos</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tours">Top Asia Tours</a></li>
</ul>
<!-- Best-time -->
@ -190,7 +190,7 @@
<footer>
<div class="infotailor">
<span class="infotailorword">We are here to help you...<br> Start planning your tailor-made Asia tour with 1-1 help from our travel advisors.
<span class="infotailormade"><a href="https://www.chinahighlights.com/tour/create-my-trip.htm">Create My Trip <i
<span class="infotailormade"><a href="/forms/tailormade">Create My Trip <i
aria-hidden="true" class="fa fa-caret-right"></i></a></span>
</span>
@ -198,7 +198,7 @@
<div class="infobottom">
<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
href="/about-us">more
...</a>
<img
src="https://data.asiahighlights.com/grey.gif"
@ -229,15 +229,15 @@
<div class="bottomlinks">
<span class="followtitle"><a href="/aboutus" rel="nofollow">About Us</a></span>
<span class="followtitle"><a href="/about-us" rel="nofollow">About Us</a></span>
<ul>
<li><a href="/about-us/history.htm" rel="nofollow">History</a></li>
<li><a href="/about-us/our-differences.htm" rel="nofollow">Our Differences</a></li>
<li><a href="/contact-us.htm" rel="nofollow">Contact Us</a></li>
<li><a href="/privacy.htm">Privacy Policy</a></li>
<li><a href="/terms-of-use.htm">Terms</a></li>
<li><a href="/about-us/history" rel="nofollow">History</a></li>
<li><a href="/about-us/our-differences" rel="nofollow">Our Differences</a></li>
<li><a href="/contact-us" rel="nofollow">Contact Us</a></li>
<li><a href="/privacy">Privacy Policy</a></li>
<li><a href="/terms-of-use">Terms</a></li>
</ul>
</div>
<div class="clear"></div>

Write Preview
Loading…
Cancel
Save