From a536af8fa3c6b830d5eef1123758b3d04ebf1588 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 19 Aug 2015 15:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7show=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb |   1 +
 app/views/users/show.html.erb            | 143 ++++++++++++++---------
 2 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 550f6653f..fd9ac678f 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -119,6 +119,7 @@
         </div>
         <div class="homepageLeftMenuCourses">
           <ul>
+            <% @user.courses.visible%>
             <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">课程名称一</a></li>
             <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">课程名称二</a></li>
             <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">课程名称三</a></li>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b82faccce..4975229eb 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,53 +1,70 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
 <div class="resources">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>
     <ul class="resourcesSelect">
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-        <ul class="newsType">
-          <li><a href="javascript:void(0);" class="resourcesGrey">全部</a></li>
-          <li><a href="javascript:void(0);" class="resourcesGrey">@我</a></li>
-          <li><a href="javascript:void(0);" class="resourcesGrey">作业消息</a></li>
-          <li><a href="javascript:void(0);" class="resourcesGrey">课程通知</a></li>
-          <li><a href="javascript:void(0);" class="resourcesGrey">指派给我</a></li>
-          <li><a href="javascript:void(0);" class="resourcesGrey">讨论区回复</a></li>
-          <li><a href="javascript:void(0);" class="resourcesGrey">留言</a></li>
-          <li><a href="javascript:void(0);" class="resourcesGrey">申请消息</a></li>
+        <ul class="homepagePostType">
+          <li>
+            <ul class="homepagePostTypeHomework fl">
+              <li class="f14">课程动态</li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>
+            </ul>
+          </li>
+          <li>
+            <ul class="homepagePostTypeProject fl">
+              <li class="f14">项目动态</li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+              <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>
+            </ul>
+          </li>
         </ul>
       </li>
     </ul>
   </div>
   <div class="homepagePostBrief">
-    <div class="homepagePostPortrait"> <img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /> </div>
+    <div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
     <div class="homepagePostDes">
       <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）</div>
+      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
         <div class="homepagePostDeadline">截止时间：2015-08-20</div>
       </div>
       <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
-      <div class="homepagePostSetting"> </div>
+      <div class="homepagePostSetting">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
     </div>
     <div class="cl"></div>
   </div>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
       <div class="homepagePostReplyBannerCount">回复（5）</div>
-      <div class="homepagePostReplyBannerTime">2015-07-31</div>
-      <div class="homepagePostReplyBannerMore">点击展开更多回复</div>
+      <div class="homepagePostReplyBannerTime">2015-07-28</div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a></div>
     </div>
     <div class="homepagePostReplyInputContainer">
       <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
     </div>
     <div class="homepagePostReplyInputContainer">
-      <div class="homepagePostReplyEmotion">表情</div>
-      <div class="homepagePostReplyCancel">取消</div>
-      <div class="homepagePostReplySubmit">发送</div>
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
       <div class="cl"></div>
     </div>
     <div class="homepagePostReplyContainer">
-      <div class="homepagePostReplyPortrait"> <img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /> </div>
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">尹教授</a> 2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
         <div class="homepagePostReplyContent">请大家说下软件工程是什么！</div>
@@ -55,7 +72,7 @@
       <div class="cl"></div>
     </div>
     <div class="homepagePostReplyContainer">
-      <div class="homepagePostReplyPortrait"> <img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /> </div>
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">Tang 学生</a> 2015-08-02<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
         <div class="homepagePostReplyContent">软件工程是一门研究用工程化方法构建和维护有效的、实用的和高质量的软件的学科。它涉及程序设计语言、数据库、软件开发工具、系统平台、标准、设计模式等方面。</div>
@@ -63,16 +80,16 @@
           <textarea class="homepagePostReplyInput2" placeholder="请输入回复"></textarea>
         </div>
         <div class="homepagePostReplyInputContainer2 mb10">
-          <div class="homepagePostReplyEmotion">表情</div>
-          <div class="homepagePostReplyCancel">取消</div>
-          <div class="homepagePostReplySubmit">发送</div>
+          <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+          <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+          <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
           <div class="cl"></div>
         </div>
       </div>
       <div class="cl"></div>
     </div>
     <div class="homepagePostReplyContainer borderBottomNone">
-      <div class="homepagePostReplyPortrait"> <img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /> </div>
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr15 f14">尹教授</a><span class="f14">回复</span><a href="javascript:void(0);" class="newsBlue mr10 ml15 f14">Tang学生</a>刚刚<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
         <div class="homepagePostReplyContent">回答非常好！</div>
@@ -83,14 +100,24 @@
 </div>
 <div class="resources mt15">
   <div class="homepagePostBrief">
-    <div class="homepagePostPortrait"> <img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /> </div>
+    <div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
     <div class="homepagePostDes">
       <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO <a href="javascript:void(0);" class="newsBlue ml15 mr5">黄井泉</a><span class="c_blue">，</span><a href="javascript:void(0);" class="newsBlue ml5">陈正东</a></div>
-      <div class="homepagePostTitle">假期开心吗？（讨论区内容）</div>
+      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">假期开心吗？（讨论区内容）</a></div>
       <div class="homepagePostSubmitContainer">
-        <div class="homepagePostDeadline">时间：2015-08-20</div>
+        <div class="homepagePostDeadline">时间：2015-07-31</div>
+      </div>
+      <div class="homepagePostSetting">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
       </div>
