From 35d1c33a298d0cae507a5a974209bbca7606738c Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Thu, 27 Mar 2014 10:53:45 +0800
Subject: [PATCH] ...

---
 app/controllers/projects_controller.rb     |  3 +-
 app/views/welcome/_search_project.html.erb | 38 ++++++++++++++++++++++
 app/views/welcome/course.html.erb          | 35 ++++++++++++--------
 app/views/welcome/index.html.erb           | 14 ++++----
 public/stylesheets/application.css         |  2 +-
 public/stylesheets/nyan.css                | 15 +++++++++
 public/stylesheets/welcome.css             |  8 +++++
 7 files changed, 94 insertions(+), 21 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index db47319e..9076bb50 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -846,7 +846,8 @@ class ProjectsController < ApplicationController
   def select_project_layout
     project = Project.find_by_id(params[:id])
     project ||= @project
-    (project.project_type == Project::ProjectType_project) ? 'base_projects' : 'base_courses'
+    project ||= @course
+    (project.try(:project_type) == Project::ProjectType_project) ? 'base_projects' : 'base_courses'
   end
 
   # Validates parent_id param according to user's permissions
diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb
index ca7d151e..c139be6f 100644
--- a/app/views/welcome/_search_project.html.erb
+++ b/app/views/welcome/_search_project.html.erb
@@ -6,10 +6,48 @@
 	#select_option << ['教师', 'users_teacher'],
 	#select_option << ['学生', 'users_student']
 %>
+<style type="text/css">
+form #q, form #search_type{
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	display: inline-block;
+	margin: 0px;
+	padding: 5px;
+	height: 33px;
+}
+form #q{
+	border-top-left-radius: 5px;
+	border-bottom-left-radius: 5px;
+	border-right: none;
+
+}
+form #search_type{
+	color: #363739;
+	border-top-right-radius: 5px;
+	border-bottom-right-radius: 5px;
+	border-left: 1px outset #83A9A9;
+	margin-left: -4px;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	text-indent: 0.01px;
+	text-overflow: '';
+}
+.search_widget{
+	display:inline-block;
+	border-radius: 5px;
+}
+.search_widget:hover{
+	box-shadow: 0px 0px 3px #56B4EF;
+}
+<%#完了把上面东西放到 .css 里%>
+</style>
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
 <div class="project-search" style="float: right">
+	<div class='search_widget'>
 		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27 %>
 		<%= select_tag(:search_type, options_for_select(select_option) ) %>
+	</div>
 		<%#= hidden_field_tag 'project_type', project_type %>
 		<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
 		</div>	
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index a4bdd622..be6b09d0 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -111,23 +111,32 @@
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
 			<% find_miracle_course(10, 7).map do |project| %>
-			<li style="position:relative;height:5em;" class='<%= cycle("odd", "even") %>'>
-				<div style="float: left;">
+			<li style="position:relative; height:5em;" class='<%= cycle("odd", "even") %>'  title=<%=project.description.to_s%>>
+				<div style="float: left; height: 100%;">
 					<%= image_tag(get_course_avatar(project), :class => "avatar-4") %>
 				</div>
 				<!-- 上左下右 -->
-				<div style="float: left; margin-left: 10px; width: 380px;">
-					<span>[<%= get_course_term project %>]</span>
-					<%#= join_in_course(project, User.current) %>
+				<div class='desc_item' style="" >
+					[<%= get_course_term project %>]
 					<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
 					(<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>)
 				</div>
-				<div style="float: left;margin:5px; margin-left: 10px; width: 380px;">
-					<span class='font_lighter' title =<%=project.description.to_s%>><%=project.description.truncate(25, omission: '...')%></span>
+				<div class='desc_item' style="">
+					<span class='font_bolder'>
+					<%=l :label_main_teacher%>: <%=Course.find_by_extra(project.identifier).try(:teacher).try(:name)%>
+					</span>
+					<span class='font_italic'>
+					<%= Course.find_by_extra(project.identifier).teacher.user_extensions.occupation %>
+					</span>
 				</div>
+<!-- 				<div class='desc_item' style="">
+					<span class='font_lighter' title=<%#=project.description.to_s%>><%#=project.description.truncate(25, omission: '...')%></span>
+				</div> -->
 				<div style="position:absolute; bottom:0;right:0;margin:5px 10px 5px 5px ;">
 					<% if !course_endTime_timeout?(project)%>
+					<div >
 					<%= join_in_course(project, User.current)%>
