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

Browse Source
hotfix/paypal-note
LiaoYijun 4 years ago
parent d1bf4718ea 5b824b07a9
commit 0a04598ba3
8 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
application/third_party/recommend/controllers/tips.php vendored
Unescape Escape View File

@ -26,7 +26,7 @@ class Tips extends CI_Controller
$infoTip = new StdClass; $infoTip = new StdClass;
$infoTip->it_title = '新广告'; $infoTip->it_title = '新广告';
$infoTip->it_expires = time(); $infoTip->it_expires = time();
$infoTip->it_content = ''; $infoTip->it_content = $this->load->view('templates', false,true);;
$infoTip->it_code = '<!--@TIPS--@-->'; $infoTip->it_code = '<!--@TIPS--@-->';
$infoTip->it_datetime = time(); $infoTip->it_datetime = time();
$infoTip->it_sitecode = $this->config->item('site_code'); $infoTip->it_sitecode = $this->config->item('site_code');

13
application/third_party/recommend/views/welcome.php vendored
Unescape Escape View File

@ -4,7 +4,7 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<h4>广告管理</h4> <h4>广告管理 <small><a href="<?php echo site_url('thirdparty/recommend/tips/add'); ?>">添加广告</a></small></h4>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@ -16,8 +16,9 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($tipsList as $key=>$item){ ?> <?php foreach ($tipsList as $key=>$item){ ?>
<tr> <tr class="<?php if($item->it_expires<time()){echo 'danger';} ?>">
<td><?php echo ++$key; ?></td> <td><?php echo ++$key; ?></td>
<td> <td>
<a href="<?php echo site_url('thirdparty/recommend/tips/edit/'.$item->it_id); ?>"><?php echo $item->it_title; ?></a> <a href="<?php echo site_url('thirdparty/recommend/tips/edit/'.$item->it_id); ?>"><?php echo $item->it_title; ?></a>
@ -26,13 +27,7 @@
<td><?php echo date('m/d/Y', $item->it_expires); ?></td> <td><?php echo date('m/d/Y', $item->it_expires); ?></td>
</tr> </tr>
<?php } ?> <?php } ?>
<tr>
<td></td>
<td></td>
<td></td>
<td><a href="<?php echo site_url('thirdparty/recommend/tips/add'); ?>">添加广告</a></td>
</tr>
<tr>
</tbody> </tbody>

6
application/views/bootstrap3/header.php
Unescape Escape View File

