From 2b7615c877deb553321ce1653200258e8dda2d6d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 13 Oct 2017 17:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E9=A2=98=E7=9B=AEke=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=99=E5=87=BA=E5=9B=BE=E7=89=87=E6=A0=BC=E5=BC=8F=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E4=BD=8D=E7=BD=AE=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=B1=85=E4=B8=AD=EF=BC=8C=E4=B8=94=E6=A0=B7=E5=BC=8F=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E5=85=AC=E7=94=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js |  3 +--
 public/javascripts/edu/application.js  | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index f1fa69302..264c361df 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5762,8 +5762,7 @@ _plugin('core', function(K) {
             } else {
                 //alert(data.message);
 //                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);
+                long_notice_box("仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF!");
             }
         },
         afterError : function(str) {
diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js
index e7d63f74f..17e1d1797 100644
--- a/public/javascripts/edu/application.js
+++ b/public/javascripts/edu/application.js
@@ -291,7 +291,7 @@ function delete_confirm_box(url, str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-orange fr pop_close" data-remote="true" id="task_popup_confirm">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 //点击删除时的确认弹框: 走destroy方法,remote为true
@@ -299,7 +299,7 @@ function delete_confirm_box_2(url, str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-orange fr pop_close" data-method="delete" data-remote="true">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 //点击删除时的确认弹框: 走destroy方法
@@ -307,7 +307,7 @@ function delete_confirm_box_3(url, str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-orange fr pop_close" data-method="delete" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 // 点击删除时的确认弹框: 走destroy方法  有“载入中”的提示
@@ -315,7 +315,7 @@ function delete_confirm_box_4(url, str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-orange fr" data-method="delete" onclick="hideModal(); $(\'#ajax-indicator\').show();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 //提示框：只有一个按钮，点击关闭弹框
@@ -324,7 +324,7 @@ function notice_sure_box(str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="hideModal();">知道啦</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 //提示框：只有一个确定按钮，点击关闭弹框
@@ -333,7 +333,7 @@ function notice_box(str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 
@@ -343,7 +343,7 @@ function long_notice_box(str){
     var htmlvalue = '<div class="task-popup" style="width:575px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="javascript:void(0);" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 575, 140);
+    pop_box_new(htmlvalue, 575, 160);
 }
 
 // 长提示框：只有一个“知道啦”按钮，点击关闭弹框
@@ -361,7 +361,7 @@ function sure_box_redirect(url, str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" onclick="hideModal();" target="_blank">知道啦</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 //提示框：只有一个知道啦按钮，点击打开新窗口
@@ -370,7 +370,7 @@ function sure_box_redirect_without_newtab(url, str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" onclick="hideModal();" >知道啦</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 //提示框：只有一个确定按钮，点击跳转
@@ -379,7 +379,7 @@ function notice_box_redirect(url, str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 //提示框：只有一个确定按钮，点击跳转（局部刷新）
@@ -388,7 +388,7 @@ function notice_box_redirect_remote(url, str){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" data-remote="true">确定</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 //重新登录
@@ -396,7 +396,7 @@ function re_entry(url){
     var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3><a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16 mt10 mb10"><i class="fa fa-exclamation-circle color-orange04 mr10"></i>您的会话已退出，请重新登录^_^</p></div><div class="task-popup-right-sure clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" data-remote="true">重新登录</a></div></div>';
-    pop_box_new(htmlvalue, 480, 140);
+    pop_box_new(htmlvalue, 480, 160);
 }
 
 // 警告/提示弹框点击“x”关闭