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/training_tasks/_content_list.html.erb b/app/views/training_tasks/_content_list.html.erb index 24b7df2e2..d08f24427 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/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 %> 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;}