- - <%= link_to (course_endTime_timeout?(course) ? "[已关闭] #{course.name}" : "#{course.name}").html_safe, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey"%> + <%= link_to (course_endTime_timeout?(course) ? "[已关闭] #{course.name}" : "#{course.name}").html_safe, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden", :title => course.name%> <% end %> diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb index 864b6888c..da078c963 100644 --- a/app/views/layouts/_user_projects.html.erb +++ b/app/views/layouts/_user_projects.html.erb @@ -1,6 +1,6 @@ <% projects.each do |project|%>
- - <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey"%> + <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => project.name%> <% end %> <% if projects.size == 5%> diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb new file mode 100644 index 000000000..d0b830740 --- /dev/null +++ b/app/views/users/_course_homework.html.erb @@ -0,0 +1,39 @@ +
- 作业动态
- 通知动态
- 论坛动态 -
- 问卷动态 +
+
\ No newline at end of file
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
new file mode 100644
index 000000000..b6dfdbbe6
--- /dev/null
+++ b/app/views/users/_course_message.html.erb
@@ -0,0 +1,95 @@
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
+
+
+
+
+
+ <% if activity.try(:user).try(:realname) == ' ' %>
+ <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
+ <% end %> TO
+ <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+
+
+ <%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
+
+
+
+
+ <%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(activity.id), :class=> "c_blue" %>
+
+ 截止时间：<%= format_date(activity.end_time) %>
+ （作业描述）<%= activity.description.html_safe %>
+
+
+
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
new file mode 100644
index 000000000..0e82d7622
--- /dev/null
+++ b/app/views/users/_course_news.html.erb
@@ -0,0 +1,78 @@
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+
+
+
+ <% if activity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %>
+ TO
+ <%= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
+
+
+ <% if activity.parent_id.nil? %>
+ <%= link_to activity.subject.to_s.html_safe+"(讨论区内容)", course_boards_path(Board.where('id=?',activity.board_id).first.course_id), :class=> "postGrey", :style=>"word-break:break-all" %>
+ <% else %>
+ <%= link_to activity.parent.subject.to_s.html_safe+"(讨论区内容)", course_boards_path(Board.where('id=?',activity.board_id).first.course_id), :class=> "postGrey", :style=>"word-break:break-all"%>
+ <% end %>
+
+
+
+
+ 时间：<%= format_date(activity.created_on) %>
+
+
+
+
+ 回复（
+ <% if activity.parent_id.nil? %>
+ <%=activity.replies_count %>
+ <% else %>
+ <%=activity.parent.replies_count %>
+ <% end %>
+ ）
+ <%=format_date(activity.updated_on)%>
+ 点击展开更多回复
+
+
+
+
+
+ <% activity= activity.parent_id.nil? ? activity:activity.parent%>
+ <% activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
+
+
+ <% end %>
+ <% end %>
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
+
+
+
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %>
+ <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%=format_date(reply.created_on)%>
+ <%= link_to(
+ l(:button_delete),
+ {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
+ :method => :post,
+ :data => {:confirm => l(:text_are_you_sure)},
+ :title => l(:button_delete),
+ :class => 'replyGrey fr ml10'
+ ) if reply.course_destroyable_by?(User.current) %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
new file mode 100644
index 000000000..3b0087bb4
--- /dev/null
+++ b/app/views/users/_project_issue.html.erb
@@ -0,0 +1,112 @@
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+
+
+
+ <% if @ctivity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %> TO
+ <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+
+
+ <%=link_to activity.title.to_s+"(通知标题)", news_path(activity), :class=> "postGrey", :style=>"word-break:break-all" %>
+
+
+
+ 发布时间：<%= format_date(activity.created_on) %>
+ （通知描述）<%= activity.description.html_safe %>
+
+
+
+
+
+
+
+
+ <% activity.comments.reorder("created_on desc").each do |comment| unless activity.comments.nil?%>
+
+
+ <% end %>
+ <% end %>
+
+ <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %>
+
+
+
+
+
+ <% if comment.try(:author).try(:realname) == ' ' %>
+ <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%=format_date(comment.created_on)%>
+ <%= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment},
+ :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
new file mode 100644
index 000000000..a2b97d2da
--- /dev/null
+++ b/app/views/users/_project_message.html.erb
@@ -0,0 +1,96 @@
+
+
+
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+
+
+
+
+ <% if activity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %> TO
+ <%=activity.project.name %>（项目名称）
+
+ <%=activity.subject %>（缺陷标题）<%=activity.status.name %>
+
+
+
+
+ 时间：<%=format_date(activity.created_on) %>
+ （缺陷描述）<%=activity.description.html_safe %>
+
+
+
+ 
+
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 4975229eb..85f415d1d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -10,7 +10,7 @@
+
+
+ <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
+
+
+
+
+
+ <% if activity.try(:author).try(:realname) == ' ' %>
+ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% else %>
+ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+ <% end %>
+ TO
+ <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
+
+
+
+ <% if activity.parent_id.nil? %>
+ <%= link_to activity.subject.to_s.html_safe+"(讨论区内容)", project_boards_path(Board.where('id=?',activity.board_id).first.project_id), :class=> "postGrey", :style=>"word-break:break-all" %>
+ <% else %>
+ <%= link_to activity.parent.subject.to_s.html_safe+"(讨论区内容)", project_boards_path(Board.where('id=?',activity.board_id).first.project_id), :class=> "postGrey", :style=>"word-break:break-all"%>
+ <% end %>
+
+
+
+
+ 时间：<%= format_date(activity.created_on) %>
+
+
+
+
+ 回复（
+ <% if activity.parent_id.nil? %>
+ <%=activity.replies_count %>
+ <% else %>
+ <%=activity.parent.replies_count %>
+ <% end %>）
+ <%=format_date(activity.updated_on)%>
+ 点击展开更多回复
+
+
+
+
+
+ <% activity= activity.parent_id.nil? ? activity:activity.parent%>
+ <% activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
+
+
+ <% end %>
+ <% end %>
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
+
+
+
+
+
+ <% if reply.try(:author).try(:realname) == ' ' %>
+ <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+ <% else %>
+ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+ <% end %>
+ <%=format_date(reply.created_on)%>
+ <%= link_to(
+ l(:button_delete),
+ {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
+ :method => :post,
+ :data => {:confirm => l(:text_are_you_sure)},
+ :title => l(:button_delete),
+ :class => 'replyGrey fr ml10'
+ ) if reply.course_destroyable_by?(User.current) %>
+
+
+
+