Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
hotfix/paypal-note
candice 2 years ago
parent 048dd2c1e3 a2c91c448c
commit d5adfd24b1
5 changed files with 1958 additions and 1807 deletions
Show Stats Download Patch File Download Diff File

1821
application/third_party/order/views/ah/confirm_order.php vendored
View File

File diff suppressed because it is too large Load Diff

73
application/third_party/order/views/ah/link_tips.php vendored
Unescape Escape View File

@ -0,0 +1,73 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Thanks for booking with China Highlights!</title>
<meta name="robots" content="noindex,nofollow"/>
<link href="https://www.chinahighlights.com/css/min.php?f=/image/customer_center_data/css/bootstrap.min.css,/image/customer_center_data/css/order.css&v=2015042802" rel="stylesheet">
<!--[if lt IE 9]>
<script src="https://cdn.bootcss.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
<script src="https://www.chinahighlights.com/js/min.php?f=/image/customer_center_data/js/jquery.min.js,/image/customer_center_data/js/bootstrap.min.js&v=2015042802"></script>
<link rel="shortcut icon" href="https://www.chinahighlights.com/favicon.ico">
</head>
<body class="modal-open">
<div id="headerWrapper">
<div id="header">
<div id="mainnav" class="nav navbar" role="navigation">
<div class="container-fluid">
<div class="row">
<div class="col-lg-3 col-sm-4 logobox hidden-xs">
<a href="/">
<img src="https://www.chinahighlights.com/image/customer_center_data/css/images/logo-132x104.png" alt="logo">
</a>
</div>
<div class="col-lg-16 col-sm-13 col-lg-offset-3 col-sm-offset-4">
<div class="navbar-header">
<div class="col-xs-24 btn-lg"></div>
</div>
</div>
<div class="col-lg-5 col-sm-7 hidden-xs pull-right nopadding">
<div class="tollfree pull-right">
<div class="col-xs-24 btn-sm"></div>
<div class="currentNo col-sm-24 nopadding"><span class="glyphicon glyphicon-earphone" style="font-size:12px;"></span> 800-2682918 (USA/CA)</div>
<div class="col-sm-24">
<div class="currentNo col-sm-24 nopadding"> 1800-764678 (AU)</div>
<div class="currentNo col-sm-24 nopadding"> 0800-0327753 (UK)</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="bs-example bs-example-modal" data-example-id="static-modal">
<div class="modal" style="display:block;">
<div class="modal-dialog" style="margin-top:200px;">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title text-success" id="modal-title">Success!<a class="anchorjs-link" href="#modal-title"><span class="anchorjs-icon"></span></a></h3>
</div>
<div class="modal-body" style="height:150px;">
<h4 style="padding-top:10px;">For any change, please contact your travel advisor.</h4>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
</div>
<div class="modal-backdrop fade in" style="bottom:0;"></div>
</body>
</html>

1821
application/third_party/order/views/confirm_order.php vendored
View File

File diff suppressed because it is too large Load Diff

2
application/third_party/order/views/gh/confirm_order.php vendored
Unescape Escape View File

@ -319,7 +319,7 @@ input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15p
<header class="headerbar" id="header"> <header class="headerbar" id="header">
<div class="topnavigation"> <div class="topnavigation">
<a href="/" class="p_toplogo" style="display: inline-block;"> <img <a href="/" class="p_toplogo" style="display: inline-block;"> <img
src="https://data.asiahighlights.com/pic/ah-bottom-logo-mobile.png" alt="Asiahighlights logo" src="https://data.chinahighlights.com/image/aboutus/gh2.png" alt="Globalhighlights logo"
class="asiahighlightslogo img-responsive"></a> class="asiahighlightslogo img-responsive"></a>
</div> </div>

48
application/views/bootstrap3/information_edit.php
Unescape Escape View File

