From 614b6fde710565d676779e95b7482014c82a69ef Mon Sep 17 00:00:00 2001
From: Fu Matthew <kaito@matt-zoe.local>
Date: Wed, 9 Jan 2013 12:13:55 +0800
Subject: [PATCH] fix wrong html structure for announcement frontend

---
 .../panel/announcement/front_end/bulletins/index.html.erb  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
index d63c21eb..fdf4e097 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
@@ -5,7 +5,6 @@
 <h1 class="h1"><%= @page.title rescue nil %></h1>
 
 <% if !@item.frontend_field.blank? %>
-
 <% if @frontend_style == '1' %>
 
 	<div class="news news1">
@@ -18,8 +17,8 @@
 			</tr>
 		</thead>
 		<% @bulletins.each do |post| %>
-			<% @item.frontend_field.each do |ff|  %>
 			<tr class="<%= cycle('odd', '')%>">
+			<% @item.frontend_field.each do |ff|  %>
 				<td>
 				<span class="<%= ff[1] %>">
 				<% if ff[1] == 'title' %>
@@ -27,7 +26,7 @@
 				<% elsif ff[1] == 'date' %>
 					<%= display_date(post.send(ff[0])) %>
 				<% elsif ff[1] == 'category' %>
-					<%= post.send("#{post.class.to_s.underscore}_#{ff[0]}").title rescue nil %>
+					<%= post.send(ff[0]).title rescue nil %>
 				<% elsif ff[1] == 'img' %>
 					<div class="img app-pic"><%= image_tag(post.send(wf[0]).url) %></div>
 				<% elsif ff[1] == 'text' %>
@@ -50,8 +49,8 @@
 				<% end %>
 				</span>
 				</td>
-			</tr>
 			<% end %>
+			</tr>
 		<% end %>
 		</table>
 	</div>