Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

public/assets/kindeditor/kindeditor.js

@@ -4972,7 +4972,7 @@ KEditor.prototype = {
             'emoticons',
             'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
             'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'link', 'fullscreen',"more",
+            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'link', 'fullscreen',"less",
                 '/',
              'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut',  'plainpaste',
             'justifyfull', 'insertunorderedlist', 'indent', 'outdent', 'subscript',

public/assets/kindeditor/lang/zh_CN.js

@@ -9,7 +9,8 @@
 
 KindEditor.lang({
     imagedirectupload:'本地图片',
-    more: '更多功能',
+    more: '切换到更多功能',
+    less: '切换到简单功能',
 	source : 'HTML代码',
 	preview : '预览',
 	undo : '后退(Ctrl+Z)',

public/assets/kindeditor/plugins/less/less.js

@@ -0,0 +1,15 @@
+KindEditor.plugin('less', function(K) {
+    var self = this, name = 'less';
+    self.plugin.less = {
+        click : function(){
+            if($("#define").css('display') == 'block'){
+                $("#define").css('display','none')
+                $("#full").css('display','block')
+            }else if($("#full").css('display') == 'block'){
+                $("#full").css('display','none')
+                $("#define").css('display','block')
+            }
+        }
+    }
+    self.clickToolbar(name,self.plugin.less.click)
+});

public/assets/kindeditor/themes/default/default.css

@@ -333,6 +333,11 @@
 	width: 16px;
 	height: 16px;
 }
+.ke-icon-less {
+    background-position: 0px -976px;
+    width: 16px;
+    height: 16px;
+}
 .ke-icon-baidumap {
 	background-position: 0px -976px;
 	width: 16px;