Merge branch 'master' of github.com:hainatravel/information-system

master
Jimmy Liow 2 years ago
commit a30ea07f1c

@ -3240,7 +3240,7 @@ class Information extends CI_Controller
} }
// GH国际 不发布的时候删除缓存 // GH国际 不发布的时候删除缓存
if (isset($information) && !$information->ic_status) { if (isset($information) && !empty($information) && !$information->ic_status) {
$url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $tmp; $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $tmp;
} }

@ -74,18 +74,15 @@
<li class="dropdown"><a class="p_topnavilink" href="/destinations">Destinations</a> <li class="dropdown"><a class="p_topnavilink" href="/destinations">Destinations</a>
<div class="dropdown-content"> <div class="dropdown-content">
<div class="inspirationinfo"> <div class="inspirationinfo">
<div class="inspirationlist vacationtype"> <div class="inspirationlist vacationtype" style="width: 15%;">
<div class="inspirationtitle">Europe</div> <div class="inspirationtitle">Europe</div>
<ul class="inspiration"> <ul class="inspiration">
<li><a href="/italy">Italy <li><a href="/italy">Italy</a></li>
</a></li> <li><a href="/greece">Greece</a></li>
<li><a href="/greece">Greece <li><a href="/portugal">Portugal</a></li>
</a></li>
<li><a href="/portugal">Portugal
</a></li>
</ul> </ul>
</div> </div>
<div class="inspirationlist vacationtype"> <div class="inspirationlist vacationtype" style="width: 25%;">
<div class="inspirationtitle">Asia</div> <div class="inspirationtitle">Asia</div>
<div class="listtour"> <div class="listtour">
@ -127,16 +124,15 @@
target="_blank">Singapore</a> target="_blank">Singapore</a>
</li> </li>
<li><a href="https://www.asiahighlights.com/indonesia/bali/tours" <li><a href="https://www.asiahighlights.com/indonesia/bali/tours"
target="_blank">Indonesia target="_blank">Indonesia (Bali)</a></li>
(Bali)</a></li>
<li><a href="https://www.asiahighlights.com/caucasus-central-asia/tours" <li><a href="https://www.asiahighlights.com/caucasus-central-asia/tours"
target="_blank">Caucasus and Central Asia</a></li> target="_blank">Central Asia</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<div class="inspirationlist vacationtype"> <div class="inspirationlist vacationtype" style="width: 15%;">
<div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div> <div class="inspirationtitle"><a href="/middle-east/tours">Middle East</a></div>
<ul class="inspiration"> <ul class="inspiration">
<li><a href="/egypt/tours">Egypt <li><a href="/egypt/tours">Egypt
@ -151,7 +147,7 @@
</a></li> </a></li>
</ul> </ul>
</div> </div>
<div class="inspirationlist vacationtype"> <div class="inspirationlist vacationtype" style="width: 15%;">
<div class="inspirationtitle">Africa</div> <div class="inspirationtitle">Africa</div>
<ul class="inspiration"> <ul class="inspiration">
<li><a href="/african-safari">African Safari</a></li> <li><a href="/african-safari">African Safari</a></li>
@ -160,7 +156,7 @@
<li><a href="/tanzania">Tanzania</a></li> <li><a href="/tanzania">Tanzania</a></li>
</ul> </ul>
</div> </div>
<div class="inspirationlist vacationtype"> <div class="inspirationlist vacationtype" style="width: 15%;">
<div class="inspirationtitle">South America</div> <div class="inspirationtitle">South America</div>
<ul class="inspiration"> <ul class="inspiration">
<li><a href="/peru/2-week-itinerary">Peru</a></li> <li><a href="/peru/2-week-itinerary">Peru</a></li>

