From 090ef98ec621ab1aa655d1718e0eb54ac3dea915 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 29 Sep 2014 10:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=EF=BC=9A?=
=?UTF-8?q?=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80=E8=B4=B4=E5=90=A7=E6=A0=87?=
=?UTF-8?q?=E7=AD=BE=EF=BC=8C=E5=BC=B9=E5=87=BA=E9=A1=B5=E9=9D=A2=E8=B4=B4?=
=?UTF-8?q?=E5=90=A7=E6=8F=8F=E8=BF=B0=E5=90=ABhtml=E4=BB=A3=E7=A0=81=20#1?=
=?UTF-8?q?292=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E8=A7=A3=E6=9E=90=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/tags/_show_forums.html.erb | 2 +-
app/views/tags/_tag_search_results.html.erb | 56 ++++++++++-----------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/app/views/tags/_show_forums.html.erb b/app/views/tags/_show_forums.html.erb
index c6dd8a2ed..3caba4903 100644
--- a/app/views/tags/_show_forums.html.erb
+++ b/app/views/tags/_show_forums.html.erb
@@ -6,7 +6,7 @@
<%= l(:label_tags_forum) %>:<%= link_to "#{forum.name}",
:controller => "forums",:action => "show",:id => forum.id %>
- <%= l(:label_tags_forum_description) %>:<%= forum.description %>
+ <%= l(:label_tags_forum_description) %>:<%= textAreailizable forum.description %>
<%= forum.updated_at %>
diff --git a/app/views/tags/_tag_search_results.html.erb b/app/views/tags/_tag_search_results.html.erb
index 43048be58..3ed4ba112 100644
--- a/app/views/tags/_tag_search_results.html.erb
+++ b/app/views/tags/_tag_search_results.html.erb
@@ -2,45 +2,45 @@
<% unless show_flag.nil? %>
<% case %>
<% when show_flag == '1' %>
- <%=l(:label_user)%>(<%= @results_count %>)
- <%= render :partial => "show_users",:locals => {:users_results => users_results}%>
+ <%=l(:label_user)%>(<%= @results_count %>)
+ <%= render :partial => "show_users",:locals => {:users_results => users_results}%>
<% when show_flag == '2'%>
- <%=l(:label_project)%>(<%= @results_count %>)
- <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%>
+ <%=l(:label_project)%>(<%= @results_count %>)
+ <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%>
<% when show_flag == '3'%>
- <%=l(:label_issue)%>(<%= @results_count %>)
- <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%>
+ <%=l(:label_issue)%>(<%= @results_count %>)
+ <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%>
<% when show_flag == '4'%>
- <%= l(:label_requirement)%>(<%= @results_count %>)
- <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%>
+ <%= l(:label_requirement)%>(<%= @results_count %>)
+ <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%>
<% when show_flag == '5'%>
- <%= l(:label_forum)%>(<%= @results_count %>)
- <%= render :partial => "show_forums",:locals => {:forums_results => forums_results}%>
+ <%= l(:label_forum)%>(<%= @results_count %>)
+ <%= render :partial => "show_forums",:locals => {:forums_results => forums_results}%>
<% when show_flag == '6'%>
- <%= l(:label_attachment)%>(<%= @results_count %>)
- <%= render :partial => "show_attachments",:locals => {:attachments_results => attachments_results}%>
+ <%= l(:label_attachment)%>(<%= @results_count %>)
+ <%= render :partial => "show_attachments",:locals => {:attachments_results => attachments_results}%>
<% when show_flag == '7'%>
- <%= l(:label_contest_innovate)%>(<%= @results_count %>)
- <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%>
+ <%= l(:label_contest_innovate)%>(<%= @results_count %>)
+ <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%>
<% when show_flag == '8'%>
- <%#= l(:label_attachment)%>
- 开源项目：(<%= @results_count %>)
- <%= render :partial => "show_open_source_projects",:locals => {:projects_results => open_source_projects_results}%>
- <% when show_flag == '9'%>
- <%= l(:label_course)%>(<%= @results_count %>)
- <%= render :partial => "show_courses",:locals => {:courses_results => courses_results}%>
+ <%#= l(:label_attachment)%>
+ 开源项目：(<%= @results_count %>)
+ <%= render :partial => "show_open_source_projects",:locals => {:projects_results => open_source_projects_results}%>
+ <% when show_flag == '9'%>
+ <%= l(:label_course)%>(<%= @results_count %>)
+ <%= render :partial => "show_courses",:locals => {:courses_results => courses_results}%>
<% else %>
- <%= l(:label_tags_all_objects)%>
-
- <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%>
- <%= render :partial => "show_users",:locals => {:users_results => users_results }%>
- <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%>
- <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%>
- <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%>
+ <%= l(:label_tags_all_objects)%>
+
+ <%= render :partial => "show_issues",:locals => {:issues_results => issues_results }%>
+ <%= render :partial => "show_users",:locals => {:users_results => users_results }%>
+ <%= render :partial => "show_projects",:locals => {:projects_results => projects_results }%>
+ <%= render :partial => "show_bids",:locals => {:bids_results => bids_results}%>
+ <%= render :partial => "show_contests",:locals => {:contests_results => contests_results}%>
<% end %>
<% else %>
- no data...
+ no data...
<% end %>
<%= render :partial => "pagination",:locals => {:obj_pages => @obj_pages} %>