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
赵鹏 3 years ago
parent d35c2d4538 5d818afea0
commit 48352f22e1
7 changed files with 155 additions and 40 deletions
Show Stats Download Patch File Download Diff File

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

@ -1042,6 +1042,13 @@ class Information extends CI_Controller
}
}
}
$why_us_covid_list_pc = $this->load->view(
$template_path . '-why-us-covid-list-pc', array(), true);
$information->ic_content = str_replace('<!--@WHY-US-COVID-LIST-PC@-->', $why_us_covid_list_pc, $information->ic_content);
$why_us_covid_list_mobile = $this->load->view(
$template_path . '-why-us-covid-mobile', array(), true);
$information->ic_content = str_replace('<!--@WHY-US-COVID-MOBILE@-->', $why_us_covid_list_mobile, $information->ic_content);
if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
@ -1068,15 +1075,7 @@ class Information extends CI_Controller
//设置内容图片缓加载
$lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif');
$template = str_replace('<!--@CUSTOM-CONENT@-->', $lazy_content, $template);
//替换内容中各种标签
//$tag_why_us = $this->load->view($template_path . '-why-us', false, true);
// $template = str_replace('<!--@TAG-WHY-US@-->', $tag_why_us, $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);
//}
//社媒分享图片
$full_ic_photo = '';
if (!empty($information->ic_photo)) {
@ -1236,6 +1235,26 @@ class Information extends CI_Controller
$breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true);
$information->ic_content = str_replace('<!--@BREADCRUMB-BLOCK@-->', $breadcrumb_content, $information->ic_content);
// 动态加载反馈标签，第一个城市不足八条，使用第二城市数据。
// HTLM: <div><!--@FEEDBACK_Siem Reap,Bangkok@--></div>
// 解析结果：<!--@FEEDBACK_Siem Reap,Bangkok@-->; Siem Reap,Bangkok
$feedback_array = [];
preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $information->ic_content, $feedback_array);
if (!empty($feedback_array)) {
foreach ($feedback_array[0] as $index => $tag_name) {
$city_name = $feedback_array[1][$index];
$feedback_data = $this->Feedback_model->get_feedback_by_city($city_name);
// $feedback_content = $this->load->view(
// $template_path . '-feedback',
// array('feedback_data' => $feedback_data),
// true);
// $information->ic_content = str_replace(
// $tag_name,
// $feedback_content,
// $information->ic_content);
}
}
//主样式表，内联模式
if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
$main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css'));

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

@ -187,7 +187,7 @@
</ul>
</div>
<!--@TIPS-RIGHT@-->
<div class="info_tm_button"><a href="/forms/tailormade">Create My Trip</a>
<div class="info_tm_button"><a href="/forms/tailormade" id="create_my_trip_button_pc">Create My Trip</a>
</div>
</div>
@ -196,18 +196,59 @@
<!--PC正文 结束-->
<!--PC底部-->
<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="/forms/tailormade" id="create_my_trip_button_pc">Create My Trip</a></span>
<span class="infotailormade"><a href="/forms/tailormade" >Create My Trip</a></span>
</span>
</div>
<div class="bottom_why_us">
<h2>The Asia Highlights Experience</h2>
<div class="table-responsive">
<table class="why_us_table">
<tbody>
<tr>
<td>
<div class="bottom_why_us_content" >
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive" >
<h3 >1-to-1 Expert Planning</h3>
<p>Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.</p>
</div>
</td>
<td>
<div class="bottom_why_us_content">
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive" >
<h3>Personal Journeys</h3>
<p >Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.</p>
</div>
</td>
<td>
<div class="bottom_why_us_content">
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Authentic Experiences" class="img-responsive">
<h3>Authentic Experiences</h3>
<p>Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.</p>
</div>
</td>
<td>
<div class="bottom_why_us_content">
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="One-Stop Service" class="img-responsive" >
<h3>One-Stop Service</h3>
<p>Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities.</p>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="infobottom">
<div class="footerbox">

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

