From be2b43d66b267960e7199ab9dfae5418d0cb3b15 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 28 May 2021 10:01:49 +0800 Subject: [PATCH 01/13] 11 --- .../views/mobile_first/ch-inquiry-form.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index a2b8f911..48e4b677 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -11,19 +11,27 @@
-

+ +

-

+

+ +

-

+ +

-

+ +

From 33c5958e4b2c67bf6acd0679bd0f87d1de96af44 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 28 May 2021 10:13:05 +0800 Subject: [PATCH 02/13] 11 --- application/views/mobile_first/ch-inquiry-form.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index 48e4b677..55884846 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -11,35 +11,35 @@
-

+

-

+

-

+

+ placeholder="Any other way to reach you (optional)" type="tel"/>

-

+

-

+ -

+ config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?> - + - + From e6071931c913cf217743a4627de2a508ab66a054 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sat, 29 May 2021 00:32:24 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/header.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 6ffb06d1..d48a127f 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -163,9 +163,9 @@ config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?> - + - + From 1fa7e20bc9ba72e5950344c3b03960b8f94f534a Mon Sep 17 00:00:00 2001 From: "59361885@qq.com" <59361885@qq.com> Date: Sat, 29 May 2021 00:37:03 +0800 Subject: [PATCH 09/13] ok --- application/views/bootstrap3/header.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index d48a127f..5b9075e0 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -163,9 +163,9 @@ config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?> - + - + From 772b4b8176cf550637cf4a63f6479bb9e64ed461 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 31 May 2021 10:14:19 +0800 Subject: [PATCH 10/13] =?UTF-8?q?CH=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-inquiry-form.php | 2 +- application/views/mobile_first/ch-pc.php | 2 +- application/views/mobile_first/ch.php | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index 91757723..a56e95fa 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -28,7 +28,7 @@

- +

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 40b2cbf8..9744b709 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -57,7 +57,7 @@
  • China Tours 2021
  • Panda Tours
  • Great Wall Hiking
    • -
  • Nature Tours
    • +
  • Hiking Tours
  • Silk Road Tours
  • China Expats Tours
  • Yangtze River Cruise
    • diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index f27b8343..255b8c62 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -82,8 +82,7 @@ - +
    -
    - - \ No newline at end of file + \ No newline at end of file From 7e8874dc62a429c26bd08dc3e0d738cb7cae99a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 2 Jun 2021 14:42:48 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=92=8C=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E9=80=89=E6=8B=A9=E7=9A=84=E4=BE=BF=E6=8D=B7=E5=8C=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/recommend/controllers/tips.php | 2 +- application/third_party/recommend/views/welcome.php | 13 ++++--------- application/views/bootstrap3/header.php | 4 ++-- wysiwyg/config.js | 4 ++-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/application/third_party/recommend/controllers/tips.php b/application/third_party/recommend/controllers/tips.php index 42ca9e1c..304cad97 100644 --- a/application/third_party/recommend/controllers/tips.php +++ b/application/third_party/recommend/controllers/tips.php @@ -26,7 +26,7 @@ class Tips extends CI_Controller $infoTip = new StdClass; $infoTip->it_title = '新广告'; $infoTip->it_expires = time(); - $infoTip->it_content = ''; + $infoTip->it_content = $this->load->view('templates', false,true);; $infoTip->it_code = ''; $infoTip->it_datetime = time(); $infoTip->it_sitecode = $this->config->item('site_code'); diff --git a/application/third_party/recommend/views/welcome.php b/application/third_party/recommend/views/welcome.php index 4c8efefa..eb10a2b1 100644 --- a/application/third_party/recommend/views/welcome.php +++ b/application/third_party/recommend/views/welcome.php @@ -4,7 +4,7 @@
    -

    广告管理

    +

    广告管理 添加广告

    @@ -16,8 +16,9 @@ + $item){ ?> - + - - - - - - - + diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 5b9075e0..86d3f99b 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -89,8 +89,8 @@ var use_pictures = $("#use_pictures").val(); if (result != null) { for (var key in result.Pinfo) { - if ('config->item('site_code') ?>' == 'cht') { - editor.insertHtml('
    ' + result.Pinfo[key].Sinfo + '' + result.Pinfo[key].Sinfo + '
    '); + if ('config->item('site_code') ?>' == 'ah') { + editor.insertHtml('
    ' + result.Pinfo[key].Sinfo + ' ' + result.Pinfo[key].Sinfo + '
    '); } else if ('config->item('site_code') ?>' == 'ch') { editor.insertHtml('
    ' + result.Pinfo[key].Sinfo + '' + result.Pinfo[key].Sinfo + '
    '); } else { diff --git a/wysiwyg/config.js b/wysiwyg/config.js index bb7b49d7..1c29a191 100644 --- a/wysiwyg/config.js +++ b/wysiwyg/config.js @@ -42,8 +42,8 @@ CKEDITOR.editorConfig = function( config ) { { name: 'others', groups: [ 'others' ] }, { name: 'about', groups: [ 'about' ] } ]; -//,NumberedList,BulletedList,SpecialChar - 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'; +//,NumberedList,BulletedList,SpecialChar ,Templates + 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'; From 5b824b07a9a5185c4c94c4485a3ba84a9c55caec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 2 Jun 2021 14:44:50 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=8F=90=E9=86=92=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/recommend/views/welcome.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/recommend/views/welcome.php b/application/third_party/recommend/views/welcome.php index eb10a2b1..161f894d 100644 --- a/application/third_party/recommend/views/welcome.php +++ b/application/third_party/recommend/views/welcome.php @@ -18,7 +18,7 @@ $item){ ?> - +
    it_title; ?> @@ -26,13 +27,7 @@ it_expires); ?>
    添加广告
    it_title; ?>