From 2ac89fcdbce81cbb0d346a97c3408f7e30936eda Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 1 Nov 2014 16:35:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E8=B8=A9=E3=80=81=E8=B5=9E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/praise_tread/_praise_tread.html.erb | 166 ++++++++++++------
 1 file changed, 116 insertions(+), 50 deletions(-)

diff --git a/app/views/praise_tread/_praise_tread.html.erb b/app/views/praise_tread/_praise_tread.html.erb
index 5bb7addb2..d7ee09ce0 100644
--- a/app/views/praise_tread/_praise_tread.html.erb
+++ b/app/views/praise_tread/_praise_tread.html.erb
@@ -3,38 +3,57 @@
     <% if horizontal %>
         <!-- 横排 -->
         <div id="praise_tread_<%= obj.id %>" style="float:right;">
-
           <% @is_valuate = is_praise_or_tread(obj,user_id)%>
           <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
               <% @flag = @is_valuate.first.praise_or_tread %>
               <% if  @flag == 1 %> <!-- 顶过  --><!-- modified by bai -->
                   <table style="line-height: 1px">
                     <tr>
-                      <td ><%= image_tag "/images/praise_tread/praise_false.png" , weight:"22px", height:"22px",:title => l(:label_issue_praise_over) %></td>
-                      <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
-                      <td><%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_appraise_over) %></td>
+                      <td >
+                        <%= image_tag "/images/praise_tread/praise_false.png" , weight:"22px", height:"22px",:title => l(:label_issue_praise_over) %>
+                      </td>
+                      <td align="center">
+                        <strong class="font_small_watch">
+                          <%= get_praise_num(obj)%>
+                        </strong>
+                      </td>
+                      <td>
+                        <%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_appraise_over) %>
+                      </td>
                     </tr>
                   </table>
-
               <% elsif @flag == 0 %> <!-- 踩过 0-->
-
                   <table style="line-height: 1px">
                     <tr>
-                      <td > <%= image_tag "/images/praise_tread/praise_false.png",weight:"22px", height:"22px", :title => l(:label_issue_appraise_over) %></td>
-                      <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
-                      <td><%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_tread_over) %> </td>
+                      <td >
+                        <%= image_tag "/images/praise_tread/praise_false.png",weight:"22px", height:"22px", :title => l(:label_issue_appraise_over) %>
+                      </td>
+                      <td align="center">
+                        <strong class="font_small_watch">
+                          <%= get_praise_num(obj)%>
+                        </strong>
+                      </td>
+                      <td>
+                        <%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_tread_over) %>
+                      </td>
                     </tr>
                   </table>
               <% end %>
-
           <% else %>
-
               <% if user_id == obj.author_id %>
                   <table style="line-height: 1px">
                     <tr>
-                      <td ><%= image_tag "/images/praise_tread/praise_true.png" , weight:"22px", height:"22px",:title => l(:label_issue_not_praise_over) %></td>
-                      <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
-                      <td><%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_not_treed_over) %></td>
+                      <td >
+                        <%= image_tag "/images/praise_tread/praise_true.png" , weight:"22px", height:"22px",:title => l(:label_issue_not_praise_over) %>
+                      </td>
+                      <td align="center">
+                        <strong class="font_small_watch">
+                          <%= get_praise_num(obj)%>
+                        </strong>
+                      </td>
+                      <td>
+                        <%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_not_treed_over) %>
+                      </td>
                     </tr>
                   </table>
               <% else %>
@@ -42,30 +61,42 @@
                   <% if OptionNumber.get_user_option_number(user_id).nil? || OptionNumber.get_user_option_number(user_id).total_score < 2 %>
                       <table style="line-height: 1px">
                         <tr>
-                          <td ><%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
-                                           :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %></td>
-                          <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
-                          <td><%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issues_score_not_enough) %></td>
+                          <td >
+                            <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
+                                           :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>
+                          </td>
+                          <td align="center">
+                            <strong class="font_small_watch">
+                              <%= get_praise_num(obj)%>
+                            </strong>
+                          </td>
+                          <td>
+                            <%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issues_score_not_enough) %>
+                          </td>
                         </tr>
                       </table>
                   <% else %>
                       <table style="line-height: 1px">
                         <tr>
-                          <td > <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
-                                            :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %> </td>
-                          <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
-                          <td> <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread",
-                                           :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %></td>
+                          <td >
+                            <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
+                                            :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>
+                          </td>
+                          <td align="center">
+                            <strong class="font_small_watch">
+                              <%= get_praise_num(obj)%>
+                            </strong>
+                          </td>
+                          <td>
+                            <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread",
+                                           :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>
+                          </td>
                         </tr>
                       </table>
                   <% end %>
