From 0287a0f3b463b23c3ecf89524459c86418f549fb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 11:40:09 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show_new_score.js.erb | 9 +++++++--
 public/stylesheets/new_public.css     | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/users/show_new_score.js.erb b/app/views/users/show_new_score.js.erb
index 40ef7d5c5..51f430fa9 100644
--- a/app/views/users/show_new_score.js.erb
+++ b/app/views/users/show_new_score.js.erb
@@ -1,4 +1,9 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_new_score') %>');
 showModal('ajax-modal', '400px');
-$('#ajax-modal').siblings().show();
-$('#ajax-modal').addClass('new-watcher');
+$('#ajax-modal').css('height','auto');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+"<a href='javascript:void(0)' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+//$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","30%").css("left","35%");
+$('#ajax-modal').parent().addClass("alert_box");
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index 17b17f59f..7e3e92923 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -9,6 +9,7 @@ a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
 
 /*常用*/
+.user_score_box{width:250px;height:180px;position:fixed !important;z-index:100;left:60%;top:65%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .none{display: none;}
 .rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}

From 36152d19e8dd1c62cb702c8bdc251db5d0d61f47 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 11:42:26 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BAshow=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E6=9C=89=E4=B8=80=E5=9D=97=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 02791d02d..4975229eb 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -213,9 +213,4 @@
       <div class="cl"></div>
     </div>
   </div>
-</div>
-
-<!-- 美化设置，勿删！ -->
-<div  id="RSide" class="rside_back">
-
 </div>
\ No newline at end of file

From 2d75fea96b9d504cfbf2ccea7ca7342c8d59a878 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 14:44:22 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb        | 35 +++------------
 app/views/layouts/_user_courses.html.erb   | 12 +++++
 app/views/layouts/new_base_user.html.erb   | 33 ++++----------
 app/views/users/user_courses4show.html.erb | 16 -------
 app/views/users/user_courses4show.js.erb   |  1 +
 public/javascripts/new_user.js             | 51 +++++++++++++++-------
 public/stylesheets/new_public.css          |  2 +-
 7 files changed, 62 insertions(+), 88 deletions(-)
 create mode 100644 app/views/layouts/_user_courses.html.erb
 delete mode 100644 app/views/users/user_courses4show.html.erb
 create mode 100644 app/views/users/user_courses4show.js.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 59823ec8f..6bdd3d6fc 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -473,40 +473,15 @@ class UsersController < ApplicationController
     end
   end
 
+  #显示更多用户课程
   def user_courses4show
-    query = Course.joins("join members m on #{Course.table_name}.id=m.course_id")
-    query = query.where("m.user_id = ?",@user.id).order("#{Course.table_name}.id desc")
-    if User.current == @user  #看自己
-    else
-      if @user.user_extensions!=nil && @user.user_extensions.identity == 0 #看老师
-        query = query.joins("join member_roles r on m.id = r.member_id")
-        query = query.where("r.role_id in(3,7,9)")
-      end
-      query = query.where(Course.table_name+".is_public = 1")
-    end
-
-    if params[:lastid]!=nil && !params[:lastid].empty?
-      query = query.where(" #{Course.table_name}.id < ?",params[:lastid],)
-    end
-    @list = query.limit(8)
-
-    render :layout=>nil
+    @page = params[:page].to_i + 1
+    @courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
-  def user_projects4show
-    query = Project.joins("join members m on #{Project.table_name}.id=m.project_id")
-    query = query.where("m.user_id = ? and #{Project.table_name}.project_type=?",@user.id,Project::ProjectType_project)
-    if User.current == @user  #看自己
-    else
-      query = query.where(Project.table_name+".is_public = 1")
-      # TODO or exists (select 1 from project c2,members m2 where c2.id=m2.course_id and c2.id=#{Project.table_name}.id and m2.user_id= User.current.id)
-    end
 
-    if params[:lastid]!=nil && !params[:lastid].empty?
-      query = query.where("( (#{Project.table_name}.updated_on=? and #{Project.table_name}.id < ?) or #{Project.table_name}.updated_on<?)",params[:lasttime],params[:lastid],params[:lasttime])
-    end
-    @list = query.order("#{Project.table_name}.updated_on desc,#{Project.table_name}.id desc").limit(8).all
+  #显示更多用户项目
+  def user_projects4show
 
-    render :layout=>nil
   end
 
   def user_course_activities
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
new file mode 100644
index 000000000..393e3d48f
--- /dev/null
+++ b/app/views/layouts/_user_courses.html.erb
@@ -0,0 +1,12 @@
+<% courses.each do |course|%>
+    <li class="homepageLeftMenuCoursesLine">
+      <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey"%>
+    </li>
+<% end %>
+
+<% if courses.size == 5%>
+    <li class="homepageLeftMenuMore" id="user_show_more_course">
+      <input type="hidden" value="<%= page%>" id="course_page_num">
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_course('<%=  user_courses4show_user_path(user.id)%>');"></a>
+    </li>
+<% end%>
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 419fa70ce..15af50332 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -102,18 +102,7 @@
         <div class="homepageLeftMenuCourses">
           <ul>
             <% courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
-            <% courses.each do |course|%>
-                <li class="homepageLeftMenuCoursesLine">
-                  <a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>course.id, :host=>Setting.host_course) %>" class="coursesLineGrey">
-                    <%= course.name %>
-                  </a>
-                </li>
-            <% end %>
-            <% if courses.size == 5%>
-                <li class="homepageLeftMenuMore">
-                  <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a>
-                </li>
-            <% end%>
+            <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
@@ -124,19 +113,13 @@
         </div>
         <div class="homepageLeftMenuCourses">
           <ul>