@ -89,8 +89,8 @@
var use_pictures = $("#use_pictures").val(); var use_pictures = $("#use_pictures").val();
if (result != null) { if (result != null) {
for (var key in result.Pinfo) { for (var key in result.Pinfo) {
if ('<?php echo $this->config->item('site_code') ?>' == 'cht') { if ('<?php echo $this->config->item('site_code') ?>' == 'ah') {
editor.insertHtml('<div class="photoBlock300 autowidht" id="yonglaidingweitupian"> <img class="img-responsive" src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '" />' + result.Pinfo[key].Sinfo + '</div>'); editor.insertHtml('<div class="infoimage"> <img alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive" loader="lazy" originalsrc="' + site_image_url + result.Pinfo[key].PUrl + '" src="https://data.asiahighlights.com/image/grey.gif" /> <span class="photoTxt">' + result.Pinfo[key].Sinfo + '</span></div>');
} else if ('<?php echo $this->config->item('site_code') ?>' == 'ch') { } else if ('<?php echo $this->config->item('site_code') ?>' == 'ch') {
editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>'); editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>');
} else { } else {
@ -163,7 +163,7 @@
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default btn-sm" type="submit">搜索</button> <button class="btn btn-default btn-sm" type="submit">搜索</button>
<?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?> <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
<a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" class="btn btn-default btn-sm" title="图片管理" ><span class="glyphicon glyphicon-picture"></span></a> <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" target="_blank" class="btn btn-default btn-sm" title="图片上传管理"><span class="glyphicon glyphicon-picture"></span></a>
<?php } else { ?> <?php } else { ?>
<a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"><span class="glyphicon glyphicon-picture"></span></a> <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"><span class="glyphicon glyphicon-picture"></span></a>
<?php } ?> <?php } ?>

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

@ -2098,7 +2098,14 @@
<label>标题图片<a href="javascript:void(0);" onclick="delete_root_image();" title="删除图片"><i <label>标题图片<a href="javascript:void(0);" onclick="delete_root_image();" title="删除图片"><i
class="text-muted glyphicon glyphicon-remove"></i></a></label> class="text-muted glyphicon glyphicon-remove"></i></a></label>
<a href="javascript:void(0);" onclick="openKCFinder_Root();"> <a href="javascript:void(0);" onclick="openKCFinder_Root();">
<img src="<?php echo $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg'; ?>" <?php
if (stripos($information->ic_photo, '//') === false) {
$list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg';
} else {
$list_picture = $information->ic_photo;
}
?>
<img src="<?php echo $list_picture; ?>"
name="ic_photo_img" id="ic_photo_img" class="img-polaroid col-xs-24 nopadding" name="ic_photo_img" id="ic_photo_img" class="img-polaroid col-xs-24 nopadding"
height="115"/> height="115"/>
</a> </a>

28
application/views/mobile_first/ch-inquiry-form.php
Unescape Escape View File

@ -11,27 +11,39 @@
<form action="https://www.chinahighlights.com/secureforms/qi_save" id="quick_inquiry_form" method="post" <form action="https://www.chinahighlights.com/secureforms/qi_save" id="quick_inquiry_form" method="post"
name="quick_inquiry_form" novalidate="" onsubmit="return validateQuickInquiryForm()"> name="quick_inquiry_form" novalidate="" onsubmit="return validateQuickInquiryForm()">
<div class="InquiryBox"> <div class="InquiryBox">
<p><input class="FullName" id="realname" name="realname" placeholder="Full name" type="text"/> <span <p >
<span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-name.png">
<span class="form_required">*</span>
</span>
<input class="FullName" id="realname" name="realname" placeholder="Full name" type="text"/> <span
id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your full name</span></span> id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your full name</span></span>
</p> </p>
<p><input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/> <p >
<span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-email.png">
<span class="form_required">*</span></span>
<input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/>
<span id="email_errmsg" style="display: none"><span class="requiredArea">Please enter your email</span></span> <span id="email_errmsg" style="display: none"><span class="requiredArea">Please enter your email</span></span>
<span id="email_verify_errmsg" style="display: none"><span class="requiredArea">Please verify your email</span></span> <span id="email_verify_errmsg" style="display: none"><span class="requiredArea">Please verify your email</span></span>
</p> </p>
<p><input class="Inquiryphone" id="PhoneNo" name="PhoneNo" <p >
placeholder="Any other way to reach you (optional)" style="padding-left: 50px;" type="tel"/></p> <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-form-phone-tag-bg.png" style="margin-left: -13px;"></span>
<input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
placeholder="Any other way to reach you" type="tel"/></p>
<p class="InquiryDate"><input class="InquiryCalendar" data-min-date="7" id="starting_date" <p >
<span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-calendar.png">
<span class="form_required">*</span></span>
<input class="InquiryCalendar" data-min-date="7" id="starting_date"
name="starting_date" placeholder="Starting date" readonly="readonly" name="starting_date" placeholder="Starting date" readonly="readonly"
type="text"/><span id="starting_date_errmsg" style="display: none"><span type="text"/><span id="starting_date_errmsg" style="display: none"><span
class="requiredArea">Please enter your starting date</span></span></p> class="requiredArea">Please enter your starting date</span></span></p>
<p>
<textarea id="form_additionalrequirements" name="form_additionalrequirements" <textarea id="form_additionalrequirements" name="form_additionalrequirements"
placeholder="Tell us your travel ideas/interests, how many people, your hotel style…"></textarea> placeholder="Tell us your travel ideas/interests, how many people, your hotel style…"></textarea>
</p>
<input type="hidden" name="nullemail"> <input type="hidden" name="nullemail">
<input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/> <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/>
<button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="submit">Send My <button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="submit">Send My
@ -39,5 +51,3 @@
</div> </div>
</form> </form>
</div> </div>
<script async src="https://www.recaptcha.net/recaptcha/api.js?render=6Lf4bfAaAAAAAEZZ9rX0ZIYfPAqACtRldSOFzl9b"></script>

2
application/views/mobile_first/ch-pc.php
Unescape Escape View File

@ -57,7 +57,7 @@
<li class="start-nav-item"><a href="/tour/year.htm">China Tours 2021</a></li> <li class="start-nav-item"><a href="/tour/year.htm">China Tours 2021</a></li>
<li class="start-nav-item"><a href="/tour/china-panda-tours/">Panda Tours</a></li> <li class="start-nav-item"><a href="/tour/china-panda-tours/">Panda Tours</a></li>
<li class="start-nav-item"><a href="/greatwall/hiking.htm">Great Wall Hiking</a></li> <li class="start-nav-item"><a href="/greatwall/hiking.htm">Great Wall Hiking</a></li>
<li class="start-nav-item"><a href="/tour/china-nature-tours/">Nature Tours</a></li> <li class="start-nav-item"><a href="/tour/china-hiking-tours/">Hiking Tours</a></li>
<li class="start-nav-item"><a href="/tour/silk-road-tours/">Silk Road Tours</a></li> <li class="start-nav-item"><a href="/tour/silk-road-tours/">Silk Road Tours</a></li>
<li class="start-nav-item"><a href="/tour/expats-tours.htm">China Expats Tours</a></li> <li class="start-nav-item"><a href="/tour/expats-tours.htm">China Expats Tours</a></li>
<li class="start-nav-item"><a href="/yangtzecruise/">Yangtze River Cruise</a></li> <li class="start-nav-item"><a href="/yangtzecruise/">Yangtze River Cruise</a></li>

3
application/views/mobile_first/ch.php
Unescape Escape View File

@ -81,8 +81,7 @@
</li> </li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/greatwall/hiking.htm">Great Wall <li class="menu__item" role="menuitem"><a class="menu__link" href="/greatwall/hiking.htm">Great Wall
Hiking</a></li> Hiking</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/china-nature-tours/">Nature <li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/china-hiking-tours/">Hiking Tours</a></li>
Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/silk-road-tours/">Silk Road <li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/silk-road-tours/">Silk Road
Tours</a></li> Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/expats-tours.htm">China Expats <li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/expats-tours.htm">China Expats

4
wysiwyg/config.js
Unescape Escape View File

@ -42,8 +42,8 @@ CKEDITOR.editorConfig = function( config ) {
{ name: 'others', groups: [ 'others' ] }, { name: 'others', groups: [ 'others' ] },
{ name: 'about', groups: [ 'about' ] } { name: 'about', groups: [ 'about' ] }
]; ];
//,NumberedList,BulletedList,SpecialChar //,NumberedList,BulletedList,SpecialChar ,Templates
config.removeButtons = 'Print,Preview,NewPage,Save,Templates,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut'; config.removeButtons = 'Print,Preview,NewPage,Save,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut';

Write Preview
Loading…
Cancel
Save