From 353f484bbe3a7ce86dbeef7a0667916e4993862c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 17 Sep 2014 17:07:18 +0800
Subject: [PATCH] =?UTF-8?q?course=E9=A6=96=E9=A1=B5=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/course.html.erb | 53 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index f57bc97d7..51f082ae6 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -39,30 +39,31 @@
 
     </div>
     <div class="course welcome_left" id="welcome_left">
-			<span class="font_welcome_school"> <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
+        <span class="font_welcome_school"> <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
+          <% else %>
+                <% if @school_id == "0" %>
               <% else %>
-					<% if @school_id == "0" %>
-                  <% else %>
-						<% if @school_id.nil? %>
-							<%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course', :school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
-                          <br/>
-						<% else %>
-							<%= link_to School.find(@school_id).name, options={:action => 'course', :school_id => @school_id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
-                          <br/>
-						<% end %>
-					<% end %>
-				<% end %> </span>
+                    <% if @school_id.nil? %>
+                        <%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course', :school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
+                      <br/>
+                    <% else %>
+                        <%= link_to School.find(@school_id).name, options={:action => 'course', :school_id => @school_id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
+                      <br/>
+                    <% end %>
+                <% end %>
+            <% end %>
+        </span>
       <% unless @course_page.nil? %>
-        <span class="font_welcome_trustie"><%= @course_page.title %> </span>
+          <span class="font_welcome_trustie"><%= @course_page.title %> </span>
 
-      <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
-          <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
-      <% else %>
-          <% if @school_id == "0" %>
+          <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
               <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
+          <% else %>
+              <% if @school_id == "0" %>
+                  <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
+              <% end %>
           <% end %>
       <% end %>
-      <% end %>
     </div>
     <div class="search-bar" id="search-bar">
       <%= render :partial => "search_course", :locals => {:project_type => Project::ProjectType_course} %>
@@ -98,7 +99,7 @@
         </ul>
       </div>
   <% else %>
-      <% if school_course.count < 10 %>
+      <% if school_course.count < 9 %>
           <span>
             <%= render :partial =>  'more_course', :locals => {:school_id => nil}%>
           </span>
@@ -110,7 +111,7 @@
       <div class="d-p-projectlist-box">
         <ul class="d-p-projectlist">
           <%= render :partial => 'course_list', :locals => {:course_list => school_course} %>
-          <% if school_course.count < 10 %>
+          <% if school_course.count < 9 %>
               <li>
                 <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %>
               </li>
@@ -123,9 +124,9 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
   <h3 style="padding-bottom:0px ;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"} %>
+    <strong><%= l(:label_issue_feedback_activities)%></strong>
+    <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %>
+    <%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %>
   </h3>
   <span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
 
@@ -143,13 +144,13 @@
 						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
 					</span>
 					<span class="memo_author">
-						楼主： <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
+						<%= l(:label_question_sponsor)%>： <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
 					</span>
 					<span class="memo_last_person">
-						最后回复：<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %><%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%><% end %>
+						<%= l(:label_final_reply)%>：<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %><%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%><% end %>
 					</span>
 					<span class="memo_reply">
-						回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
+						<%= l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
 					</span>
               </div>
             </div>