-      <div class="homepagePostSetting"> </div>
     </div>
     <div class="cl"></div>
   </div>
@@ -98,19 +125,19 @@
     <div class="homepagePostReplyBanner">
       <div class="homepagePostReplyBannerCount">回复（5）</div>
       <div class="homepagePostReplyBannerTime">2015-07-31</div>
-      <div class="homepagePostReplyBannerMore">点击展开更多回复</div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a></div>
     </div>
     <div class="homepagePostReplyInputContainer">
       <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
     </div>
     <div class="homepagePostReplyInputContainer">
-      <div class="homepagePostReplyEmotion">表情</div>
-      <div class="homepagePostReplyCancel">取消</div>
-      <div class="homepagePostReplySubmit">发送</div>
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
       <div class="cl"></div>
     </div>
     <div class="homepagePostReplyContainer">
-      <div class="homepagePostReplyPortrait"> <img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /> </div>
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">黄井泉  学生</a> 2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
         <div class="homepagePostReplyContent">很开心！</div>
@@ -118,7 +145,7 @@
       <div class="cl"></div>
     </div>
     <div class="homepagePostReplyContainer borderBottomNone">
-      <div class="homepagePostReplyPortrait"> <img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /> </div>
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">陈正东 学生</a> 2015-08-02<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
         <div class="homepagePostReplyContent">假期好热，没出去。</div>
@@ -129,38 +156,48 @@
 </div>
 <div class="resources mt15">
   <div class="homepagePostBrief">
-    <div class="homepagePostPortrait"> <img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /> </div>
+    <div class="homepagePostPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /></a></div>
     <div class="homepagePostDes">
       <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO <a href="javascript:void(0);" class="newsBlue ml15">Trustie Forge（项目名称）</a></div>
-      <div class="homepagePostTitle">上传资源未显示在项目动态中（缺陷标题）<span class="homepagePostProjectState">正常</span></div>
+      <div class="homepagePostTitle"><a href="javascript:void(0);" class="postGrey">上传资源未显示在项目动态中（缺陷标题）</a><span class="homepagePostProjectState">正常</span></div>
       <div class="homepagePostSubmitContainer">
-        <div class="homepagePostAssignTo"><span class="c_blue">指派给&nbsp;&nbsp;</span><a href="javascript:void(0);" class="c_blue mr15">苏稳</a></div>
+        <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;<a href="javascript:void(0);" class="newsBlue mr15">苏稳</a></div>
         <div class="homepagePostDeadline">时间：2015-08-20</div>
       </div>
       <div class="homepagePostIntro">（缺陷描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
-      <div class="homepagePostFileAtt">文件附件.zip<span>(123KB)</span></div>
-      <div class="homepagePostImageAtt">图片附件.png<span>(123KB)</span></div>
-      <div class="homepagePostSetting"> </div>
+      <div class="mt10"><a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span></div>
+      <div><a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span></div>
+      <div class="homepagePostSetting">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
     </div>
     <div class="cl"></div>
   </div>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
       <div class="homepagePostReplyBannerCount">回复（5）</div>
-      <div class="homepagePostReplyBannerTime">2015-07-31</div>
-      <div class="homepagePostReplyBannerMore">点击展开更多回复</div>
+      <div class="homepagePostReplyBannerTime">2015-07-26</div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a></div>
     </div>
     <div class="homepagePostReplyInputContainer">
       <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
     </div>
     <div class="homepagePostReplyInputContainer">
-      <div class="homepagePostReplyEmotion">表情</div>
-      <div class="homepagePostReplyCancel">取消</div>
-      <div class="homepagePostReplySubmit">发送</div>
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a></div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a></div>
       <div class="cl"></div>
     </div>
     <div class="homepagePostReplyContainer">
-      <div class="homepagePostReplyPortrait"> <img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /> </div>
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">尹教授</a> 2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
         <div class="homepagePostReplyContent">请大家说下软件工程是什么！</div>
@@ -168,20 +205,12 @@
       <div class="cl"></div>
     </div>
     <div class="homepagePostReplyContainer">
-      <div class="homepagePostReplyPortrait"> <img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /> </div>
+      <div class="homepagePostReplyPortrait"><a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /></a></div>
       <div class="homepagePostReplyDes">
-        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">Tang 学生</a> 2015-08-02<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
+        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr10 f14">Tang 学生</a> 2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
         <div class="homepagePostReplyContent">软件工程是一门研究用工程化方法构建和维护有效的、实用的和高质量的软件的学科。它涉及程序设计语言、数据库、软件开发工具、系统平台、标准、设计模式等方面。</div>
       </div>
       <div class="cl"></div>
     </div>
-    <div class="homepagePostReplyContainer borderBottomNone">
-      <div class="homepagePostReplyPortrait"> <img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像" /> </div>
-      <div class="homepagePostReplyDes">
-        <div class="homepagePostReplyPublisher"><a href="javascript:void(0);" class="newsBlue mr15 f14">尹教授</a><span class="f14">回复</span><a href="javascript:void(0);" class="newsBlue mr10 ml15 f14">Tang学生</a>刚刚<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><a href="javascript:void(0);" class="newsBlue fr">回复</a></div>
-        <div class="homepagePostReplyContent">回答非常好！</div>
-      </div>
-      <div class="cl"></div>
-    </div>
   </div>
-</div>
+</div>
\ No newline at end of file