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 into master

Browse Source 
# Conflicts:
#	application/views/mobile_first/ch-pc.php
#	application/views/mobile_first/ch.php
hotfix/paypal-note
candice 3 years ago
parent 148905adfe 8a863a0b17
commit 32d8841a7a
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File

41
application/views/mobile_first/ch-pc.php
Unescape Escape View File

@ -88,6 +88,7 @@
id="china_destinations_2021">Destinations</a>
<div class="destinationspc dropdown-content">
<ul class="list-reset sidebar">
<<<<<<< HEAD
<li class="start-nav-item"><a href="/beijing/tours.htm" id="beijing_tours_2021">Beijing</a></li>
<li class="start-nav-item"><a href="/xian/tours.htm" id="xian_tours_2021">Xi&#39;an</a></li>
<li class="start-nav-item"><a href="/shanghai/tours.htm" id="shanghai_tours_2021">Shanghai</a></li>
@ -203,6 +204,46 @@
<input type="image" class="submits"
src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px">
</form>
=======
<li class="start-nav-item"><a href="/travelguide/chinese-zodiac/" id="china_zodiac_2021">Chinese Zodiac</a></li>
<li class="start-nav-item"><a href="/travelguide/special-report/chinese-new-year/" id="china_new_year_2021">Chinese New Year</a></li>
<li class="start-nav-item"><a href="/travelguide/culture/china-history.htm" id="china_history_2021">China History</a></li>
<li class="start-nav-item"><a href="/travelguide/religion.htm" id="china_religions_2021">Chinese Religions</a></li>
<li class="start-nav-item"><a href="/festivals/" id="china_festivals_2021">Chinese Festivals</a></li>
<li class="start-nav-item"><a href="/travelguide/chinese-food/" id="china_food_2021">Chinese Food</a></li>
<li class="start-nav-item"><a href="/travelguide/kungfu/" id="china_kungfu_2021">Kung Fu</a></li>
<li class="start-nav-item start-nav-item-last"><a href="/travelguide/chinese-tea/" id="china_tea_2021">Chinese Tea</a></li>
</ul>
</div>
</li>
<li class="dropdown"><a href="/china-trains/" class="p_topnavilink">Trains</a>
<div class="travelguidepc dropdown-content">
<ul class="list-reset sidebar">
<li class="start-nav-item"><a href="/china-trains/china-railway-station.htm">Train Stations and
Schedules</a></li>
<li class="start-nav-item"><a href="/china-trains/train-travel.htm">Train Travel</a></li>
<li class="start-nav-item"><a href="/china-flights/">Flight</a></li>
<li class="start-nav-item start-nav-item-last"><a href="/china-trains/china-train-app-download.htm">Train App Download</a></li>
</ul>
</div>
</li>
<li class="dropdown"><a href="/tour/asia-tours/" class="p_topnavilink">Asia Tours</a></li>
<li class="dropdown"><a href="/day-tours/" class="p_topnavilink">Day Tours</a>
<div class="destinationspc dropdown-content">
<ul class="list-reset sidebar">
<li class="start-nav-item"><a href="/day-tours/beijing/">Beijing</a></li>
<li class="start-nav-item"><a href="/day-tours/shanghai/">Shanghai</a></li>
<li class="start-nav-item"><a href="/day-tours/xian/">Xi&#39;an</a></li>
<li class="start-nav-item"><a href="/day-tours/chengdu/">Chengdu</a></li>
<li class="start-nav-item"><a href="/day-tours/guilin/">Guilin</a></li>
<li class="start-nav-item"><a href="/day-tours/zhangjiajie/">Zhangjiajie</a></li>
<li class="start-nav-item"><a href="/day-tours/huangshan/">Huangshan</a></li>
<li class="start-nav-item"><a href="/day-tours/yunnan/">Yunnan</a></li>
<li class="start-nav-item"><a href="/day-tours/great-wall-hiking/">Great Wall Tours</a></li>
<li class="start-nav-item"><a href="/day-tours/china-food-tours/">Food Tours</a></li>
<li class="start-nav-item start-nav-item-last"><a href="/day-tours/activities/">Fun Activities</a></li>
</ul>
>>>>>>> 8a863a0b17c441db634cfba61ec00873659e0983
</div>
</div>
</nav>

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

@ -185,6 +185,7 @@
<li class="menu__item" role="menuitem"><a class="menu__link" href="/weather/">China Weather</a></li>
</ul>
<<<<<<< HEAD
<!-- Culture -->
<ul data-menu="submenu-4" id="submenu-4" class="menu__level" tabindex="-1" role="menu" aria-label="Culture">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/travelguide/culture/">Culture</a></li>
@ -248,6 +249,31 @@
<li class="menu__item" role="menuitem"><a href="/tour/asia-tours/" target="_blank"
class="menu__link">More Asia Tours</a></li>
</ul>
=======
<!-- train -->
<ul data-menu="submenu-5" id="submenu-5" class="menu__level" tabindex="-1" role="menu" aria-label="Trains">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-trains/">Search Train</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-trains/china-railway-station.htm">Train Stations and Schedules</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-trains/train-travel.htm">Train Travel</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-flights/">Flight</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-trains/china-train-app-download.htm">Train App Download</a></li>
</ul>
<!-- Day Tours -->
<ul data-menu="submenu-6" id="submenu-6" class="menu__level" tabindex="-1" role="menu"
aria-label="Day-Tours">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/beijing/">Beijing</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/shanghai/">Shanghai</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/xian/">Xi&#39;an</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/chengdu/">Chengdu</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/guilin/">Guilin</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/zhangjiajie/">Zhangjiajie</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/huangshan/">Huangshan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/yunnan/">Yunnan</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/great-wall-hiking/">Great Wall Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/china-food-tours/">Food Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/day-tours/activities/">Fun Activities</a></li>
</ul>
>>>>>>> 8a863a0b17c441db634cfba61ec00873659e0983
</div>

Write Preview
Loading…
Cancel
Save