@ -193,11 +193,50 @@
<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="/forms/tailormade">Create My Trip <i
aria-hidden="true" class="fa fa-caret-right"></i></a></span>
<span class="infotailormade"><a href="/forms/tailormade">Create My Trip</a></span>
</span>
</div>
<div class="bottom_why_us">
<h2>The Asia Highlights Experience</h2>
<div class="table-responsive">
<table class="why_us_table">
<tbody>
<tr>
<td>
<div class="bottom_why_us_content">
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive">
<h3>1-to-1 Expert Planning</h3>
<p>Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.</p>
</div>
</td>
<td>
<div class="bottom_why_us_content">
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive">
<h3>Personal Journeys</h3>
<p>Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.</p>
</div>
</td>
<td>
<div class="bottom_why_us_content">
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Authentic Experiences" class="img-responsive">
<h3>Authentic Experiences</h3>
<p>Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.</p>
</div>
</td>
<td>
<div class="bottom_why_us_content">
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="One-Stop Service" class="img-responsive">
<h3>One-Stop Service</h3>
<p>Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities.</p>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<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="/about-us">more

28
application/views/mobile_first/gh-pc.php
Unescape Escape View File

@ -213,16 +213,16 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<div class="InquiryFormBox">
<div class="FieldSet">
<p><input class="FullName" data-required="Please enter your fullname" id="realname" name="realname"
placeholder="Full name" required="" type="text"></p>
placeholder="Your name" required="" type="text"></p>
<p><input class="EmailAddress" data-required="Please enter your e-mail address"
data-pattern="Expecting an e-mail address" id="email" name="email" pattern="^[\w\-\.]+@[\w\-\.]+(\.\w+)+$"
placeholder="Email" required type="text"></p>
<p><input class="InquiryCalendar" data-min-date="7" id="starting_date" name="starting_date"
placeholder="Starting date" required type="date"></p>
<p><input class="Inquiryphone" name="phone" placeholder="Phone or other ways to contact you"
<p><input class="Inquiryphone" name="phone" placeholder="Phone or other ways to contact you (optional)"
type="text"> </p>
<textarea id="additionalrequirements" name="additionalrequirements"
placeholder="How many people, hotel style and changes to make... " style="margin-bottom:20px;"></textarea>
placeholder="Anniversary, honeymoon, family trip, birthday travel, beach, food..." style="margin-bottom:20px;"></textarea>
<input name="nullemail" placeholder="Your alternative email?" type="hidden">
<input id="url" name="url" type="hidden">
<!--@INPUT_PRODUCT_CODE@-->
@ -275,38 +275,42 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
</div>
<div id="footer">
<div class="footerContent">
<h2>The Global Highlights Experience</h2>
<div class="footerFeatures">
<div class=" whyuscontent">
<div class="featureTitle">100% Tailor-made</div>
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive">
<div class="featureTitle">1-to-1 Expert Planning</div>
<ul>
<li>Your timetable, your pace, unlimited changes without charge.</li>
<li>Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.</li>
</ul>
</div>
<div class=" whyuscontent">
<div class="featureTitle">Authentic</div>
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive">
<div class="featureTitle">Personal Journeys</div>
<ul>
<li>Visit local families. rural farmers, and experience local life.</li>
<li>Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.</li>
</ul>
</div>
<div class=" whyuscontent">
<div class="featureTitle">Quality</div>
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Authentic Experiences" class="img-responsive">
<div class="featureTitle">Authentic Experiences</div>
<ul>
<li>Our award winning service is backed up by a money back guarantee. We constantly review, inspect, and train our handpicked team.</li>
<li>Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.</li>
</ul>
</div>
<div class=" whyuscontent">
<div class="featureTitle">Top Reviews</div>
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="One-Stop Service" class="img-responsive">
<div class="featureTitle">One-Stop Service</div>
<ul>
<li>Over 10,000 travelers choose us per year, including celebrities, royalty and Australian Geographic Magazines team. And TripAdvisor Certificate of Excellence Winner Year on Year. </li>
<li>Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities. </li>
</ul>
</div>

4
application/views/mobile_first/gh-why-us-covid-list-pc.php
Unescape Escape View File

