Merge branch 'szzh' into guange_dev

public/assets/kindeditor/kindeditor.js

@@ -257,10 +257,10 @@ K.options = {
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : ['emoticons',
+	items : ['emoticons','imagedirectupload',
 		'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
 		'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-		'italic', 'underline', 'removeformat', '|', 'image', 'table',   'link', '|', 'fullscreen'
+		'italic', 'underline', 'removeformat', '|','table',   'link', '|', 'fullscreen'
 	],
 	noDisableItems : ['source', 'fullscreen'],
 	colorTable : [

public/assets/kindeditor/lang/zh_CN.js

@@ -8,6 +8,7 @@
 *******************************************************************************/
 
 KindEditor.lang({
+    imagedirectupload:'本地图片',
 	source : 'HTML代码',
 	preview : '预览',
 	undo : '后退(Ctrl+Z)',

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

@@ -413,6 +413,13 @@
 	width: 16px;
 	height: 16px;
 }
+
+.ke-icon-imagedirectupload
+{
+    background-position: 0px -1232px;
+    width: 16px;
+    height: 16px;
+}
 /* container */
 .ke-container {
 	display: block;