From e4be6ea121609753694bc136ad19dea7b4179a23 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, 27 Aug 2019 16:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=94=99=E8=AF=AF=E5=92=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?toolbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bootstrap/information_backup_content.php  | 21 +------------------
 .../views/bootstrap3/information_edit.php     |  1 -
 wysiwyg/config.js                             |  7 ++++++-
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/application/views/bootstrap/information_backup_content.php b/application/views/bootstrap/information_backup_content.php
index 1bd7d5c7..3397daf2 100644
--- a/application/views/bootstrap/information_backup_content.php
+++ b/application/views/bootstrap/information_backup_content.php
@@ -1,24 +1,5 @@
-<SCRIPT LANGUAGE="JavaScript">
-var editor;
-KindEditor.ready(function(K) {
-    editor = K.create('#ic_content', {
-        width : '100%',
-        height:'800px',
-        allowImageUpload:false,
-        filterMode : false,
-        items : [
-                'source', '|', 'undo', 'redo', '|', 'preview', 'cut', 'copy', 'paste', 'plainpaste', 'wordpaste', '|',
-                'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', '|', 
-                'clearhtml', 'quickformat','removeformat', 'selectall',  '/','fullscreen', '|',
-                'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-                'italic', 'underline', 'strikethrough', 'lineheight',  '|', 'table', 'hr', 'emoticons','image', 'map',  'pagebreak',
-                'link', 'unlink', '|', 'about'
-        ]
-    });
-});
-</script>
 
-<textarea id="ic_content" name="ic_content" class="infoCon"><?php echo str_replace($this->config->item('site_image_url'),$this->config->item('media_image_url'),$log_info->log_content); ?></textarea> 
+<textarea id="ic_content" name="ic_content" class="span12"  rows="20"  ><?php echo str_replace($this->config->item('site_image_url'),$this->config->item('media_image_url'),$log_info->log_content); ?></textarea> 
 
 
 <div class="well" >
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 707ff575..5af06dae 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -247,7 +247,6 @@
       for (var key in result.Pinfo) {
         if ('<?php echo $this->config->item('site_code') ?>' == 'cht') {
           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>');
-          insertoutP();
         } else {
           editor.insertHtml('<img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].PName + '" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '" />');
         }
diff --git a/wysiwyg/config.js b/wysiwyg/config.js
index e25f23db..ad4d7aa3 100644
--- a/wysiwyg/config.js
+++ b/wysiwyg/config.js
@@ -22,7 +22,6 @@ CKEDITOR.editorConfig = function( config ) {
 	config.enterMode = CKEDITOR.ENTER_BR;
 	config.allowedContent = true;
 	config.toolbarGroups = [
-			{ name: 'document', groups: [ 'Print'] },
 			{ name: 'undo', groups: [ 'Undo', 'Redo', ] },
 			{ name: 'styles', groups: [ 'styles' ] },
 			{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
@@ -42,6 +41,12 @@ CKEDITOR.editorConfig = function( config ) {
 
 
 	config.extraPlugins= 'tableresize,uploadimage,image2,codemirror,hianamedia';
+	config.codemirror = {
+		showFormatButton: false,
+		 showCommentButton: false,
+		 showUncommentButton: false,
+		 showAutoCompleteButton: false,
+	};
 	config.height=1024;
 	config.width=1024;
 	//config.contentsCss= [ 'https://data.chinahighlights.com/css/min.php?f=/css/train/global140627.css,/css/train/guide.css,/public/css/global.min.css,/css/ui.core.css,/css/ui.datepicker.css,/css/ui.theme.css,/css/calendar.css&v=1565334166829' ];