-            <% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
-            <% projects.each do |project|%>
-                <li class="homepageLeftMenuCoursesLine">
-                  <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>project.id, :host=>Setting.host_name) %>" class="coursesLineGrey">
-                    <%= project.name %>
-                  </a>
-                </li>
-            <% end %>
-            <% if projects.size == 5%>
-                <li class="homepageLeftMenuMore">
-                  <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a>
-                </li>
-            <% end%>
+            <%# projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
+            <%#= render :partial => 'layouts/user_item', :locals => {:items => courses,:is_course => false} %>
+            <%# if projects.size == 5%>
+                <!--li class="homepageLeftMenuMore" id="user_show_more_project">
+                  <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_project();"></a>
+                </li-->
+            <%# end%>
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
diff --git a/app/views/users/user_courses4show.html.erb b/app/views/users/user_courses4show.html.erb
deleted file mode 100644
index 7aab1b2a5..000000000
--- a/app/views/users/user_courses4show.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% for item in @list %>
-
-<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>" data-time="<%= item.updated_at %>">
-  <div class="courses_list_pic fl ml10 mr10">
-    <a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>item.id, :host=>Setting.host_course) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %></a>
-  </div>
-  <span class="fl" style="width:260px;">
-    <a href="<%= url_for(:controller => 'courses', :action=>"show", :id=>item.id, :host=>Setting.host_course) %>" class="home_list_title c_blue02 fl mb10" title="<%= item.name %>"><%= item.name %></a>
-  </span>
-  <div class="fl c_dgrey">
-    <p>主讲老师：<a href="<%= user_path(item.teacher) %>" title="<%= item.teacher.show_name %>"><%= item.teacher.show_name %></a></p>
-    <p>课程作业：<a href="<%=url_for(:controller => 'homework_common', :action => 'index',:course=>item.id, :host=>Setting.host_course)%>"><%= item.homework_commons.count %></a> <span class="ml10"></span>学生：<a href="<%= url_for(:controller => 'courses', :action=>"member", :id=>item.id,:role=>2, :host=>Setting.host_course) %>"><%= studentCount(item) %></a></p>
-  </div>
-  <div class="cl"></div>
-</div>
-<% end %>
diff --git a/app/views/users/user_courses4show.js.erb b/app/views/users/user_courses4show.js.erb
new file mode 100644
index 000000000..12696e232
--- /dev/null
+++ b/app/views/users/user_courses4show.js.erb
@@ -0,0 +1 @@
+$("#user_show_more_course").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_courses',:locals => {:courses => @courses,:user => @user, :page => @page} )%>");
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 44f719a0b..ae94e48a7 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -1,6 +1,4 @@
 $(function(){
-    $("#RSide").css("min-height",$("#LSide").height()-40).css("padding","10px");
-
     //头像相关
     $("#homepage_portrait_image").live("mouseover",function(){
         $("#edit_user_file_btn").show();
@@ -29,18 +27,39 @@ function edit_user_introduction(url){
     );
 }
 
-$(function(){
-    $(".newsType").mouseover(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
-    });
-    $(".newsType").mouseout(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
-    });
-    $(".resourcesSelected").mouseover(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
-    });
-    $(".resourcesSelected").mouseout(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
-    });
-});
+//显示更多的课程
+function show_more_course(url){
+    $.get(
+        url,
+        { page: $("#course_page_num").val() },
+        function (data) {
+        }
+    );
+}
+
+//显示更多的项目
+function show_more_project(url){
+    $.get(
+        url,
+        { brief_introduction: $("#user_brief_introduction_edit").val() },
+        function (data) {
+
+        }
+    );
+}
+//
+//$(function(){
+//    $(".newsType").mouseover(function(){
+//        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
+//    });
+//    $(".newsType").mouseout(function(){
+//        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
+//    });
+//    $(".resourcesSelected").mouseover(function(){
+//        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
+//    });
+//    $(".resourcesSelected").mouseout(function(){
+//        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
+//    });
+//});
 //个人动态 end
\ No newline at end of file
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index 7e3e92923..0f684f5a0 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -415,7 +415,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
 .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
 .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
