From 708e27025050105cf7de3be8eebfed3fb9061de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Thu, 1 Feb 2018 10:51:02 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0AMP=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/amp.php               |  62 +++++++
 application/views/amp_editor.php              |  85 ++++++++++
 .../views/bootstrap3/information_edit.php     | 155 +++++++++---------
 3 files changed, 228 insertions(+), 74 deletions(-)
 create mode 100644 application/controllers/amp.php
 create mode 100644 application/views/amp_editor.php

diff --git a/application/controllers/amp.php b/application/controllers/amp.php
new file mode 100644
index 00000000..e24c449a
--- /dev/null
+++ b/application/controllers/amp.php
@@ -0,0 +1,62 @@
+<?php
+
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+
+class Amp extends CI_Controller {
+
+    function __construct() {
+        parent::__construct();
+        $this->permission->is_admin();
+        //$this->output->enable_profiler(TRUE);
+        $this->load->model('Information_model');
+        $this->load->model('InfoMetas_model');
+    }
+
+    public function index() {
+        $data = array();
+        $this->load->view('bootstrap3/header', $data);
+        $this->load->view('amp_editor');
+        $this->load->view('bootstrap3/footer');
+    }
+
+    public function edit($ic_id) {
+        $data = array();
+        $data['information'] = $this->Information_model->detail_by_ic_id($ic_id);
+        if ($data['information'] == FALSE) {
+            show_404();
+        }
+        $this->load->view('bootstrap3/header', $data);
+        $this->load->view('amp_editor');
+        $this->load->view('bootstrap3/footer');
+    }
+
+    public function edit_save() {
+        $data = array();
+        $ic_id = $this->input->post('ic_id');
+        $textarea_htmlcode = $this->input->post('textarea_htmlcode');
+        $amp_status = $this->input->post('amp_status');
+        $data['information'] = $this->Information_model->detail_by_ic_id($ic_id);
+        if ($data['information'] == FALSE) {
+            show_404();
+        }
+
+        $amp = $this->InfoMetas_model->get($ic_id, 'AMP');
+        if ($amp === false) {
+            $this->InfoMetas_model->add($ic_id, 'AMP', $textarea_htmlcode);
+        } else {
+            $this->InfoMetas_model->update($ic_id, 'AMP', $textarea_htmlcode);
+        }
+
+        $amp_status_value = $this->InfoMetas_model->get($ic_id, 'AMP_STATUS');
+        if ($amp_status_value === false) {
+            $this->InfoMetas_model->add($ic_id, 'AMP_STATUS', $amp_status);
+        } else {
+            $this->InfoMetas_model->update($ic_id, 'AMP_STATUS', $amp_status);
+        }
+
+        $data[] = array('name' => 'ok', 'value' => $this->lang->line('form_info_success'));
+        echo json_encode($data);
+    }
+
+}
diff --git a/application/views/amp_editor.php b/application/views/amp_editor.php
new file mode 100644
index 00000000..974e7e5b
--- /dev/null
+++ b/application/views/amp_editor.php
@@ -0,0 +1,85 @@
+<style>
+    .preview_box {
+        float: left;
+        width:375px;
+        height:600px;
+        margin-top:8px;
+    }
+    .code_editor {
+        overflow: hidden;
+        height:600px;
+        margin-top:8px;
+    }
+</style>
+
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="preview_box" id="iframe_box" ></div>
+        <div class="code_editor" id="editor"></div>
+    </div>
+    <hr/>
+    <form name="form_amp_code" id="form_amp_code" method="post" action="<?php echo site_url('amp/edit_save') ?>">
+        <textarea id="textarea_htmlcode" name="textarea_htmlcode" style="display: none;"><?php echo get_meta($information->ic_id, 'AMP'); ?></textarea>
+        <input type="hidden" name="ic_id" value="<?php echo $information->ic_id; ?>" />
+
+        <div class="row">
+            <div class="col-sm-13" ><a href="https://validator.ampproject.org/" target="_blank">AMP代码验证</a></div>
+            <div class="col-sm-3">
+
+                <select name="amp_status" id="amp_status" class="form-control" >
+                    <option value="0" <?php echo get_meta($information->ic_id, 'AMP_STATUS') === '0' ? 'selected' : FALSE; ?> >不发布</option>
+                    <option value="1" <?php echo get_meta($information->ic_id, 'AMP_STATUS') === '1' ? 'selected' : FALSE; ?> >发布</option>
+                </select>
+            </div>
+            <div class="col-sm-4">
+                <button type="button" class="btn btn-primary" onclick="submit_amp_editor();">保存</button>
+            </div>
+            <div class="col-sm-4"> <button type="button" class="btn btn-default" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'AMP', ''); meta('delete', '<?php echo $information->ic_id; ?>', 'AMP_STATUS', '');">删除</button> </div>
+        </div>
+    </form>
+    <hr/>
+</div>
+
+
+
+
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script>
+<script>
+                var editor = ace.edit("editor");
+                editor.setTheme("ace/theme/eclipse");
+                editor.session.setMode("ace/mode/html");
+                editor.setOptions({
+                    autoScrollEditorIntoView: true,
+                    wrap: true
+                });
+
+                editor.getSession().on('change', function (e) {
+                    update_preview();
+                });
+                editor.session.setValue($('#textarea_htmlcode').html($('#textarea_htmlcode').html()).text());
+
+                function update_preview() {
+                    //考虑做成异步操作，降低页面卡顿
+                    var iframe = document.createElement('iframe');
+                    iframe.setAttribute('frameBorder', '0');
+                    iframe.setAttribute('id', 'previewIframe');
+                    iframe.setAttribute('height', '100%');
+                    iframe.setAttribute('width', '100%');
+                    iframe.setAttribute('name', 'AMP Playground Output');
+                    $('#iframe_box').html('');
+                    $('#iframe_box').append(iframe);
+                    var doc = iframe.contentDocument || iframe.document;
+                    doc.open();
+                    doc.write(editor.getValue());
+                    doc.close();
+                }
+
+                function submit_amp_editor() {
+                    $('#textarea_htmlcode').text(editor.getValue()).html();
+                    submitForm('form_amp_code');
+                }
+</script>
+
+
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 9409aae5..038c8268 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -1,4 +1,4 @@
-<?php //  代码各服务器已经同步 2016.06.01 ycc                  ?>
+<?php //  代码各服务器已经同步 2016.06.01 ycc                   ?>
 <script src="/js/ace/ace.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript">
     var content_length = 0;
@@ -65,12 +65,12 @@
         sObj.append(addStr);
         var btn = $("#addBtn_" + treeNode.id);
         if (btn)
