From b6cf7096962b5079673aab5c009cc6341e047818 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 29 Dec 2015 11:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb        | 8 +++-----
 app/views/boards/_project_show_detail.html.erb | 9 ---------
 app/views/boards/show.html.erb                 | 9 ++++-----
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 50fd7f34b..3dac2a3d5 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -21,14 +21,12 @@
 
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
-    <div class="NewsBannerName">
-      项目讨论区
-    </div>
+    <div class="NewsBannerName"><%= l(:label_borad_project) %></div>
   </div>
   <% if User.current.logged? %>
       <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},
-                            :html => {:nhname=>'form',:multipart => true, :id => 'message-form-project'} do |f| %>
-          <%= render :partial => 'project_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :project => @board.project} %>
+                                     :html => {:nhname=>'form',:multipart => true, :id => 'message-form-project'} do |f| %>
+        <%= render :partial => 'project_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :project => @board.project} %>
       <% end %>
   <% end %>
   <%= render :partial=> 'project_show_detail',:locals =>{:topics => @topics, :page => 0} %>
diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb
index 428d987aa..6d77452a8 100644
--- a/app/views/boards/_project_show_detail.html.erb
+++ b/app/views/boards/_project_show_detail.html.erb
@@ -1,16 +1,7 @@
-<<<<<<< .mine
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
     <%= javascript_include_tag "init_activity_KindEditor" %>
 <% end %>
-
-=======
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
-<% end %>
-
->>>>>>> .theirs
 <style type="text/css">
     /*回复框*/
     .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index d6d825d46..89f43e0d6 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -32,12 +32,11 @@
 <% end %>
 
 
-
-  <% if @project %>
+<% if @project %>
     <%= render :partial => 'project_show', locals: {:topics => @topics, :page => 0, project: @project} %>
-  <% elsif @course %>
-      <%= render :partial => 'course_show', :locals => {:topics => @topics, :page => 0, :course => @course} %>
-    <% end %>
+<% elsif @course %>
+    <%= render :partial => 'course_show', :locals => {:topics => @topics, :page => 0, :course => @course} %>
+<% end %>
 
 
 <script type="text/javascript">//侧导航