-
               <% end %>
-
-              <!-- end -->
           <% end %>
         </div>
-
     <% else %>
         <!-- 竖排 -->
         <div id="praise_tread_<%= obj.id %>" style="float:right;">
@@ -75,80 +106,115 @@
               <% if  @flag == 1 %> <!-- 顶过  --><!-- modified by bai -->
                   <table style="line-height: 1px">
                     <tr>
-                      <td ><%= image_tag "/images/praise_tread/praise_false.png" , weight:"22px", height:"22px",:title => l(:label_issue_praise_over) %></td>
+                      <td >
+                        <%= image_tag "/images/praise_tread/praise_false.png" , weight:"22px", height:"22px",:title => l(:label_issue_praise_over) %>
+                      </td>
                     </tr>
                     <tr>
-                      <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
+                      <td align="center">
+                        <strong class="font_small_watch">
+                          <%= get_praise_num(obj)%>
+                        </strong>
+                      </td>
                     </tr>
 
                     <tr>
-                      <td><%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_appraise_over) %></td>
+                      <td>
+                        <%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_appraise_over) %>
+                      </td>
                     </tr>
                   </table>
-
               <% elsif @flag == 0 %> <!-- 踩过 0-->
-
                   <table style="line-height: 1px">
                     <tr>
-                      <td > <%= image_tag "/images/praise_tread/praise_false.png",weight:"22px", height:"22px", :title => l(:label_issue_appraise_over) %></td>
+                      <td >
+                        <%= image_tag "/images/praise_tread/praise_false.png",weight:"22px", height:"22px", :title => l(:label_issue_appraise_over) %>
+                      </td>
                     </tr>
 
                     <tr>
-                      <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
+                      <td align="center">
+                        <strong class="font_small_watch">
+                            <%= get_praise_num(obj)%>
+                        </strong>
+                      </td>
                     </tr>
                     <tr>
-                      <td><%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_tread_over) %> </td>
+                      <td>
+                        <%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_tread_over) %>
+                      </td>
                     </tr>
                   </table>
               <% end %>
-
           <% else %>
               <% if user_id == obj.author_id %>
                   <table style="line-height: 1px">
                     <tr>
-                      <td > <%= image_tag "/images/praise_tread/praise_true.png",weight:"22px", height:"22px", :title => l(:label_issue_not_praise_over) %></td>
+                      <td >
+                        <%= image_tag "/images/praise_tread/praise_true.png",weight:"22px", height:"22px", :title => l(:label_issue_not_praise_over) %>
+                      </td>
                     </tr>
 
                     <tr>
-                      <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
+                      <td align="center">
+                        <strong class="font_small_watch">
+                          <%= get_praise_num(obj)%>
+                        </strong>
+                      </td>
                     </tr>
                     <tr>
-                      <td><%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_not_treed_over) %> </td>
+                      <td>
+                        <%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_not_treed_over) %>
+                      </td>
                     </tr>
                   </table>
               <% else %>
                   <% if OptionNumber.get_user_option_number(user_id).nil? || OptionNumber.get_user_option_number(user_id).total_score < 2 %>
                       <table style="line-height: 1px">
                         <tr>
-                          <td > <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
-                                            :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %></td>
+                          <td >
+                            <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
+                                            :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %>
+                          </td>
                         </tr>
 
                         <tr>
-                          <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
+                          <td align="center">
+                            <strong class="font_small_watch">
+                              <%= get_praise_num(obj)%>
+                            </strong>
+                          </td>
                         </tr>
                         <tr>
-                          <td><%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issues_score_not_enough) %> </td>
+                          <td>
+                            <%= image_tag "/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issues_score_not_enough) %>
+                          </td>
                         </tr>
                       </table>
                   <% else %>
                       <table style="line-height: 1px">
                         <tr>
-                          <td > <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
-                                            :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %> </td>
+                          <td >
+                            <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
+                                            :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %>
+                          </td>
                         </tr>
                         <tr>
-                          <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
+                          <td align="center">
+                            <strong class="font_small_watch">
+                              <%= get_praise_num(obj)%>
+                            </strong>
+                          </td>
                         </tr>
                         <tr>
-                          <td> <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread",
-                                           :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %></td>
+                          <td>
+                            <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread",
+                                           :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class ,:horizontal => horizontal %>
+                          </td>
                         </tr>
                       </table>
                   <% end %>
-
               <% end %>
-
               <!-- end -->
           <% end %>
         </div>