diff --git a/application/controllers/information.php b/application/controllers/information.php index 0104a84c..dd6f73aa 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -714,20 +714,27 @@ class Information extends CI_Controller $template = str_replace('', $information->ic_seo_keywords, $template); $template = str_replace('', $this->config->item('site_url') . $information->ic_url, $template); - //顶部全屏大图 - if ($device == 'mobile') { //移动端读取移动大图 - $data['meta_addon_picture'] = get_meta($information->ic_id, 'meta_addon_picture_mobile'); - } else { - $data['meta_addon_picture'] = get_meta($information->ic_id, 'meta_addon_picture'); + //顶部视频 + $data['meta_news_video'] = get_meta($information->ic_id, 'meta_news_video'); + $data['meta_video_picture'] = get_meta($information->ic_id, 'meta_video_picture'); + if (empty($data['meta_news_video']) && empty($data['meta_video_picture'])) { + //没有顶部视频时候才读取全屏大图 + //顶部全屏大图 + if ($device == 'mobile') { //移动端读取移动大图 + $data['meta_addon_picture'] = get_meta($information->ic_id, 'meta_addon_picture_mobile'); + } else { + $data['meta_addon_picture'] = get_meta($information->ic_id, 'meta_addon_picture'); + } + $data['meta_addon_picture_url'] = get_meta($information->ic_id, 'meta_addon_picture_url'); } - $data['meta_addon_picture_url'] = get_meta($information->ic_id, 'meta_addon_picture_url'); + $data['author'] = $this->Operator_model->get_author_nikename($information->ic_author); //获取作者信息 $template_H1 = $this->load->view($template_path . '-h1', $data, TRUE); $template = str_replace('', $template_H1, $template); //推荐信息或者产品 - //信息推荐 暂时不用，未来用广告系统替代 + //信息推荐 $template_recommand = $this->recommand_information($information); $template = str_replace('', $this->load->view($template_path . '-next', array('recommands'=>$template_recommand), TRUE), $template); //广告，改叫tips，防止被插件屏蔽 diff --git a/application/helpers/info_helper.php b/application/helpers/info_helper.php index 71e52c41..c392c9ae 100644 --- a/application/helpers/info_helper.php +++ b/application/helpers/info_helper.php @@ -368,4 +368,10 @@ function compress_css($buffer) /* remove tabs, spaces, newlines, etc. */ $buffer = str_replace(array("\r\n", "\r", "\n", "\t", ' ', ' ', ' '), '', $buffer); return $buffer; +} + +//把临时多媒体中心预览图片地址替换为网前地址 +function replace_image_url($ic_content){ + $CI = &get_instance(); + return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'),$ic_content); } \ No newline at end of file diff --git a/application/third_party/recommend/controllers/tips.php b/application/third_party/recommend/controllers/tips.php index dccf2cd0..42ca9e1c 100644 --- a/application/third_party/recommend/controllers/tips.php +++ b/application/third_party/recommend/controllers/tips.php @@ -77,7 +77,7 @@ class Tips extends CI_Controller $infoTip->it_title = $this->input->post('it_title'); $infoTip->it_expires = strtotime($this->input->post('it_expires')); $infoTip->it_code = $this->input->post('it_code'); - $infoTip->it_content = $this->input->post('it_content'); + $infoTip->it_content = replace_image_url($this->input->post('it_content')); $infoTip->it_datetime = time(); $infoTip->it_id = $this->infoTips_model->update('infoTips', $infoTip, 'it_id=' . $it_id); $data[] = array('name' => 'ok', 'value' => '保存成功！'); diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 02f4ef3a..1204310f 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -142,7 +142,7 @@
  • AMP转化检查
  • Html基础知识
  • AMP知识
    • -
  • 添加信息分组
    • +
  • AMP操作SOP
  • HTML构建工具V3
  • PS基础课件
    • diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index 03cde613..006e095d 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -1,8 +1,13 @@
    - <?php echo !empty($information->ic_title)?$information->ic_title:'H1 title asiahighlights mobile first template'; ?> + + + + + <?php echo !empty($information->ic_title)?$information->ic_title:'H1 title asiahighlights mobile first template'; ?> +
    diff --git a/application/views/mobile_first/ah-next.php b/application/views/mobile_first/ah-next.php index cccfe665..d5de775f 100644 --- a/application/views/mobile_first/ah-next.php +++ b/application/views/mobile_first/ah-next.php @@ -1,9 +1,15 @@
    +

    More Travel Ideas and Inspiration

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

    Get Inspired with Our Sample Itineraries

    At Asia Highlights, we create your kind of journey — your dates, your destinations, at your pace. You can have any trip tailor made for your travel.

    +
    + + + + + + + + + +
    - +
    - +
    - +
    - +
    +
    + -
    +
    \ No newline at end of file diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 7260d561..cbd7a131 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -51,18 +51,18 @@
    @@ -136,7 +136,7 @@
  • About Us
    • -
  • Contact Us +
  • Contact Us
  • @@ -205,7 +205,7 @@
    About Us
    -
    At Asia Highlights, we create your kind of journey — your dates, your destinations, at your pace. Not just any journey, but the unique trip with the exceptional experiences you're looking for — whether it's a family vacation, a honeymoon, or your annual break. more +
    At Asia Highlights, we create your kind of journey — your dates, your destinations, at your pace. Not just any journey, but the unique trip with the exceptional experiences you're looking for — whether it's a family vacation, a honeymoon, or your annual break. more ...
    diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index b13791e8..24c4caee 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -36,7 +36,7 @@
    - Contact Us