已登录用户header完成

app/controllers/users_controller.rb

@@ -534,7 +534,7 @@ class UsersController < ApplicationController
   end
 
   def show
-    render :layout=>'base_users_new'
+    render :layout=>'new_base_user'
   end
 
   def show_old

app/views/layouts/_logined_header.html.erb

@@ -0,0 +1,44 @@
+<div class="navHomepage">
+  <div class="navHomepageLogo fl">
+    <%=link_to image_tag("../images/logo.png",weight:"51px", height: "45px",class: "mt3"), user_activities_path(User.current.id)%>
+  </div>
+  <div class="fl">
+    <ul>
+      <li class="navHomepageMenu fl">
+        <a href="javascript:void(0);" class="homepageWhite f16">首页</a>
+      </li>
+      <li class="navHomepageMenu fl">
+        <a href="javascript:void(0);" class="homepageWhite f16">资源库</a></li>
+      <li class="navHomepageMenu fl">
+        <a href="javascript:void(0);" class="homepageWhite f16">作业</a>
+      </li>
+      <li class="navHomepageMenu fl">
+        <a href="javascript:void(0);" class="homepageWhite f16">联系人</a>
+      </li>
+    </ul>
+  </div>
+
+  <div class="fl">
+    <form class="navHomepageSearchBox">
+      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
+      <a href="javascript:void(0);" class="homepageSearchIcon"></a>
+    </form>
+  </div>
+
+  <div class="navHomepageProfile">
+    <ul>
+      <li class="homepageProfileMenuIcon">
+        <%= link_to "<div class='mt5 mb8'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:alt=>"头像")}</div>".html_safe,user_activities_path(User.current.id)%>
+        <ul class="topnav_login_list">
+          <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
+          <li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>
+          <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <div class="navHomepageNews">
+    <a href="javascript:void(0);" class="homepageNewsIcon">
+    <div class="newsActive"></div>
+  </a></div>
+</div>

app/views/layouts/_unlogin_header.html.erb

@@ -0,0 +1,40 @@
+<div class="navHomepage">
+  <div class="navHomepageLogo fl">
+    <%=link_to image_tag("../images/logo.png",weight:"51px", height: "45px",class: "mt3")%>
+  </div>
+  <div class="fl">
+    <ul>
+      <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="homepageWhite f16">首页</a></li>
+      <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="homepageWhite f16">资源库</a></li>
+      <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="homepageWhite f16">作业</a></li>
+      <li class="navHomepageMenu fl"><a href="javascript:void(0);" class="homepageWhite f16">联系人</a></li>
+    </ul>
+  </div>
+  <div class="fl">
+    <form class="navHomepageSearchBox">
+      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
+      <a href="javascript:void(0);" class="homepageSearchIcon"></a>
+    </form>
+  </div>
+  <div class="navHomepageProfile">
+    <ul>
+      <li class="homepageProfileMenuIcon">
+        <a href="javascript:void(0);">
+          <div class="mt5 mb8">
+            <img src="images/homepageProfileImage.png" width="40" height="40" />
+          </div>
+        </a>
+        <ul class="topnav_login_list">
+          <li><a href="javascript:void(0);" class="menuGrey">修改资料</a> </li>
+          <li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>
+          <li><a href="javascript:void(0);" class="menuGrey">退出</a></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <div class="navHomepageNews">
+    <a href="javascript:void(0);" class="homepageNewsIcon">
+      <div class="newsActive"></div>
+    </a>
+  </div>
+</div>

app/views/users/show.html.erb

@@ -1,40 +1,187 @@
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
-<% @center_flag = (User.current == @user) %>
-<div class="top_new">
-    <span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>
-    <% if @user.allowed_to?(:add_project, nil, :global => true) %>
-      <a href="<%= url_for(:controller => 'projects', :action => 'new',:host=>Setting.host_name) %>" class="bgreen_n_btn fr ml10 mt2" target="_blank">新建项目</a>
-    <% else %>
-      <a href="<%= join_project_projects_path %>" data-remote ="true" class="bgreen_n_btn fr mt2">加入项目</a>
-    <% end %>
-
-    <% if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>
-      <a href="<%= url_for(:controller => 'courses', :action => 'new',:host=>Setting.host_course) %>" class="bgreen_n_btn fr mt2" target="_blank">新建课程</a>
-    <% else %>
-      <!--<a href="<%#= url_for(:controller => 'courses', :action => 'join_private_courses',:host=>Setting.host_course) %>" data-remote ="true" class="green_n_btn fr mt2">加入课程</a>-->
-      <a href="<%= join_private_courses_courses_path %>" data-remote ="true" class="bgreen_n_btn fr mt2">加入课程</a>
-    <% end %>
-  <div class="cl"></div>
+<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>
+      </li>
+    </ul>
+  </div>
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait"> <img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /> </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="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>
+    <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>
+    <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="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer">
+      <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 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>
+      </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="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>
+        <div class="homepagePostReplyInputContainer2">
+          <textarea class="homepagePostReplyInput2" placeholder="请输入回复"></textarea>
+        </div>
+        <div class="homepagePostReplyInputContainer2 mb10">
+          <div class="homepagePostReplyEmotion">表情</div>
+          <div class="homepagePostReplyCancel">取消</div>
+          <div class="homepagePostReplySubmit">发送</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="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 id="RSide" class="fl">
-
-  <div class="users_courses_box line_box mb10" nhname="list_more_div" style="display:none;">
-    <h4 class="users_h4">课程动态</h4>
-    <div nhname="container" data-nodatamsg="暂无动态" data-url="<%= url_for(:controller => 'users', :action => 'user_course_activities') %>" data-isclose="0" data-currpage="0" data-hasmore="1"></div>
-    <div class="message_list_more">
-      <a nhname="expand" href="javascript:void(0)" class="c_blue02">点击展开更多</a> <a nhname="close" style="display:none" href="javascript:void(0)" class="c_lgrey fr">收起</a>
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait"> <img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /> </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="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline">时间：2015-08-20</div>
+      </div>
+      <div class="homepagePostSetting"> </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>
+    <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="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer">
+      <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 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>
+      </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 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>
+      </div>
       <div class="cl"></div>
     </div>
   </div>
-
-  <div class="users_courses_box line_box mb10" nhname="list_more_div" style="display:none;">
-    <h4 class="users_h4">项目动态</h4>
-    <div nhname="container" data-nodatamsg="暂无动态" data-url="<%= url_for(:controller => 'users', :action => 'user_project_activities') %>" data-isclose="0" data-currpage="0" data-hasmore="1"></div>
-    <div class="message_list_more">
-      <a nhname="expand" href="javascript:void(0)" class="c_blue02">点击展开更多</a> <a nhname="close" style="display:none" href="javascript:void(0)" class="c_lgrey fr">收起</a>
+</div>
+<div class="resources mt15">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait"> <img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像" /> </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="homepagePostSubmitContainer">
+        <div class="homepagePostAssignTo"><span class="c_blue">指派给&nbsp;&nbsp;</span><a href="javascript:void(0);" class="c_blue 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>
+    <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>
+    <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="cl"></div>
+    </div>
+    <div class="homepagePostReplyContainer">
+      <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 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>
+      </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="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>
+      </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>