jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/contests/show_attendingcontest.html.erb
View File

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

40
app/views/softapplications/show.html.erb
View File

@ -1,7 +1,4 @@
<%= render :partial => 'layouts/base_softapplication_top_content' %>
<div style="height: auto; padding-bottom: 10px" class="softapplications-div">
<tr>
<td colspan="2" valign="top" width="320">
@ -16,13 +13,24 @@
</td>
</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 %>
<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>
<td style="padding-left: 40px"><%=l(:label_attendingcontestwork_release_person)%>：<%= @softapplication.user.name %></td>
<td><%=l(:label_attendingcontestwork_adaptive_system)%>：<%= @softapplication.android_min_version_available %></td>
<td style="padding-left: 40px">
<%=l(:label_attendingcontestwork_release_person)%>：
<%= @softapplication.user.name %>
</td>
<td>
<%=l(:label_attendingcontestwork_adaptive_system)%>：
<%= @softapplication.android_min_version_available %>
</td>
</tr>
<tr>
<td style="padding-left: 40px">
@ -31,7 +39,6 @@
<% options = {:author => true, :deletable => @softapplication.user.eql?(User.current)} %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %>
</span>
</td>
<td><%=l(:label_attendingcontestwork_developers)%>：<%= @softapplication.application_developers %></td>
</tr>
<tr>
@ -51,11 +58,10 @@
</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>
<div style="font-size: 15px;"><%=l(:label_work_description)%>：</div>
</strong>
<div style="padding-top: 5px"><%= @softapplication.description %></div>
</div>
<div class="underline-contests_one"></div>
@ -102,7 +108,9 @@
<ul>
<% @image_results.take(4).each do |attachment| %>
<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"%>
</li>
<% end %>
@ -114,14 +122,14 @@
<div class="underline-contests_one"></div>
<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) %>
<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>
<% end %>
</div>
<!--提示登录后对应用进行评价-->
<div id="history">
<%= render :partial => 'message_history', :locals => {:contest => @softapplication, :journals => @jour, :state => false} %>
@ -133,7 +141,3 @@
<%= pagination_links_full @feedback_pages %>
</ul>
</div>
<div>
</div>