Merge branch 'master' of git.mycht.cn:developers/information-system

hotfix/远程访问多媒体中心
LiaoYijun 8 years ago
commit 7415de3d70

@ -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 src="/js/ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
var content_length = 0; var content_length = 0;
@ -341,6 +341,13 @@
return true; return true;
} }
//跳转到测试页面
function goto_test_page() {
var site_url = 'http://192.155.224.195:8080/guide-use.php/travelguide/guide/?static_html_url=';
$('#goto_test_page_button').attr("href", site_url + $('#ic_url').val());
return true;
}
//跳转到HTML验证页面 //跳转到HTML验证页面
function goto_validator() { function goto_validator() {
var site_url = '<?php echo $this->config->item('site_url') ?>'; var site_url = '<?php echo $this->config->item('site_url') ?>';
@ -441,7 +448,9 @@
init_recommend_popover("#meta_bread_info", ".meta_bread_info_box"); init_recommend_popover("#meta_bread_info", ".meta_bread_info_box");
//自动读取google网页性能评分 //自动读取google网页性能评分
setTimeout(function(){mobile_friendly(),1000}); setTimeout(function() {
mobile_friendly(), 1000
});
}); });
var editor; var editor;
@ -540,6 +549,9 @@
<div class="col-xs-24 nopadding">链接地址 <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="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> <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 } ?>
</div> </div>
<input class="form-control col-xs-24" type="text" id="ic_url" name="ic_url" value="<?php echo $information->ic_url; ?>" > <input class="form-control col-xs-24" type="text" id="ic_url" name="ic_url" value="<?php echo $information->ic_url; ?>" >
</div> </div>
@ -552,7 +564,7 @@
</div> </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>
@ -696,7 +708,7 @@
</div> </div>
<?php if ($information->ic_sitecode == 'cht') { ?> <?php if ($information->ic_sitecode == 'cht') { ?>
<div class="row"> <div class="row">
<div class="col-sm-5"> <div class="col-sm-5">
@ -779,7 +791,7 @@
</div> </div>
<?php } ?> <?php } ?>
<label>信息备注 <label>信息备注
@ -872,7 +884,7 @@
</div> </div>
<?php if (is_series_site()) { ?> <?php if (is_series_site()) { ?>
<div class="row"> <div class="row">
<div class="col-sm-8"> <div class="col-sm-8">
<label>机票目的地 <label>机票目的地
@ -911,7 +923,7 @@
<option selected="selected" value="<?php echo $meta_subnavi; ?>"><?php echo $meta_subnavi_arr[$meta_subnavi]; ?></option> <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> <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="index"><?php echo($meta_subnavi_arr['index']); ?></option>
<option value="tour"><?php echo($meta_subnavi_arr['tour']); ?></option> <option value="tour"><?php echo($meta_subnavi_arr['tour']); ?></option>
<option value="dest"><?php echo($meta_subnavi_arr['dest']); ?></option> <option value="dest"><?php echo($meta_subnavi_arr['dest']); ?></option>
@ -941,7 +953,7 @@
<?php } else { ?> <?php } else { ?>
<option value="noshow">不显示</option> <option value="noshow">不显示</option>
<option selected="selected" value="show">显示</option> <option selected="selected" value="show">显示</option>
<?php } ?> <?php } ?>
</select> </select>
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">
@ -952,7 +964,7 @@
</label> </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'); ?>" /> <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> </div>
<?php if ($information->ic_ht_area_type == 'err') { ?> <?php if ($information->ic_ht_area_type == 'err') { ?>
<div class="col-sm-8"> <div class="col-sm-8">
<label>自定义样式 <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> <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>
@ -974,11 +986,11 @@
</label> </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"/> <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> </div>
<?php } ?> <?php } ?>
</div> </div>
<?php } ?> <?php } ?>
<?php if ($information->ic_ht_area_type == 'g') { ?> <?php if ($information->ic_ht_area_type == 'g') { ?>
<div class="row"> <div class="row">
@ -1019,7 +1031,7 @@
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
<div class="row"> <div class="row">
<div class="col-sm-5"> <div class="col-sm-5">
<label>展示打赏功能 <label>展示打赏功能
@ -1093,9 +1105,9 @@
$value == $information->ic_type ? $select_str = 'selected' : $select_str = ''; $value == $information->ic_type ? $select_str = 'selected' : $select_str = '';
?> ?>
<option <?php echo $select_str; ?> value="<?php echo $value; ?>" ><?php echo $key; ?></option> <option <?php echo $select_str; ?> value="<?php echo $value; ?>" ><?php echo $key; ?></option>
<?php } ?> <?php } ?>
</select> </select>
<?php if ($rootInformation->ic_ht_area_type == 'pd') { ?> <?php if ($rootInformation->ic_ht_area_type == 'pd') { ?>
<div id="bind_product_code"> <div id="bind_product_code">
<br/> <br/>
<div class="input-group"> <div class="input-group">
@ -1104,7 +1116,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> <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>
</div> </div>
<?php } ?> <?php } ?>
<label style="width:48px;">模板</label> <label style="width:48px;">模板</label>
<select name="ic_template" id="ic_template" class="form-control"> <select name="ic_template" id="ic_template" class="form-control">
<?php <?php
@ -1112,7 +1124,7 @@
$value == $information->ic_template ? $select_str = 'selected' : $select_str = ''; $value == $information->ic_template ? $select_str = 'selected' : $select_str = '';
?> ?>
<option <?php echo $select_str; ?> value="<?php echo $value; ?>" ><?php echo $key; ?></option> <option <?php echo $select_str; ?> value="<?php echo $value; ?>" ><?php echo $key; ?></option>
<?php } ?> <?php } ?>
</select> </select>
<label>是否作为面包屑显示</label> <label>是否作为面包屑显示</label>
@ -1147,7 +1159,7 @@
($author_item->a_id == $information->ic_author) ? $select_str = 'selected' : $select_str = ''; ($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> <option <?php echo $select_str; ?> value="<?php echo $author_item->a_id; ?>" ><?php echo $author_item->a_name; ?></option>
<?php } ?> <?php } ?>
</select> </select>
<label>是否发布</label> <label>是否发布</label>
@ -1169,11 +1181,11 @@
<div class="clearfix"></div> <div class="clearfix"></div>
<?php if (is_series_site() || ($this->config->item('site_code') == 'ah')) { ?> <?php if (is_series_site() || ($this->config->item('site_code') == 'ah')) { ?>
<label class="col-xs-24">本站会自动更新静态页面</label> <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;"> <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; ?>" />静态更新 <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> </label>
<?php } ?> <?php } ?>
<div class="clearfix"></div> <div class="clearfix"></div>
<p class="col-xs-24 nopadding"> <p class="col-xs-24 nopadding">
@ -1181,7 +1193,7 @@
$('#mobile_friendly_status').html(''); $('#mobile_friendly_status').html('');
mobile_friendly(true);">网页性能检测: </button> mobile_friendly(true);">网页性能检测: </button>
<span id="mobile_friendly_status"></span> <span id="mobile_friendly_status"></span>
<!-- <a href="javascript:void();" class="btn btn-sm" id="goto_validator_button" target="_blank" onclick="goto_validator();" >HTML规范验证</a> --> <!-- <a href="javascript:void();" class="btn btn-sm" id="goto_validator_button" target="_blank" onclick="goto_validator();" >HTML规范验证</a> -->
</p> </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'; ?>">
@ -1211,7 +1223,7 @@
<ul class="dropdown-menu history_log" style="right: 157px;left: inherit;top: 83px;"> <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> <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> </ul>
</li> </li>
</ul> </ul>

Loading…
Cancel
Save