@ -0,0 +1,4 @@
<div class="why_us_covid hidden-xs">
<div class="infoimage">
<img src="https://data.globalhighlights.com/image/aboutus/gh-covid-why-us-pc.jpg" class="img-responsive" alt="travel with confidence despite covid">
</div></div>

4
application/views/mobile_first/gh-why-us-covid-mobile.php
Unescape Escape View File

@ -0,0 +1,4 @@
<div class="infoimage visible-xs">
<img src="https://data.globalhighlights.com/image/aboutus/gh-covid-why-us-mobile.jpg" class="img-responsive" alt="travel with confidence despite covid">
</div>

30
application/views/mobile_first/gh.php
Unescape Escape View File

@ -179,16 +179,16 @@ aria-label="festival">
<div class="InquiryFormBox">
<div class="FieldSet">
<p><input class="FullName" data-required="Please enter your fullname" id="realname" name="realname"
placeholder="Full name" required="" type="text"></p>
placeholder="Your name" required="" type="text"></p>
<p><input class="EmailAddress" data-required="Please enter your e-mail address"
data-pattern="Expecting an e-mail address" id="email" name="email" pattern="^[\w\-\.]+@[\w\-\.]+(\.\w+)+$"
placeholder="Email" required type="text"></p>
<p><input class="InquiryCalendar" data-min-date="7" id="starting_date" name="starting_date"
placeholder="Starting date" required type="date"></p>
<p><input class="Inquiryphone" name="phone" placeholder="Phone or other ways to contact you"
<p><input class="Inquiryphone" name="phone" placeholder="Other ways to contact you (optional)"
type="text"> </p>
<textarea id="additionalrequirements" name="additionalrequirements"
placeholder="How many people, hotel style and changes to make... " style="margin-bottom:20px;"></textarea>
placeholder="Anniversary, honeymoon, family trip, birthday travel, beach, food..." style="margin-bottom:20px;"></textarea>
<input name="nullemail" placeholder="Your alternative email?" type="hidden">
<input id="url" name="url" type="hidden">
<!--@INPUT_PRODUCT_CODE@-->
@ -234,45 +234,49 @@ aria-label="festival">
</script>
<div class="infotailor">
We are here to help you...<br> start planning your tailor-made China tour with 1-1 help from our travel advisors.
We are here to help you...<br> start planning your tailor-made global tour with 1-1 help from our travel advisors.
<div class="tourbutton"><a href="/forms/tailormade" >Create Your Trip </a></div>
</div>
<footer>
<div id="footer">
<div class="footerContent">
<h2>The Global Highlights Experience</h2>
<div class="footerFeatures">
<div class="whyuscontent">
<span class="featureTitle">100% Tailor-made</span>
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive">
<span class="featureTitle">1-to-1 Expert Planning</span>
<ul>
<li>Your timetable, your pace, unlimited changes without charge.</li>
<li>Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.</li>
</ul>
</div>
<div class=" whyuscontent">
<span class="featureTitle">Authentic</span>
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive">
<span class="featureTitle">Personal Journeys</span>
<ul>
<li>Visit local families. rural farmers, and experience local life.</li>
<li>Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.</li>
</ul>
</div>
<div class=" whyuscontent">
<span class="featureTitle">Quality</span>
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Authentic Experiences" class="img-responsive">
<span class="featureTitle">Authentic Experiences</span>
<ul>
<li>Our award winning service is backed up by a money back guarantee. We constantly review, inspect, and train our handpicked team.</li>
<li>Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.</li>
</ul>
</div>
<div class=" whyuscontent">
<span class="featureTitle">Top Reviews</span>
<img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="One-Stop Service" class="img-responsive">
<span class="featureTitle">One-Stop Service</span>
<ul>
<li>Over 10,000 travelers choose us per year, including celebrities, royalty and Australian Geographic Magazines team. And TripAdvisor Certificate of Excellence Winner Year on Year. </li>
<li>Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities.</li>
</ul>
</div>

Write Preview
Loading…
Cancel
Save