From 813f2d10266ad907b885c997a8b3282449393e38 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Dec 2014 09:33:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=82=B9=E8=B5=9E=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E4=BD=8D=202.=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E9=9D=9E=E5=B8=B8=E7=9F=AD=EF=BC=8C=E6=88=96=E8=80=85=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8F=8F=E8=BF=B0=E6=97=B6=EF=BC=8C=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=BC=BA=E9=99=B7=E7=9A=84=E6=8C=87?=
 =?UTF-8?q?=E6=B4=BE=E4=BA=BA=E3=80=81=E6=9F=A5=E7=9C=8B=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_list.html.erb | 116 ++++++++++++++++----------------
 1 file changed, 59 insertions(+), 57 deletions(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 39fd3776f..58960df4c 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -1,67 +1,69 @@
 <div class="autoscroll">
-	<ul>
-		<% issue_list(issues) do |issue, level| -%>
-		<% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
+  <ul>
+    <% issue_list(issues) do |issue, level| -%>
+        <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_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)}"}) %>
+        <% 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)}"}) %>
+            <% if issue.tracker_id == 1 %>
+                <%= image_tag("/images/task.png", :class => "img-tag-issues") %>
+            <% end %>
+            <% if issue.tracker_id == 2 %>
+                <%= image_tag("/images/feature.png", :class => "img-tag-issues") %>
+            <% end %>
+            <% if issue.tracker_id == 3 %>
+                <%= image_tag("/images/support.png", :class => "img-tag-issues") %>
+            <% end %>
+            <% if issue.tracker_id == 4 %>
+                <%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
+            <% end %>
 
-			<!-- 在这里添加赞和踩-->
-			<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>
+            <ul class="issue_list">
+              <% unless issue.author.nil? || issue.author.name == "Anonymous" %>
+                  <ul class="list-group-item-meta" style="word-break: break-all;word-wrap: break-word;width: 100%;">
+                    <!-- 在这里添加赞和踩-->
+                    <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>
+                      <%= link_to issue.author.name, user_path(issue.author), :class => "bid_user_u" %>
+                    </span>
+                    <%= l(:label_post_on)%>
+                    <% a = [] %>
+                    <% a << column_content[1] %>
+                    <%# a << "##{column_content[0]}" << "(#{raw column_content[2]}):" << column_content[4] %>
+                    <% a << "#{issue.source_from}" << "(#{raw column_content[2]}):" << column_content[4] %>
+                    <%= link_to a.join(' '), issue_path(issue.id), :class => "issue-link" , :target =>"_blank"%>
 
-			<% if issue.tracker_id == 1 %>
-			    <%= image_tag("/images/task.png", :class => "img-tag-issues") %>
-			<% end %>
-			<% if issue.tracker_id == 2 %>
-			    <%= image_tag("/images/feature.png", :class => "img-tag-issues") %>
-			<% end %>
-			<% if issue.tracker_id == 3 %>
-			    <%= image_tag("/images/support.png", :class => "img-tag-issues") %>
-			<% end %>
-			<% if issue.tracker_id == 4 %>
-			    <%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
-			<% end %>
-
-			<ul class="issue_list">
-				<% unless issue.author.nil? || issue.author.name == "Anonymous" %>
-				<ul class="list-group-item-meta" style="word-break: break-all;word-wrap: break-word;">
-					<span> <%= link_to issue.author.name, user_path(issue.author), :class => "bid_user_u" %></span>
-                    <%= l(:label_post_on)%> <% a = [] %>
-						<% a << column_content[1] %>
-						<%# a << "##{column_content[0]}" << "(#{raw column_content[2]}):" << column_content[4] %>
-						<% a << "#{issue.source_from}" << "(#{raw column_content[2]}):" << column_content[4] %>
-						<%= link_to a.join(' '), issue_path(issue.id), :class => "issue-link" , :target =>"_blank"%>
-				</ul>
-				<% end -%>
-				<ul class="list-group-item-meta">
-                  <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
-                    <%= textilizable issue, :description %>
-                  </div>
-				</ul>
-				<ul class="list-group-item-meta">
-					<% unless issue.assigned_to_id.nil? %>
-                        <span>
-                          <%= l(:field_assigned_to)%>&nbsp;
-                        </span>
+                    <ul class="list-group-item-meta">
+                      <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
+                        <%= textilizable issue, :description %>
+                      </div>
+                    </ul>
+                  </ul>
+                  <ul class="list-group-item-meta" style="margin-top: -15px;">
+                    <% 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">
+                    <% 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>
+                      <%= l(:label_comments_count, :count => issue.journals.all.count) %>
+                    </div>
+                  </ul>
+              <% end -%>
+            </ul>
+          </li>
+        </div>
+    <% end -%>
+  </ul>
 </div>
\ No newline at end of file