From 75f1fc964a95cf79a0dc46fe157afda421b23be2 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 23 Feb 2017 17:09:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E5=B1=95=E5=BC=80=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=E4=B8=8E=E6=94=B6=E8=B5=B7=E5=9B=9E=E5=A4=8D=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 5 ++ .../_project_issue_expand_show.html.erb | 4 +- .../projects/_project_reply_banner.html.erb | 10 ++-- app/views/users/all_journals.js.erb | 53 ++++++++++++++++--- 4 files changed, 59 insertions(+), 13 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index bd546c886..2b0a0799c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4353,6 +4353,11 @@ class UsersController < ApplicationController @journals = @activity.journals.reorder("created_on desc") @user_activity_id = params[:div_id].to_i if params[:div_id] @user_activity = ForgeActivity.where(params[:div_id].to_i).first if params[:div_id] + when 'is_project_training_task' + @activity = TrainingTask.where('id = ?', params[:id].to_i).first + @journals = @activity.journals.reorder("created_on desc") + @user_activity_id = params[:div_id].to_i if params[:div_id] + @user_activity = ForgeActivity.where(params[:div_id].to_i).first if params[:div_id] when 'BlogComment' obj = BlogComment.where('id = ?', params[:id].to_i).first @user_activity_id = params[:div_id].to_i if params[:div_id] diff --git a/app/views/projects/_project_issue_expand_show.html.erb b/app/views/projects/_project_issue_expand_show.html.erb index adbf662cc..f5e5a425c 100644 --- a/app/views/projects/_project_issue_expand_show.html.erb +++ b/app/views/projects/_project_issue_expand_show.html.erb @@ -83,9 +83,9 @@
- +
-

+

<% end%> <% else %> diff --git a/app/views/projects/_project_reply_banner.html.erb b/app/views/projects/_project_reply_banner.html.erb index 27d7d029a..b9acfbb82 100644 --- a/app/views/projects/_project_reply_banner.html.erb +++ b/app/views/projects/_project_reply_banner.html.erb @@ -11,15 +11,19 @@ <% if expand_more %>
<% if activity.class.to_s == 'Issue' %> - + 展开更多 <% elsif activity.class.to_s == 'Message' %> - + + 展开更多 + + <% elsif activity.class.to_s == 'TrainingTask' %> + 展开更多 <% else %> - + 展开更多 <% end %> diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb index bcba9b5fb..6e6a39f88 100644 --- a/app/views/users/all_journals.js.erb +++ b/app/views/users/all_journals.js.erb @@ -1,17 +1,54 @@ <% if params[:type] == 'HomeworkCommon' || params[:type] == 'Work' %> -$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :type => @type, :is_teacher => @is_teacher, :user_activity_id => @user_activity_id, :activity_id => params[:id].to_i}) %>'); + $('#reply_div_<%= @user_activity_id %>').html('<%= escape_javascript(render :partial => 'users/news_replies', + :locals => {:comments => @journals, + :type => @type, + :is_teacher => @is_teacher, + :user_activity_id => @user_activity_id, + :activity_id => params[:id].to_i}) %>'); <% elsif params[:type] == 'JournalsForMessage' %> -$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id =>params[:id].to_i}) %>'); + $('#reply_div_<%= @user_activity_id %>').html('<%= escape_javascript(render :partial => 'users/message_replies', + :locals => {:comments => @journals, + :user_activity_id => @user_activity_id, + :type => @type, + :activity_id =>params[:id].to_i}) %>'); <% elsif params[:type] == 'Message' %> -$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>'); + $('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :partial => 'users/message_replies', + :locals => {:comments => @journals, + :user_activity_id => @user_activity_id, + :type => @type, + :activity_id => params[:id].to_i}) %>'); <% elsif params[:type] == 'BlogComment' %> -$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>'); + $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', + :locals => {:comments => @journals, + :user_activity_id => @user_activity_id, + :type => @type, + :activity_id => params[:id].to_i}) %>'); <% elsif params[:type] == 'OrgDocumentComment' %> -$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>'); + $('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :partial => 'users/message_replies', + :locals => {:comments => @journals, + :user_activity_id => @user_activity_id, + :type => @type, + :activity_id => params[:id].to_i}) %>'); <% elsif params[:type] == 'News' || params[:type] == 'Issue' || params[:type] == 'Syllabus' %> -$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>'); + $('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :partial => 'users/news_replies', + :locals => {:comments => @journals, + :user_activity_id => @user_activity_id, + :type => @type, + :activity_id => params[:id].to_i}) %>'); <% elsif params[:type] == 'is_project_issue' %> -$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'projects/project_issue_expand_show', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :activity => @activity}) %>'); + $('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :partial => 'projects/project_issue_expand_show', + :locals => {:comments => @journals, + :user_activity_id => @user_activity_id, + :activity => @activity}) %>'); +<% elsif params[:type] == 'is_project_training_task' %> +$('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :partial => 'projects/project_issue_expand_show', + :locals => {:comments => @journals, + :user_activity_id => @user_activity_id, + :activity => @activity}) %>'); <% elsif params[:type] == 'is_project_message' %> -$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'projects/project_message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>'); + $('#reply_div_<%= params[:div_id].to_i %>').html('<%= escape_javascript(render :partial => 'projects/project_message_replies', + :locals => {:comments => @journals, + :user_activity_id => @user_activity_id, + :type => @type, + :activity_id => params[:id].to_i}) %>'); <% end %> From b369b9c281006b9f2f549e63316a298c8a6e10be Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Thu, 23 Feb 2017 17:13:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/training_tasks/_content_list.html.erb | 2 +- public/stylesheets/css/project.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/training_tasks/_content_list.html.erb b/app/views/training_tasks/_content_list.html.erb index 37940eacc..55b839abd 100644 --- a/app/views/training_tasks/_content_list.html.erb +++ b/app/views/training_tasks/_content_list.html.erb @@ -8,7 +8,7 @@ <% end %>
- + step<%= activity.position %> <%= activity.subject.to_s %> diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 09a3faeca..0b554ed6d 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -675,3 +675,4 @@ span.task-step{ color:#ee4a20;font-style: italic; font-weight:bold; font-size:14 .task-display-span,a.task-display-span{ display:inline-block; border-radius:3px; width: 100%; text-align: center; color: #fff; padding: 5px 0; } .task-bgrey{background:#ccc;} .task-title{ width: 830px;} +a.task-list-title{ max-width: 700px;}