From c13eeee56d81b3b60d84e258c269c4892d95cf7e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 20 Aug 2014 15:51:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E9=94=99=E8=AF=AF=202.=E6=B3=A8=E9=87=8A=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_form.html.erb |  2 +-
 app/views/news/_form.html.erb        |  5 ++---
 app/views/news/_news.html.erb        | 10 +++++-----
 app/views/news/new.html.erb          |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index 1f2198a3b..ad2c7835c 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -5,7 +5,7 @@
 </div>
 <div class="box tabular">
   <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
-  <!-- <p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
+  <!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
   <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
   <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
 </div>
diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb
index 0601ee25b..f92559903 100644
--- a/app/views/news/_form.html.erb
+++ b/app/views/news/_form.html.erb
@@ -1,11 +1,10 @@
 <%= error_messages_for @news %>
 <div class="add_frame_header" >
-	<% str = @project ? l(:bale_news_notice) : l(:label_news_new) %>
-	<%= str %>
+	<%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
 </div>
 <div class="box tabular">
 <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
-<!-- <p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
+<!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
 <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
 </div>
diff --git a/app/views/news/_news.html.erb b/app/views/news/_news.html.erb
index 704e0eef3..7684a5949 100644
--- a/app/views/news/_news.html.erb
+++ b/app/views/news/_news.html.erb
@@ -1,9 +1,9 @@
-<!--<p><%= link_to_project(news.project) + ': ' unless @project %>
-<table><tr><td><img src="/images/new/news.png" width="40" height="40"/></td><td><%= link_to h(news.title), news_path(news) %>
-<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
+<!--<p><%#= link_to_project(news.project) + ': ' unless @project %>
+<table><tr><td><img src="/images/new/news.png" width="40" height="40"/></td><td><%#= link_to h(news.title), news_path(news) %>
+<%#= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
 
- <% unless news.summary.blank? %></td><td><span class="fontligher"><%=h news.summary %></span><% end %></td>
-<td><span class="author"><%= authoring news.created_on, news.author %></span></td></tr></table></p>-->
+ <%# unless news.summary.blank? %></td><td><span class="fontligher"><%#=h news.summary %></span><%# end %></td>
+<td><span class="author"><%#= authoring news.created_on, news.author %></span></td></tr></table></p>-->
 
 <table width="660px" border="0" align="center">
   <tr>
diff --git a/app/views/news/new.html.erb b/app/views/news/new.html.erb
index 68fad17f2..836d3b6ed 100644
--- a/app/views/news/new.html.erb
+++ b/app/views/news/new.html.erb
@@ -1,4 +1,4 @@
-<!-- <h3><%=l(:label_news_new)%></h3> -->
+<!-- <h3><%#=l(:label_news_new)%></h3> -->
 <% if @project %>
     <%= labelled_form_for @news, :url => project_news_index_path(@project),
                           :html => {:id => 'news-form', :multipart => true} do |f| %>