+					</div>
 					<% end %>
 				</div>
 			</li>
@@ -136,7 +145,7 @@
 	</div>
 </div>
 
-<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
+<div id="J_Slide" class="d-p-index-box d-p-index-hotproject hidden" style="float: right;">
 
 	<div class="web_status">
 		<h3 style="margin-left: 5px; color: #e8770d;"><strong>当前网站状态</strong></h3>
@@ -156,13 +165,13 @@
 				</tr>
 			</tbody>
 		</table>
-		<div style="text-align: right; padding-right: 20px">
+		<div class='hidden' style="text-align: right; padding-right: 20px">
 			<%= link_to "意见反馈" , suggestion_send_path, {:class => 'orangeButton', :style => "color: #EEEEEE" }%>
 		</div>
 		</div>
 </div>
-<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="margin-top: 20px; float: right;">
-<h3 style="padding-bottom:5px ;margin-left: 5px; color: #e8770d;">
+<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
+<h3 style="padding-bottom:px ;margin-left: 5px; color: #e8770d;">
 	<strong>问题和反馈动态</strong>
 	<%= link_to "我要提问" , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
 	<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
@@ -170,8 +179,8 @@
 	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
-			<% find_new_forum_topics(11).each do |topic|%>
-			<li class="message-brief-intro" style="min-height: 20px;padding-bottom:3px; line-height:1.27em; ">
+			<% find_new_forum_topics(10).each do |topic|%>
+			<li class="message-brief-intro" style="min-height: 65px; line-height:2em; ">
 				<div  style="display: inline-block; width: 100%;">
 				  <span style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 				    <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 1bba0e25..81da358b 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -119,7 +119,7 @@
 					<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
 					 (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) 			
 				</div>
-				<div style="float: left;margin:5px; margin-left: 10px; width: 380px;">
+				<div class='text_nowrap' style="float: left;margin:5px; margin-left: 10px; width: 380px;">
 					<span class='font_lighter' title =<%=project.description.to_s%>><%=project.description.truncate(50, omission: '...')%></span>
 				</div>
 				<div style="position:absolute; bottom:0;right:0;margin:5px 10px 5px 5px ;">
@@ -157,15 +157,17 @@
 		</ul>
 	</div>
 
-<div class="right" style="float: right; min-height: 470px; width: 48%; "> 
+<div class="right" style="float: right; width: 48%; "> 
 	<ul class="welcome-message-list">
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
-		  <h3 style="color: rgb(21, 188, 207);"><strong>贴吧动态</strong></h3>
-		  <span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
+		  <h3 style="color: rgb(21, 188, 207);">
+			<strong>贴吧动态</strong>
+			<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%></h3>
+			<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
 		</div>
 		<div class="welcome-box-list-new">
-			<% find_new_forum_topics(8).each do |topic|%>
-			<li class="message-brief-intro" style="min-height: 25px;padding-bottom:3px;">
+			<% find_new_forum_topics(7).each do |topic|%>
+			<li class="message-brief-intro" style="line-height: 1.63em;padding-bottom:3px;">
 				<div  style="display: inline-block; width: 100%;">
 				  <span style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 				    <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8306155d..e6031684 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -606,7 +606,7 @@ ul.tool li{list-style-type:none;
 }
 
 .font_welcome_trustie{
-	font-family:Impact, '微软雅黑';
+	font-family: Tahoma,"Microsoft YaHei";
 	font-weight: bold;
 	font-size: 18px;
 	color:#15bccf;
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 6e62c1fe..7fefa1a6 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -5,6 +5,21 @@
   -moz-box-sizing: border-box;
   -box-sizing: border-box;
 }
+/*文字不换行*/
+.text_nowrap{
+  word-break:keep-all;
+  white-space:nowrap;
+  overflow:hidden;
+  text-overflow:ellipsis;
+}
+/*字体 斜体*/
+.font_italic{
+  font-style: italic;
+}
+/*字体加粗*/
+.font_bolder{
+  font-weight: bolder;
+}
 .text_center{
   text-align: center;
 }
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index b1fe6707..b616fd59 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -203,6 +203,14 @@ ul.even{
 ul.d-p-projectlist{
  margin-top: 0px;
 }
+.d-p-projectlist li .desc_item{
+    float: left;
+    display: inline-block;
+    /*margin: 2px;*/
+    line-height: 2em;
+    margin-left: 10px;
+    width: 380px;
+}
 
 
 /*