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

application/controllers/information.php

@@ -678,6 +678,13 @@ class Information extends CI_Controller
                 array('information' => $information, 'author' => $author),
                 true);
             $template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
+
+            
+            $article_top_image_content = $this->load->view(
+                $template_path . '-info-top-img',
+                array('information' => $information),
+                true);
+            $template = str_replace('<!--@INFO-TOP-IMAGE@-->', $article_top_image_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/mobile_first/ch-h1.php

@@ -1,8 +1,6 @@
 
 <div class="topcontent">
     <section>
-        
-
     <div class="infocategory">
         <a href="/" data-count="<?php echo count($breadcrumb_data) ?>">Home</a>
         <?php foreach ($breadcrumb_data as $index => $item) {?>
@@ -11,8 +9,7 @@
     </div>
     <h1><?php echo !empty($ic_title)?$ic_title:'H1 title Chinahighlights mobile first template'; ?></h1>
     <!--<p class="subheadline">to do</p> -->
-    <div class="authorupdate">By <strong><?php echo !empty($author)?$author->OPI_FirstName:'author nickname'; ?></strong>Updated <?php echo date("M. j, Y",time()); ?></div>
+    <div class="authorupdate">Written by <strong><?php echo !empty($author)?$author->OPI_FirstName:'author nickname'; ?></strong>Updated <?php echo date("M. j, Y",time()); ?></div>
- 
     <?php if ($ads_by_google) { ?>
     <style>
     #adsense-head-ads {

application/views/mobile_first/ch-info-top-img.php

@@ -0,0 +1,6 @@
+<?php if (!empty($ic_photo)) { ?>
+    <div class="infotopimage">
+        <img src="<?php echo 'https://images.chinahighlights.com'.$ic_photo; ?>"
+            alt="<?php echo !empty($ic_title)?$ic_title:'H1 title Chinahighlights mobile first template'; ?>" class="img-responsive">
+    </div>
+<?php } ?>

application/views/mobile_first/ch-pc.php

@@ -187,12 +187,7 @@
     <!--@HEAD_1@-->
     <div id="main_content_pc">
         <div class="pc_content">      
-            <?php if (!empty($ic_photo)) { ?>
+            <!--@INFO-TOP-IMAGE@-->
-                <div class="infotopimage">
-                    <img src="<?php echo 'https://images.chinahighlights.com'.$ic_photo; ?>"
-                         alt="<?php echo !empty($ic_title)?$ic_title:'H1 title Chinahighlights mobile first template'; ?>" class="img-responsive">
-                </div>
-            <?php } ?>
 <article>
             <!--@TRAIN-SEARCH@-->
             <!--@CUSTOM-CONENT@-->
@@ -201,16 +196,16 @@
         <!--@TIPS-RIGHT-TOP@-->
         <!--@TIPS-RIGHT@-->
     </div>
+</div>
+
+<!--PC底部-->
+<div class="infobottom">
     <div id="main_content_next">
         <section>
         <!--@Match-Content-GOOGLE###ycc###@-->
         <!--@ARTICLENEXT@-->
         </section>
     </div>
-</div>
-
-<!--PC底部-->
-<div class="infobottom">
     <div class="infotailor"><div class="form_content_bg"></div>
 <div class="form_content">
   <div class="formtitle">
@@ -229,7 +224,7 @@
 </div>
 
     <div class="footerbox">
-
+<div class="list_content">
         <div class="aboutusleft">
 
             <div class="bottomaboutus">
@@ -334,11 +329,10 @@
             </div>
         </div>
     </div>
-</div>
+</div></div>
 
 <div class="bottomlogo">
-    <div class="footerbox">
+    <div class="list_content">
-
         <img src="https://data.chinahighlights.com/grey.gif"
              originalsrc="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
              width="114"
@@ -348,9 +342,7 @@
         <span class="bottomcopyright">© 1998-2022 China Highlights — Discovery Your Way!  </span>
         <span class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a>  |  <a
                     href="/aboutus/terms.htm">Terms</a></span>
-
+</div></div>
-    </div>
-</div>
 <div class="web_cookie" style='display: none;' id='gotIdArea'><p>China Highlights uses cookies to give you the best
         possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a
                 href="/privacy.htm">privacy policy</a>.</p>

application/views/mobile_first/ch.php

@@ -198,12 +198,7 @@
 <!--@TOP-VIDEO@-->
 
 <!--@HEAD_1@-->
-<?php if (!empty($ic_photo)) { ?>
+<!--@INFO-TOP-IMAGE@-->
-            <div class="infotopimage">
-                <img src="<?php echo 'https://images.chinahighlights.com'.$ic_photo; ?>"
-                     alt="<?php echo !empty($ic_title)?$ic_title:'H1 title Chinahighlights mobile first template'; ?>" class="img-responsive">
-            </div>
-        <?php } ?>
 <div id="main_content_mobile">
   <article>
     <!--@TRAIN-SEARCH@-->