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

hotfix/paypal-note
candice 3 years ago
commit f280e048f7

@ -678,6 +678,13 @@ class Information extends CI_Controller
array('information' => $information, 'author' => $author), array('information' => $information, 'author' => $author),
true); true);
$template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template); $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 { } else {
$template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template); $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); $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true);

@ -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 } ?>

@ -187,12 +187,7 @@
<!--@HEAD_1@--> <!--@HEAD_1@-->
<div id="main_content_pc"> <div id="main_content_pc">
<div class="pc_content"> <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> <article>
<!--@TRAIN-SEARCH@--> <!--@TRAIN-SEARCH@-->
<!--@CUSTOM-CONENT@--> <!--@CUSTOM-CONENT@-->

@ -198,12 +198,7 @@
<!--@TOP-VIDEO@--> <!--@TOP-VIDEO@-->
<!--@HEAD_1@--> <!--@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"> <div id="main_content_mobile">
<article> <article>
<!--@TRAIN-SEARCH@--> <!--@TRAIN-SEARCH@-->

Loading…
Cancel
Save