From 0e016eed2a3bcd1704ea9093ab2da9075f267cd3 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 18 May 2016 14:15:39 +0800
Subject: [PATCH] =?UTF-8?q?KE=E4=B8=8A=E4=BC=A0=E9=9D=9E=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=97=B6=E5=BC=B9=E6=A1=86=E7=94=A8=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84,=E5=8D=9A=E5=AE=A2=E5=B8=96=E5=AD=90=E5=8F=91?=
 =?UTF-8?q?=E5=B8=96=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blogs/_article.html.erb      | 2 +-
 public/assets/kindeditor/kindeditor.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 77aa3f9d8..550b1e4ef 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -43,7 +43,7 @@
                       <% count=activity.children.count%>
                   <% end %>
                   <li class="ml15">
-                    <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
+                    <span class="grayTxt">发布：<%= format_time(activity.created_on) %></span>
                     <span class="grayTxt">更新：<%= format_time(activity.updated_on) %></span>
                     <p class="list-info fr grayTxt">
                         <span><%= count>0 ? "#{count}" :"0" %></span>
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 12db483b8..c86a9ccd3 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5694,7 +5694,9 @@ _plugin('core', function(K) {
                 }
             } else {
                 //alert(data.message);
-                alert("仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF");
+//                alert("仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF");
+                var htmlvalue = "</br><div style='width:550px;text-align:center'>仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
+                pop_up_box(htmlvalue,580,30,50);
             }
         },
         afterError : function(str) {