From 786110f7117fdc2315f156f987e40526b8cbde6f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 20 Oct 2016 13:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb | 51 +++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e69de29bb..66aafcf46 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -0,0 +1,51 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
+<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
+<div class="homepageRightBanner">
+    <div class="NewsBannerName">最新动态</div>
+    <ul class="resourcesSelect">
+  <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+    <ul class="homepagePostType">
+          <li>
+            <ul class="homepagePostTypeHomework fl">
+              <% if hidden_unproject_infos %>
+                  <li class="f14">班级动态</li>
+                  <li><%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+                    <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+                  <li><%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+                  <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                  <li><%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                  <li><%= link_to "班级留言", {:controller => "users", :action => "show", :type => "course_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
+                    <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                  <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+              <% end %>
+            </ul>
+          </li>
+      <li>
+        <ul class="homepagePostTypeProject fl">
+          <li class="f14">项目动态</li>
+          <li><%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+          <li><%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+          <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+        </ul>
+      </li>
+      <li>
+        <ul class="homepagePostTypeProject fl">
+          <li class="f14">更多</li>
+          <li class="mt-4"><%= link_to "个人留言", {:controller => "users", :action => "show", :type => "user_journals"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
+          <li class="mt-4"><%= link_to @user == User.current ? "我的动态" : "他的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeMine postTypeGrey"%>
+          <li class="mt-4"><%= link_to "全部动态", {:controller => "users", :action => "show", :type => "all"}, :class =>"homepagePostTypeAll postTypeGrey"%>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ul>
+</div>
+
+<!--显示个人主页-->
+<%# 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)} %>