From 8bb4d44cbed67d630f16ad905d3be91b1b5280ec Mon Sep 17 00:00:00 2001
From: xianbo <senluowanxiangt@163.com>
Date: Mon, 24 Mar 2014 13:48:43 +0800
Subject: [PATCH] fix link

---
 app/views/welcome/_search_project.html.erb |  9 ++++-
 app/views/welcome/index.html.erb           | 38 +++-------------------
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb
index a082a6dcf..df5ce7ad3 100644
--- a/app/views/welcome/_search_project.html.erb
+++ b/app/views/welcome/_search_project.html.erb
@@ -3,5 +3,12 @@
 		<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字',  :size => 30 %>
 		<%= hidden_field_tag 'project_type', project_type %>
 		<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-		</div>			
+		</div>	
+		<div class='font_lighter' style="margin: 0; padding: 0; margin-top: 4px;">
+		<%= if project_type == 0
+			"全站项目搜索。不会搜索私有项目"
+		 else 
+			"全站课程搜索。"
+		 end %>
+		</div>		
 <% end %>	
\ No newline at end of file
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index eae4cba2a..c88f7e0e2 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -87,7 +87,7 @@
 </script>
 <div class='top_bar'>
 	<div id="identifier-pannel" style="display:none">
-		<%= image_tag '/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" %>
+		<%= link_to image_tag('/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" ), home_path %>
 		<div class="weixin-content">微信扫码</div>
 	</div> 
 	<div class="main-content-bar">
@@ -106,41 +106,13 @@
 
 <%= stylesheet_link_tag 'welcome' %>
 	
-<!-- <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-	<h3 style="margin-left: 5px; color: #e8770d;"><strong>热门项目</strong></h3>
-  <span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank"  %></span>
-	<div class="d-p-projectlist-box">
-		<ul class="d-p-projectlist">
-			<% find_all_hot_project.map do |project| break if(project == find_all_hot_project[10]) %>
-				<li  style="background-image:none;">
-		  	<div style="float: left;">
-		  	  <%= image_tag url_to_avatar(project), :class => "avatar-4" %>
-		    </div>
-		  	<div style="float: left; margin-left: 10px; width: 360px;">
-    	      <p class="layout">
-         	    <span style="display: inline-block; width: 250px;"><%= link_to( project.name, :controller => 'projects', :action => 'show', :host=> Setting.project_domain, :id => project.id, :class => "d-g-blue d-p-project-name",  :title => "#{project.name}", :target => "_blank" )%></span>
-         	    <%= content_tag "span", show_grade(project), 
-         	        :style => "cursor: pointer; display: inline-block; float: right; color: #ec6300; ",
-			        :title => "项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度",
-			        :class => "tooltip",
-			        :id => "tooltip-#{project.id}" %>
-		      </p>
-    	      <p class="layout-1" >
-			    <%= content_tag "span", project.description.truncate(50, omission: '...'), :class => "d-p-project-intro" , :title => project.description %>
-    	      </p>  
-    	    </div>
-				</li>
-			<% end %>
-		</ul>
-	</div>
-</div> -->
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
 <h3 style="margin-left: 5px; color: #e8770d;"><strong>热门项目</strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", {:controller => 'projects', :action => 'course', :project_type => 1}, :target => "_blank"  %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank"  %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
-			<% find_miracle_project(11, 7).map do |project| %>
-			<li style="position:relative;height:5em;" class='<%= cycle("odd", "even") %>'>
+			<% find_miracle_project(10, 7).map do |project| %>
+			<li style="position:relative;height:6em;" class='<%= cycle("odd", "even") %>'>
 				<div style="float: left;">
 					<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
 				</div>
@@ -150,7 +122,7 @@
 					 (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) 			
 				</div>
 				<div style="float: left;margin:5px; margin-left: 10px; width: 380px;">
-					<span class='font_lighter' title =<%=project.description.to_s%>><%=project.description.truncate(35, omission: '...')%></span>
+					<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 ;">
          	    <%= content_tag "span", show_grade(project),