diff --git a/application/controllers/information.php b/application/controllers/information.php index 48e6a1b7..79bf04ff 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1097,6 +1097,7 @@ class Information extends CI_Controller if (!empty($author)) { $data_H1['author'] = $author->OPI_FirstName; $data_H1['OPI_Code'] = $author->OPI_Code; + $data_H1['author_url'] = $this->get_author_url('www.chinahighlights.com', $author->OPI_Code); } else { $author_web = $this->Infoauthors_model->detail_by_id($information->ic_author); //原始作者，可能是在线作者等 if (!empty($author_web)) { @@ -1150,7 +1151,7 @@ class Information extends CI_Controller $article_structured_data_content = $this->load->view( $template_path . '-structured-data-article', - array('information' => $information, 'author' => $author), + array('information' => $information, 'author_name' => $data_H1['author'], 'author_url' => $data_H1['author_url']), true ); $template = str_replace('', $article_structured_data_content, $template); @@ -1837,6 +1838,7 @@ class Information extends CI_Controller if (!empty($author)) { $data_H1['author'] = $author->OPI_FirstName; $data_H1['OPI_Code'] = $author->OPI_Code; + $data_H1['author_url'] = $this->get_author_url('www.globalhighlights.com', $author->OPI_Code); } else { $author_web = $this->Infoauthors_model->detail_by_id($information->ic_author); //原始作者，可能是在线作者等 if (!empty($author_web)) { @@ -1856,8 +1858,8 @@ class Information extends CI_Controller } $article_structured_data_content = $this->load->view( - $template_path . '-structured-data-article', - array('information' => $information, 'author_name' => $data_H1['author']), + 'mobile_first/gh-structured-data-article', + array('information' => $information, 'author_name' => $data_H1['author'], 'author_url' => $data_H1['author_url']), true ); $template = str_replace('', $article_structured_data_content, $template); @@ -2226,6 +2228,7 @@ class Information extends CI_Controller if (!empty($author)) { $data['author'] = $author->OPI_FirstName; $data['OPI_Code'] = $author->OPI_Code; + $data['author_url'] = $this->get_author_url('www.asiahighlights.com', $author->OPI_Code); } else { $author_web = $this->Infoauthors_model->detail_by_id($information->ic_author); //原始作者，可能是在线作者等 if (!empty($author_web)) { @@ -2238,7 +2241,7 @@ class Information extends CI_Controller // 结构化标签：Article $article_structured_data_content = $this->load->view( $template_path . '-structured-data-article', - array('information' => $information, 'author' => $data['author']), + array('information' => $information, 'author_name' => $data['author'], 'author_url' => $data['author_url']), true ); $template = str_replace('', $article_structured_data_content, $template); @@ -2631,6 +2634,7 @@ class Information extends CI_Controller if (!empty($author)) { $data['author'] = $author->OPI_FirstName; $data['OPI_Code'] = $author->OPI_Code; + $data['author_url'] = $this->get_author_url('www.japanhighlights.com', $author->OPI_Code); } else { $author_web = $this->Infoauthors_model->detail_by_id($information->ic_author); //原始作者，可能是在线作者等 if (!empty($author_web)) { @@ -2643,7 +2647,7 @@ class Information extends CI_Controller // 结构化标签：Article $article_structured_data_content = $this->load->view( $template_path . '-structured-data-article', - array('information' => $information, 'author' => $data['author']), + array('information' => $information, 'author_name' => $data['author'], 'author_url' => $data['author_url']), true ); $template = str_replace('', $article_structured_data_content, $template); @@ -3129,7 +3133,7 @@ class Information extends CI_Controller if (!empty($meta_index_set)) { $data["meta_index_set"] = ''; } - + //总JS：为了方便以后js好维护，必须的把一些公用的JS统计到一个文件。但是又不是所有页面都需要调用这个基础js，所以必须在这里进行判断 $addBaseJs = false; @@ -5635,4 +5639,51 @@ class Information extends CI_Controller echo json_encode($data); return true; } + + public function get_author_url($domain_name, $OPI_Code) + { + $OPI_CodeUrls = [ + 'zzy' => 'https://' . $domain_name .'/aboutus/team/ruru-zhou', + '2' => 'https://' . $domain_name .'/aboutus/team/ruru-zhou', + 'HWT' => 'https://' . $domain_name .'/aboutus/team/mike-he', + 'CA' => 'https://' . $domain_name .'/aboutus/team/carol-wang', + 'SI' => 'https://' . $domain_name .'/aboutus/team/simon-huang', + 'TJQ' => 'https://' . $domain_name .'/aboutus/team/cindy-tang', + 'CLA' => 'https://' . $domain_name .'/aboutus/team/claire-wang', + 'Albee' => 'https://' . $domain_name .'/aboutus/team/albee-ning', + 'KM' => 'https://' . $domain_name .'/aboutus/team/kimi-huang', + 'RY' => 'https://' . $domain_name .'/aboutus/team/rita-yu', + 'QMY' => 'https://' . $domain_name .'/aboutus/team/chris-quan', + 'CY' => 'https://' . $domain_name .'/aboutus/team/cynthia-li', + 'Vicky' => 'https://' . $domain_name .'/aboutus/team/vicky-leng', + 'LXW' => 'https://' . $domain_name .'/aboutus/team/carper-li', + 'zzyGH' => 'https://' . $domain_name .'/aboutus/team/ruru-zhou', + ]; + + if ($domain_name == 'www.chinahighlights.com') { + $OPI_CodeUrls = [ + 'zzy' => 'https://www.chinahighlights.com/aboutus/team/ruru-zhou.htm', + '2' => 'https://www.chinahighlights.com/aboutus/team/ruru-zhou.htm', + 'HWT' => 'https://www.chinahighlights.com/aboutus/team/mike-he.htm', + 'CA' => 'https://www.chinahighlights.com/aboutus/team/carol-wang.htm', + 'SI' => 'https://www.chinahighlights.com/aboutus/team/simon-huang.htm', + 'TJQ' => 'https://www.chinahighlights.com/aboutus/team/cindy-tang.htm', + 'CLA' => 'https://www.chinahighlights.com/aboutus/team/claire-wang.htm', + 'Albee' => 'https://www.chinahighlights.com/aboutus/team/albee-ning.htm', + 'KM' => 'https://www.chinahighlights.com/aboutus/team/kimi-huang.htm', + 'RY' => 'https://www.chinahighlights.com/aboutus/team/rita-yu.htm', + 'QMY' => 'https://www.chinahighlights.com/aboutus/team/chris-quan.htm', + 'CY' => 'https://www.chinahighlights.com/aboutus/team/cynthia-li.htm', + 'Vicky' => 'https://www.chinahighlights.com/aboutus/team/vicky-leng.htm', + 'LXW' => 'https://www.chinahighlights.com/aboutus/team/carper-li.htm', + 'zzyGH' => 'https://www.chinahighlights.com/aboutus/team/ruru-zhou.htm', + ]; + } + + if (!empty($OPI_Code) && array_key_exists($OPI_Code, $OPI_CodeUrls)) { + return $OPI_CodeUrls[$OPI_Code]; + } else { + return ''; + } + } } diff --git a/application/views/mobile_first/ah-gp-form.php b/application/views/mobile_first/ah-gp-form.php index 0fa161c1..9b29fa03 100644 --- a/application/views/mobile_first/ah-gp-form.php +++ b/application/views/mobile_first/ah-gp-form.php @@ -1,352 +1,348 @@ - +
-

Inquire now! Your 1:1 travel consultant will reply within 1 working day.

-
- +

Inquire now! Your 1:1 travel consultant will + reply within 1 working day.

+ + -
-
+
+

Traveler numbers for your group:

-
-

- Adults and kids (≥10 years old) -

-
- - +

+ Adults and kids (≥10 years old) +

+
+ + - -
+
- -
-

Children

-
-

3-9 yrs old

- -
-
-

0-2 yrs old

- -
+
+ +
+

Children

+
+

3-9 yrs old

+ +
+
+

0-2 yrs old

+
+
+
+ + + + + - - - - - + + + - - - - -

I am also available on:

-
- - -
-
- - -
+
+ + +
+
+ + +
- - - - - + + + + +
- - \ No newline at end of file + + + \ No newline at end of file diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 02d26942..f77fca71 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -1,647 +1,643 @@ - -
Inquire now! Your 1:1 travel consultant will reply within 1 working day.
- - - - - + + + - - - - + }); + document.querySelector('.expandAll').onclick = function (e) { + let obj = document.querySelector('.expandAll'); + let all_status = obj.getAttribute("collapse-status"); + if (all_status == "hide") { + obj.setAttribute("collapse-status", "show"); + obj.querySelector(".expandAllText").innerHTML = "Collapse All"; + obj.parentNode.querySelectorAll("div[collapse] span[id$='Icon']").forEach(function (icon, i) { + icon.classList.remove('OpenIcon'); + icon.classList.add('CloseIcon'); + }); + obj.parentNode.querySelectorAll("div[collapse-content]").forEach(function (itinerary, i) { + slideDown(itinerary); + }); + obj.parentNode.querySelectorAll("div[collapse]").forEach(function (title, i) { + title.setAttribute("collapse-status", "show"); + }); + } else { + obj.setAttribute("collapse-status", "hide"); + obj.querySelector(".expandAllText").innerHTML = "Expand All"; + obj.parentNode.querySelectorAll("div[collapse] span[id$='Icon']").forEach(function (icon, i) { + icon.classList.remove('CloseIcon'); + icon.classList.add('OpenIcon'); + }); + obj.parentNode.querySelectorAll("div[collapse-content]").forEach(function (itinerary, i) { + slideUp(itinerary); + }); + obj.parentNode.querySelectorAll("div[collapse]").forEach(function (title, i) { + title.setAttribute("collapse-status", "hide"); + }); + } + } + function slideUp(target, duration) { + duration = duration ? duration : 500; + target.style.transitionProperty = 'height, margin, padding'; + target.style.transitionDuration = duration + 'ms'; + target.style.boxSizing = 'border-box'; + target.style.height = target.offsetHeight + 'px'; + target.offsetHeight; + target.style.overflow = 'hidden'; + target.style.height = 0; + target.style.paddingTop = 0; + target.style.paddingBottom = 0; + target.style.marginTop = 0; + target.style.marginBottom = 0; + window.setTimeout(() => { + target.style.display = 'none'; + target.style.removeProperty('height'); + target.style.removeProperty('padding-top'); + target.style.removeProperty('padding-bottom'); + target.style.removeProperty('margin-top'); + target.style.removeProperty('margin-bottom'); + target.style.removeProperty('overflow'); + target.style.removeProperty('transition-duration'); + target.style.removeProperty('transition-property'); + }, duration); + } + + function slideDown(target, duration) { + duration = duration ? duration : 500; + target.style.removeProperty('display'); + let display = window.getComputedStyle(target).display; + if (display === 'none') + display = 'block'; + target.style.display = display; + let height = target.offsetHeight; + target.style.overflow = 'hidden'; + target.style.height = 0; + target.style.paddingTop = 0; + target.style.paddingBottom = 0; + target.style.marginTop = 0; + target.style.marginBottom = 0; + target.offsetHeight; + target.style.boxSizing = 'border-box'; + target.style.transitionProperty = "height, margin, padding"; + target.style.transitionDuration = duration + 'ms'; + target.style.height = height + 'px'; + target.style.removeProperty('padding-top'); + target.style.removeProperty('padding-bottom'); + target.style.removeProperty('margin-top'); + target.style.removeProperty('margin-bottom'); + window.setTimeout(() => { + target.style.removeProperty('height'); + target.style.removeProperty('overflow'); + target.style.removeProperty('transition-duration'); + target.style.removeProperty('transition-property'); + }, duration); + } + + + + \ No newline at end of file diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 61b8e688..6d523b64 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -240,7 +240,6 @@
-
@@ -260,10 +259,9 @@ - - + @@ -347,7 +345,6 @@ - diff --git a/application/views/mobile_first/ah-lantern-festival-gp-form.php b/application/views/mobile_first/ah-lantern-festival-gp-form.php index 73d50799..ec5662fd 100644 --- a/application/views/mobile_first/ah-lantern-festival-gp-form.php +++ b/application/views/mobile_first/ah-lantern-festival-gp-form.php @@ -1,454 +1,448 @@ - +
-

