From a4a29b0ee9b542ed9b3551fd7b4d25ce642bfe76 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 4 Jan 2016 11:26:42 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 2e8133172..a13c63fbc 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1220,6 +1220,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .mr150 {margin-right:150px;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} +.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} From 3ddbeae100d74011e7fd1e24a38457e60690413a Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 4 Jan 2016 11:32:48 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E2=80=9C?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E2=80=9D=E6=A8=A1=E5=BC=8F=E7=9A=84=E6=96=87?= =?UTF-8?q?=E5=AD=97=E4=B8=8D=E7=94=A8=E7=B2=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_tool_expand.html.erb | 14 +++++++------- public/stylesheets/courses.css | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index e032496ea..50854cf23 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -2,19 +2,19 @@ <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> <% if show_nav?(@course.homework_commons.count) %>
- <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02 ml10"%> + <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02 ml10 fn"%> <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
<% end %> <% if show_nav?(@course.news.count) %>
- <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02 ml10" %> + <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02 ml10 fn" %> <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
<% end %> <% if show_nav?(course_file_num) %>
- <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02 ml10" %> + <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02 ml10 fn" %> <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> @@ -23,25 +23,25 @@ <% end %> <% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
- <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02 ml10" %> + <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02 ml10 fn" %> <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
<% end %> <% if show_nav?(course_feedback_count) %>
- <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02 ml10" %> + <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02 ml10 fn" %> <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
<% end %> <% if show_nav?(course_poll_count) %>
- <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02 ml10"%> + <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02 ml10 fn"%> <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
<% end %> <% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
- <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02 ml10"%> + <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02 ml10 fn"%> <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
<% end %> \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index a13c63fbc..1b94a0c50 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1260,3 +1260,5 @@ div.disable_link {background-color: #c1c1c1 !important;} .fileTagWrap{ width:710px;} .boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} + +.fn {font-weight:normal} From 8ea943031849591fc100961876df980d72df05a4 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 4 Jan 2016 15:51:24 +0800 Subject: [PATCH 03/14] =?UTF-8?q?at=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/at/config.js | 2 +- public/assets/kindeditor/at/jquery.atwho.css | 3 ++- public/assets/kindeditor/plugins/code/previewcode.css | 3 ++- public/javascripts/application.js | 11 ----------- public/stylesheets/new_user.css | 1 + public/stylesheets/public.css | 1 + 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js index 2bab7eb67..651f33464 100644 --- a/public/assets/kindeditor/at/config.js +++ b/public/assets/kindeditor/at/config.js @@ -35,7 +35,7 @@ var enableAt = function(_editor) { var at_config = { at: "@", data: names, - insertTpl: '@${name}(${login})', + insertTpl: '@${name}(${login})', displayTpl: "
  • ${name} ${login}
    • ", searchKey: 'searchKey', limit: 200 diff --git a/public/assets/kindeditor/at/jquery.atwho.css b/public/assets/kindeditor/at/jquery.atwho.css index df3ff9d94..13ca0265a 100644 --- a/public/assets/kindeditor/at/jquery.atwho.css +++ b/public/assets/kindeditor/at/jquery.atwho.css @@ -49,4 +49,5 @@ } /* @功能 定义 */ -span.at {color:#269ac9;} \ No newline at end of file +span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index c106a72f3..c8e5df4e1 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -45,4 +45,5 @@ .ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;} -span.at {color:#269ac9;} \ No newline at end of file +span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 3d9fba942..84186a0b2 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -991,14 +991,3 @@ function showNormalImage(id) { } } - -$(function(){ - //at 加链接 - $("span.at").hover(function(){ - $(this).css('cursor', 'pointer'); - }); - $("span.at").live('click', function(){ - var userId = $(this).attr('data-user-id'); - $(window.location).attr('href', '/users/'+userId); - }); -}); \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 775ade128..fbd2bc7c5 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1387,6 +1387,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} /* @功能 定义 */ span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} /*问题状态图片*/ diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 51f0be25d..a736ef777 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -918,6 +918,7 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r /* @功能 定义 */ span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} .del_line{text-decoration:line-through !important;} /*转发样式*/ .shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;} From f52dc37a76a3dae2112cf6cf7ee521a364eee167 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 5 Jan 2016 11:29:30 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85=E5=92=8C?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=8F=90=E4=BA=A4=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/api_helper.rb | 2 +- .../_org_course_homework.html.erb | 110 +++++++++++++++++- app/views/users/_course_homework.html.erb | 20 +++- .../users/_user_homework_detail.html.erb | 18 +++ public/stylesheets/org.css | 6 +- 5 files changed, 151 insertions(+), 5 deletions(-) diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb index f73cc87e6..8324951f9 100644 --- a/app/helpers/api_helper.rb +++ b/app/helpers/api_helper.rb @@ -180,7 +180,7 @@ module ApiHelper if timePassed < 0 updateAtValue = "时间有问题" elsif timePassed < ONE_MINUTE - updateAtValue = "一分钟前" + updateAtValue = "1分钟前" elsif timePassed < ONE_HOUR timeIntoFormat = timePassed / ONE_MINUTE updateAtValue = timeIntoFormat.to_s + "分钟前" diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 9699eff5f..4039059a4 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -44,7 +44,27 @@ 教师评阅中 <% end%> <% end%> +
    + <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%> + 系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！ + <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%> + 系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！ + <% end %>
    + <% if activity.homework_type == 3 && !is_teacher && activity.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(activity.course)%> + <% projects = cur_user_projects_for_homework activity %> + <% works = cur_user_works_for_homework activity %> + <% if works.nil? && projects.nil? %> +
    + <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %> + <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %> +
    + <% elsif works.nil? %> +
    + <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %> +
    + <% end %> + <% end %>
    <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %> <%= user_for_homework_common activity,is_teacher %> @@ -61,8 +81,16 @@ <%= activity.language_name%>
    <% end %> - -
    截止时间：<%= activity.end_time.to_s %> 23:59
    + <% if activity.homework_type == 3 && activity.homework_detail_group%> +
    + 分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人 +
    + <% end %> + <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %> +
    提交截止时间：<%= activity.end_time.to_s %> 23:59
    + <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 %> +
    匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %> 23:59
    + <% end %>
    @@ -73,10 +101,88 @@
    +
    +
    + 迟交扣分：<%= activity.late_penalty%>分 +
    + <% if activity.anonymous_comment == 0%> +
    + 匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%> 00:00 +
    + <% end %> +
    +
    +
    +
    + 缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品 +
    + <% if activity.anonymous_comment == 0%> +
    + 匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%> 23:59 +
    + <% end %> +
    +
    + <% if activity.student_works.count != 0 %> + <% sw = activity.student_works.reorder("created_at desc").first %> +
    + <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 +
    + <% end %> +
    + <% if activity.student_works.count != 0 %> + <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> + <% last_score = student_work_scores.first %> +
    + <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 +
    + <% end %> + <% end %> +
    <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
    + <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %> +
    + <% projects = activity.student_work_projects.where("is_leader = 1") %> +
    + 已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %> +
    + <% projects.each do |pro| %> + <% project = Project.find pro.project_id %> + + +
    + <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> + <% else %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> + <% end %> + <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

    <%=(User.find project.user_id).show_name %>(组长)

    +

    <%=time_from_now time %>

    +
    + 项目名称：<%=project.name %>
    + 创建者：<%=(User.find project.user_id).show_name %>(组长)
    + 更新时间：<%=time_from_now time %> +
    +
    + <% end %> +
    + <% end %> +
    <% if is_teacher%> <% comment_status = activity.homework_detail_manual.comment_status %>
    diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index a0ce84795..cd1ffd7ae 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -124,6 +124,24 @@ <% end %>
    + <% if activity.student_works.count != 0 %> + <% sw = activity.student_works.reorder("created_at desc").first %> +
    + <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 +
    + <% end %> +
    + <% if activity.student_works.count != 0 %> + <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> + <% last_score = student_work_scores.first %> +
    + <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 +
    + <% end %> + <% end %> +
    <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
    @@ -131,7 +149,7 @@ <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
    <% projects = activity.student_work_projects.where("is_leader = 1") %> -
    +
    已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
    <% projects.each do |pro| %> diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 0472613e4..7a91827a6 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -127,6 +127,24 @@ <% end %>
    + <% if homework_common.student_works.count != 0 %> + <% sw = homework_common.student_works.reorder("created_at desc").first %> +
    + <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 +
    + <% end %> +
    + <% if homework_common.student_works.count != 0 %> + <% sw_id = "("+homework_common.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> + <% last_score = student_work_scores.first %> +
    + <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 +
    + <% end %> + <% end %> +
    <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
    diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index b37a38da0..2279f0fe5 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -103,4 +103,8 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } .sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;}.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .org_login_list a {color:#269ac9;} -div.flash {margin-top :0px !important} \ No newline at end of file +div.flash {margin-top :0px !important} + +.w80{ width:80px;} +.relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} +.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} \ No newline at end of file From 1b177a849840cca95119e5677b92f25b802fc763 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 5 Jan 2016 11:55:30 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/rails_kindeditor/lib/rails_kindeditor/helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb index a2fef6174..50fc50b38 100644 --- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb +++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb @@ -14,7 +14,7 @@ module RailsKindeditor output = ActiveSupport::SafeBuffer.new output << text_area_tag(name, content, input_html) output << javascript_tag(js_replace(id, options.merge(window_onload: 'true', - :autoHeightMode=>true, + :autoHeightMode=>false, afterCreate: eval_str(at_id, at_type), emotionsBasePath: 'http://' + Setting.host_name ))) @@ -29,7 +29,7 @@ module RailsKindeditor output_buffer = ActiveSupport::SafeBuffer.new output_buffer << build_text_area_tag(name, method, self, options, input_html) output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true', - :autoHeightMode=>true, + :autoHeightMode=>false, afterCreate: eval_str(at_id, at_type), emotionsBasePath: 'http://' + Setting.host_name ))) From 1f09817e4d7d5a7013688c86fad6246c16d2a0f0 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 5 Jan 2016 12:59:59 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA/=E9=A1=B9=E7=9B=AE=E8=AE=A8?= =?UTF-8?q?=E8=AE=BA=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E5=8D=9A=E5=AE=A2=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E9=AB=98=E5=BA=A6=E4=B8=BA=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=B1=8F=E5=B9=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blogs/_article.html.erb | 20 ++++++++++------ app/views/blogs/_article_list.html.erb | 24 ++++++++++++------- .../boards/_project_show_detail.html.erb | 24 ++++++++++++------- public/stylesheets/courses.css | 4 ++-- public/stylesheets/new_user.css | 3 ++- public/stylesheets/project.css | 6 ----- public/stylesheets/public.css | 6 ++++- 7 files changed, 52 insertions(+), 35 deletions(-) diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 33a3201c0..ee20dcd22 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -57,13 +57,14 @@
    发帖时间：<%= format_time(activity.created_on) %>
    - -
    - <% if activity.parent_id.nil? %> - <%= activity.content.to_s.html_safe%> - <% else %> - <%= activity.parent.content.to_s.html_safe%> - <% end %> +
    +
    + <% if activity.parent_id.nil? %> + <%= activity.content.to_s.html_safe%> + <% else %> + <%= activity.parent.content.to_s.html_safe%> + <% end %> +
    @@ -72,6 +73,11 @@ <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => activity.attachments, :options => options, :is_float => true} %> <% end %>
    +
    + + +
    +