From c10eeb1c01eb09bd0c2ae3feb9f75ddd3b54927d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 11:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/projects_helper.rb   |  8 ++-----
 app/views/welcome/index.html.erb | 39 +++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index dfacff864..5ae2b0864 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -152,9 +152,9 @@ module ProjectsHelper
     tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
   end
   # Ended by young
-  
 
-  
+
+
 
   def parent_project_select_tag(project)
     selected = project.parent
@@ -175,18 +175,15 @@ module ProjectsHelper
     render_project_nested_lists(projects) do |project|
       #Modified by young
         if project.try(:project_type) == Project::ProjectType_course
-
           # modified by longjun
           # never use unless and else
           # unless project.is_public == 1
-
           if project.is_public != 1
             s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
           else
             s = "".html_safe
           end
           # end longjun
-
           # modified by Longjun
           s += link_to_project(project, {},
                                :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}").html_safe
@@ -194,7 +191,6 @@ module ProjectsHelper
         else
           # modified by longjun
           # unless project.is_public
-
           if !project.is_public
           # end longjun
             s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 83d1fef28..025f24ab1 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -56,8 +56,15 @@
 	<div style="clear:both"></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 => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank"  %></span>
+    <h3 style="margin-left: 5px; color: #e8770d;">
+      <strong>热门项目</strong>
+    </h3>
+	<span style="margin-top: -20px;float: right; display: block;">
+      <% if User.current.logged? %>
+        <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type =>( @project_type||=0)}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
+      <% end %>
+      &nbsp;&nbsp;
+      <%= link_to l(:label_more), { :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">
 			<% #projects = find_miracle_project(10, 3) %>
@@ -98,20 +105,20 @@
 			<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'users', :action => 'index'}, :target => "_blank"  %></span>
 			<div class="user-message-box-list" style="margin-top: 10px;">
 				<%activities = find_all_activities%>
-			<% activities.each do |event| %>
-                  <!--<%# cache cache_key_for_event(event) do %> -->
-			<li style="display: block;height:60px; padding-bottom: 4px;">
-				<div class="inner-right" style="float: left; height: 100%; ">
-					<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
-				</div>
-				
-				<div class="inner-right" style="float: right; width:86%; height: 100%; ">
-				<span style="color: green;"><%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;", :target => "_blank"  %></span><%= show_user_content event %>
-				<p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
-				</div>
-			</li>
-                      <!--<%#end %> --><!-- cache -->
-			    <% end  %>	
+                <% activities.each do |event| %>
+                      <!--<%# cache cache_key_for_event(event) do %> -->
+                    <li style="display: block;height:60px; padding-bottom: 4px;">
+                        <div class="inner-right" style="float: left; height: 100%; ">
+                            <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
+                        </div>
+
+                        <div class="inner-right" style="float: right; width:86%; height: 100%; ">
+                        <span style="color: green;"><%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;", :target => "_blank"  %></span><%= show_user_content event %>
+                        <p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
+                        </div>
+                    </li>
+                          <!--<%#end %> --><!-- cache -->
+                <% end  %>
 			</div>
 		</ul>
 	</div>