The premium tickets and hotel bookings are filling up quickly. Secure your seats on the tour right now!

+

The premium tickets and hotel bookings are + filling up quickly. Secure your seats on the tour right now!

- -
-
-

Traveler numbers for your group:

-
+ +
+
+

Traveler numbers for your group:

+

Adult & kids (≥8 years old) -

-
- - + + - -
+ +
-
+

- Kids (0-7 years old) -

-
- - + + - -
+ +
-
-
+
+
- - - - - + + + + + + + + - - - - -

I am also available on:

-
- - -
-
- - -
- - +
+ + +
+
+ + +
+ + - - + +
\ No newline at end of file + }); + })(document); + \ No newline at end of file diff --git a/application/views/mobile_first/ah-lantern-form-2025.php b/application/views/mobile_first/ah-lantern-form-2025.php index ffa88512..d95cea48 100644 --- a/application/views/mobile_first/ah-lantern-form-2025.php +++ b/application/views/mobile_first/ah-lantern-form-2025.php @@ -3,7 +3,6 @@

Chiang Mai CAD Yi Peng Festival 2025 Ticket Booking

-

Choose a Date:

@@ -124,10 +123,9 @@ background: #fff;margin-top: 15px; margin-bottom: 20px; display: none;"> - - + @@ -211,7 +209,6 @@ background: #fff;margin-top: 15px; margin-bottom: 20px; display: none;"> - diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 65f3636c..432c4756 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -32,7 +32,6 @@ November 15th, 2024
-
-

