From e5e3eeca2c562d071f7345b982aaca1ddd2f9a7a Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 10 Sep 2015 17:30:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?kindeditor=20=20icon=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index bc45cd91f..e8c28f678 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -264,10 +264,10 @@ K.options = {
 	minHeight : 100,
 	minChangeSize : 50,
 	zIndex : 811213,
-	items : ['code', 'emoticons',
-		'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
-		'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media',"more"
+	items : ['code', 'emoticons','fontname',
+        'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
+		'formatblock', 'fontsize', '|','indent', 'outdent',
+		 '|','imagedirectupload','table',   'media', 'preview',"more"
 	],
 	noDisableItems : ['source', 'fullscreen'],
 	colorTable : [
@@ -4987,16 +4987,16 @@ KEditor.prototype = {
         htmlList.push('</div>')
         var htmlListFull = [];
         var fullItems =  ['code',
-            'emoticons',
-            'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
-            'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media', "less",
+            'emoticons','fontname',
+            'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter',  'insertorderedlist', 'insertunorderedlist', '|',
+            'formatblock', 'fontsize', '|', 'indent', 'outdent',
+              '|','imagedirectupload','table',   'media', 'preview', "less",
                 '/',
-             'undo', 'redo', '|', 'preview', 'print', 'template',
-            'justifyfull', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
-            'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/  'fontname',
+            'italic', 'underline',  'undo', 'redo', '|',  'removeformat',
+            'justifyright','justifyfull', 'source','plainpaste', 'wordpaste',  'subscript',
+            'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/
             'strikethrough', 'lineheight', 'hr', 'pagebreak',
-            'anchor' , 'link','unlink'
+            'link','unlink', 'print'
         ]
         K.each(fullItems, function(i, name) {
             if (name == '|') {

From 2beb85561ab61ffdf20dceafac1ea34470529e5d Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Sep 2015 09:08:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=85=A8=E9=80=89=E6=8C=89=E9=92=AE=E5=92=8C?=
 =?UTF-8?q?=E5=B7=B2=E9=80=89=E6=8B=A9=E8=B5=84=E6=BA=90=E6=95=B0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_resource_create.js.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index f7ae832d1..2d6c4f4d8 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -2,4 +2,6 @@
 closeModal();
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 //这里不能将翻页的更新
-$("#res_all_count").html(parseInt($("#res_all_count").html())+1);
\ No newline at end of file
+$("#res_all_count").html(parseInt($("#res_all_count").html())+1);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
\ No newline at end of file