@ -673,6 +673,19 @@ if ($embody == 1) {
</div> </div>
<div class="col-xs-24 btn-sm"></div> <div class="col-xs-24 btn-sm"></div>
</div> </div>
<div class="col-xs-24 nopadding">
<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; ?>">
</div>
<div class="col-xs-8" style="display: none">
<label>SEO关键词</label>
<input class="form-control" type="text" id="ic_seo_keywords" name="ic_seo_keywords" value="<?php echo $information->ic_seo_keywords; ?>">
</div>
<div class="col-xs-24 nopadding">
<label>SEO描述<em class="pull-right muted" id="ic_seo_description_count"></em></label>
<textarea class="form-control" onkeyup="change_seo_count(this.id);" id="ic_seo_description" name="ic_seo_description"><?php echo $information->ic_seo_description; ?></textarea>
</div>
<div class="col-xs-12 nopadding"> <div class="col-xs-12 nopadding">
<div class="form-group"> <div class="form-group">
<div class="col-xs-24 nopadding">链接标题</div> <div class="col-xs-24 nopadding">链接标题</div>
@ -719,19 +732,7 @@ if ($embody == 1) {
<textarea name="ic_summary" id="ic_summary" class="col-xs-24" rows="5" placeholder="信息简介" style="border:none;border-bottom:1px solid #bbb;"><?php echo str_replace('textarea', 't-e-x-t-a-r-e-a', $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 str_replace('textarea', 't-e-x-t-a-r-e-a', $information->ic_summary); ?></textarea>
<div class="col-xs-16">
<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; ?>">
</div>
<div class="col-xs-8">
<label>SEO关键词</label>
<input class="form-control" type="text" id="ic_seo_keywords" name="ic_seo_keywords" value="<?php echo $information->ic_seo_keywords; ?>">
</div>
<div class="col-xs-24">
<label>SEO描述<em class="pull-right muted" id="ic_seo_description_count"></em></label>
<textarea class="form-control" onkeyup="change_seo_count(this.id);" id="ic_seo_description" name="ic_seo_description"><?php echo $information->ic_seo_description; ?></textarea>
</div>
@ -784,7 +785,7 @@ if (!empty($setting_website_nav)) {
<div> <div>
<div class="col-sm-8"> <div class="col-sm-8">
<label>附加图片 <label>附加图片PC
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a> <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').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_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a> <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture', $('#meta_addon_picture').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
</label> </label>
@ -799,7 +800,7 @@ if (!empty($setting_website_nav)) {
<input name="meta_addon_picture_mobile" id="meta_addon_picture_mobile" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_mobile'); ?>" /> <input name="meta_addon_picture_mobile" id="meta_addon_picture_mobile" type="text" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_addon_picture_mobile'); ?>" />
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8" style="display: none">
<label>附加图片链接 <label>附加图片链接
<a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a> <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').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_addon_picture_url', $('#meta_addon_picture_url').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a> <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_addon_picture_url', $('#meta_addon_picture_url').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
@ -1870,12 +1871,6 @@ if (stripos($information->ic_photo, '//') === false) {
<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;">
&lt;!--@Content-Recommends-Article@--&gt; &lt;!--@Content-Recommends-Article@--&gt;
</label> </label>
<label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
&lt;!--@Content-Recommends-Tour@--&gt;
</label>
<label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
&lt;!--@Match-Content-GOOGLE@--&gt;
</label>
</div> </div>
</div> </div>
@ -1969,11 +1964,6 @@ foreach ($author_list as $author_item) {
<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 if (!empty($has_html_file)) {?>
<label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
<a href="<?php echo site_url('information/html_file_helper/delete?ic_url=') . $information->ic_url; ?>" target="_blank">静态文件已生成，点击删除</a>
</label>
<?php }?>
<?php }?> <?php }?>
<?php if (in_array($this->config->item('site_code'), array('cht', 'gm'))) {?> <?php if (in_array($this->config->item('site_code'), array('cht', 'gm'))) {?>
@ -2034,6 +2024,12 @@ foreach ($author_list as $author_item) {
</ul> </ul>
</li> </li>
</ul> </ul>
<?php if (!empty($has_html_file)) {?>
<label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
<a href="<?php echo site_url('information/html_file_helper/delete?ic_url=') . $information->ic_url; ?>" target="_blank">静态文件已生成，点击删除</a>
</label>
<?php }?>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>

Write Preview
Loading…
Cancel
Save