From c48f66015d398c434a50c967d9ebfca09ff72973 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Oct 2014 14:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B=E8=B8=A9?=
 =?UTF-8?q?=E3=80=81=E9=A1=B6=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/index.html.erb | 62 ++++++++++++-------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index b8f733bf2..5c4f2cef0 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -36,11 +36,19 @@
       <%=  image_tag(url_to_avatar(@contest.author), :class => "avatar")%>
     </span>
 	<span class="body">
+        <span id="praise_tread" style="float: right">
+			<%= render :partial => "/praise_tread/praise_tread",
+                       :locals => {:obj => @contest,
+                                   :show_flag => true,
+                                   :user_id =>User.current.id,
+                                   :horizontal => false}
+            %>
+		</span>
 		<h3>
           <%= link_to(@contest.author.lastname+@contest.author.firstname,
-                      user_path(@contest.author))
-          %>
-          ：<%= @contest.name %></h3>
+                      user_path(@contest.author))%>
+          ：<%= @contest.name %>
+        </h3>
 		<p>
           <strong>
             <%= l(:label_bids_reward_method) %>
@@ -52,14 +60,6 @@
 		<div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;">
           <%= @contest.description %>
         </div>
-		<span id="praise_tread" style="float: right">
-			<%= render :partial => "/praise_tread/praise_tread",
-                       :locals => {:obj => @contest,
-                                   :show_flag => true,
-                                   :user_id =>User.current.id,
-                                   :horizontal => false}
-            %>
-		</span>
 	</span>
   </div>
 
@@ -69,28 +69,46 @@
   <% @contestnotificationss.each do |contestnotifications| %>
       <table class="content-text-list">
         <tr>
-          <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %></td>
+          <td colspan="2" valign="top" width="50">
+            <%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %>
+          </td>
           <td>
             <table width="580px" border="0">
 
               <tr>
                 <td colspan="2" valign="top">
-                  <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter">
-                      <%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %></span>
-                      <span style="float: right">
-                        <%= link_to l(:button_edit), edit_contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %>
-                        <%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> 
-                      </span>
+                  <strong>
+                    <%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %>
+                  </strong>
+                  <span style="margin-left: 4px;" class="font_lighter">
+                    <%= l(:label_project_notice) %>
+                  </span>
+                  <span>
+                    <%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %>
+                  </span>
+                  <span style="float: right">
+                    <%= link_to l(:button_edit), edit_contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %>
+                    <%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %>
+                  </span>
                 </td>
               </tr>
               <tr>
                 <td colspan="2" width="580px">
-                  <span class="font_description"><%= textilizable(contestnotifications, :description) %></span></td>
+                  <span class="font_description">
+                    <%= textilizable(contestnotifications, :description) %>
+                  </span>
+                </td>
               </tr>
               <tr>
-                <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
-                  &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                <td width="350" align="right" class="a"><%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %></td>
+                <td align="left"><span class="font_lighter">
+                  <%= l :label_update_time %>
+                  &nbsp;
+                  <%= format_time(contestnotifications.created_at) %>
+                </span>
+                </td>
+                <td width="350" align="right" class="a">
+                  <%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %>
+                </td>
               </tr>
             </table>
           </td>