-.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
+.homepageImageBlock {margin:0 auto; width:75px; float:left; text-align:center; display:inline-block;}
 .homepageImageNumber {font-size:12px; color:#484848;}
 a.homepageImageNumber:hover {color:#15bccf;}
 .homepageImageText {font-size:12px; color:#888888;}

From 7f2f2c5d40dbec858f45027f7189644598f8ef4c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 14:53:35 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb         |  3 ++-
 app/views/layouts/_user_projects.html.erb   | 11 +++++++++++
 app/views/layouts/new_base_user.html.erb    |  9 ++-------
 app/views/users/user_projects4show.html.erb | 16 ----------------
 app/views/users/user_projects4show.js.erb   |  1 +
 public/javascripts/new_user.js              |  2 +-
 6 files changed, 17 insertions(+), 25 deletions(-)
 create mode 100644 app/views/layouts/_user_projects.html.erb
 delete mode 100644 app/views/users/user_projects4show.html.erb
 create mode 100644 app/views/users/user_projects4show.js.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6bdd3d6fc..2af2b9c42 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -481,7 +481,8 @@ class UsersController < ApplicationController
 
   #显示更多用户项目
   def user_projects4show
-
+    @page = params[:page].to_i + 1
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
 
   def user_course_activities
diff --git a/app/views/layouts/_user_projects.html.erb b/app/views/layouts/_user_projects.html.erb
new file mode 100644
index 000000000..864b6888c
--- /dev/null
+++ b/app/views/layouts/_user_projects.html.erb
@@ -0,0 +1,11 @@
+<% projects.each do |project|%>
+    <li class="homepageLeftMenuCoursesLine">
+      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey"%>
+    </li>
+<% end %>
+<% if projects.size == 5%>
+    <li class="homepageLeftMenuMore" id="user_show_more_project">
+      <input type="hidden" value="<%= page%>" id="project_page_num">
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_project('<%=  user_projects4show_user_path(user.id)%>');"></a>
+    </li>
+<% end%>
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 15af50332..4d85ef1b3 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -113,13 +113,8 @@
         </div>
         <div class="homepageLeftMenuCourses">
           <ul>
-            <%# projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
-            <%#= render :partial => 'layouts/user_item', :locals => {:items => courses,:is_course => false} %>
-            <%# if projects.size == 5%>
-                <!--li class="homepageLeftMenuMore" id="user_show_more_project">
-                  <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_project();"></a>
-                </li-->
-            <%# end%>
+            <% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
+            <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
diff --git a/app/views/users/user_projects4show.html.erb b/app/views/users/user_projects4show.html.erb
deleted file mode 100644
index 3c709bd5d..000000000
--- a/app/views/users/user_projects4show.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% for item in @list %>
-<div class="home_courses_list fl" nhname="rec" data-id="<%= item.id %>" data-time="<%= item.updated_on %>">
-  <div class="courses_list_pic fl ml10 mr10">
-    <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>item.id, :host=>Setting.host_name) %>"><%= image_tag(url_to_avatar(item), :style => 'width:64px;height:64px;') %></a>
-  </div>
-  <span class="fl" style="width:260px;">
-    <a href="<%= url_for(:controller => 'projects', :action=>"show", :id=>item.id, :host=>Setting.host_name) %>" class="home_list_title c_blue02 fl mb10" title="<%= item.name %>"><%= item.name %></a>
-  </span>
-  <div class="fl c_dgrey">
-    <!--<p>项目评分：<a href="<%#= url_for(:controller => 'projects', :action => 'show_projects_score', :id => item.id,:host=>Setting.host_name) %>" data-remote="true"><%#= format( "%.2f" , project_scores(item) ).to_i %></a></p>-->
-    <p>项目评分：<a href="<%= url_for(:controller => 'projects', :action => 'show_projects_score', :id => item.id) %>" data-remote="true"><%= format( "%.2f" , project_scores(item) ).to_i %></a></p>
-    <p>发布缺陷：<a href="<%= url_for(:controller => 'issues', :action=>"index", :project_id=>item.id, :host=>Setting.host_name) %>"><%= item.issues.count %></a> <span class="ml10"></span>成员：<a href="<%= url_for(:controller => 'projects', :action=>"member", :id=>item.id, :host=>Setting.host_name) %>"><%= item.members.count %></a></p>
-  </div>
-  <div class="cl"></div>
-</div>
-<% end %>
diff --git a/app/views/users/user_projects4show.js.erb b/app/views/users/user_projects4show.js.erb
new file mode 100644
index 000000000..c19a79c81
--- /dev/null
+++ b/app/views/users/user_projects4show.js.erb
@@ -0,0 +1 @@
+$("#user_show_more_project").replaceWith("<%= escape_javascript( render :partial =>  'layouts/user_projects',:locals => {:projects => @projects,:user => @user, :page => @page} )%>");
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index ae94e48a7..e89b7374b 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -41,7 +41,7 @@ function show_more_course(url){
 function show_more_project(url){
     $.get(
         url,
-        { brief_introduction: $("#user_brief_introduction_edit").val() },
+        { page: $("#project_page_num").val() },
         function (data) {
 
         }

From fe91442c96ee3e07ffd4565cb3ccfb36050b538a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 15:18:07 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B7=B2=E5=85=B3=E9=97=AD=E8=AF=BE=E7=A8=8B=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_user_courses.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 393e3d48f..d5f0507f1 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -1,6 +1,6 @@
 <% courses.each do |course|%>
     <li class="homepageLeftMenuCoursesLine">
-      <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey"%>
+      <%= link_to (course_endTime_timeout?(course) ? "[已关闭]&nbsp;#{course.name}" : "#{course.name}").html_safe, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey"%>
     </li>
 <% end %>
 

From dabef542fecb985a60473127cd8cab81961aa200 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 15:30:11 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0css=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=AE=9E=E7=8E=B0=E6=9C=AA=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb |   2 +-
 app/views/layouts/_unlogin_header.html.erb |  60 +++++----
 public/stylesheets/new_public.css          | 146 ++++++++++++++-------
 3 files changed, 134 insertions(+), 74 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index cb93ca7fa..c91b452dc 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -18,7 +18,7 @@
     </ul>
   </div>
 
-  <div class="fl">
+  <div class="navHomepageSearchBoxcontainer fl">
     <form class="navHomepageSearchBox">
       <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
       <a href="javascript:void(0);" class="homepageSearchIcon"></a>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index ac322f07f..e91cf9ddb 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,40 +1,50 @@
 <div class="navHomepage">
   <div class="navHomepageLogo fl">
-    <%=link_to image_tag("../images/logo.png",weight:"51px", height: "45px",class: "mt3")%>
+    <a href="javascript:void(0);">
+      <img src="images/nav_logo.png" width="51" height="45" alt="确实Trustie" class="mt3" />
+    </a>
   </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>
+      <li class="navHomepageMenu fl">
+        <a href="javascript:void(0);" class="c_white f16">帮助中心</a>
+      </li>
     </ul>
   </div>
-  <div class="fl">
+  <div class="navHomepageSearchBoxcontainer 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 class="navSearchTypeBox">
+      <form class="mt8">
+        <div class="fl mr15">
+          <div class="fl mt5">
+            <input type="radio" value="课程" name="navSearchType" />
           </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="fl mr15">
+          <div class="fl mt5">
+            <input type="radio" value="项目" name="navSearchType" />
+          </div>
+          项目
+        </div>
+        <div class="fl mr15">
+          <div class="fl mt5">
+            <input type="radio" value="用户" name="navSearchType" />
+          </div>
+          用户</div>
+        <div id="navSearchAlert" class="fr mr10">
+          <span class="c_red">请选择搜索类型</span>
+        </div>
+      </form>
+    </div>
   </div>
-  <div class="navHomepageNews">
-    <a href="javascript:void(0);" class="homepageNewsIcon">
-      <div class="newsActive"></div>
-    </a>
+  <div id="loginInButton" class="fr ml20">
+    <a href="javascript:void(0);" class="c_white db">登录</a>
+  </div>
+  <div id="loginSignButton" class="fr">
+    <a href="javascript:void(0);" class="c_white db">注册</a>
   </div>
 </div>
\ No newline at end of file
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index 0f684f5a0..09ca8a8ec 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -23,7 +23,7 @@ table{ background:#fff;}
 .line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 .no_border{ border:none;background:none;}
 .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
-
+.db {display:block;}
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}
 h3{ font-size:14px; color:#e8770d;}
@@ -71,6 +71,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml90{ margin-left:90px;}
 .ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
+.ml150 { margin-left:150px;}
 .mr5{ margin-right:5px;}
 .mr45 {margin-right:45px;}
 .mr55{ margin-right:55px;}
@@ -83,7 +84,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
-.mt10{ margin-top:10px;}
+.mt10{ margin-top:10px !important;}
 .mt15 {margin-top:15px;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
@@ -229,7 +230,7 @@ a:hover.bgreen_n_btn{background:#08a384;}
 #TopNav{}
 #TopNav ul li{ margin-top:8px;}
 .topnav_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
-.topnav_a a:hover{color: #a1ebff;;}
+.topnav_a a:hover{color: #a1ebff;}
 #userInfo {float:right; display:inline-block; width:130px; padding-top:5px;}
 .userInfoRow2 {margin-top:-5px;}
 .myPractice {display:inline-block;}
@@ -285,56 +286,66 @@ a.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:
 a:hover.search_btn{ background: #0fa9bb;}
 .search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
 
+
 /*资源库*/
-.resources {width:730px; background-color:#ffffff; padding:10px;}
+.resources {width:728px; background-color:#ffffff; padding:10px 10px 20px 10px; border:1px solid #dddddd;}
 .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}
 .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}
 .resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;}
 .resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}
 .resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}
 .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}
-.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}
+.resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
+a.resourcesTypeAll {background:url(../images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
+a.resourcesTypeAtt {background:url(../images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
 a.resourcesGrey {font-size:12px; color:#888888;}
 a.resourcesGrey:hover {font-size:12px; color:#15bccf;}
 .resourcesBanner ul li:hover ul.resourcesType {display:block;}
 ul li:hover ul {display:block;}
 .resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}
-.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}
-a.uploadText {color:#ffffff; font-size:14px;}
-.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;}
+.resourcesUploadBox:hover {background-color:#0781b4;}
+a.uploadBoxIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:81px; height:30px; padding-left:22px; font-size:14px; color:#ffffff;}
+.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:left; background-color:#ffffff;}
 .searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}
 .searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}
-.resourcesSearchBanner {height:34px; margin-bottom:10px;}
-.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}
-.resourcesListCheckbox {width:40px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
+.resourcesSearchBanner {width:710px; height:34px; margin-bottom:10px; margin-top:15px; margin-left:auto; margin-right:auto;}
+.resourcesListTab {width:710px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a; margin-left:auto; margin-right:auto;}
+.resourcesListCheckbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
 .resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}
-.resourcesListName {width:135px; height:40px; line-height:40px; text-align:left;}
-.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}
+.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;}
+.resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
 .resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}
-.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}
-.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}
+.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;}
+.resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
+.resourcesList {width:710px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto;}
+.resourcesListOption {width:710px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
+.resourcesCheckAll {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle; float:left;}
+.resourcesSelectSend {float:right;}
+.resourcesSelectSendButton {width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; margin-top:5px; margin-right:10px; margin-left:15px; text-align:center; border:1px solid #15bccf; border-radius:5px; float:right;}
+a.sendButtonBlue {color:#15bccf;}
+a.sendButtonBlue:hover {color:#ffffff;}
+.resourcesSelectSendButton:hover {background-color:#15bccf;}
 a.resourcesBlack {font-size:12px; color:#4c4c4c;}
 a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 80px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  font-size: 12px;
-  text-align: left;
-  background-color: #fff;
-  -webkit-background-clip: padding-box;
-          background-clip: padding-box;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+    position: absolute;
+    top: 100%;
+    left: 0;
+    z-index: 1000;
+    display: none;
+    float: left;
+    min-width: 80px;
+    padding: 5px 0;
+    margin: 2px 0 0;
+    font-size: 12px;
+    text-align: left;
+    background-color: #fff;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+    box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
 }
 .dropdown-menu > li > a {
     display: block;
@@ -355,7 +366,9 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 /*发送资源弹窗*/
 /*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
 .resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
-.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
+.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:100px; display:inline-block;}
+.resourcesSendTo {float:left; height:20px; margin-top:15px;}
+.resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
@@ -365,15 +378,18 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;}
 .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
 .sendCourseName {font-size:12px; color:#5f6060;}
 .courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}
+.courseSendSubmit:hover {background-color:#0182bb;}
 .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
-a.sendSourceText {font-size:14px; color:#ffffff;}
+.courseSendCancel:hover {background-color:#717171;}
+a.sendSourceText {font-size:14px; color:#ffffff; display:block;}
 
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
 .uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
 .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}
 .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}
-a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}
+.uploadBox:hover {background-color:#0182bb;}
+a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px; display:block;}
 .chooseFile {color:#ffffff; display:block; margin-left:32px;}
 .uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}
 .uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}
@@ -387,12 +403,16 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .homepageContentContainer {width:100%; margin:0 auto; background-color:#eaebed;}
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
 .navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;}
-.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:40px;}
-.navHomepageMenu {margin-right:40px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
-.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
+.navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
+.navHomepageMenu {margin-right:20px; padding-left:10px; padding-right:10px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
+.navHomepageMenu:hover {background-color:#0ea6b7;}
+.navHomepageSearchBoxcontainer {margin-top:11px; }
+.navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  background-color:#ffffff;}
 .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}
 .homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
 a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
+.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
+#navSearchAlert {display:none;}
 .navHomepageNews {width:30px; display:block; float:right; margin-top:12px; position:relative;}
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:29px; display:block;}
 .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
@@ -404,14 +424,14 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
 .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
 .homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
-.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 13px 5px 13px;; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
 .homepagePortraitImage:hover {border:1px solid #15bccf;}
 .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
 .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
 .homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
 .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px; height:21px; float:left;max-width: 100px;}
-.homepageImageSexMan {width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
+.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:20px; float:left;}
+.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
 .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
 .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
 .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
@@ -437,7 +457,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
 .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
-.homepageRightBlock {}
+.newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
@@ -448,7 +468,7 @@ a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
 a.newsGrey {color:#4b4b4b;}
 a.newsGrey:hover {color:#000000;}
-a.replyGrey {color:#888888; display:block;}
+a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
 a.newsBlue {color:#15bccf;}
 a.newsBlue:hover {color:#0781b4;}
@@ -470,11 +490,11 @@ a.postTypeGrey:hover {color:#15bccf;}
 .homepagePostPortrait {float:left; width:90px;}
 .homepagePostDes {float:left; width:600px; margin-left:20px;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:15px;}
-.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:15px;}
+.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:15px; font-weight:bold;}
 .homepagePostSubmitContainer {height:30px; margin-bottom:15px;}
 .homepagePostSubmit {font-size:14px; color:#888888; width:80px; height:30px; text-align:center; vertical-align:middle; line-height:30px; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:12px; color:#888888;}
+.homepagePostIntro {font-size:14px; color:#484848;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; height:30px; line-height:30px; vertical-align:middle;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:15px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -484,7 +504,7 @@ a.postTypeGrey:hover {color:#15bccf;}
 .homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;}
 .homepagePostReplyInputContainer {width:670px; margin:0px auto;}
 .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;}
-.homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:70px; height:24px; float:left; padding-left:30px;}
+.homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;}
 .homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#15bccf;}
 .homepagePostReplySubmit:hover {background-color:#329cbd;}
 a.postReplySubmit {color:#ffffff; display:block;}
@@ -515,6 +535,36 @@ a.postGrey:hover {color:#000000;}
 a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;}
 a:hover.gz_btn{ color:#ff5722;}
 
+/*课程主页css*/
+.homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
+
+/*注册登陆页面*/
+#loginInBox {display:block; margin-top:143px;}
+#signUpBox {display:none; margin-top:79px;}
+#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginSignButton:hover {background-color:#0ea6b7;}
+#loginInButton:hover {background-color:#0ea6b7;}
+.loginContentContainer {width:100%; background-color:#15bccf; margin-top:1px; height:580px;}
+.loginContent {width:1000px; margin:0px auto;}
+.loginLeft {width:595px; float:left;}
+.loginLogo {padding-left:208px; padding-top:155px;}
+.loginInro {width:465px; padding-top:55px; padding-left:50px; font-size:16px; color:#ffffff;}
+.loginRight {width:405px; float:left;}
+.loginChooseBox {width:405px; height:54px; background-color:#ffffff; padding-top:18px;}
+.loginChooseList {width:350px; height:30px; font-size:14px; margin:0px auto;}
+.loginChoose {width:55px; height:30px; border-bottom:1px solid #8ad2da; text-align:center;}
+a.loginChooseTab {color:#484848; height:30px; display:block;}
+.loginInButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:20px;}
+.loginUpButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;}
+.loginChooseBorder {width:295px; height:30px; border-bottom:1px solid #e3e3e3;}
+.loginChoose:hover {border-bottom:1px solid #8ad2da;}
+.loginSign {width:405px; background-color:#ffffff;}
+.loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;}
+.loginSignOption {margin-left:46px; margin-top:15px;}
+.loginIn {width:405px; background-color:#ffffff; padding-bottom:30px;}
+.loginSignAlert {font-size:12px; color:#fc0000; margin-left:60px;}
+
 
 
 /*底部*/

From e746a7764fbb8345e33ec15f0da49751e7418dac Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 15:36:32 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=A2=AB=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=E7=9A=84css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_public.css | 173 +++++++++++-------------------
 1 file changed, 65 insertions(+), 108 deletions(-)

diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index 40b049b7e..b26f39ae2 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -22,7 +22,7 @@ table{ background:#fff;}
 .line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 .no_border{ border:none;background:none;}
 .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;}
-
+.db {display:block;}
 /* font & color */
 h2{ font-size:18px; color:#15bccf;}
 h3{ font-size:14px; color:#e8770d;}
@@ -70,6 +70,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml90{ margin-left:90px;}
 .ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
+.ml150 { margin-left:150px;}
 .mr5{ margin-right:5px;}
 .mr45 {margin-right:45px;}
 .mr55{ margin-right:55px;}
@@ -82,7 +83,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
-.mt10{ margin-top:10px;}
+.mt10{ margin-top:10px !important;}
 .mt15 {margin-top:15px;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
@@ -228,7 +229,7 @@ a:hover.bgreen_n_btn{background:#08a384;}
 #TopNav{}
 #TopNav ul li{ margin-top:8px;}
 .topnav_a a{ font-size:14px; font-weight:bold; color:#fff; margin-right:10px;}
-.topnav_a a:hover{color: #a1ebff;;}
+.topnav_a a:hover{color: #a1ebff;}
 #userInfo {float:right; display:inline-block; width:130px; padding-top:5px;}
 .userInfoRow2 {margin-top:-5px;}
 .myPractice {display:inline-block;}
@@ -284,101 +285,6 @@ a.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:
 a:hover.search_btn{ background: #0fa9bb;}
 .search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; }
 
-/*资源库*/
-/*.resources {width:730px; background-color:#ffffff; padding:10px;}*/
-/*.resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;}*/
-/*.bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;}*/
-/*.resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;}*/
-/*.resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;}*/
-/*.resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;}*/
-/*.resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;}*/
-/*.resourcesType {width:50px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:35px; padding:5px 10px; left:-30px; font-size:12px; color:#888888; display:none;}*/
-/*a.resourcesGrey {font-size:12px; color:#888888;}*/
-/*a.resourcesGrey:hover {font-size:12px; color:#15bccf;}*/
-/*.resourcesBanner ul li:hover ul.resourcesType {display:block;}*/
-/*ul li:hover ul {display:block;}*/
-/*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
-/*.uploadIcon {background:url(images/resource_icon_list.png) -35px 10px no-repeat; float:left; display:block; width:30px; height:30px; margin-left:-3px;}*/
-/*a.uploadText {color:#ffffff; font-size:14px;}*/
-/*.resourcesSearchloadBox {border:1px solid #e6e6e6; width:225px; float:right; background-color:#ffffff;}*/
-/*.searchResource {border:none; outline:none; background-color:#ffffff; width:184px; height:32px; padding-left:10px; display:block; float:left;}*/
-/*.searchIcon{width:31px; height:32px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -15px no-repeat; display:block; float:left;}*/
-/*.resourcesSearchBanner {height:34px; margin-bottom:10px;}*/
-/*.resourcesListTab {width:730px; height:40px; background-color:#f6f6f6; border-bottom:1px solid #eaeaea; font-size:14px; color:#7a7a7a;}*/
-/*.resourcesListCheckbox {width:40px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}*/
-/*.resourcesCheckbox {padding:0px; margin:0px; margin-top:14px; width:12px; height:12px;}*/
-/*.resourcesListName {width:135px; height:40px; line-height:40px; text-align:left;}*/
-/*.resourcesListSize {width:110px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
-/*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
-/*a.resourcesBlack {font-size:12px; color:#4c4c4c;}*/
-/*a.resourcesBlack:hover {font-size:12px; color:#000000;}*/
-/*.dropdown-menu {*/
-  /*position: absolute;*/
-  /*top: 100%;*/
-  /*left: 0;*/
-  /*z-index: 1000;*/
-  /*display: none;*/
-  /*float: left;*/
-  /*min-width: 80px;*/
-  /*padding: 5px 0;*/
-  /*margin: 2px 0 0;*/
-  /*font-size: 12px;*/
-  /*text-align: left;*/
-  /*background-color: #fff;*/
-  /*-webkit-background-clip: padding-box;*/
-          /*background-clip: padding-box;*/
-  /*border: 1px solid #ccc;*/
-  /*border-radius: 4px;*/
-  /*-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
-          /*box-shadow: 0 6px 12px rgba(0, 0, 0, .175);*/
-/*}*/
-/*.dropdown-menu > li > a {*/
-    /*display: block;*/
-    /*padding: 3px 20px;*/
-    /*clear: both;*/
-    /*font-weight: normal;*/
-    /*line-height: 1.5;*/
-    /*color:#616060;*/
-    /*white-space: nowrap;*/
-/*}*/
-/*.dropdown-menu > li > a:hover{*/
-    /*color: #ffffff;*/
-    /*text-decoration: none;*/
-    /*background-color: #64bdd9;*/
-    /*outline:none;*/
-/*}*/
-
-/*发送资源弹窗*/
-/*.resourceShareContainer {width:100%; height:100%; background:#666; filter:alpha(opacity=50); opacity:0.5; -moz-opacity:0.5; position:absolute; left:0; top:0; z-index:-999;}*/
-/*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
-/*.sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
-/*.resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}*/
-/*.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}*/
-/*.resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}*/
-/*.searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}*/
-/*.searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}*/
-/*.courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}*/
-/*.courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}*/
-/*.sendCourseName {font-size:12px; color:#5f6060;}*/
-/*.courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}*/
-/*.courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}*/
-/*a.sendSourceText {font-size:14px; color:#ffffff;}*/
-
-/*上传资源弹窗*/
-/*.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}*/
-/*.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}*/
-/*.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}*/
-/*.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}*/
-/*a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px;}*/
-/*.chooseFile {color:#ffffff; display:block; margin-left:32px;}*/
-/*.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}*/
-/*.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}*/
-/*.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}*/
-/*.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}*/
-/*.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}*/
 
 /*资源库*/
 .resources {width:728px; background-color:#ffffff; padding:10px; border:1px solid #dddddd;float: right}
@@ -501,6 +407,8 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 /*.resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}*/
 .resourceSharePopup {width:300px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:100px; display:inline-block;}
+.resourcesSendTo {float:left; height:20px; margin-top:15px;}
+.resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
@@ -510,6 +418,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
 .sendCourseName {font-size:12px; color:#5f6060;}
 .courseSendSubmit {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#64bdd9; margin-right:25px; float:left;}
+.courseSendSubmit:hover {background-color:#0182bb;}
 .courseSendCancel {width:50px; height:25px; line-height:25px; text-align:center; vertical-align:middle; background-color:#c1c1c1; float:left}
 a.sendSourceText {font-size:14px; color:#ffffff;}
 input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;}
@@ -517,6 +426,20 @@ input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:scroll; overflow-x:hidden;}
 
+/*上传资源弹窗*/
+.resourceUploadPopup {width:400px; height:auto; border:3px solid #15bccf; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
+.uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}
+.uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#64bdd9; border-radius:3px; float:left; margin-right:12px;}
+.uploadBox:hover {background-color:#0182bb;}
+a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat; width:100px; height:33px; display:block;}
+.chooseFile {color:#ffffff; display:block; margin-left:32px;}
+.uploadResourceIntr {width:250px; height:33px; float:left; line-height:33px; font-size:12px;}
+.uploadResourceName {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444; margin-bottom:2px;}
+.uploadResourceIntr2 {width:250px; display:inline-block; line-height:15px; font-size:12px; color:#444444;}
+.uploadType {margin:10px 0; border:1px solid #e6e6e6; width:100px; height:30px; outline:none; font-size:12px; color:#888888;}
+.uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
+
 
 /*新个人主页框架css*/
 .navContainer {width:100%; margin:0 auto; background-color:#15bccf;}
@@ -525,10 +448,14 @@ input.sendSourceText {font-size:14px;color:#ffffff;background-color:#64bdd9;}
 .navHomepage {width:1000px; height:54px; background-color:#15bccf; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:40px;}
 .navHomepageMenu {margin-right:40px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
+.navHomepageMenu:hover {background-color:#0ea6b7;}
+.navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
 .navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;}
 .homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;}
 a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;}
+.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
+#navSearchAlert {display:none;}
 .navHomepageNews {width:30px; display:block; float:right; margin-top:12px; position:relative;}
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:29px; display:block;}
 .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
@@ -540,14 +467,14 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
 .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
 .homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
-.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 13px 5px 13px;; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
 .homepagePortraitImage:hover {border:1px solid #15bccf;}
 .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
 .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
 .homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
 .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px; height:21px; float:left;max-width: 100px;}
-.homepageImageSexMan {width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
+.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:20px; float:left;}
+.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
 .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
 .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
 .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
@@ -573,7 +500,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;}
 .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
-.homepageRightBlock {}
+.newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
@@ -582,9 +509,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
-a.newsGrey1 {color:#4b4b4b;}
-a.newsGrey1:hover {color:#000000;}
-a.replyGrey {color:#888888; display:block;}
+a.newsGrey {color:#4b4b4b;}
+a.newsGrey:hover {color:#000000;}
+a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
 a.replyGrey1 {color:#888888;}
 a.replyGrey1:hover {color:#4b4b4b;}
@@ -608,11 +535,11 @@ a.postTypeGrey:hover {color:#15bccf;}
 .homepagePostPortrait {float:left; width:90px;}
 .homepagePostDes {float:left; width:600px; margin-left:20px;}
 .homepagePostTo {font-size:14px; color:#484848; margin-bottom:15px;}
-.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:15px;}
+.homepagePostTitle {font-size:14px; color:#484848; margin-bottom:15px; font-weight:bold;}
 .homepagePostSubmitContainer {height:30px; margin-bottom:15px;}
 .homepagePostSubmit {font-size:14px; color:#888888; width:80px; height:30px; text-align:center; vertical-align:middle; line-height:30px; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:12px; color:#888888;}
+.homepagePostIntro {font-size:14px; color:#484848;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; height:30px; line-height:30px; vertical-align:middle;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:15px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -622,7 +549,7 @@ a.postTypeGrey:hover {color:#15bccf;}
 .homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;}
 .homepagePostReplyInputContainer {width:670px; margin:0px auto;}
 .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;}
-.homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:70px; height:24px; float:left; padding-left:30px;}
+.homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;}
 .homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#15bccf;}
 .homepagePostReplySubmit:hover {background-color:#329cbd;}
 a.postReplySubmit {color:#ffffff; display:block;}
@@ -653,6 +580,36 @@ a.postGrey:hover {color:#000000;}
 a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;}
 a:hover.gz_btn{ color:#ff5722;}
 
+/*课程主页css*/
+.homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
+
+/*注册登陆页面*/
+#loginInBox {display:block; margin-top:143px;}
+#signUpBox {display:none; margin-top:79px;}
+#loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
+#loginSignButton:hover {background-color:#0ea6b7;}
+#loginInButton:hover {background-color:#0ea6b7;}
+.loginContentContainer {width:100%; background-color:#15bccf; margin-top:1px; height:580px;}
+.loginContent {width:1000px; margin:0px auto;}
+.loginLeft {width:595px; float:left;}
+.loginLogo {padding-left:208px; padding-top:155px;}
+.loginInro {width:465px; padding-top:55px; padding-left:50px; font-size:16px; color:#ffffff;}
+.loginRight {width:405px; float:left;}
+.loginChooseBox {width:405px; height:54px; background-color:#ffffff; padding-top:18px;}
+.loginChooseList {width:350px; height:30px; font-size:14px; margin:0px auto;}
+.loginChoose {width:55px; height:30px; border-bottom:1px solid #8ad2da; text-align:center;}
+a.loginChooseTab {color:#484848; height:30px; display:block;}
+.loginInButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:20px;}
+.loginUpButton {width:315px; height:40px; background-color:#15bccf; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;}
+.loginChooseBorder {width:295px; height:30px; border-bottom:1px solid #e3e3e3;}
+.loginChoose:hover {border-bottom:1px solid #8ad2da;}
+.loginSign {width:405px; background-color:#ffffff;}
+.loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;}
+.loginSignOption {margin-left:46px; margin-top:15px;}
+.loginIn {width:405px; background-color:#ffffff; padding-bottom:30px;}
+.loginSignAlert {font-size:12px; color:#fc0000; margin-left:60px;}
+
 
 
 /*底部*/

From a9c7c252e5b61f673a01dd208d5013a24daf745e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 24 Aug 2015 16:16:07 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BDjs?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 25 +++++++++++-
 app/views/layouts/_unlogin_header.html.erb | 47 ++++++++++------------
 app/views/layouts/new_base_user.html.erb   |  2 +-
 public/javascripts/new_user.js             | 10 +++++
 public/stylesheets/new_public.css          |  1 +
 5 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index d45adecf6..ee3f2f0ab 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -18,11 +18,34 @@
     </ul>
   </div>
 
-  <div class="navHomepageSearchBoxcontainer fl">
+  <div class="fl" id="navHomepageSearch">
     <form class="navHomepageSearchBox">
       <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
       <a href="javascript:void(0);" class="homepageSearchIcon"></a>
     </form>
+
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="课程" name="navSearchType" checked/>
+        </div>
+        课程
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="项目" name="navSearchType" />
+        </div>
+        项目
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="用户" name="navSearchType" />
+        </div>
+        用户</div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
+    </div>
   </div>
 
   <div class="navHomepageProfile">
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index e91cf9ddb..b4423a713 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,8 +1,6 @@
 <div class="navHomepage">
   <div class="navHomepageLogo fl">
-    <a href="javascript:void(0);">
-      <img src="images/nav_logo.png" width="51" height="45" alt="确实Trustie" class="mt3" />
-    </a>
+    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), "javascript:void(0);"%>
   </div>
   <div class="fl">
     <ul>
@@ -11,34 +9,33 @@
       </li>
     </ul>
   </div>
-  <div class="navHomepageSearchBoxcontainer fl">
+
+  <div class="fl" id="navHomepageSearch">
     <form class="navHomepageSearchBox">
-      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput" />
+      <input type="text" name="navHomepageSearch" class="navHomepageSearchInput"/>
       <a href="javascript:void(0);" class="homepageSearchIcon"></a>
     </form>
-    <div class="navSearchTypeBox">
-      <form class="mt8">
-        <div class="fl mr15">
-          <div class="fl mt5">
-            <input type="radio" value="课程" name="navSearchType" />
-          </div>
-          课程
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="课程" name="navSearchType" checked/>
         </div>
-        <div class="fl mr15">
-          <div class="fl mt5">
-            <input type="radio" value="项目" name="navSearchType" />
-          </div>
-          项目
+        课程
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="项目" name="navSearchType" />
         </div>
-        <div class="fl mr15">
-          <div class="fl mt5">
-            <input type="radio" value="用户" name="navSearchType" />
-          </div>
-          用户</div>
-        <div id="navSearchAlert" class="fr mr10">
-          <span class="c_red">请选择搜索类型</span>
+        项目
+      </div>
+      <div class="fl mr15">
+        <div class="fl mt5">
+          <input type="radio" value="用户" name="navSearchType" />
         </div>
-      </form>
+        用户</div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
     </div>
   </div>
   <div id="loginInButton" class="fr ml20">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 4d85ef1b3..6f3ed0c67 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -131,7 +131,7 @@
         </div>
       </div>
     </div>
-    <div class="homepageRight">
+    <div class="homepageRight" id="RSide">
       <%= yield %>
     </div>
   </div>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index e89b7374b..97894bd45 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -1,4 +1,7 @@
 $(function(){
+    //右侧最小高度 = 左侧高度 - 15px   保证两边高度基本一样，页面美观
+    $("#RSide").css("min-height",$("#LSide").height()-15);
+
     //头像相关
     $("#homepage_portrait_image").live("mouseover",function(){
         $("#edit_user_file_btn").show();
@@ -7,6 +10,13 @@ $(function(){
         $("#edit_user_file_btn").hide();
         $("#watch_user_btn").hide();
     });
+
+    //搜索相关
+    $("#navHomepageSearch").mouseover(function(){
+        $("#navHomepageSearchType").show();
+    }).mouseout(function(){
+        $("#navHomepageSearchType").hide();
+    });
 });
 
 //编辑个人简介
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index b26f39ae2..aae981e1b 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -9,6 +9,7 @@ a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
 
 /*常用*/
+#RSide{ background:#fff;}
 .hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .none{display: none;}
 .rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}