From 595e146c60df589da83ccfd134d39e87f336b902 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 19 Aug 2022 15:29:32 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=87=AA=E5=8A=A8=E6=92=AD=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-next.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/application/views/mobile_first/gh-next.php b/application/views/mobile_first/gh-next.php index 4be343e7..95e324a4 100644 --- a/application/views/mobile_first/gh-next.php +++ b/application/views/mobile_first/gh-next.php @@ -291,10 +291,7 @@ var articleSwiper = new Swiper("#articleSwiper", { keyboard: true, slidesPerView: slidesPerView, loop: true, - autoplay: { - delay: 3000, - disableOnInteraction: false - }, + autoplay: false, navigation: { nextEl: "#article-swiper-button-next", prevEl: "#article-swiper-button-prev" @@ -309,10 +306,7 @@ var tourSwiper = new Swiper("#tourSwiper", { keyboard: true, slidesPerView: slidesPerView, loop: true, - autoplay: { - delay: 3000, - disableOnInteraction: false - }, + autoplay: false, navigation: { nextEl: "#tour-swiper-button-next", prevEl: "#tour-swiper-button-prev" From d9545594cdb7e872231b95ac5ca7a148ed5a7f5b Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 22 Aug 2022 09:52:38 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20GH=20=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E5=90=8D=E5=AD=97=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E4=BD=9C=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 3 ++- application/views/mobile_first/gh-structured-data-article.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 5d43c318..d65b6b89 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1019,6 +1019,7 @@ class Information extends CI_Controller $data_H1['infocategory'] = $this->Information_model->get_detail_by_path($information->is_path, 1); //信息所属分类，获取信息顶级节点内容 $data_H1['author'] = ''; //获取作者信息 $author = $this->Operator_model->get_author_nikename($information->ic_author); + if(!empty($author)){ $data_H1['author']=$author->OPI_FirstName; }else{ @@ -1041,7 +1042,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']), true); $template = str_replace('', $article_structured_data_content, $template); diff --git a/application/views/mobile_first/gh-structured-data-article.php b/application/views/mobile_first/gh-structured-data-article.php index 2b03ebbe..4f345911 100644 --- a/application/views/mobile_first/gh-structured-data-article.php +++ b/application/views/mobile_first/gh-structured-data-article.php @@ -14,7 +14,7 @@ "dateModified": "", "author": { "@type": "Person", - "name": "OPI_FirstName; ?>" + "name": "" }, "publisher": { "@type": "Organization", From 17cc046f25859196ebc2d885317bca7d86438ac9 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 22 Aug 2022 14:11:44 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=B0=B4=E7=81=AF=E8=8A=82?= =?UTF-8?q?=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 3 + .../ah-lantern-form-info-page.php | 766 ++++++++++++++++++ 2 files changed, 769 insertions(+) create mode 100644 application/views/mobile_first/ah-lantern-form-info-page.php diff --git a/application/controllers/information.php b/application/controllers/information.php index d65b6b89..6f9e5607 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1297,6 +1297,9 @@ class Information extends CI_Controller // 水灯节表单 $lantern_form_content = $this->load->view($template_path . '-lantern-form', false, true); $information->ic_content = str_replace('', $lantern_form_content, $information->ic_content); + // 水灯节在信息页面表单 + $lantern_form_info_page_content = $this->load->view($template_path . '-lantern-form-info-page', false, true); + $information->ic_content = str_replace('', $lantern_form_info_page_content, $information->ic_content); // GP 表单 $gp_form_content = $this->load->view($template_path . '-gp-form', false, true); diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php new file mode 100644 index 00000000..52de90de --- /dev/null +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -0,0 +1,766 @@ +
+ +

Get Your 2022 Chiang Mai CAD Lantern Mass Release + Tickets Here!

+
+

Select Date

+
+
+ + +
+
+ + +
+
+

Select Ticket Type

+
+
+ + +
+
+ + +
+
+ + +
+
+

Select Quantity

+
+ + Adults and older children (8+ years old) + +
+ + + +
+
+

Children under 8 years old enter free; 8-year-olds and above are charged the same as adults.

+
Total price: $170
+

Please provide correct personal information for your ticket + booking. Double + check.

+ + + + + + + + + + + + +

+ Having a phone number, especially with WhatsApp/iMessage capability will improve communication efficiency.

+

I prefer to be contacted via:

+ +
+ + +
+
+ + +
+
+ + +
+ + + + +
+
+ + \ No newline at end of file From 1986b1dfcbc1b4eddf89b58775c81b91abf6d3b1 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 22 Aug 2022 15:04:41 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E4=BB=A3=E5=8F=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form-info-page.php | 1 + application/views/mobile_first/ah-lantern-form.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index 52de90de..d57d787d 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -668,6 +668,7 @@ + diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 1c1081c5..e1584e1b 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -667,6 +667,7 @@ + From e861de3d02a4b427b7270161375a1b82fe86641e Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 22 Aug 2022 15:14:35 +0800 Subject: [PATCH 05/23] 11 --- application/views/mobile_first/ah-lantern-form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index e1584e1b..ec746379 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -667,7 +667,7 @@ - + From 01356a5e3ddcc7f1632ab6901a509a07e00daf80 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 24 Aug 2022 11:02:51 +0800 Subject: [PATCH 06/23] 11 --- application/views/mobile_first/ah-gp-form.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/views/mobile_first/ah-gp-form.php b/application/views/mobile_first/ah-gp-form.php index 46b3689e..632add61 100644 --- a/application/views/mobile_first/ah-gp-form.php +++ b/application/views/mobile_first/ah-gp-form.php @@ -622,6 +622,8 @@ + +

Poland   +48 - + diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 1200b84c..cef577bc 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -425,10 +425,10 @@ + - - + diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 4ed0528f..d4889010 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -424,7 +424,7 @@ - + diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index d57d787d..e7217316 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -489,7 +489,7 @@ - + diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index ec746379..ce7a181c 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -489,7 +489,7 @@ - + From 43833e0bc5d1d1e647c85a1247bb539585d92c7f Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 26 Aug 2022 15:12:37 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=92=8C=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E4=BD=8D=E7=BD=AE=E4=BA=92=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-next.php | 294 +++++++++++---------- 1 file changed, 148 insertions(+), 146 deletions(-) diff --git a/application/views/mobile_first/gh-next.php b/application/views/mobile_first/gh-next.php index 95e324a4..925ece24 100644 --- a/application/views/mobile_first/gh-next.php +++ b/application/views/mobile_first/gh-next.php @@ -1,3 +1,151 @@ + + + +

Recommended Tours

+ +
+
+ + +
+ +
+ + + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + + +
+
+
+
+
+ + + +

Recommended Articles

@@ -133,153 +281,7 @@ - - - -

Recommended Tours

- -
-
- - -
- -
- - - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - -
- -
- - - -
- -
- - - -
- -
- - - - -
-
-
-
-
- - - From 3d5eda7debcc01607aa9d758e9e1fdd1d32bd4ab Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 29 Aug 2022 10:17:25 +0800 Subject: [PATCH 09/23] =?UTF-8?q?QI=20=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- application/views/mobile_first/ah-inquiry-form.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 6f9e5607..923fdb2c 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1277,7 +1277,7 @@ class Information extends CI_Controller $template = str_replace('', '', $template); $inquiry_form_template = $this->load->view( $template_path . '-inquiry-form', - array('meta_product_code' => $meta_product_code, 'ic_seo_title' => $information->ic_seo_title), + array('meta_product_code' => $meta_product_code, 'information' => $information), true); $information->ic_content = str_replace('', $inquiry_form_template, $information->ic_content); } diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 4ed0528f..21a7e55d 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -600,7 +600,7 @@ - +

Inquire Now - +

+ diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index ce7a181c..e2ed25a5 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -668,6 +668,7 @@ + From 8bc4f4f50828c173038fbf8666d109ca20c2d3fc Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 31 Aug 2022 16:35:52 +0800 Subject: [PATCH 12/23] 11 --- application/views/mobile_first/gh-pc.php | 269 ++++++++++++++++++++++- application/views/mobile_first/gh.php | 269 ++++++++++++++++++++++- 2 files changed, 528 insertions(+), 10 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index ff53ac17..2b73525e 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -199,15 +199,274 @@ height="0" width="0" style="display:none;visibility:hidden">

+ placeholder="Your name *" required="" type="text">

+ placeholder="Email *" required type="text">

-

+

+ +

- +

Having a phone number, especially with WhatsApp/iMessage capability will improve communication + efficiency.

+

I prefer to be contacted via:

+
+
+
diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index f272e32e..d5e8608e 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -169,15 +169,274 @@ aria-label="festival">

+ placeholder="Your name *" required="" type="text">

+ placeholder="Email *" required type="text">

-

+

+ +

- +

Having a phone number, especially with WhatsApp/iMessage capability will improve communication + efficiency.

+

I prefer to be contacted via:

+
+
+
From 6aec3f7959ae6aac5443cf4b5356d7e1890120e0 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 31 Aug 2022 16:36:28 +0800 Subject: [PATCH 13/23] 11 --- application/views/mobile_first/gh-pc.php | 3 --- application/views/mobile_first/gh.php | 5 ----- 2 files changed, 8 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 2b73525e..5bae7211 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -188,10 +188,7 @@ height="0" width="0" style="display:none;visibility:hidden">
- -
-

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index d5e8608e..527ecc77 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -150,15 +150,10 @@ aria-label="festival">
- - - - -
From ce2c73e39ca72790c74e40af24386a9c99483b9e Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 31 Aug 2022 17:14:39 +0800 Subject: [PATCH 14/23] 11 --- .../views/mobile_first/ch-inquiry-form.php | 613 +++++++++++++++++- 1 file changed, 585 insertions(+), 28 deletions(-) diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index 7cdd546d..2047fade 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -1,19 +1,14 @@
-
-
- - china highlights' wechat code -
Quickly inquire about this tour via our WeChat: chinahighlightstour -
-
-

Or submit an inquiry below

+ + +

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

+

* @@ -29,28 +24,590 @@

-

- -

- + + * +

- - * -

- - - - + +

+

Having a phone number, especially with WhatsApp/iMessage capability will improve communication efficiency.

+

I prefer to be contacted via:

+
+ + +
+
+ + +
+ Inquiry
-
\ No newline at end of file + +
+ + china highlights' wechat code +
Quickly inquire about this tour via our WeChat: chinahighlightstour +
+
+ +
\ No newline at end of file From 34bf4c637fbaf08b302f6082d3053e11037dc62a Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 31 Aug 2022 17:17:27 +0800 Subject: [PATCH 15/23] 11 --- .../views/mobile_first/ch-info-page-form.php | 627 +++++++++++++++++- 1 file changed, 609 insertions(+), 18 deletions(-) diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php index 97e15bac..c2f488b8 100644 --- a/application/views/mobile_first/ch-info-page-form.php +++ b/application/views/mobile_first/ch-info-page-form.php @@ -1,23 +1,614 @@
-
china highlights' wechat code -
Quickly inquire via our WeChat: chinahighlightstour
-
- -

Or Submit an Inquiry Below

- -
-
-

*

- -

*

- -

- -

*

- -
+ + + +

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

+ + +
+ +

+ + * + + +

+ +

+ + * + + + +

+

+ + * +

+

+ +

+

Having a phone number, especially with WhatsApp/iMessage capability will improve communication efficiency.

+

I prefer to be contacted via:

+
+ + +
+
+ + +
+ + +
-
+ +
+ + china highlights' wechat code +
Quickly inquire about this tour via our WeChat: chinahighlightstour +
+
+ +
+ + @@ -780,4 +780,4 @@ document.addEventListener('DOMContentLoaded', () => { - \ No newline at end of file + From 577ae3fc39c071f29afa53e44ff9e5a3b92553f2 Mon Sep 17 00:00:00 2001 From: hainatravel Date: Thu, 8 Sep 2022 09:35:24 +0800 Subject: [PATCH 23/23] Update gh.php --- application/views/mobile_first/gh.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index 527ecc77..b20d6093 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -16,14 +16,14 @@ - - + + @@ -736,4 +736,4 @@ document.addEventListener('DOMContentLoaded', () => { - \ No newline at end of file +