-
- <% end %>
- 课程社区
- <% if hidden_unproject_infos %> --
-
- - <%= link_to "课程#{user_course_count}".html_safe, {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list", :class => "fl" %> - - - <% if @user == User.current %> -
- - <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :class => "fl" %> - - <% end %> -
- - <%= link_to "题库", user_homeworks_user_path(User.current), :target => "_blank", :class => "fl" %> - -
- - <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank", :class => "fl" %> - -
-
+ 项目社区
--
-
- - <%= link_to "项目#{user_project_count}".html_safe, {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "fl" %> - - -
- - <%= link_to "我发布的issue#{issues_author_is_self_count}".html_safe, user_issues_user_path(@user), :class => "fl" %> - -
- - <%= link_to "我收到的issue#{issues_assigned_is_self_count}".html_safe, user_issues_user_path(@user), :class => "fl" %> - -
+
+ <% end %>
Ta在确实 + <%= time_tag(@user.created_on).html_safe %> +
+-
+
- + <%= link_to user_course_count > 0 ? "课程#{user_course_count}".html_safe : "课程", + {:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list", :class => "fl" %> + +
- + <%= link_to user_project_count > 0 ? "项目#{user_project_count}".html_safe : "项目", + {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "fl" %> + +
- diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb index 78a6f2ecd..7a73e29c3 100644 --- a/app/views/users/_join_course_course_message.html.erb +++ b/app/views/users/_join_course_course_message.html.erb @@ -1,7 +1,7 @@
- 系统提示 - ">您有了新的班级成员申请： + 您有了新的班级成员申请：
-
@@ -22,7 +22,8 @@
<%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %>
申请职位：<%=ma.content && ma.content.include?('9') ? "教师" : "助教"%>
-
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true %>
+
-
-
-
-
-
-
-
- <% if hidden_unproject_infos %>
-
- 班级动态 -
- <%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%> - -
- <%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%> - -
- <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%> -
- <%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%> -
- <%= link_to "班级留言", {:controller => "users", :action => "show", :type => "course_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%> - - - <% end %> -
- -
-
-
-
- 项目动态 -
- <%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%> -
- <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%> - -
- -
-
-
-
- 更多 -
- <%= link_to "个人留言", {:controller => "users", :action => "show", :type => "user_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%> -
- <%= link_to @user == User.current ? "我的动态" : "他的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%> -
- <%= link_to "全部动态", {:controller => "users", :action => "show", :type => "all"}, :class =>"homepagePostTypeAll postTypeGrey"%> -
-
- -
-
-
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true %>
+ 
+
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 66aafcf46..f299f1ef3 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,51 +1,74 @@
-该用户无公开动态~
+
-
+<% if is_current_user %>
+ 最新动态
- -
-
+
+
+ 消息动态
+
+
+ 共 <%= @message_count %> 个消息
+
+
+
-
+<% else %>
+
+ <%= render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls } %>
+
+
+
+
+
<%# if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %>
<%# homepage = BlogComment.find(@user.blog.homepage_id) %>
<%#= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
<%# end %>
-<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} %>
+ <% if @user_activities_count > 0 %>
+ <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities, :page => 0, :type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} %>
+ <% else %>
+ Ta的动态
+
+
+ <%= render :partial => 'users/no_data' %>
+
+ <% end %>
+<% end %>
\ No newline at end of file
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 7ab2bf3f3..0e18770ae 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -104,8 +104,8 @@ div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-
.homepageSystenMessageContent a:link{color:#1b1818;}
.homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:14px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
.homepageHomeworkContent {width:235px; max-width:365px; margin-right:10px; font-size:14px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
-.homepageHomeworkContentWarn2 {width:60px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
-.homepageHomeworkContent2 {width:285px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageHomeworkContentWarn2 {width:70px; max-width:365px; margin-right:10px; font-size:14px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageHomeworkContent2 {width:285px; max-width:365px; margin-right:10px; font-size:14px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
.loadMore {font-size:14px;width:748px; text-align:center; display:block; border:1px solid #dddddd; background-color:#ffffff; float:right;padding:5px 0; letter-spacing: 1px;}