-            btn.bind("click", function() {
+            btn.bind("click", function () {
                 var urlReQuery = "<?php echo site_url('information/add/'); ?>";
                 $.ajax({
                     type: "get",
                     url: urlReQuery + '/' + treeNode.id,
-                    success: function(data, textStatus) {
+                    success: function (data, textStatus) {
                         var dataArray = $.parseJSON(data);//JSON.parse(data);
                         for (var key in dataArray) {
                             if (dataArray[key].name == 'ok') {
@@ -82,7 +82,7 @@
                             }
                         }
                     },
-                    error: function() {
+                    error: function () {
                         alert('发生错误，请联系YCC');
                     }
                 });
@@ -138,10 +138,10 @@
                 type: "post",
                 url: urlReQuery,
                 data: {'pid': treeNodes[0].getParentNode().id, 'ids': idStr},
-                success: function(data, textStatus) {
+                success: function (data, textStatus) {
                     return true;
                 },
-                error: function() {
+                error: function () {
                     $.modaldialog.error('发生错误，请联系YCC');
                     return false;
                 }
@@ -160,11 +160,11 @@
                     type: "post",
                     url: urlReQuery,
                     data: {'is_id': is_id, 'is_parent_id': is_parent_id},
-                    success: function(data, textStatus) {
+                    success: function (data, textStatus) {
                         window.location.href = "<?php echo site_url('information/edit'); ?>/" + is_id;
                         return true;
                     },
-                    error: function() {
+                    error: function () {
                         $.modaldialog.error('发生错误，请联系YCC');
                         return false;
                     }
@@ -180,12 +180,12 @@
             $.ajax({
                 type: "get",
                 url: urlReQuery + '/' + is_id,
-                success: function(data, textStatus) {
+                success: function (data, textStatus) {
                     var dataArray = $.parseJSON(data);//JSON.parse(data);
                     for (var key in dataArray) {
                         if (dataArray[key].name == 'ok') {
                             $.modaldialog.success('删除成功!，程序正在刷新...');
-                            setTimeout(function() {
+                            setTimeout(function () {
                                 window.location.href = dataArray[key].value;
                             }, 500);
                             return true;
@@ -195,7 +195,7 @@
                         }
                     }
                 },
-                error: function() {
+                error: function () {
                     $.modaldialog.error('发生错误，请联系YCC');
                     return false;
                 }
@@ -278,7 +278,7 @@
             dataType: "json",
             url: "<?php echo site_url('information/get_products/'); ?>",
             data: {'product_type': product_type, 'product_name': product_name},
-            success: function(data, textStatus) {
+            success: function (data, textStatus) {
                 for (var key in data) {
                     if (data[key].name == 'ok') {
                         $("#product_list_ul").html(data[key].value);
@@ -286,7 +286,7 @@
                     }
                 }
             },
-            error: function() {
+            error: function () {
                 $.modaldialog.error('发生错误，请联系YCC');
                 return false;
             }
@@ -315,7 +315,7 @@
         $.ajax({
             type: "get",
             url: urlReQuery + '/' + area_id + '/' + lsi_sn,
-            success: function(data, textStatus) {
+            success: function (data, textStatus) {
                 var dataArray = $.parseJSON(data);//JSON.parse(data);
                 for (var key in dataArray) {
                     if (dataArray[key].name == 'ok') {
@@ -327,7 +327,7 @@
                     }
                 }
             },
-            error: function() {
+            error: function () {
                 $.modaldialog.error('发生错误，请联系YCC');
                 return false;
             }
@@ -365,13 +365,13 @@
         $(elem).popover({
             'container': container,
             'title': 'title',
-            'content': function() {
+            'content': function () {
             },
             'placement': 'bottom',
             'trigger': 'click',
             'template': '<div class="popover recommend_info_popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title hidden"></h3><div class="popover-content" style="width:500px;"></div><div class="col-xs-24" style="background:#eee;padding: 8px 10px;margin-top: -19px;border-bottom:1px solid #ddd;"><div class="col-xs-22" style="padding-left:0;"><div class="input-group"><input type="text" class="form-control" id="article_key" name="article_key" placeholder="文章URL、标题或关键词"><span class="input-group-btn"><button class="btn btn-default" id="btn_search_article_list" type="button">搜索</button></span></div></div><div class="col-xs-2" style="border-left:1px solid #bbb;height:32px;line-height:38px;font-size:18px;"><a href="javascript:void(0);" onclick="$(\'#meta_recommend_info\').popover(\'hide\');$(\'#meta_related_info\').popover(\'hide\');$(\'#meta_bread_info\').popover(\'hide\');" class="glyphicon glyphicon-remove text-danger"></a></div></div><div class="col-xs-24" id="recommended_list"></div><div class="col-xs-24" id="recommend_list" style="padding-left:0;"></div></div>'
         });
-        $(elem).on('shown.bs.popover', function() {
+        $(elem).on('shown.bs.popover', function () {
             var right_offset = document.documentElement["clientWidth"] - $(elem)[0].getBoundingClientRect().right;
             if (right_offset < 300) {
                 $(elem).next(".recommend_info_popover").attr('style', "left:" + (-(400 - right_offset)) + "px !important;display: block;");
@@ -384,39 +384,39 @@
             ;
             $("#recommended_list").html('<img src="/css/images/loading.gif" >');
             var url = "<?php echo site_url('/welcome/search_by_icid/'); ?>";
-            $.post(url, {"ic_id_list": ic_id_list}, function(html) {
+            $.post(url, {"ic_id_list": ic_id_list}, function (html) {
                 $("#recommended_list").html(html);
             });
-        }).on('hidden.bs.popover', function() {
-            setTimeout(function() {
+        }).on('hidden.bs.popover', function () {
+            setTimeout(function () {
                 $(".recommend_info_popover").remove();
             }, 0);
         });
 
-        $("body").on("click", "#btn_search_article_list", function() {
+        $("body").on("click", "#btn_search_article_list", function () {
             $("#recommend_list").html('<img src="/css/images/loading.gif" >');
             var url = "<?php echo site_url('/welcome/search/1'); ?>";
             var key = $("#article_key").val();
             var ic_id_list = $(elem).val();
-            $.post(url, {'keywords': key, "ic_id_list": ic_id_list}, function(html) {
+            $.post(url, {'keywords': key, "ic_id_list": ic_id_list}, function (html) {
                 $("#recommend_list").html(html);
             });
         });
     }
 
     //初始化树形菜单
-    $(document).ready(function() {
-        $("#history_log_toggle").hover(function() {
+    $(document).ready(function () {
+        $("#history_log_toggle").hover(function () {
             $(".history_log").css({"display": "block"});
-        }, function() {
+        }, function () {
         });
-        $(".history_log").hover(function() {
+        $(".history_log").hover(function () {
         },
-                function() {
+                function () {
                     $(".history_log").css({"display": "none"});
                 });
 
-        setTimeout(function() {
+        setTimeout(function () {
             $("#treeDemo").css({"overflow-y": "hidden"});
         }, 100);
         $.fn.zTree.init($("#treeDemo"), setting, zNodes);
@@ -448,13 +448,13 @@
         init_recommend_popover("#meta_bread_info", ".meta_bread_info_box");
 
         //自动读取google网页性能评分
-        setTimeout(function() {
+        setTimeout(function () {
             mobile_friendly(), 1000
         });
     });
 
     var editor;
-    KindEditor.ready(function(K) {
+    KindEditor.ready(function (K) {
         editor = K.create('#ic_content', {
             width: '100%',
             height: '560px',
@@ -468,7 +468,7 @@
                 'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', '|',
                 'clearhtml', 'removeformat', '|', 'plainpaste', 'wordpaste', '|', 'table', 'hr', 'image', 'template', 'link', 'unlink', 'mediacits', 'character', 'undo', 'source', 'fullscreen'
             ],
-            afterChange: function() {
+            afterChange: function () {
                 K('#display_count').html(getWordCount(editor.text()));
                 content_length = this.count('text');
                 $("iframe.ke-edit-iframe").contents().find(".ke-content").css({"padding-right": "25px", "padding-top": "12px"});
@@ -479,28 +479,28 @@
 
 
     //新闻日历
-    $(function() {
+    $(function () {
         $("#meta_news_createdate").datepicker({
             showButtonPanel: true
         });
     })
 
     //节庆开始日期
-    $(function() {
+    $(function () {
         $("#meta_festival_start").datepicker({
             showButtonPanel: true
         });
     })
 
     //节庆结束日期
-    $(function() {
+    $(function () {
         $("#meta_festival_end").datepicker({
             showButtonPanel: true
         });
     })
 
     //团购结束时间
-    $(function() {
+    $(function () {
         $("#meta_groupon_end").datepicker({
             showButtonPanel: true
         });
@@ -535,12 +535,19 @@
                                 <label>
                                     信息标题 &nbsp;
                                     <?php if (is_series_site()) { ?>
-                                    <button type="button" class="btn btn-xs none" data-toggle="modal" data-target="#tagM">
-                                        + 标签（国际站）
-                                    </button>
+                                        <button type="button" class="btn btn-xs none" data-toggle="modal" data-target="#tagM">
+                                            + 标签（国际站）
+                                        </button>
                                     <?php } ?>
                                 </label>
                             </div>
+                            <div class="col-xs-17 text-right">
+                                <?php if(get_meta($information->ic_id, 'AMP_STATUS') === '1'){ ?>
+                                    <label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/'.$information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-flash"></i></a></label>
+                                <?php }else{ ?>
+                                    <label title="创建AMP页面"><a href="<?php echo site_url('amp/edit/'.$information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-plus"></i></a></label>
+                                <?php } ?>
+                            </div>
                             <div class="col-xs-24">
                                 <input class="form-control" type="text" id="ic_title" style="<?php if ($embody == 1) echo 'border-color:green;'; ?>" name="ic_title" value="<?php echo $information->ic_title; ?>" >
                             </div>
@@ -558,7 +565,7 @@
                                 <a href="javascript:void(0);" onclick="goto_page();" id="goto_page_button" name="goto_page_button" target="_blank" title="查看" ><i class="glyphicon glyphtext-muted glyphicon glyphicon-eye-open text-muted"></i></a>
                                 <?php if ($information->ic_sitecode == 'cht') { ?>
                                     <a href="javascript:void(0);" onclick="goto_test_page();" id="goto_test_page_button" name="goto_test_page_button" target="_blank" title="查看测试页面" ><i class="glyphicon glyphtext-muted glyphicon glyphicon-random text-muted"></i></a>
-                            <?php } ?>
+                                <?php } ?>
                             </div>
                             <input class="form-control col-xs-24" type="text" id="ic_url" name="ic_url"  value="<?php echo $information->ic_url; ?>" >
                         </div>
@@ -715,7 +722,7 @@
 
                         </div>
 
-<?php if ($information->ic_sitecode == 'cht') { ?>
+                        <?php if ($information->ic_sitecode == 'cht') { ?>
 
                             <div class="row">
                                 <div class="col-sm-5">
@@ -798,7 +805,7 @@
                             </div>
 
 
-<?php } ?>
+                        <?php } ?>
 
 
                         <label>信息备注
@@ -891,7 +898,7 @@
                         </div>
 
 
-<?php if (is_series_site()) { ?>
+                        <?php if (is_series_site()) { ?>
                             <div class="row">
                                 <div class="col-sm-8"> 
                                     <label>机票目的地
@@ -932,7 +939,7 @@
                                             <option selected="selected" value="<?php echo $meta_subnavi; ?>"><?php echo $meta_subnavi_arr[$meta_subnavi]; ?></option>
                                         <?php } else { ?>
                                             <option selected="selected" value="info"><?php echo $meta_subnavi_arr['info']; ?></option>
-    <?php } ?>
+                                        <?php } ?>
                                         <option value="index"><?php echo($meta_subnavi_arr['index']); ?></option>
                                         <option value="tour"><?php echo($meta_subnavi_arr['tour']); ?></option>
                                         <option value="dest"><?php echo($meta_subnavi_arr['dest']); ?></option>
@@ -964,7 +971,7 @@
                                         <?php } else { ?>
                                             <option value="noshow">不显示</option>
                                             <option selected="selected" value="show">显示</option>
-    <?php } ?>
+                                        <?php } ?>
                                     </select>
                                 </div>
                                 <div class="col-sm-8"> 
@@ -975,7 +982,7 @@
                                     </label>
                                     <input name="meta_top_img" id="meta_top_img" type="text"  class="form-control"  value="<?php echo get_meta($information->ic_id, 'meta_top_img'); ?>" />
                                 </div>
-    <?php if ($information->ic_ht_area_type == 'err') { ?>
+                                <?php if ($information->ic_ht_area_type == 'err') { ?>
                                     <div class="col-sm-8">
                                         <label>自定义样式
                                             <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_my_class', $('#meta_my_class').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
@@ -997,11 +1004,11 @@
                                         </label>
                                         <input class="form-control" type="text" name="meta_z_res" value="<?php echo get_meta($information->ic_id, 'meta_z_res'); ?>" id="meta_z_res"/>
                                     </div>
-                            <?php } ?>
+                                <?php } ?>
                             </div>  
                         <?php } ?>
 
-<?php if ($information->ic_ht_area_type == 'g') { ?>
+                        <?php if ($information->ic_ht_area_type == 'g') { ?>
                             <div class="row">
 
 
@@ -1042,7 +1049,7 @@
                                 </div>
 
                             </div>	
-<?php } ?>
+                        <?php } ?>
                         <div class="row">
                             <div class="col-sm-5">
                                 <label>展示打赏功能
@@ -1116,9 +1123,9 @@
                             $value == $information->ic_type ? $select_str = 'selected' : $select_str = '';
                             ?>
                             <option  <?php echo $select_str; ?> value="<?php echo $value; ?>" ><?php echo $key; ?></option>
-                    <?php } ?>
+                        <?php } ?>
                     </select>
-<?php if ($rootInformation->ic_ht_area_type == 'pd') { ?>
+                    <?php if ($rootInformation->ic_ht_area_type == 'pd') { ?>
                         <div id="bind_product_code">
                             <br/>
                             <div class="input-group">
@@ -1127,7 +1134,7 @@
                                 <a href="javascript:void(0);" class="input-group-addon" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_product_code', $('#meta_product_code').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
                             </div>
                         </div>
-                        <?php } ?>
+                    <?php } ?>
                     <label style="width:48px;">模板</label>		
                     <select name="ic_template" id="ic_template" class="form-control">
                         <?php
@@ -1135,7 +1142,7 @@
                             $value == $information->ic_template ? $select_str = 'selected' : $select_str = '';
                             ?>
                             <option <?php echo $select_str; ?> value="<?php echo $value; ?>" ><?php echo $key; ?></option>
-<?php } ?>
+                        <?php } ?>
                     </select>
 
                     <label>是否作为面包屑显示</label>	
@@ -1190,13 +1197,13 @@
                         <input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
                     </label>
                     <div class="clearfix"></div>
-                    <?php if (is_series_site() || ($this->config->item('site_code') == 'ah') || ($this->config->item('site_code') == 'gm') ) { ?>
+                    <?php if (is_series_site() || ($this->config->item('site_code') == 'ah') || ($this->config->item('site_code') == 'gm')) { ?>
                         <label class="col-xs-24">本站会自动更新静态页面</label>
-<?php } else { ?>
+                    <?php } else { ?>
                         <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
                             <input type="checkbox" name="auto_update_cache_checkbox" id="auto_update_cache_checkbox" onclick="get_update_cache_url();" value="<?php echo $information->ic_url; ?>" />静态更新
                         </label>
-<?php } ?>
+                    <?php } ?>
 
                     <div class="clearfix"></div>	
                     <p class="col-xs-24 nopadding">
@@ -1234,7 +1241,7 @@
                                 <ul class="dropdown-menu history_log" style="right: 157px;left: inherit;top: 83px;">
                                     <?php foreach ($content_backup_list as $item) { ?>
                                         <li><a href="<?php echo site_url('information/backup_content/' . $item->log_id); ?>" target="_blank"><?php echo $item->log_datetime ?>, <?php echo $item->log_ht_username ?></a></li>
-<?php } ?>
+                                    <?php } ?>
                                 </ul>
                             </li>
                         </ul>
@@ -1263,30 +1270,30 @@
 <?php //标签模态框 ?>
 <div class="modal fade" id="tagM" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <style type="text/css">
-    .tagLabel {background: #eee;padding: 5px 15px 5px 35px!important;border-radius: 5px;border: 1px solid #aaa; margin-right:2px;box-shadow: 0px 0px 2px #ddd;}
-    .myTag {background: #d2eafb; color:#108ee9; border-color: #108ee9;}
-    .tagLabel.newLabel {padding: 5px 10px!important;border: 1px dashed #000;}
+        .tagLabel {background: #eee;padding: 5px 15px 5px 35px!important;border-radius: 5px;border: 1px solid #aaa; margin-right:2px;box-shadow: 0px 0px 2px #ddd;}
+        .myTag {background: #d2eafb; color:#108ee9; border-color: #108ee9;}
+        .tagLabel.newLabel {padding: 5px 10px!important;border: 1px dashed #000;}
     </style>
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title" id="myModalLabel">添加标签</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="myModalLabel">添加标签</h4>
             </div>
             <div class="modal-body">
                 <div class="checkbox">
                     <?php foreach ($my_tags as $tag) { ?>
                         <label class="tagLabel myTag">
-                            <input type="checkbox" value="<?php echo($tag->it_title)?>" data-it-id="<?php echo($tag->it_id)?>" checked>
-                            <span><?php echo($tag->it_title)?></span>
+                            <input type="checkbox" value="<?php echo($tag->it_title) ?>" data-it-id="<?php echo($tag->it_id) ?>" checked>
+                            <span><?php echo($tag->it_title) ?></span>
                         </label>
                     <?php } ?>
                 </div>
                 <div class="checkbox">
                     <?php foreach ($all_tags as $tag) { ?>
                         <label class="tagLabel">
-                            <input type="checkbox" value="<?php echo($tag->it_title)?>" data-it-id="<?php echo($tag->it_id)?>">
-                            <span><?php echo($tag->it_title)?></span>
+                            <input type="checkbox" value="<?php echo($tag->it_title) ?>" data-it-id="<?php echo($tag->it_id) ?>">
+                            <span><?php echo($tag->it_title) ?></span>
                         </label>
                     <?php } ?>
                     <label class="tagLabel newLabel">
@@ -1303,33 +1310,33 @@
     </div>
     <script type="text/javascript">
         //标签更新
-        $('[data-it-id]').on('change', function() {
+        $('[data-it-id]').on('change', function () {
             if ($(this).is(':checked')) {
                 $.post('/info.php/info_tags/add_tag_to_content/', {
-                    'it_id' : $(this).attr('data-it-id'), 
-                    'ic_id' : <?php echo $information->ic_id; ?>, 
+                    'it_id': $(this).attr('data-it-id'),
+                    'ic_id': <?php echo $information->ic_id; ?>,
                 });
                 $(this).parent().addClass('myTag');
             } else {
                 $.post('/info.php/info_tags/remove_tag_to_content/', {
-                    'it_id' : $(this).attr('data-it-id'), 
-                    'ic_id' : <?php echo $information->ic_id; ?>, 
+                    'it_id': $(this).attr('data-it-id'),
+                    'ic_id': <?php echo $information->ic_id; ?>,
                 });
                 $(this).parent().removeClass('myTag');
             }
         });
         //新标签
-        $('.newTagA').on('click', function() {
+        $('.newTagA').on('click', function () {
             $(this).hide();
             $('.newTagI').show();
         });
-        $('.newTagI').on('blur', function() {
+        $('.newTagI').on('blur', function () {
             $(this).hide();
             if ($(this).val()) {
                 var yes = confirm("确认添加新标签：" + $(this).val())
                 //添加标签
                 if (yes) {
-                    $.post('/info.php/info_tags/add_tag/', {'title':$(this).val(),'memo':'test'}, function(json) {
+                    $.post('/info.php/info_tags/add_tag/', {'title': $(this).val(), 'memo': 'test'}, function (json) {
                         if (json.statu != '-1') {
                             $clone = $('.tagLabel').eq(0).clone(true);
                             $clone.removeClass('myTag');
@@ -1352,7 +1359,7 @@
             }
         });
         //添加新模板
-        $('#newTemp').on('click', function() {
+        $('#newTemp').on('click', function () {
             alert('ok');
         });
     </script>

From a085651a5b926ef0d5fc5969374313a458d6e473 Mon Sep 17 00:00:00 2001
From: "lmr@hainatravel.com" <59361885@qq.com>
Date: Thu, 1 Feb 2018 11:38:04 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bootstrap3/information_edit.php     | 369 +++++++-----------
 1 file changed, 139 insertions(+), 230 deletions(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 038c8268..70098812 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -534,22 +534,20 @@
                             <div class="col-xs-7">
                                 <label>
                                     信息标题 &nbsp;
-                                    <?php if (is_series_site()) { ?>
-                                        <button type="button" class="btn btn-xs none" data-toggle="modal" data-target="#tagM">
-                                            + 标签（国际站）
-                                        </button>
-                                    <?php } ?>
                                 </label>
                             </div>
                             <div class="col-xs-17 text-right">
-                                <?php if(get_meta($information->ic_id, 'AMP_STATUS') === '1'){ ?>
-                                    <label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/'.$information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-flash"></i></a></label>
-                                <?php }else{ ?>
-                                    <label title="创建AMP页面"><a href="<?php echo site_url('amp/edit/'.$information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-plus"></i></a></label>
-                                <?php } ?>
+                                <?php if (get_meta($information->ic_id, 'AMP_STATUS') === '1') {?>
+                                    <label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-flash"></i></a></label>
+                                <?php } else {?>
+                                    <label title="创建AMP页面"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-plus"></i></a></label>
+                                <?php }?>
                             </div>
                             <div class="col-xs-24">
-                                <input class="form-control" type="text" id="ic_title" style="<?php if ($embody == 1) echo 'border-color:green;'; ?>" name="ic_title" value="<?php echo $information->ic_title; ?>" >
+                                <input class="form-control" type="text" id="ic_title" style="<?php if ($embody == 1) {
+	echo 'border-color:green;';
+}
+?>" name="ic_title" value="<?php echo $information->ic_title; ?>" >
                             </div>
                             <div class="col-xs-24 btn-sm"></div>
                         </div>
@@ -563,9 +561,9 @@
                             <div class="col-xs-24 nopadding">链接地址
                                 <a href="javascript:void(0);" onclick="format_url()" title="格式化URL"><i class="glyphicon glyphtext-muted glyphicon glyphicon-flag text-muted"></i></a>
                                 <a href="javascript:void(0);" onclick="goto_page();" id="goto_page_button" name="goto_page_button" target="_blank" title="查看" ><i class="glyphicon glyphtext-muted glyphicon glyphicon-eye-open text-muted"></i></a>
-                                <?php if ($information->ic_sitecode == 'cht') { ?>
+                                <?php if ($information->ic_sitecode == 'cht') {?>
                                     <a href="javascript:void(0);" onclick="goto_test_page();" id="goto_test_page_button" name="goto_test_page_button" target="_blank" title="查看测试页面" ><i class="glyphicon glyphtext-muted glyphicon glyphicon-random text-muted"></i></a>
-                                <?php } ?>
+                                <?php }?>
                             </div>
                             <input class="form-control col-xs-24" type="text" id="ic_url" name="ic_url"  value="<?php echo $information->ic_url; ?>" >
                         </div>
@@ -578,10 +576,10 @@
                     </div>
 
 
-                    <textarea id="ic_content" name="ic_content" ><?php echo str_replace('textarea', '#textarea#', $information->ic_content); ?></textarea> 
+                    <textarea id="ic_content" name="ic_content" ><?php echo str_replace('textarea', '#textarea#', $information->ic_content); ?></textarea>
 
 
-                    <textarea name="ic_summary" id="ic_summary" class="col-xs-24" rows="5" placeholder="信息简介" style="border:none;border-bottom:1px solid #bbb;"><?php echo $information->ic_summary; ?></textarea>                            
+                    <textarea name="ic_summary" id="ic_summary" class="col-xs-24" rows="5" placeholder="信息简介" style="border:none;border-bottom:1px solid #bbb;"><?php echo $information->ic_summary; ?></textarea>
                     <div class="col-xs-24">
                         <label>SEO标题<em class="pull-right muted" id="ic_seo_title_count"></em></label>
                         <input class="form-control" type="text" onkeyup="change_seo_count(this.id);" id="ic_seo_title" name="ic_seo_title" value="<?php echo $information->ic_seo_title; ?>" >
@@ -607,16 +605,16 @@
                             <select name="meta_website_nav" id="meta_website_nav" class="form-control" >
                                 <option value="" >不选择</option>
                                 <?php
-                                if (!empty($setting_website_nav)) {
-                                    $setting_website_nav_active = trim(get_meta($information->ic_id, 'meta_website_nav'));
-                                    foreach ($setting_website_nav as $item) {
-                                        $strcasecmp_nav = strcasecmp($setting_website_nav_active, $item->im_value);
-                                        ?>
+if (!empty($setting_website_nav)) {
+	$setting_website_nav_active = trim(get_meta($information->ic_id, 'meta_website_nav'));
+	foreach ($setting_website_nav as $item) {
+		$strcasecmp_nav = strcasecmp($setting_website_nav_active, $item->im_value);
+		?>
                                         <option <?php echo $strcasecmp_nav == 0 ? 'selected' : FALSE; ?> value="<?php echo $item->im_value ?>" ><?php echo $item->im_value ?></option>
                                         <?php
-                                    }
-                                }
-                                ?>
+}
+}
+?>
                             </select>
 
                         </div>
@@ -666,7 +664,7 @@
                         <label><a href="javascript:void(0);" onclick="$('#customize').toggle();">自定义选项</a>　</label>
                     </div>
 
-                    <div id="customize" class="col-xs-24" style="display:none;"> 
+                    <div id="customize" class="col-xs-24" style="display:none;">
 
                         <!-- 自定义选项 -->
 
@@ -717,12 +715,13 @@
                                     <a href="javascript:void(0);" title="自定义面包屑导航，填写文章ID，以英文逗号分隔."><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-question-sign"></i></a>
                                 </label>
                                 <input name="meta_bread_info" id="meta_bread_info" type="text"  class="form-control" placeholder="124343,8784," value="<?php echo get_meta($information->ic_id, 'meta_bread_info'); ?>" />
-                            </div>   
+                            </div>
 
 
                         </div>
 
-                        <?php if ($information->ic_sitecode == 'cht') { ?>
+                        <?php if ($information->ic_sitecode == 'cht') {
+	?>
 
                             <div class="row">
                                 <div class="col-sm-5">
@@ -737,7 +736,10 @@
                                     </select>
                                 </div>
 
-                                <div class="col-sm-5 <?php if ($information->ic_ht_area_type != 'c') echo 'hidden'; ?>">
+                                <div class="col-sm-5 <?php if ($information->ic_ht_area_type != 'c') {
+		echo 'hidden';
+	}
+	?>">
                                     <label>景点评论数
                                         <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_review_count', $('#meta_review_count').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
                                         <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_review_count', $('#meta_review_count').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
@@ -771,12 +773,12 @@
                                 </div>
 
                                 <div class="<?php
-                                if ($information->ic_ht_area_type == 'c') {
-                                    echo 'col-sm-4';
-                                } else {
-                                    echo 'col-sm-9';
-                                }
-                                ?>">
+if ($information->ic_ht_area_type == 'c') {
+		echo 'col-sm-4';
+	} else {
+		echo 'col-sm-9';
+	}
+	?>">
                                     <label>显示作者
                                         <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_show_author', $('#meta_show_author').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
                                         <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_show_author', $('#meta_show_author').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
@@ -784,7 +786,7 @@
                                     </label>
                                     <select name="meta_show_author" id="meta_show_author" class="form-control" >
                                         <option value="yes" >展示</option>
-                                        <option <?php echo get_meta($information->ic_id, 'meta_show_author') === 'no' ? 'selected' : FALSE; ?> value="no" >不展示</option>    
+                                        <option <?php echo get_meta($information->ic_id, 'meta_show_author') === 'no' ? 'selected' : FALSE; ?> value="no" >不展示</option>
                                     </select>
                                 </div>
 
@@ -797,7 +799,7 @@
                                         <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_navigation', $('#meta_navigation').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
                                         <a href="javascript:void(0);" title="自定义导航."><i class="text-muted glyphicon glyphicon-question-sign"></i></a>
                                     </label>
-                                    <textarea name="meta_navigation" id="meta_navigation" class="form-control" ><?php echo get_meta($information->ic_id, 'meta_navigation'); ?></textarea> 
+                                    <textarea name="meta_navigation" id="meta_navigation" class="form-control" ><?php echo get_meta($information->ic_id, 'meta_navigation'); ?></textarea>
 
                                 </div>
 
@@ -805,7 +807,7 @@
                             </div>
 
 
-                        <?php } ?>
+                        <?php }?>
 
 
                         <label>信息备注
@@ -843,7 +845,7 @@
                                 <select name="meta_festival_only_month" id="meta_festival_only_month" class="form-control" >
                                     <option value="no" >否</option>
                                     <option <?php echo get_meta($information->ic_id, 'meta_festival_only_month') === 'yes' ? 'selected' : FALSE; ?> value="yes" >是</option>
-                                </select>	
+                                </select>
                             </div>
                         </div>
 
@@ -898,9 +900,10 @@
                         </div>
 
 
-                        <?php if (is_series_site()) { ?>
+                        <?php if (is_series_site()) {
+	?>
                             <div class="row">
-                                <div class="col-sm-8"> 
+                                <div class="col-sm-8">
                                     <label>机票目的地
                                         <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_flights_city', $('#meta_flights_city').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
                                         <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_flights_city', $('#meta_flights_city').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
@@ -908,73 +911,73 @@
                                     </label>
                                     <input name="meta_flights_city" id="meta_flights_city" type="text"  class="form-control"  value="<?php echo get_meta($information->ic_id, 'meta_flights_city'); ?>" />
                                 </div>
-                                <div class="col-sm-8"> 
+                                <div class="col-sm-8">
                                     <?php
-                                    $meta_subnavi_arr = array(
-                                        'index' => '首页',
-                                        'tour' => '线路',
-                                        'dest' => '目的地',
-                                        'tailormade' => 'tailormade',
-                                        'train' => '火车',
-                                        'ship' => '游船',
-                                        'hotel' => '酒店',
-                                        'flight' => '机票',
-                                        'info' => '信息',
-                                        'deal' => '促销',
-                                        '2015' => '2015',
-                                        'tour2017' => '2017',
-                                        'op' => 'OP',
-                                        'best' => '实用信息',
-                                        'culture' => '文化',
-                                        'top10' => 'TOP10'
-                                    );
-                                    ?>
+$meta_subnavi_arr = array(
+		'index' => '首页',
+		'tour' => '线路',
+		'dest' => '目的地',
+		'tailormade' => 'tailormade',
+		'train' => '火车',
+		'ship' => '游船',
+		'hotel' => '酒店',
+		'flight' => '机票',
+		'info' => '信息',
+		'deal' => '促销',
+		'2015' => '2015',
+		'tour2017' => '2017',
+		'op' => 'OP',
+		'best' => '实用信息',
+		'culture' => '文化',
+		'top10' => 'TOP10',
+	);
+	?>
                                     <label>匹配到一级导航
                                         <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_subnavi', $('#meta_subnavi').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
                                         <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_subnavi', $('#meta_subnavi').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
                                         <a href="javascript:void(0);" title="用于配置此信息对应的一级导航"><i class="text-muted glyphicon glyphicon-question-sign"></i></a>
                                     </label>
                                     <select name="meta_subnavi" id="meta_subnavi" class="form-control" >
-                                        <?php if ($meta_subnavi = get_meta($information->ic_id, 'meta_subnavi')) { ?>
+                                        <?php if ($meta_subnavi = get_meta($information->ic_id, 'meta_subnavi')) {?>
                                             <option selected="selected" value="<?php echo $meta_subnavi; ?>"><?php echo $meta_subnavi_arr[$meta_subnavi]; ?></option>
-                                        <?php } else { ?>
+                                        <?php } else {?>
                                             <option selected="selected" value="info"><?php echo $meta_subnavi_arr['info']; ?></option>
-                                        <?php } ?>
-                                        <option value="index"><?php echo($meta_subnavi_arr['index']); ?></option>
-                                        <option value="tour"><?php echo($meta_subnavi_arr['tour']); ?></option>
-                                        <option value="dest"><?php echo($meta_subnavi_arr['dest']); ?></option>
-                                        <option value="tailormade"><?php echo($meta_subnavi_arr['tailormade']); ?></option>
-                                        <option value="train"><?php echo($meta_subnavi_arr['train']); ?></option>
-                                        <option value="ship"><?php echo($meta_subnavi_arr['ship']); ?></option>
-                                        <option value="hotel"><?php echo($meta_subnavi_arr['hotel']); ?></option>
-                                        <option value="flight"><?php echo($meta_subnavi_arr['flight']); ?></option>
-                                        <option value="info"><?php echo($meta_subnavi_arr['info']); ?></option>
-                                        <option value="deal"><?php echo($meta_subnavi_arr['deal']); ?></option>
-                                        <option value="tour2017"><?php echo($meta_subnavi_arr['tour2017']); ?></option>
-                                        <option value="2015"><?php echo($meta_subnavi_arr['2015']); ?></option>
-                                        <option value="op"><?php echo($meta_subnavi_arr['op']); ?></option>
-                                        <option value="best"><?php echo($meta_subnavi_arr['best']); ?></option>
-                                        <option value="culture"><?php echo($meta_subnavi_arr['culture']); ?></option>
-                                        <option value="top10"><?php echo($meta_subnavi_arr['top10']); ?></option>
+                                        <?php }?>
+                                        <option value="index"><?php echo ($meta_subnavi_arr['index']); ?></option>
+                                        <option value="tour"><?php echo ($meta_subnavi_arr['tour']); ?></option>
+                                        <option value="dest"><?php echo ($meta_subnavi_arr['dest']); ?></option>
+                                        <option value="tailormade"><?php echo ($meta_subnavi_arr['tailormade']); ?></option>
+                                        <option value="train"><?php echo ($meta_subnavi_arr['train']); ?></option>
+                                        <option value="ship"><?php echo ($meta_subnavi_arr['ship']); ?></option>
+                                        <option value="hotel"><?php echo ($meta_subnavi_arr['hotel']); ?></option>
+                                        <option value="flight"><?php echo ($meta_subnavi_arr['flight']); ?></option>
+                                        <option value="info"><?php echo ($meta_subnavi_arr['info']); ?></option>
+                                        <option value="deal"><?php echo ($meta_subnavi_arr['deal']); ?></option>
+                                        <option value="tour2017"><?php echo ($meta_subnavi_arr['tour2017']); ?></option>
+                                        <option value="2015"><?php echo ($meta_subnavi_arr['2015']); ?></option>
+                                        <option value="op"><?php echo ($meta_subnavi_arr['op']); ?></option>
+                                        <option value="best"><?php echo ($meta_subnavi_arr['best']); ?></option>
+                                        <option value="culture"><?php echo ($meta_subnavi_arr['culture']); ?></option>
+                                        <option value="top10"><?php echo ($meta_subnavi_arr['top10']); ?></option>
                                     </select>
                                 </div>
-                                <div class="col-sm-8"> 
+                                <div class="col-sm-8">
                                     <label>面包屑显示信息首页链接？
                                         <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_bread_showinfo', $('#meta_bread_showinfo').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
                                         <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_bread_showinfo', $('#meta_bread_showinfo').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
                                         <a href="javascript:void(0);" title="用于配置是否在面包屑中显示Guide首页."><i class="text-muted glyphicon glyphicon-question-sign"></i></a>
                                     </label>
                                     <select name="meta_bread_showinfo" id="meta_bread_showinfo" class="form-control" >
-                                        <?php if (get_meta($information->ic_id, 'meta_bread_showinfo') == 'noshow') { ?>
+                                        <?php if (get_meta($information->ic_id, 'meta_bread_showinfo') == 'noshow') {?>
                                             <option selected="selected" value="noshow">不显示</option>
                                             <option value="show">显示</option>
-                                        <?php } else { ?>
+                                        <?php } else {?>
                                             <option value="noshow">不显示</option>
                                             <option selected="selected" value="show">显示</option>
-                                        <?php } ?>
+                                        <?php }?>
                                     </select>
                                 </div>
-                                <div class="col-sm-8"> 
+                                <div class="col-sm-8">
                                     <label>专题顶部大图
                                         <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_top_img', $('#meta_top_img').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
                                         <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_top_img', $('#meta_top_img').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
@@ -982,7 +985,7 @@
                                     </label>
                                     <input name="meta_top_img" id="meta_top_img" type="text"  class="form-control"  value="<?php echo get_meta($information->ic_id, 'meta_top_img'); ?>" />
                                 </div>
-                                <?php if ($information->ic_ht_area_type == 'err') { ?>
+                                <?php if ($information->ic_ht_area_type == 'err') {?>
                                     <div class="col-sm-8">
                                         <label>自定义样式
                                             <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_my_class', $('#meta_my_class').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
@@ -1004,15 +1007,15 @@
                                         </label>
                                         <input class="form-control" type="text" name="meta_z_res" value="<?php echo get_meta($information->ic_id, 'meta_z_res'); ?>" id="meta_z_res"/>
                                     </div>
-                                <?php } ?>
-                            </div>  
-                        <?php } ?>
+                                <?php }?>
+                            </div>
+                        <?php }?>
 
-                        <?php if ($information->ic_ht_area_type == 'g') { ?>
+                        <?php if ($information->ic_ht_area_type == 'g') {?>
                             <div class="row">
 
 
-                                <div class="col-sm-6">	
+                                <div class="col-sm-6">
                                     <label>最大团购数
                                         <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_groupon_init', $('#meta_groupon_init').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
                                         <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_groupon_init', $('#meta_groupon_init').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
@@ -1048,8 +1051,8 @@
                                     <input type="text" name="meta_groupon_end" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_groupon_end'); ?>" id="meta_groupon_end"/>
                                 </div>
 
-                            </div>	
-                        <?php } ?>
+                            </div>
+                        <?php }?>
                         <div class="row">
                             <div class="col-sm-5">
                                 <label>展示打赏功能
@@ -1094,7 +1097,7 @@
                                 </select>
                             </div>
 
-                        </div>  
+                        </div>
                         <!-- 自定义选项 -->
                     </div>
 
@@ -1119,13 +1122,13 @@
                     <label>信息类型</label>
                     <select name="ic_type" id="ic_type" class="form-control" onselect="" >
                         <?php
-                        foreach ($infoTypeList as $key => $value) {
-                            $value == $information->ic_type ? $select_str = 'selected' : $select_str = '';
-                            ?>
+foreach ($infoTypeList as $key => $value) {
+	$value == $information->ic_type ? $select_str = 'selected' : $select_str = '';
+	?>
                             <option  <?php echo $select_str; ?> value="<?php echo $value; ?>" ><?php echo $key; ?></option>
-                        <?php } ?>
+                        <?php }?>
                     </select>
-                    <?php if ($rootInformation->ic_ht_area_type == 'pd') { ?>
+                    <?php if ($rootInformation->ic_ht_area_type == 'pd') {?>
                         <div id="bind_product_code">
                             <br/>
                             <div class="input-group">
@@ -1134,18 +1137,18 @@
                                 <a href="javascript:void(0);" class="input-group-addon" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_product_code', $('#meta_product_code').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
                             </div>
                         </div>
-                    <?php } ?>
-                    <label style="width:48px;">模板</label>		
+                    <?php }?>
+                    <label style="width:48px;">模板</label>
                     <select name="ic_template" id="ic_template" class="form-control">
                         <?php
-                        foreach ($templateList as $key => $value) {
-                            $value == $information->ic_template ? $select_str = 'selected' : $select_str = '';
-                            ?>
+foreach ($templateList as $key => $value) {
+	$value == $information->ic_template ? $select_str = 'selected' : $select_str = '';
+	?>
                             <option <?php echo $select_str; ?> value="<?php echo $value; ?>" ><?php echo $key; ?></option>
-                        <?php } ?>
+                        <?php }?>
                     </select>
 
-                    <label>是否作为面包屑显示</label>	
+                    <label>是否作为面包屑显示</label>
                     <select name="ic_show_bread_crumbs" id="ic_show_bread_crumbs" class="form-control">
                         <option <?php echo $information->ic_show_bread_crumbs == 0 ? 'selected' : FALSE; ?> value="0" >不显示</option>
                         <option <?php echo $information->ic_show_bread_crumbs == 1 ? 'selected' : FALSE; ?> value="1" >显示</option>
@@ -1153,31 +1156,31 @@
 
                     <label>作者</label>
                     <select name="ic_author" id="ic_author" class="form-control">
-                        <option value="" >-</option>	
+                        <option value="" >-</option>
                         <?php
-                        $userinfo = $this->session->userdata('session_admin');
-                        $hasselected = false;
-                        foreach ($editor_list as $editor_item) {
-                            //mb_strtolower($editor_item->OPI_Code) == mb_strtolower($information->ic_author) ? $select_str = 'selected' : $select_str = '';
-                            if (mb_strtolower($editor_item->OPI_Code) == mb_strtolower($information->ic_author)) {
-                                $select_str = 'selected';
-                                $hasselected = true;
-                            } else {
-                                $select_str = '';
-                                if (!$hasselected && !empty($information->ic_content) && $information->ic_url_title != 'New Information' && $editor_item->OPI_Code == 'PKL') {
-                                    $select_str = 'selected';
-                                }
-                            }
-                            ?>
+$userinfo = $this->session->userdata('session_admin');
+$hasselected = false;
+foreach ($editor_list as $editor_item) {
+	//mb_strtolower($editor_item->OPI_Code) == mb_strtolower($information->ic_author) ? $select_str = 'selected' : $select_str = '';
+	if (mb_strtolower($editor_item->OPI_Code) == mb_strtolower($information->ic_author)) {
+		$select_str = 'selected';
+		$hasselected = true;
+	} else {
+		$select_str = '';
+		if (!$hasselected && !empty($information->ic_content) && $information->ic_url_title != 'New Information' && $editor_item->OPI_Code == 'PKL') {
+			$select_str = 'selected';
+		}
+	}
+	?>
                             <option  <?php echo $select_str; ?> value="<?php echo $editor_item->OPI_Code; ?>" ><?php echo $editor_item->OPI_Name; ?></option>
-                        <?php } ?>	
+                        <?php }?>
                         <option value="" >-</option>
                         <?php
-                        foreach ($author_list as $author_item) {
-                            ($author_item->a_id == $information->ic_author) ? $select_str = 'selected' : $select_str = '';
-                            ?>
+foreach ($author_list as $author_item) {
+	($author_item->a_id == $information->ic_author) ? $select_str = 'selected' : $select_str = '';
+	?>
                             <option  <?php echo $select_str; ?> value="<?php echo $author_item->a_id; ?>" ><?php echo $author_item->a_name; ?></option>
-                        <?php } ?>	
+                        <?php }?>
                     </select>
 
                     <label>是否发布</label>
@@ -1192,20 +1195,20 @@
                         <input type="checkbox" name="ignore_seo_check" id="ignore_seo_check" />忽略SEO检测
                     </label>
 
-                    <div class="clearfix"></div>	
+                    <div class="clearfix"></div>
                     <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
                         <input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
                     </label>
                     <div class="clearfix"></div>
-                    <?php if (is_series_site() || ($this->config->item('site_code') == 'ah') || ($this->config->item('site_code') == 'gm')) { ?>
+                    <?php if (is_series_site() || ($this->config->item('site_code') == 'ah') || ($this->config->item('site_code') == 'gm')) {?>
                         <label class="col-xs-24">本站会自动更新静态页面</label>
-                    <?php } else { ?>
+                    <?php } else {?>
                         <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
                             <input type="checkbox" name="auto_update_cache_checkbox" id="auto_update_cache_checkbox" onclick="get_update_cache_url();" value="<?php echo $information->ic_url; ?>" />静态更新
                         </label>
-                    <?php } ?>
+                    <?php }?>
 
-                    <div class="clearfix"></div>	
+                    <div class="clearfix"></div>
                     <p class="col-xs-24 nopadding">
                         <button type="button" id="btn-mobile-friendly" class="btn btn-sm" onclick="$('#btn-mobile-friendly').button('loading');
                                 $('#mobile_friendly_status').html('');
@@ -1214,7 +1217,10 @@
                         <!--  <a href="javascript:void();" class="btn btn-sm" id="goto_validator_button" target="_blank" onclick="goto_validator();" >HTML规范验证</a> -->
                     </p>
 
-                    <div class="btn-group col-xs-24 nopadding pull-right <?php if ($is_writeable == 0) echo 'hide'; ?>">
+                    <div class="btn-group col-xs-24 nopadding pull-right <?php if ($is_writeable == 0) {
+	echo 'hide';
+}
+?>">
                         <input type="hidden" name="rule_check_flag" id="rule_check_flag" value="1">
                         <a href="javascript:void(0);" class="btn btn-primary col-xs-19"  onclick="editor.sync();
                                 if (editor.html() != '' && editor.text() == '') {
@@ -1239,15 +1245,15 @@
                             <li class="dropdown-submenu pull-left">
                                 <a id="history_log_toggle" tabindex="-1" href="javascript:void(0);">历史记录</a>
                                 <ul class="dropdown-menu history_log" style="right: 157px;left: inherit;top: 83px;">
-                                    <?php foreach ($content_backup_list as $item) { ?>
+                                    <?php foreach ($content_backup_list as $item) {?>
                                         <li><a href="<?php echo site_url('information/backup_content/' . $item->log_id); ?>" target="_blank"><?php echo $item->log_datetime ?>, <?php echo $item->log_ht_username ?></a></li>
-                                    <?php } ?>
+                                    <?php }?>
                                 </ul>
                             </li>
                         </ul>
                     </div>
 
-                    <div class="clearfix"></div>	
+                    <div class="clearfix"></div>
                     <p></p>
                     <div class="error-tips hide" style="background-color: rgb(242, 222, 222);padding:5px; overflow: hidden;">
                         <ol id="error-tops" style="padding-left:20px;"></ol>
@@ -1266,101 +1272,4 @@
         </div>
 
     </div>
-</div>
-<?php //标签模态框 ?>
-<div class="modal fade" id="tagM" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-    <style type="text/css">
-        .tagLabel {background: #eee;padding: 5px 15px 5px 35px!important;border-radius: 5px;border: 1px solid #aaa; margin-right:2px;box-shadow: 0px 0px 2px #ddd;}
-        .myTag {background: #d2eafb; color:#108ee9; border-color: #108ee9;}
-        .tagLabel.newLabel {padding: 5px 10px!important;border: 1px dashed #000;}
-    </style>
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">添加标签</h4>
-            </div>
-            <div class="modal-body">
-                <div class="checkbox">
-                    <?php foreach ($my_tags as $tag) { ?>
-                        <label class="tagLabel myTag">
-                            <input type="checkbox" value="<?php echo($tag->it_title) ?>" data-it-id="<?php echo($tag->it_id) ?>" checked>
-                            <span><?php echo($tag->it_title) ?></span>
-                        </label>
-                    <?php } ?>
-                </div>
-                <div class="checkbox">
-                    <?php foreach ($all_tags as $tag) { ?>
-                        <label class="tagLabel">
-                            <input type="checkbox" value="<?php echo($tag->it_title) ?>" data-it-id="<?php echo($tag->it_id) ?>">
-                            <span><?php echo($tag->it_title) ?></span>
-                        </label>
-                    <?php } ?>
-                    <label class="tagLabel newLabel">
-                        <a class="btn btn-xs newTagA"> + 新标签 </a>
-                        <input class="form-control input-sm newTag newTagI" type="text" placeholder=" + 新标签 " style="display:none">
-                    </label>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <!--a class="btn btn-primary" id="newTemp" target="_blank" href="javascript:void(0);">添加为模板</a-->
-                <a class="btn btn-default" target="_blank" href="http://localhost:3000/">打开模板管理</a>
-            </div>
-        </div>
-    </div>
-    <script type="text/javascript">
-        //标签更新
-        $('[data-it-id]').on('change', function () {
-            if ($(this).is(':checked')) {
-                $.post('/info.php/info_tags/add_tag_to_content/', {
-                    'it_id': $(this).attr('data-it-id'),
-                    'ic_id': <?php echo $information->ic_id; ?>,
-                });
-                $(this).parent().addClass('myTag');
-            } else {
-                $.post('/info.php/info_tags/remove_tag_to_content/', {
-                    'it_id': $(this).attr('data-it-id'),
-                    'ic_id': <?php echo $information->ic_id; ?>,
-                });
-                $(this).parent().removeClass('myTag');
-            }
-        });
-        //新标签
-        $('.newTagA').on('click', function () {
-            $(this).hide();
-            $('.newTagI').show();
-        });
-        $('.newTagI').on('blur', function () {
-            $(this).hide();
-            if ($(this).val()) {
-                var yes = confirm("确认添加新标签：" + $(this).val())
-                //添加标签
-                if (yes) {
-                    $.post('/info.php/info_tags/add_tag/', {'title': $(this).val(), 'memo': 'test'}, function (json) {
-                        if (json.statu != '-1') {
-                            $clone = $('.tagLabel').eq(0).clone(true);
-                            $clone.removeClass('myTag');
-                            $clone.find('input').attr('data-it-id', json.message).removeAttr('checked');
-                            $clone.find('span').html($('.newTagI').val());
-                            $('.newLabel').before($clone);
-                            //归零
-                            $('.newTagI').val('').hide();
-                            $('.newTagA').html(' + 新标签 ').show();
-                        } else {
-                            alert('增加标签失败！');
-                        }
-                    }, 'json');
-                    $('.newTagA').html($(this).val()).show();
-                } else {
-                    $('.newTagA').show();
-                }
-            } else {
-                $('.newTagA').html(' + 新标签 ').show();
-            }
-        });
-        //添加新模板
-        $('#newTemp').on('click', function () {
-            alert('ok');
-        });
-    </script>
 </div>
\ No newline at end of file

From d3818673dc8a1c4131c2ab685a6921fa238ac437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Mon, 5 Feb 2018 09:21:24 +0800
Subject: [PATCH 3/6] =?UTF-8?q?amp=E9=AA=8C=E8=AF=81=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BB=A3=E7=90=86=E5=9C=B0=E5=9D=80=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=BF=BB=E5=A2=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/amp_editor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/amp_editor.php b/application/views/amp_editor.php
index 974e7e5b..9a366b61 100644
--- a/application/views/amp_editor.php
+++ b/application/views/amp_editor.php
@@ -24,7 +24,7 @@
         <input type="hidden" name="ic_id" value="<?php echo $information->ic_id; ?>" />
 
         <div class="row">
-            <div class="col-sm-13" ><a href="https://validator.ampproject.org/" target="_blank">AMP代码验证</a></div>
+            <div class="col-sm-13" ><a href="http://ampvalidator.mycht.cn/" target="_blank">AMP代码验证</a></div>
             <div class="col-sm-3">
 
                 <select name="amp_status" id="amp_status" class="form-control" >

From fef71275d348d18154ce2835de11f7cef15708b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Mon, 5 Feb 2018 09:28:55 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B2=BE=E7=AE=80css?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/amp_editor.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/views/amp_editor.php b/application/views/amp_editor.php
index 9a366b61..8f938f25 100644
--- a/application/views/amp_editor.php
+++ b/application/views/amp_editor.php
@@ -24,7 +24,13 @@
         <input type="hidden" name="ic_id" value="<?php echo $information->ic_id; ?>" />
 
         <div class="row">
-            <div class="col-sm-13" ><a href="http://ampvalidator.mycht.cn/" target="_blank">AMP代码验证</a></div>
+            <div class="col-sm-13" >
+			<a href="http://ampvalidator.mycht.cn/" target="_blank">AMP代码验证</a>
+			|
+			<a href="https://uncss-online.com/" target="_blank">CSS精简</a>
+			|
+			<a href="http://tool.oschina.net/jscompress" target="_blank">CSS压缩</a>
+			</div>
             <div class="col-sm-3">
 
                 <select name="amp_status" id="amp_status" class="form-control" >

From d57f6620bc4d7047b76d935ee48e5cfcd86ad041 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 5 Feb 2018 14:55:28 +0800
Subject: [PATCH 5/6] =?UTF-8?q?keyword=20=E6=8E=92=E5=90=8D=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/keyworlds.php         | 12 ++++++------
 application/models/infokeywordsrank_model.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php
index 099945ad..a6b7108c 100644
--- a/application/controllers/keyworlds.php
+++ b/application/controllers/keyworlds.php
@@ -341,10 +341,10 @@ class Keyworlds extends CI_Controller {
         // rank 变化
         if ($client_flag === 'PC') {
             $this->Keywords_model->update_time($kw_id);
-            $last_rank_pc = $this->Keywordsrank_model->get_last_pc_rank($kw_id);
-            if (trim($last_rank_pc[0]->kwr_rank) != "") {
+            $last_rank_pc = $this->Keywordsrank_model->get_last_pc_rank($kw_id, 2);
+            if (trim($last_rank_pc[1]->kwr_rank) != "") {
                 $this->load->model('InfoSMS_model');
-                $last_rank_pc = isset($last_rank_pc[0]) ? $last_rank_pc[0]->kwr_rank : $rank['rank'];
+                $last_rank_pc = isset($last_rank_pc[1]) ? $last_rank_pc[1]->kwr_rank : $rank['rank'];
                 $this->InfoSMS_model->readed_for_info($kw_id, 'keywords_rank');
                 $this->InfoSMS_model->add('keywords_rank', $kw_id, $rank['rank'], $last_rank_pc, (string) ($rank['rank'] - $last_rank_pc));
             }
@@ -429,10 +429,10 @@ class Keyworlds extends CI_Controller {
             // rank 变化
             if ($client_flag === 'PC') {
                 $this->Keywords_model->update_time($v->kw_id);
-                $last_rank_pc = $this->Keywordsrank_model->get_last_pc_rank($v->kw_id);
-                if (trim($last_rank_pc[0]->kwr_rank) != "") {
+                $last_rank_pc = $this->Keywordsrank_model->get_last_pc_rank($v->kw_id, 2);
+                if (trim($last_rank_pc[1]->kwr_rank) != "") {
                     $this->load->model('InfoSMS_model');
-                    $last_rank_pc = isset($last_rank_pc[0]) ? $last_rank_pc[0]->kwr_rank : $rank['rank'];
+                    $last_rank_pc = isset($last_rank_pc[1]) ? $last_rank_pc[1]->kwr_rank : $rank['rank'];
                     $this->InfoSMS_model->readed_for_info($v->kw_id, 'keywords_rank');
                     $this->InfoSMS_model->add('keywords_rank', $v->kw_id, $rank['rank'], $last_rank_pc, (string) ($rank['rank'] - $last_rank_pc));
                 }
diff --git a/application/models/infokeywordsrank_model.php b/application/models/infokeywordsrank_model.php
index df0c8039..7c4e31c2 100644
--- a/application/models/infokeywordsrank_model.php
+++ b/application/models/infokeywordsrank_model.php
@@ -64,7 +64,7 @@ class infoKeywordsrank_model extends CI_Model
     }
     public function get_last_pc_rank($kw_id_string, $top=1)
     {
-        $sql = "SELECT top 2 kwr_id,
+        $sql = "SELECT top $top kwr_id,
                          kwr_kw_id,
                          kwr_rank,
                          kwr_mobile_rank,

From 8aeb792bfe07296bc4bd8003cf9203b658792129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Tue, 6 Feb 2018 14:54:55 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=A2=83?=
 =?UTF-8?q?=E6=B8=B8=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config/config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/config/config.php b/application/config/config.php
index df5cd0d1..bc6fe541 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -382,6 +382,7 @@ $config['site'] = array(
     'mct' => array('site_code' => 'mct', 'site_id' => 6, 'site_lgc' => '101', 'site_image_url' => '', 'site_url' => 'https://www.mychinatours.com', 'site_authors' => array('cj')),
     'diy' => array('site_code' => 'diy', 'site_id' => 99, 'site_lgc' => '1', 'sitemap_name' => 'E:/Dropbox/wwwroot/diychinatours.com/information.sitemap.xml', 'site_image_url' => '//images.diychinatours.com', 'site_url' => 'http://www.diychinatours.com', 'site_sitemap' => 'E:/Dropbox/wwwroot/diychinatours.com/information.sitemap.xml', 'site_authors' => array('ycc,lyy')),
     'ah' => array('site_code' => 'ah', 'site_id' => 141, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '//images.asiahighlights.com', 'site_url' => 'https://www.asiahighlights.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
+    'pgr' => array('site_code' => 'pgr', 'site_id' => 0, 'site_lgc' => '2', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => '', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
     'bht' => array('site_code' => 'bht', 'site_id' => 6565, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'http://www.beijinghighlights.com', 'site_authors' => array('cj'))
 );