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
master
Jimmy Liow 2 years ago
parent a9d7b36717 42ab2c9c81
commit 52fbb9ab14
3 changed files with 112 additions and 65 deletions
Show Stats Download Patch File Download Diff File

6
application/config/config.php
Unescape Escape View File

@ -1070,6 +1070,12 @@ $config['templates_gm'] = array(
'空白模板' => 'none',
);
//德语信息模板
$config['templates_gh'] = array(
'通用内容模板' => 'guide_info_detail',
'带导航' => 'guide_with_nav'
);
// CHT 信息模板
$config['templates_cht'] = array(
'通用内容模板' => 'guide_info_detail',

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

@ -306,6 +306,11 @@ class Information extends CI_Controller
$this->config->set_item('templates', $this->config->item('templates_i'));
}
//可选的展示模板
if (in_array($this->config->item('site_code'), array('gh_vac', 'gh_vc', 'gh_jp', 'gh_ru', 'gh_it'))) {
$this->config->set_item('templates', $this->config->item('templates_gh'));
}
if (in_array($this->config->item('site_code'), array('ah'))) {
$this->config->set_item('templates', $this->config->item('templates_ah'));
}
@ -1283,8 +1288,9 @@ class Information extends CI_Controller
}
}
public function test_get_feedback_by_city_name() {
public function test_get_feedback_by_city_name()
{
$feedback_list = $this->Feedback_model->get_feedback_by_city_name('Bangkok', 5);
var_dump($feedback_list);
}

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

@ -54,7 +54,8 @@
w.gh_template_name = w.gh_template_name || 'desktop';
})(window);
</script>
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-4231674166786366" crossorigin="anonymous"></script>
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-4231674166786366"
crossorigin="anonymous"></script>
</head>
<body>
@ -73,6 +74,68 @@
<li class="dropdown"><a class="p_topnavilink" href="/destinations">Destinations</a>
<div class="dropdown-content">
<div class="inspirationinfo">
<div class="inspirationlist vacationtype">
<div class="inspirationtitle">Europe</div>
<ul class="inspiration">
<li><a href="/italy">Italy
</a></li>
<li><a href="/greece">Greece
</a></li>
<li><a href="/portugal">Portugal
</a></li>
</ul>
</div>
<div class="inspirationlist vacationtype">
<div class="inspirationtitle">Asia</div>
<div class="listtour">
<div>
<ul class="inspiration">
<li><a href="https://www.asiahighlights.com/bhutan"
target="_blank">Bhutan</a></li>
<li><a href="https://www.chinahighlights.com/tour/"
target="_blank">China</a></li>
<li><a href="https://www.asiahighlights.com/cambodia/tours"
target="_blank">Cambodia</a></li>
<li><a href="https://www.asiahighlights.com/india"
target="_blank">India</a></li>
<li><a href="https://www.asiahighlights.com/japan/tours"
target="_blank">Japan</a></li>
<li> <a href="https://www.asiahighlights.com/laos/trip-plan"
target="_blank">Laos</a></li>
<li><a href="https://www.asiahighlights.com/myanmar/tours"
target="_blank">Myanmar</a></li>
<li><a href="https://www.asiahighlights.com/asia/tours/mongolia-china-and-thailand"
target="_blank">Mongolia</a></li>
</ul>
</div>
<div>
<ul class="inspiration">
<li><a href="https://www.asiahighlights.com/nepal"
target="_blank">Nepal</a></li>
<li><a href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"
target="_blank">South Korea</a></li>
<li><a href="https://www.asiahighlights.com/srilanka"
target="_blank">Sri Lanka</a></li>
<li><a href="https://www.asiahighlights.com/thailand/tours"
target="_blank">Thailand</a></li>
<li> <a href="https://www.asiahighlights.com/vietnam/tours"
target="_blank">Vietnam</a></li>
<li><a href="https://www.asiahighlights.com/singapore/plan-your-trip"
target="_blank">Singapore</a>
</li>
<li><a href="https://www.asiahighlights.com/indonesia/bali/tours"
target="_blank">Indonesia
(Bali)</a></li>
<li><a href="https://www.asiahighlights.com/caucasus-central-asia/tours"
target="_blank">Caucasus and Central Asia</a></li>
</ul>
</div>
</div>
</div>
<div class="inspirationlist vacationtype">
<div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div>
<ul class="inspiration">
@ -82,57 +145,28 @@
</a></li>
<li><a href="/jordan/tours">Jordan
</a></li>
<li><a href="/turkey/tours">Turkey
</a></li>
<li><a href="/morocco/tours">Moroco
</a></li>
<li><a href="/turkey/tours">Turkey
</a></li>
</ul>
</div>
<div class="inspirationlist vacationtype">
<div class="inspirationtitle">Southeast Asia</div>
<ul class="inspiration">
<li><a href="https://www.asiahighlights.com/thailand/tours"
target="_blank">Thailand</a></li>
<li> <a href="https://www.asiahighlights.com/vietnam/tours"
target="_blank">Vietnam</a></li>
<li><a href="https://www.asiahighlights.com/cambodia/tours"
target="_blank">Cambodia</a></li>
<li> <a href="https://www.asiahighlights.com/laos/trip-plan"
target="_blank">Laos</a></li>
<li><a href="https://www.asiahighlights.com/myanmar/tours"
target="_blank">Myanmar</a></li>
<li><a href="https://www.asiahighlights.com/singapore/plan-your-trip"
target="_blank">Singapore</a>
</li>
<li><a href="https://www.asiahighlights.com/indonesia/bali/tours"
target="_blank">Indonesia
(Bali)</a></li>
</ul>
</div>
<div class="inspirationlist vacationtype">
<div class="inspirationtitle">North Asia</div>
<div class="inspirationtitle">Africa</div>
<ul class="inspiration">
<li><a href="https://www.chinahighlights.com/tour/" target="_blank">China</a>
</li>
<li><a href="https://www.asiahighlights.com/japan/tours"
target="_blank">Japan</a></li>
<li><a href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"
target="_blank">South
Korea</a></li>
<li><a href="https://www.asiahighlights.com/asia/tours/mongolia-china-and-thailand" target="_blank">Mongolia</a></li>
<li><a href="/african-safari">African Safari</a></li>
<li><a href="/kenya">Kenya</a></li>
<li><a href="/south-africa">South Africa</a></li>
<li><a href="/tanzania">Tanzania</a></li>
</ul>
</div>
<div class="inspirationlist vacationtype">
<div class="inspirationtitle">South America</div>
<ul class="inspiration"><li><a href="/peru/2-week-itinerary">Peru</a></li></ul>
</div>
<div class="inspirationlist vacationtype">
<div class="inspirationtitle">Central Asia</div>
<ul class="inspiration">
<li><a href="https://www.asiahighlights.com/caucasus-central-asia/tours" target="_blank">Caucasus and Central Asia</a></li>
<li><a href="/peru/2-week-itinerary">Peru</a></li>
</ul>
</div>
</div>
</div>
</li>
@ -185,7 +219,8 @@
</div>
<!--@TIPS-RIGHT@-->
<!--@TIPS-RIGHT-LIST@-->
<div class="info_tm_button"><a href="/forms/tailormade?product_code=" id="create_my_trip_button_pc">Create my trip</a>
<div class="info_tm_button"><a href="/forms/tailormade?product_code=" id="create_my_trip_button_pc">Create
my trip</a>
</div>
</div>
<!--PC正文 结束-->
@ -360,7 +395,7 @@
</div>
</div>
<!-- <div class="web_cookie" style='display: none;' id='gotIdArea'>
<!-- <div class="web_cookie" style='display: none;' id='gotIdArea'>
<p>Global Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to
the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p>
<div class="cookie_close" id="gotItBtn" style="float: right;
@ -393,21 +428,21 @@
</script>
-->
<script>
(function (w, d, i) {
var navbar = d.getElementById(i);
var prevScrollpos = w.pageYOffset;
w.onscroll = function() {
var currentScrollPos = w.pageYOffset;
if (prevScrollpos > currentScrollPos) {
navbar.style.top = '0';
} else {
navbar.style.top = '-100px';
}
prevScrollpos = currentScrollPos;
}
})(window, document, 'header');
</script>
<script>
(function (w, d, i) {
var navbar = d.getElementById(i);
var prevScrollpos = w.pageYOffset;
w.onscroll = function () {
var currentScrollPos = w.pageYOffset;
if (prevScrollpos > currentScrollPos) {
navbar.style.top = '0';
} else {
navbar.style.top = '-100px';
}
prevScrollpos = currentScrollPos;
}
})(window, document, 'header');
</script>
<!--PC底部 结束-->
@ -472,13 +507,13 @@
}
</script>
<script src="https://data.globalhighlights.com/js/jquery-1.8.2.min.js"></script>
<script src="https://data.globalhighlights.com/js/jquery.mailAutoComplete-4.0.min.js"></script>
<script>
$("#newsletter_email").mailAutoComplete({
email: ['gmail.com','outlook.com','yahoo.com','icloud.com','hotmail.com','live.com','aol.com']
});
</script>
<script src="https://data.globalhighlights.com/js/jquery-1.8.2.min.js"></script>
<script src="https://data.globalhighlights.com/js/jquery.mailAutoComplete-4.0.min.js"></script>
<script>
$("#newsletter_email").mailAutoComplete({
email: ['gmail.com', 'outlook.com', 'yahoo.com', 'icloud.com', 'hotmail.com', 'live.com', 'aol.com']
});
</script>
<!--@IN-ARTICLE-GOOGLE@-->
<script type="application/ld+json">
{

Write Preview
Loading…
Cancel
Save