#1298修复竞赛作品简介超出边框的BUG

This commit is contained in:
sw 2014-10-15 17:11:33 +08:00
parent 4b40824111
commit e765445279
2 changed files with 39 additions and 43 deletions

View File

@ -102,8 +102,6 @@
</span> </span>
</div> </div>
</div> </div>
<!-- modified by longjun, 登录之后才能参赛 -->
<div id="put-project-form" style=" padding-left: 83px; width: 88%"> <div id="put-project-form" style=" padding-left: 83px; width: 88%">
<%= render "new_softapplication" %> <%= render "new_softapplication" %>
</div> </div>
@ -114,12 +112,6 @@
<%= link_to l(:label_user_login_new), signin_path %> <%= link_to l(:label_user_login_new), signin_path %>
</div> </div>
<% end %> <% end %>
<div class="underline-contests_three"></div> <div class="underline-contests_three"></div>
<!--参赛作品列表,通过判断竞赛的id为2,3,6的显示参赛作品为提交的项目否则显示参赛的应用--> <!--参赛作品列表,通过判断竞赛的id为2,3,6的显示参赛作品为提交的项目否则显示参赛的应用-->
@ -230,7 +222,7 @@
</br> </br>
</div> </div>
<div style="padding-left: 68px; padding-top: 5px"> <div style="padding-left: 68px; padding-top: 5px;word-break:break-all;word-wrap: break-word;">
<tr> <tr>
<td><strong><%= l(:label_profile) %>:</strong></td> <td><strong><%= l(:label_profile) %>:</strong></td>
<td> <td>

View File

@ -1,7 +1,4 @@
<%= render :partial => 'layouts/base_softapplication_top_content' %> <%= render :partial => 'layouts/base_softapplication_top_content' %>
<div style="height: auto; padding-bottom: 10px" class="softapplications-div"> <div style="height: auto; padding-bottom: 10px" class="softapplications-div">
<tr> <tr>
<td colspan="2" valign="top" width="320"> <td colspan="2" valign="top" width="320">
@ -16,46 +13,55 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_type)%><%= @softapplication.app_type_name %></td> <td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">
<%=l(:label_attendingcontestwork_belongs_type)%>
<%= @softapplication.app_type_name %></td>
<% contest = @softapplication.contests.first %> <% contest = @softapplication.contests.first %>
<td style="width: 240px; word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_contest)%><%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %></td> <td style="width: 240px; word-wrap: break-word; word-break: break-all">
<%=l(:label_attendingcontestwork_belongs_contest)%>
<%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %>
</td>
</tr> </tr>
<tr> <tr>
<td style="padding-left: 40px"><%=l(:label_attendingcontestwork_release_person)%><%= @softapplication.user.name %></td> <td style="padding-left: 40px">
<td><%=l(:label_attendingcontestwork_adaptive_system)%><%= @softapplication.android_min_version_available %></td> <%=l(:label_attendingcontestwork_release_person)%>
<%= @softapplication.user.name %>
</td>
<td>
<%=l(:label_attendingcontestwork_adaptive_system)%>
<%= @softapplication.android_min_version_available %>
</td>
</tr> </tr>
<tr> <tr>
<td style="padding-left: 40px"> <td style="padding-left: 40px">
<span><%=l(:label_attendingcontestwork_download)%></span> <span><%=l(:label_attendingcontestwork_download)%></span>
<span> <span>
<% options = {:author => true, :deletable => @softapplication.user.eql?(User.current)} %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %> <% options = {:author => true, :deletable => @softapplication.user.eql?(User.current)} %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %>
</span> </span>
</td> </td>
<td><%=l(:label_attendingcontestwork_developers)%><%= @softapplication.application_developers %></td>
<td><%=l(:label_attendingcontestwork_developers)%><%= @softapplication.application_developers %></td> </tr>
</tr> <tr>
<tr> <td style="padding-left: 40px"><%=l(:label_attendingcontestwork_average_scores)%>: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></td>
<td style="padding-left: 40px"><%=l(:label_attendingcontestwork_average_scores)%>: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></td> <td><%=l(:label_attendingcontestwork_release_time)%><%=format_time @softapplication.created_at %></td>
<td><%=l(:label_attendingcontestwork_release_time)%><%=format_time @softapplication.created_at %></td> </tr>
</tr> <tr>
<tr> <td style="padding-left: 40px">
<td style="padding-left: 40px"> <% if @project %>
<% if @project %> <%=l(:label_attendingcontestwork_deposit_project)%><%= link_to "#@project", project_path(@project) %>
<%=l(:label_attendingcontestwork_deposit_project)%><%= link_to "#@project", project_path(@project) %> <% end %>
<% end %> </td>
</td> </tr>
</tr>
</table> </table>
</td> </td>
</tr> </tr>
</div> </div>
<div class="underline-contests_one"></div> <div class="underline-contests_one"></div>
<div style="height: auto; padding-bottom: 10px"> <div style="height: auto; padding-bottom: 10px;word-break:break-all;word-wrap: break-word;">
<strong> <strong>
<div style="font-size: 15px;"><%=l(:label_work_description)%></div> <div style="font-size: 15px;"><%=l(:label_work_description)%></div>
</strong> </strong>
<div style="padding-top: 5px"><%= @softapplication.description %></div> <div style="padding-top: 5px"><%= @softapplication.description %></div>
</div> </div>
<div class="underline-contests_one"></div> <div class="underline-contests_one"></div>
@ -102,7 +108,9 @@
<ul> <ul>
<% @image_results.take(4).each do |attachment| %> <% @image_results.take(4).each do |attachment| %>
<li> <li>
<div class="title"><a href="#"><%= attachment.filename.to_s -%></a></div> <div class="title">
<a href="#"><%= attachment.filename.to_s -%></a>
</div>
<%= link_to_attachment_img attachment, :class => "soft-application", :download => "true"%> <%= link_to_attachment_img attachment, :class => "soft-application", :download => "true"%>
</li> </li>
<% end %> <% end %>
@ -114,14 +122,14 @@
<div class="underline-contests_one"></div> <div class="underline-contests_one"></div>
<div style="height: 50px"> <div style="height: 50px">
<div style="font-size: 15px"><strong><%=l(:label_work_comment)%></strong></div> <div style="font-size: 15px">
<strong><%=l(:label_work_comment)%></strong>
</div>
<% if (User.current.logged? and User.current.id != @softapplication.user_id) %> <% if (User.current.logged? and User.current.id != @softapplication.user_id) %>
<div style="padding-left: 210px"><%=l(:label_work_rating)%>: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %> <div style="padding-left: 210px"><%=l(:label_work_rating)%>: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
<span style="font-size: 11px">(<%=l(:label_attendingcontestwork_sorting_intimation)%>)</span></div> <span style="font-size: 11px">(<%=l(:label_attendingcontestwork_sorting_intimation)%>)</span></div>
<% end %> <% end %>
</div> </div>
<!--提示登录后对应用进行评价--> <!--提示登录后对应用进行评价-->
<div id="history"> <div id="history">
<%= render :partial => 'message_history', :locals => {:contest => @softapplication, :journals => @jour, :state => false} %> <%= render :partial => 'message_history', :locals => {:contest => @softapplication, :journals => @jour, :state => false} %>
@ -133,7 +141,3 @@
<%= pagination_links_full @feedback_pages %> <%= pagination_links_full @feedback_pages %>
</ul> </ul>
</div> </div>
<div>
</div>