@ -95,15 +95,15 @@
<ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All"> <ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/">Home</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/">Home</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-8" aria-owns="submenu-8" <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-8" aria-owns="submenu-8"
href="/middle-east/tours">Middle East Destinations</a></li> href="/middle-east/tours">Europe Destinations</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6" <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6"
aria-owns="submenu-6">Southeast Asia Destinations</a></li> aria-owns="submenu-6">Asia Destinations</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-1" <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-1"
aria-owns="submenu-1">North Asia Destinations</a></li> aria-owns="submenu-1">Middle East Destinations</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-9" <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-9"
aria-owns="submenu-9">South America Destinations</a></li> aria-owns="submenu-9">Africa Destinations</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-7" <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-7"
aria-owns="submenu-7">Central Asia Destinations</a></li> aria-owns="submenu-7">South America Destinations</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/destinations">All Destinations</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/destinations">All Destinations</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/itinerary-ideas">Itinerary Ideas</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/itinerary-ideas">Itinerary Ideas</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about">About Us</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/about">About Us</a></li>
@ -111,42 +111,70 @@
</ul> </ul>
<!-- destinations --> <!-- destinations -->
<ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="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="/destinations">All Destinations</a></li> <li class="menu__item" role="menuitem"><a href="/egypt/tours" class="menu__link">Egypt
<li class="menu__item" role="menuitem"><a href="https://www.chinahighlights.com/tour/" target="_blank" class="menu__link">China</a></li> </a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="https://www.asiahighlights.com/japan/tours" target="_blank">Japan</a></li> <li class="menu__item" role="menuitem"><a href="/israel/tours" class="menu__link">Israel
<li class="menu__item" role="menuitem"><a class="menu__link" href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea" target="_blank">South Korea</a></li> </a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="https://www.asiahighlights.com/asia/tours/mongolia-china-and-thailand" target="_blank">Mongolia</a> <li class="menu__item" role="menuitem"><a href="/jordan/tours" class="menu__link">Jordan
</li> </a></li>
<li class="menu__item" role="menuitem"><a href="/morocco/tours" class="menu__link">Moroco
</a></li>
<li class="menu__item" role="menuitem"><a href="/turkey/tours" class="menu__link">Turkey
</a></li>
</ul> </ul>
<ul data-menu="submenu-6" id="submenu-6" class="menu__level" tabindex="-1" role="menu" aria-label="destinations"> <ul data-menu="submenu-6" id="submenu-6" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">
<li class="menu__item" role="menuitem"><a class="menu__link" <li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/bhutan"
href="https://www.asiahighlights.com/thailand/tours" target="_blank">Thailand</a></li> target="_blank" class="menu__link">Bhutan</a></li>
<li class="menu__item" role="menuitem"> <a class="menu__link" <li class="menu__item" role="menuitem"><a href="https://www.chinahighlights.com/tour/"
href="https://www.asiahighlights.com/vietnam/tours" target="_blank">Vietnam</a></li> target="_blank" class="menu__link">China</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" <li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/cambodia/tours"
href="https://www.asiahighlights.com/cambodia/tours" target="_blank">Cambodia</a></li> target="_blank" class="menu__link">Cambodia</a></li>
<li class="menu__item" role="menuitem"> <a class="menu__link" <li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/india"
href="https://www.asiahighlights.com/laos/trip-plan" target="_blank">Laos</a></li> target="_blank" class="menu__link">India</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="https://www.asiahighlights.com/myanmar/tours" target="_blank">Myanmar</a></li> <li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/japan/tours"
<li class="menu__item" role="menuitem"><a class="menu__link" href="https://www.asiahighlights.com/singapore/plan-your-trip" target="_blank">Singapore</a></li> target="_blank" class="menu__link">Japan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="https://www.asiahighlights.com/indonesia/bali/tours" target="_blank">Indonesia (Bali)</a></li> <li class="menu__item" role="menuitem"> <a href="https://www.asiahighlights.com/laos/trip-plan"
target="_blank" class="menu__link">Laos</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/myanmar/tours"
target="_blank" class="menu__link">Myanmar</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/asia/tours/mongolia-china-and-thailand"
target="_blank" class="menu__link">Mongolia</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/nepal"
target="_blank" class="menu__link">Nepal</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"
target="_blank" class="menu__link">South Korea</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/srilanka"
target="_blank" class="menu__link">Sri Lanka</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/thailand/tours"
target="_blank" class="menu__link">Thailand</a></li>
<li class="menu__item" role="menuitem"> <a href="https://www.asiahighlights.com/vietnam/tours"
target="_blank" class="menu__link">Vietnam</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/singapore/plan-your-trip"
target="_blank" class="menu__link">Singapore</a>
</li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/indonesia/bali/tours"
target="_blank" class="menu__link">Indonesia (Bali)</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.asiahighlights.com/caucasus-central-asia/tours"
target="_blank" class="menu__link">Central Asia</a></li>
</ul> </ul>
<ul data-menu="submenu-7" id="submenu-7" class="menu__level" tabindex="-1" role="menu" aria-label="destinations"> <ul data-menu="submenu-7" id="submenu-7" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">
<li class="menu__item" role="menuitem"><a class="menu__link" <li class="menu__item" role="menuitem"><a href="/peru/2-week-itinerary" class="menu__link">Peru</a></li>
href="https://www.asiahighlights.com/caucasus-central-asia/tours" target="_blank">Caucasus and Central Asia</a></li>
</ul> </ul>
<ul data-menu="submenu-8" id="submenu-8" class="menu__level" tabindex="-1" role="menu" aria-label="destinations"> <ul data-menu="submenu-8" id="submenu-8" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/egypt/tours">Egypt</a></li> <li class="menu__item" role="menuitem"><a href="/italy" class="menu__link">Italy</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/israel/tours">Israel</a></li> <li class="menu__item" role="menuitem"><a href="/greece" class="menu__link">Greece</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/jordan/tours">Jordan</a></li> <li class="menu__item" role="menuitem"><a href="/portugal" class="menu__link">Portugal</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/turkey/tours">Turkey</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/morocco/tours">Moroco</a></li>
</ul> </ul>
<ul data-menu="submenu-9" id="submenu-9" class="menu__level" tabindex="-1" role="menu" aria-label="destinations"> <ul data-menu="submenu-9" id="submenu-9" class="menu__level" tabindex="-1" role="menu" aria-label="destinations">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/peru/2-week-itinerary">Peru</a></li> <li class="menu__item" role="menuitem"><a class="menu__link" href="/african-safari">African Safari</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/kenya">Kenya</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/south-africa">South Africa</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tanzania">Tanzania</a></li>
</ul> </ul>
<!-- inspiration --> <!-- inspiration -->
</div> </div>

Loading…
Cancel
Save