From 543250a9e1cb6063910a5bdf9ab26b9b20f58658 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 16 Oct 2014 09:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_list.html.erb    | 37 ++++++++++++++++++------------
 app/views/issues/_sidebar.html.erb |  7 +++---
 app/views/issues/index.html.erb    | 10 ++++++--
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 4d4ac256c..e04f8754e 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -2,27 +2,30 @@
 	<ul>
 		<% issue_list(issues) do |issue, level| -%>
 		<% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
-		<% reset_cycle %>
-		<% previous_group = group %>
+            <% reset_cycle %>
+            <% previous_group = group %>
 		<% end %>
 		<div style="">
 		<li id="issue-<%= issue.id %>" class="hascontextmenu-1  <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
 			<% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
 
 			<!-- 在这里添加赞和踩-->
-			<span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => issue,:show_flag => true,:user_id =>User.current.id,:horizontal => false}%> </span>
+			<span id="praise_tread" style="float: right">
+              <%= render :partial => "/praise_tread/praise_tread",:locals =>
+                      {:obj => issue,:show_flag => true,:user_id =>User.current.id,:horizontal => false}%>
+            </span>
 
 			<% if issue.tracker_id == 1 %>
-			<%= image_tag("/images/task.png", :class => "img-tag-issues") %>
+			    <%= image_tag("/images/task.png", :class => "img-tag-issues") %>
 			<% end %>
 			<% if issue.tracker_id == 2 %>
-			<%= image_tag("/images/feature.png", :class => "img-tag-issues") %>
+			    <%= image_tag("/images/feature.png", :class => "img-tag-issues") %>
 			<% end %>
 			<% if issue.tracker_id == 3 %>
-			<%= image_tag("/images/support.png", :class => "img-tag-issues") %>
+			    <%= image_tag("/images/support.png", :class => "img-tag-issues") %>
 			<% end %>
 			<% if issue.tracker_id == 4 %>
-			<%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
+			    <%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
 			<% end %>
 
 			<ul class="issue_list">
@@ -43,18 +46,22 @@
 				</ul>
 				<ul class="list-group-item-meta">
 					<% unless issue.assigned_to_id.nil? %>
-					<span><%= l(:field_assigned_to)%>&nbsp;</span><%= raw column_content[5] %>&nbsp;
-					<% end %>
-					<%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
-					<div class="find-comment-class">
-						<span><%= link_to l(:label_find_all_comments), issue_path(issue.id) %></span><%= l(:label_comments_count, :count => issue.journals.all.count) %>
-					</div>
+                        <span>
+                          <%= l(:field_assigned_to)%>&nbsp;
+                        </span>
+                        <%= raw column_content[5] %>&nbsp;
+                        <% end %>
+                        <%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
+                        <div class="find-comment-class">
+                            <span>
+                              <%= link_to l(:label_find_all_comments), issue_path(issue.id) %>
+                            </span>
+                          <%= l(:label_comments_count, :count => issue.journals.all.count) %>
+                        </div>
 				</ul>
 			</ul>
-			
 		</li>
 		</div>
-		
 		<% end -%>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/app/views/issues/_sidebar.html.erb b/app/views/issues/_sidebar.html.erb
index 24b8a4fa4..9b55ff932 100644
--- a/app/views/issues/_sidebar.html.erb
+++ b/app/views/issues/_sidebar.html.erb
@@ -1,10 +1,10 @@
 <h3><%= l(:label_issue_plural) %></h3>
-<%= link_to l(:label_issue_view_all), _project_issues_path(@project, :set_filter => 1) %><br />
+<%= link_to l(:label_issue_view_all), _project_issues_path(@project, :set_filter => 1) %>
+<br />
 <% if @project %>
-<%= link_to l(:field_summary), project_issues_report_path(@project) %><br />
+    <%= link_to l(:field_summary), project_issues_report_path(@project) %><br />
 <% end %>
 <%= call_hook(:view_issues_sidebar_issues_bottom) %>
-
 <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
   <%= link_to l(:label_calendar), _project_calendar_path(@project) %><br />
 <% end %>
@@ -12,6 +12,5 @@
   <%= link_to l(:label_gantt), _project_gantt_path(@project) %><br />
 <% end %>
 <%= call_hook(:view_issues_sidebar_planning_bottom) %>
-
 <%= render_sidebar_queries %>
 <%= call_hook(:view_issues_sidebar_queries_bottom) %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index f5018fc94..ba6053fd6 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -92,11 +92,17 @@
       <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
       <%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
           <p>
-            <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
+            <label>
+              <%= radio_button_tag 'columns', 'all' %>
+              <%= l(:description_all_columns) %>
+            </label>
           </p>
 
           <p>
-            <label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
+            <label>
+              <%= check_box_tag 'description', '1', @query.has_column?(:description) %>
+              <%= l(:field_description) %>
+            </label>
           </p>
 
           <p class="buttons">