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

application/controllers/information.php

@@ -941,26 +941,6 @@ class Information extends CI_Controller
         $template = str_replace('<!--@KEYWORDS@-->', $information->ic_seo_keywords, $template);
         $template = str_replace('<!--@CANONICAL@-->', $this->config->item('site_url') . $information->ic_url, $template);
 
-        // 动态加载反馈标签
-        // HTLM: <div><!--@FEEDBACK_Shanghai@--></div>
-        // 解析结果：<!--@FEEDBACK_Shanghai@-->, Shanghai
-        $feedback_array = [];
-        preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $information->ic_content, $feedback_array);
-        if (!empty($feedback_array)) {
-            foreach ($feedback_array[0] as $index => $tag_name) {
-                $city_name = $feedback_array[1][$index];
-                $feedback_data = $this->Feedback_model->get_feedback_by_city($city_name);
-                $feedback_content = $this->load->view(
-                    $template_path . '-feedback',
-                    array('feedback_data' => $feedback_data),
-                    true);
-                $information->ic_content = str_replace(
-                    $tag_name,
-                    $feedback_content,
-                    $information->ic_content);
-            }
-        }
-
         //顶部全屏大图
         if ($device == 'mobile') { //移动端读取移动大图
             $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture_mobile');
@@ -988,11 +968,11 @@ class Information extends CI_Controller
 //            $addthis_widget = $this->load->view($template_path . '-add-this', false, true);
 //            $template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template);
 
-//            $article_structured_data_content = $this->load->view(
-//                $template_path . '-structured-data-article',
-//                array('information' => $information, 'author' => $author),
-//                true);
-//            $template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
+           $article_structured_data_content = $this->load->view(
+               $template_path . '-structured-data-article',
+               array('information' => $information, 'author' => $author),
+               true);
+           $template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
         } else {
 //            $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template);
 //            $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true);

application/views/bootstrap3/information_edit.php

@@ -921,7 +921,7 @@
                                     <option value="contactus" <?php echo get_meta($information->ic_id, 'meta_ct_page_type') === 'contactus' ? 'selected' : false; ?>>
                                         ContactUs表单
                                     </option>
-                                    <option value="contactus" <?php echo get_meta($information->ic_id, 'meta_ct_page_type') === 'pagewithform' ? 'selected' : false; ?>>
+                                    <option value="pagewithform" <?php echo get_meta($information->ic_id, 'meta_ct_page_type') === 'pagewithform' ? 'selected' : false; ?>>
                                         带表单信息页
                                     </option>
                                 </select>

application/views/mobile_first/gh-next.php

@@ -2,7 +2,7 @@
 
     <h2 style="text-align: center;">Recommended Articles</h2>
 
-    <div class="swiper" id='recommendedArticles'>
+    <div class="swiper" id='articleSwiper'>
         <div class="swiper-wrapper">
 
             <?php if (!empty($recommands['Article A'])) { ?>
@@ -198,9 +198,9 @@
             <?php } ?>
 
         </div>
-        <div class="swiper-button-next"></div>
-        <div class="swiper-button-prev"></div>
-        <div class="swiper-pagination"></div>
+        <div class="swiper-button-next" id='article-swiper-button-next'></div>
+        <div class="swiper-button-prev" id='article-swiper-button-prev'></div>
+        <div class="swiper-pagination" id='article-swiper-pagination'></div>
     </div>
 <?php } ?>
 
@@ -210,7 +210,7 @@
 
     <h2 style="text-align: center;">Recommended Tours</h2>
 
-    <div class="swiper" id='recommendedArticles'>
+    <div class="swiper" id='tourSwiper'>
         <div class="swiper-wrapper">
 
             <?php if (!empty($recommands['Tour A'])) { ?>
@@ -345,9 +345,9 @@
 
 
         </div>
-        <div class="swiper-button-next"></div>
-        <div class="swiper-button-prev"></div>
-        <div class="swiper-pagination"></div>
+        <div class="swiper-button-next" id='tour-swiper-pagination'></div>
+        <div class="swiper-button-prev" id='tour-swiper-pagination'></div>
+        <div class="swiper-pagination" id='tour-swiper-pagination'></div>
     </div>
 
 
@@ -357,17 +357,31 @@
 <script src="https://data.globalhighlights.com/js/swiper-bundle-7.0.9.min.js"></script>
 <!-- Initialize Swiper -->
 <script>
-    var swiper = new Swiper("#recommendedArticles", {
-        cssMode: true,
-        keyboard: true,
-        slidesPerView: 4,
-        navigation: {
-            nextEl: ".swiper-button-next",
-            prevEl: ".swiper-button-prev"
-        },
-        pagination: {
-            el: ".swiper-pagination",
-            clickable: true
-        }
-    });
+var slidesPerView = window.gh_template_name === 'mobile' ? 1 : 4;
+var articleSwiper = new Swiper("#articleSwiper", {
+    cssMode: true,
+    keyboard: true,
+    slidesPerView: slidesPerView,
+    navigation: {
+        nextEl: "#article-swiper-button-next",
+        prevEl: "#article-swiper-button-prev"
+    },
+    pagination: {
+        el: "#article-swiper-pagination",
+        clickable: true
+    }
+});
+var tourSwiper = new Swiper("#tourSwiper", {
+    cssMode: true,
+    keyboard: true,
+    slidesPerView: slidesPerView,
+    navigation: {
+        nextEl: "#tour-swiper-button-next",
+        prevEl: "#tour-swiper-button-prev"
+    },
+    pagination: {
+        el: "#tour-swiper-pagination",
+        clickable: true
+    }
+});
 </script>

application/views/mobile_first/gh-pc.php

@@ -29,6 +29,11 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
 })(window,document,'script','dataLayer','GTM-MNKHRM5');</script>
 <!-- End Google Tag Manager -->