Exclusive Add-on: Thai Costume with Makeup & Hairstyle – US$119 per person

@@ -139,10 +138,9 @@ - - + @@ -226,7 +224,6 @@ - diff --git a/application/views/mobile_first/ah-structured-data-article.php b/application/views/mobile_first/ah-structured-data-article.php index 75a180a3..71da38c6 100644 --- a/application/views/mobile_first/ah-structured-data-article.php +++ b/application/views/mobile_first/ah-structured-data-article.php @@ -14,7 +14,8 @@ "dateModified": "", "author": { "@type": "Person", - "name": "" + "name": "", + "url": "" }, "publisher": { "@type": "Organization", diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php index dd126da8..b680654e 100644 --- a/application/views/mobile_first/ah-tour-list-form.php +++ b/application/views/mobile_first/ah-tour-list-form.php @@ -1,559 +1,549 @@ + src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja">
-
-
-

Inquire now. Your 1:1 travel consultant will - reply within 1 working day.

- - - - -
-

- How would you travel? -

- -
- - -
-
- - -
-
- - -
-
- - -
+
+
+

Inquire now. Your 1:1 travel consultant will + reply within 1 working day.

+ + + + +
+

+ How would you travel? +

+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
-

- When would you travel? + When would you travel?

- -
+
+ + +
+
+ + +
+ + + + + + +
+
- - + + + \ No newline at end of file diff --git a/application/views/mobile_first/ch-h1.php b/application/views/mobile_first/ch-h1.php index 6b7caeef..c4ebee35 100644 --- a/application/views/mobile_first/ch-h1.php +++ b/application/views/mobile_first/ch-h1.php @@ -5,8 +5,8 @@ @@ -21,28 +21,28 @@

- 'https://www.globalhighlights.com/aboutus/team/ruru-zhou', - '2' => 'https://www.globalhighlights.com/aboutus/team/ruru-zhou', - 'HWT' => 'https://www.globalhighlights.com/aboutus/team/mike-he', - 'CA' => 'https://www.globalhighlights.com/aboutus/team/carol-wang', - 'SI' => 'https://www.globalhighlights.com/aboutus/team/simon-huang', - 'TJQ' => 'https://www.globalhighlights.com/aboutus/team/cindy-tang', - 'CLA' => 'https://www.globalhighlights.com/aboutus/team/claire-wang', - 'Albee' => 'https://www.globalhighlights.com/aboutus/team/albee-ning', - 'KM' => 'https://www.globalhighlights.com/aboutus/team/kimi-huang', - 'RY' => 'https://www.globalhighlights.com/aboutus/team/rita-yu', - 'QMY' => 'https://www.globalhighlights.com/aboutus/team/chris-quan', - 'CY' => 'https://www.globalhighlights.com/aboutus/team/cynthia-li', - 'Vicky' => 'https://www.globalhighlights.com/aboutus/team/vicky-leng', - 'LXW' => 'https://www.globalhighlights.com/aboutus/team/carper-li', - 'zzyGH' => 'https://www.globalhighlights.com/aboutus/team/ruru-zhou', + 'zzy' => 'https://www.chinahighlights.com/aboutus/team/ruru-zhou.htm', + '2' => 'https://www.chinahighlights.com/aboutus/team/ruru-zhou.htm', + 'HWT' => 'https://www.chinahighlights.com/aboutus/team/mike-he.htm', + 'CA' => 'https://www.chinahighlights.com/aboutus/team/carol-wang.htm', + 'SI' => 'https://www.chinahighlights.com/aboutus/team/simon-huang.htm', + 'TJQ' => 'https://www.chinahighlights.com/aboutus/team/cindy-tang.htm', + 'CLA' => 'https://www.chinahighlights.com/aboutus/team/claire-wang.htm', + 'Albee' => 'https://www.chinahighlights.com/aboutus/team/albee-ning.htm', + 'KM' => 'https://www.chinahighlights.com/aboutus/team/kimi-huang.htm', + 'RY' => 'https://www.chinahighlights.com/aboutus/team/rita-yu.htm', + 'QMY' => 'https://www.chinahighlights.com/aboutus/team/chris-quan.htm', + 'CY' => 'https://www.chinahighlights.com/aboutus/team/cynthia-li.htm', + 'Vicky' => 'https://www.chinahighlights.com/aboutus/team/vicky-leng.htm', + 'LXW' => 'https://www.chinahighlights.com/aboutus/team/carper-li.htm', + 'zzyGH' => 'https://www.chinahighlights.com/aboutus/team/ruru-zhou.htm', ]; $OPI_Code = empty($OPI_Code) ? '' : $OPI_Code; if (!empty($meta_news_createdate)) {?>
- Written by + Written by diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index d8fb4b1d..594a4377 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -267,258 +267,248 @@ margin-top: 5px;font-size: 18px;
+
+

0-2 yrs old

+ +
+
+
- - - - + + + + - - - + + + -

I am also available on:

-
- - -
-
- - -
+
+ + +
+
+ + +
- - - - + + + +
- - + + \ No newline at end of file + \ No newline at end of file diff --git a/application/views/mobile_first/jh-inquiry-form.php b/application/views/mobile_first/jh-inquiry-form.php index ea0925ec..231c14c8 100644 --- a/application/views/mobile_first/jh-inquiry-form.php +++ b/application/views/mobile_first/jh-inquiry-form.php @@ -260,10 +260,9 @@ - - + @@ -347,7 +346,6 @@ - diff --git a/application/views/mobile_first/jh-structured-data-article.php b/application/views/mobile_first/jh-structured-data-article.php index eca912e4..c57239a9 100644 --- a/application/views/mobile_first/jh-structured-data-article.php +++ b/application/views/mobile_first/jh-structured-data-article.php @@ -14,7 +14,8 @@ "dateModified": "", "author": { "@type": "Person", - "name": "" + "name": "", + "url": "" }, "publisher": { "@type": "Organization",