From cf2810f1c68bab0f722b451814eeeaad619de4f3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 15 Dec 2014 15:13:11 +0800
Subject: [PATCH] =?UTF-8?q?#1712=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=9F=90=E7=AB=9E=E8=B5=9B=E4=BD=9C=E5=93=81=EF=BC=8C=E7=BD=91?=
 =?UTF-8?q?=E9=A1=B5=E5=90=8D=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=89=98=E7=AE=A1?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/softapplications_controller.rb              | 2 +-
 .../layouts/_base_softapplication_top_content.html.erb      | 3 ++-
 app/views/softapplications/show.html.erb                    | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb
index 5b6111187..e47cfc2ff 100644
--- a/app/controllers/softapplications_controller.rb
+++ b/app/controllers/softapplications_controller.rb
@@ -48,7 +48,7 @@ class SoftapplicationsController < ApplicationController
 
   def show
     @softapplication = Softapplication.find(params[:id])
-    @project = @softapplication.project
+    #@project = @softapplication.project
     # 打分统计
     stars_reates = @softapplication.
                     rates(:quality)
diff --git a/app/views/layouts/_base_softapplication_top_content.html.erb b/app/views/layouts/_base_softapplication_top_content.html.erb
index afa2e1d29..46d45c903 100644
--- a/app/views/layouts/_base_softapplication_top_content.html.erb
+++ b/app/views/layouts/_base_softapplication_top_content.html.erb
@@ -17,7 +17,8 @@
               <%=link_to l(:field_homepage), home_path %> >
               <a><%= l(:label_contest_innovate) %></a>
 			  <span>
-                <% contest = @softapplication.contests.first %><%= contest ? link_to(contest.name, show_contest_contest_path(contest)) : '尚未加入竞赛'%>
+                <% contest = @softapplication.contests.first %>
+                <%= contest ? link_to(">" + contest.name, show_contest_contest_path(contest)) : '尚未加入竞赛'%>
 		      </span>
 			     
 			</td>
diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb
index 7a2edfa1f..77cc6aa71 100644
--- a/app/views/softapplications/show.html.erb
+++ b/app/views/softapplications/show.html.erb
@@ -1,4 +1,5 @@
 <%= render :partial => 'layouts/base_softapplication_top_content' %>
+<% html_title(@softapplication.name) -%>
 <div style="height: auto; padding-bottom: 10px" class="softapplications-div">
   <tr>
     <td colspan="2" valign="top" width="320">
@@ -47,8 +48,9 @@
         </tr>
         <tr>
             <td style="padding-left: 40px">
-            <% if @project %>
-              <%=l(:label_attendingcontestwork_deposit_project)%>：<%= link_to "#@project", project_path(@project) %>
+            <% if @softapplication.project %>
+              <%=l(:label_attendingcontestwork_deposit_project)%>：
+                  <%= link_to "#{@softapplication.project}", project_path(@softapplication.project) %>
             <% end %>
             </td>
         </tr>