From e765445279fc725d594fbea844a9bb090e906155 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 15 Oct 2014 17:11:33 +0800 Subject: [PATCH] =?UTF-8?q?#1298=E4=BF=AE=E5=A4=8D=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E7=AE=80=E4=BB=8B=E8=B6=85=E5=87=BA=E8=BE=B9?= =?UTF-8?q?=E6=A1=86=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contests/show_attendingcontest.html.erb | 10 +-- app/views/softapplications/show.html.erb | 72 ++++++++++--------- 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb index 3ba3e73ba..9d5b08ea9 100644 --- a/app/views/contests/show_attendingcontest.html.erb +++ b/app/views/contests/show_attendingcontest.html.erb @@ -102,8 +102,6 @@ - -
<%= render "new_softapplication" %>
@@ -114,12 +112,6 @@ <%= link_to l(:label_user_login_new), signin_path %> <% end %> - - - - - -
@@ -230,7 +222,7 @@
-
+
<%= l(:label_profile) %>: diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 1410563c3..1d6d46e9e 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -1,7 +1,4 @@ <%= render :partial => 'layouts/base_softapplication_top_content' %> - - -
@@ -16,46 +13,55 @@ - <%=l(:label_attendingcontestwork_belongs_type)%>：<%= @softapplication.app_type_name %> + + <%=l(:label_attendingcontestwork_belongs_type)%>： + <%= @softapplication.app_type_name %> <% contest = @softapplication.contests.first %> - <%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %> + + <%=l(:label_attendingcontestwork_belongs_contest)%>： + <%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %> + - <%=l(:label_attendingcontestwork_release_person)%>：<%= @softapplication.user.name %> - <%=l(:label_attendingcontestwork_adaptive_system)%>：<%= @softapplication.android_min_version_available %> + + <%=l(:label_attendingcontestwork_release_person)%>： + <%= @softapplication.user.name %> + + + <%=l(:label_attendingcontestwork_adaptive_system)%>： + <%= @softapplication.android_min_version_available %> + <%=l(:label_attendingcontestwork_download)%>： - - <% 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} %> + - - <%=l(:label_attendingcontestwork_developers)%>：<%= @softapplication.application_developers %> - - - <%=l(:label_attendingcontestwork_average_scores)%>: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %> - <%=l(:label_attendingcontestwork_release_time)%>：<%=format_time @softapplication.created_at %> - - - - <% if @project %> - <%=l(:label_attendingcontestwork_deposit_project)%>：<%= link_to "#@project", project_path(@project) %> - <% end %> - - + <%=l(:label_attendingcontestwork_developers)%>：<%= @softapplication.application_developers %> + + + <%=l(:label_attendingcontestwork_average_scores)%>: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %> + <%=l(:label_attendingcontestwork_release_time)%>：<%=format_time @softapplication.created_at %> + + + + <% if @project %> + <%=l(:label_attendingcontestwork_deposit_project)%>：<%= link_to "#@project", project_path(@project) %> + <% end %> + +
-
+
<%=l(:label_work_description)%>：
 -
<%= @softapplication.description %>
@@ -102,7 +108,9 @@
    <% @image_results.take(4).each do |attachment| %>
  • -
    <%= attachment.filename.to_s -%>
    +
    + <%= attachment.filename.to_s -%> +
    <%= link_to_attachment_img attachment, :class => "soft-application", :download => "true"%>
    • <% end %> @@ -114,14 +122,14 @@
    -
    <%=l(:label_work_comment)%>：
    +
    + <%=l(:label_work_comment)%>： +
    <% if (User.current.logged? and User.current.id != @softapplication.user_id) %>
    <%=l(:label_work_rating)%>: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %> (<%=l(:label_attendingcontestwork_sorting_intimation)%>)
    <% end %> -
    -
    <%= render :partial => 'message_history', :locals => {:contest => @softapplication, :journals => @jour, :state => false} %> @@ -133,7 +141,3 @@ <%= pagination_links_full @feedback_pages %>
- - -
-