From 576adfac34834c6d8e6ec55bea039dd16a0dd9a5 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 23 Sep 2015 08:56:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E4=B8=AD?= =?UTF-8?q?=E5=87=BA=E7=8E=B0html=E4=BB=A3=E7=A0=81=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/init_activity_KindEditor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js index bea7dc1e7..c9d8189c2 100644 --- a/public/javascripts/init_activity_KindEditor.js +++ b/public/javascripts/init_activity_KindEditor.js @@ -19,7 +19,7 @@ function init_editor(params){ afterBlur:function(){ nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea}); if(this.edit.html()=="") { - this.edit.html('我要回复'); + this.edit.html("我要回复"); } //params.toolbar_container.hide(); $('#reply_image_' + id).addClass('imageFuzzy'); @@ -61,7 +61,7 @@ function init_editor(params){ //reset height paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight; edit.iframe.height(paramsHeight); - edit.html('我要回复'); + edit.html("我要回复"); this.resize(null,Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight));// Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ paramsHeight , paramsHeight) // params.toolbar_container.hide(); From 76afbdec3f4164db4ecb7931ce63c455b91ad2d7 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 23 Sep 2015 09:23:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9A=90=E8=97=8Fkindeditor=E7=9A=84?= =?UTF-8?q?=E2=80=9C=E6=8F=92=E5=85=A5=E4=BB=A3=E7=A0=81=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7/?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7=E7=9A=84=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 | 5 ++--- public/stylesheets/courses.css | 4 ++-- public/stylesheets/css.css | 4 ++-- public/stylesheets/new_user.css | 4 ++-- public/stylesheets/project.css | 4 ++-- public/stylesheets/public.css | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index e8c28f678..b045a27cc 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -264,7 +264,7 @@ K.options = { minHeight : 100, minChangeSize : 50, zIndex : 811213, - items : ['code', 'emoticons','fontname', + items : ['emoticons','fontname', 'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|', 'formatblock', 'fontsize', '|','indent', 'outdent', '|','imagedirectupload','table', 'media', 'preview',"more" @@ -4986,8 +4986,7 @@ KEditor.prototype = { htmlList.unshift('
') htmlList.push('
') var htmlListFull = []; - var fullItems = ['code', - 'emoticons','fontname', + var fullItems = ['emoticons','fontname', 'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter', 'insertorderedlist', 'insertunorderedlist', '|', 'formatblock', 'fontsize', '|', 'indent', 'outdent', '|','imagedirectupload','table', 'media', 'preview', "less", diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 0ea279253..754112b52 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -280,8 +280,8 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;} .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;} /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/ -.list_style ol li{list-style-type: decimal;margin-left: 40px;} -.list_style ul li{list-style-type: disc;margin-left: 40px;} +.list_style ol li{list-style-type: decimal;margin-left: 20px;} +.list_style ul li{list-style-type: disc;margin-left: 20px;} /* 创建作品 work */ .Newwork{ width:668px; height:418px;} diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index f6bf63f2c..6114c1b4d 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -120,8 +120,8 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_distop span{ float:left;} .ping_distop p{ color:#5f5f5f;min-height: 24px;} .ping_disfoot a{ float:right; color:#15bccf; margin-left:5px;} -.list_style ol li{list-style-type: decimal;margin-left: 40px;} -.list_style ul li{list-style-type: disc;margin-left: 40px;} +.list_style ol li{list-style-type: decimal;margin-left: 20px;} +.list_style ul li{list-style-type: disc;margin-left: 20px;} .ping_distop span a{ float:right; /*width:20px;*/ height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 9c075efa7..5e049e029 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1150,5 +1150,5 @@ a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-l a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} -.list_style ol li{list-style-type: decimal;margin-left: 40px;} -.list_style ul li{list-style-type: disc;margin-left: 40px;} \ No newline at end of file +.list_style ol li{list-style-type: decimal;margin-left: 20px;} +.list_style ul li{list-style-type: disc;margin-left: 20px;} \ No newline at end of file diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 875f01ba0..963b4aeb3 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -328,8 +328,8 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;} .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;} /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/ -.list_style ol li{list-style-type: decimal;margin-left: 40px;} -.list_style ul li{list-style-type: disc;margin-left: 40px;} +.list_style ol li{list-style-type: decimal;margin-left: 20px;} +.list_style ul li{list-style-type: disc;margin-left: 20px;} /*上传资源弹出框样式*/ .popbox_polls{position:fixed !important;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 5d528678a..d8285709f 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -951,5 +951,5 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;} .AgreementTxt{text-indent:2em; margin-bottom:15px;} .AgreementImg{ margin:0px auto;} -.list_style ol li{list-style-type: decimal;margin-left: 40px;} -.list_style ul li{list-style-type: disc;margin-left: 40px;} +.list_style ol li{list-style-type: decimal;margin-left: 20px;} +.list_style ul li{list-style-type: disc;margin-left: 20px;} From afb1a8f53f7e83680086718c27cf20bbdcb631a5 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 23 Sep 2015 09:59:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=8C=89=E9=92=AE=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_message.html.erb | 2 +- app/views/users/_course_news.html.erb | 2 +- app/views/users/_project_issue.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- public/javascripts/init_activity_KindEditor.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index bed895ee8..fd9ae05e8 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -107,7 +107,7 @@
- 发送 +

<% end%> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 97f0acb69..99e85fc73 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -77,7 +77,7 @@
- 发送 +

<% end%> diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index e8bac335c..0b86dc3eb 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -121,7 +121,7 @@
- 发送 +

<% end%> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 32468f9a0..2856d6ed1 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -92,7 +92,7 @@
- 发送 +

<% end%> diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js index c9d8189c2..decbbb341 100644 --- a/public/javascripts/init_activity_KindEditor.js +++ b/public/javascripts/init_activity_KindEditor.js @@ -48,7 +48,7 @@ function init_editor(params){ }, afterCreate:function(){ - params.submit_btn.hide(); + //params.submit_btn.hide(); var toolbar = $("div[class='ke-toolbar']",params.div_form); toolbar.css('width',24); $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');