+<script>
+(function(w){
+  w.gh_template_name = w.gh_template_name || 'desktop';
+})(window);
+</script>
 </head>
 
 <body>
@@ -89,24 +94,18 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                 <li class="dropdown"><a href="/about" class="p_topnavilink" >About Us</a></li>
                 <li class="dropdown" style="padding-top: 25px;"><a href="/contactus" class="p_topnavilink contactbutton" >Contact Us</a>
                 </li>
-                <!--
                 <li class="dropdown">
                     <div class="siteSearch">
-                        <form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi"
-                              name="googlesreach" action="https://www.asiahighlights.com/sitesearch">
-                            <input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
-                            <input type="hidden" value="FORID:9" name="cof">
+                        <form class="searchtextbox" id="searchbox_44a5ad0e15d0ad976"
+                              name="googlesreach" action="https://www.globalhighlights.com/sitesearch">
                             <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search"
                                    name="q" style="width: 225px;">
                             <input type="image" class="submits"
                                    src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png"
                                    width="25px">
-                            <input type="hidden" name="__ftoken__"
-                                   value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a">
                         </form>
                     </div>
                 </li>
-                -->
             </ul>
         </div>
     </div>
@@ -424,6 +423,22 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     ]
 }
 </script>
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "WebSite",
+  "url": "https://www.globalhighlights.com/",
+  "potentialAction": {
+      "@type": "SearchAction",
+      "target": {
+        "@type": "EntryPoint",
+        "urlTemplate": "https://www.globalhighlights.com/sitesearch?q={search_term_string}"
+      },
+      "query-input": "required name=search_term_string"
+    }
+  }
+</script>
+<!--@STRUCTURED-DATA-BREADCRUMB-BLOCK@-->
+<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->
 </body>
-
 </html>

application/views/mobile_first/gh-structured-data-article.php

@@ -0,0 +1,28 @@
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "Article",
+  "mainEntityOfPage": {
+    "@type": "WebPage",
+    "@id": "https://www.asiahighlights.com<?php echo $information->ic_url; ?>"
+  },
+  "headline": "<?php echo $information->ic_seo_title; ?>",
+  "image": [
+    "https://images.asiahighlights.com<?php echo $information->ic_photo; ?>"
+    ],
+  "datePublished": "<?php echo $information->is_datetime; ?>",
+  "dateModified": "<?php echo date('Y-m-d\TH:i:s'); ?>",
+  "author": {
+    "@type": "Person",
+    "name": "<?php echo $author->OPI_FirstName; ?>"
+  },
+    "publisher": {
+    "@type": "Organization",
+    "name": "China Highlights",
+    "logo": {
+      "@type": "ImageObject",
+      "url": "https://data.asiahighlights.com/pic/logo-ah.png"
+    }
+  }
+}
+</script>

application/views/mobile_first/gh.php

@@ -23,7 +23,11 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
 })(window,document,'script','dataLayer','GTM-MNKHRM5');</script>
     <!-- End Google Tag Manager -->
-
+<script>
+(function(w){
+  w.gh_template_name = w.gh_template_name || 'mobile';
+})(window);
+</script>
 </head>
 <body>
 <!-- Google Tag Manager (noscript) -->
@@ -45,19 +49,15 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
 
 <nav id="ml-menu" class="menu">
-    <!--
+
     <div class="siteSearch">
-        <form id="searchbox_001281624266240652297:cl1fy1cxepi" name="googlesreach"
-              action="https://www.asiahighlights.com/sitesearch">
-            <input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
-            <input type="hidden" value="FORID:9" name="cof">
+        <form id="searchbox_44a5ad0e15d0ad976" name="googlesreach"
+              action="https://www.globalhighlights.com/sitesearch">
             <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
             <input type="image" class="submits"
-                   src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png">
-            <input type="hidden" name="__ftoken__"
-                   value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a"></form>
+                   src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png"></form>
     </div>
--->
+
     <button class="action action--close" aria-label="Close Menu"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"></path><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z" fill="var(--c-text-secondary)"></path></svg></button>
     <div class="menu__wrap">
         <ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All">
@@ -372,5 +372,22 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     ]
 }
 </script>
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "WebSite",
+  "url": "https://www.globalhighlights.com/",
+  "potentialAction": {
+      "@type": "SearchAction",
+      "target": {
+        "@type": "EntryPoint",
+        "urlTemplate": "https://www.globalhighlights.com/sitesearch?q={search_term_string}"
+      },
+      "query-input": "required name=search_term_string"
+    }
+  }
+</script>
+<!--@STRUCTURED-DATA-BREADCRUMB-BLOCK@-->
+<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->
 </body>
 </html>