From 3545a8b0bc356acd1268a94565284b4bd736da01 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 29 Dec 2014 17:34:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B=E8=AF=84?= =?UTF-8?q?=E5=88=86=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/softapplications/show.html.erb | 99 +++++++++++++++++------- db/schema.rb | 2 +- 2 files changed, 73 insertions(+), 28 deletions(-) diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index 77cc6aa71..8dd82a62d 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -16,7 +16,8 @@ <%=l(:label_attendingcontestwork_belongs_type)%>： - <%= @softapplication.app_type_name %> + <%= @softapplication.app_type_name %> + <% contest = @softapplication.contests.first %> <%=l(:label_attendingcontestwork_belongs_contest)%>： @@ -35,23 +36,35 @@ - <%=l(:label_attendingcontestwork_download)%>： - <% options = {:author => true, :deletable => @softapplication.user.eql?(User.current)} %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %> + <%=l(:label_attendingcontestwork_download)%>： + + + <% 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 %> + + <%=l(:label_attendingcontestwork_developers)%>： + <%= @softapplication.application_developers %> + - <% if @softapplication.project %> - <%=l(:label_attendingcontestwork_deposit_project)%>： + <%=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 @softapplication.project %> + <%=l(:label_attendingcontestwork_deposit_project)%>： <%= link_to "#{@softapplication.project}", project_path(@softapplication.project) %> - <% end %> + <% end %> @@ -62,18 +75,28 @@
-
<%=l(:label_work_description)%>：
+
+ <%=l(:label_work_description)%>： +
-
<%= @softapplication.description %>
+
+ <%= @softapplication.description %> +
-
<%=l(:label_work_scores)%>：
+
+ + <%=l(:label_work_scores)%>： + +
-
<%=l(:label_work_scores_people)%>
+
+ <%=l(:label_work_scores_people)%> +
<% 100.step(20, -20) do |star| %>
@@ -87,15 +110,26 @@ <% end %>
-
-
<%=l(:label_final_scores)%>
-
<%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>分
-
<%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>
+
+
+ <%=l(:label_final_scores)%> +
+
+ <%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>分 +
+
+ <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %> +
-
<%=l(:label_rating_person_amount)%>
+
+ <%=l(:label_rating_person_amount)%> +
- <%= @softapplication.raters(:quality).count %>
+ + <%= @softapplication.raters(:quality).count %> + +
@@ -103,7 +137,9 @@
-
<%=l(:label_work_photo)%>：
+
+ <%=l(:label_work_photo)%>： +
@@ -111,8 +147,10 @@ <% @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 %> @@ -125,11 +163,18 @@
    - <%=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)%>)
    +
    + <%=l(:label_work_rating)%>: + <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %> + ( + <%=l(:label_attendingcontestwork_sorting_intimation)%>) + +
    <% end %>
    diff --git a/db/schema.rb b/db/schema.rb index 5725d8221..fd8c8ee1a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20141229025925) do +ActiveRecord::Schema.define(:version => 20141229081716) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false