From a3a95556a388b34690c19eb9949cdcb7d3126d8d Mon Sep 17 00:00:00 2001 From: xianbo Date: Fri, 23 May 2014 14:16:32 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=8E=8B=E6=9E=97=E6=98=A5=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BA=86=E5=86=B2=E7=AA=81=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_footer.html.erb.orig | 73 -------- .../softapplications/new.html.erb.BASE.erb | 12 -- .../softapplications/new.html.erb.LOCAL.erb | 12 -- .../softapplications/new.html.erb.REMOTE.erb | 64 ------- app/views/softapplications/show.html.erb.orig | 158 ------------------ 5 files changed, 319 deletions(-) delete mode 100644 app/views/layouts/_base_footer.html.erb.orig delete mode 100644 app/views/softapplications/new.html.erb.BASE.erb delete mode 100644 app/views/softapplications/new.html.erb.LOCAL.erb delete mode 100644 app/views/softapplications/new.html.erb.REMOTE.erb delete mode 100644 app/views/softapplications/show.html.erb.orig diff --git a/app/views/layouts/_base_footer.html.erb.orig b/app/views/layouts/_base_footer.html.erb.orig deleted file mode 100644 index c2e9c1f3..00000000 --- a/app/views/layouts/_base_footer.html.erb.orig +++ /dev/null @@ -1,73 +0,0 @@ - -
-<<<<<<< HEAD - -
- <%= debug(params) if Rails.env.development? %> - - -
diff --git a/app/views/softapplications/new.html.erb.BASE.erb b/app/views/softapplications/new.html.erb.BASE.erb deleted file mode 100644 index 40c6a405..00000000 --- a/app/views/softapplications/new.html.erb.BASE.erb +++ /dev/null @@ -1,12 +0,0 @@ -

<%=l(:label_release_softapplication)%>

- - -<%= labelled_form_for @softapplication, :url => {:controller => 'softapplications', :action => 'create'}, method: :post do |f| %> -
- <%= render :partial => 'form', :locals => { :f => f } %> - <%= submit_tag l(:button_create) %> - - <% end %> -
\ No newline at end of file diff --git a/app/views/softapplications/new.html.erb.LOCAL.erb b/app/views/softapplications/new.html.erb.LOCAL.erb deleted file mode 100644 index bf4e19f3..00000000 --- a/app/views/softapplications/new.html.erb.LOCAL.erb +++ /dev/null @@ -1,12 +0,0 @@ -

<%=l(:label_release_softapplication)%>

- - -<%= labelled_form_for @softapplication, :url => {:controller => 'softapplications', :action => 'create'}, method: :post do |f| %> -
- <%= render :partial => 'form', :locals => { :f => f } %> - <%= submit_tag l(:button_create) %> - - <% end %> -
\ No newline at end of file diff --git a/app/views/softapplications/new.html.erb.REMOTE.erb b/app/views/softapplications/new.html.erb.REMOTE.erb deleted file mode 100644 index 82016581..00000000 --- a/app/views/softapplications/new.html.erb.REMOTE.erb +++ /dev/null @@ -1,64 +0,0 @@ -

<%= l(:label_release_softapplication)%>

- - -
- <%= form_for Softapplication.new, :url => {:controller => 'softapplications', :action => 'create'}, :update => "bidding_project_list", :complete => '$("#put-bid-form").hide();', :html => {:multipart => true, :id => 'add_homework_form'} do |f| %> -
- - <%= l(:label_attachment_plural) %> - - - <%= l(:label_softapplication_name) %> - * : <%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %> - <%= l(:label_softapplication_name_condition)%> - -
-
- - - <%= l(:label_softapplication_version_available) %> - * : <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %> - - -
-
- - - <%= l(:label_softapplication_type) %> - - * : <%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %> - - -
-
- - - <%= l(:label_softapplication_description) %> - * : <%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %> - - -
-
- <%= render_flash_messages %> -

- <%= render :partial => 'attachments/form' %> -

-
- <%= submit_tag l(:button_create), :onclick => "return true" %> - -
- - <% end %> - \ No newline at end of file diff --git a/app/views/softapplications/show.html.erb.orig b/app/views/softapplications/show.html.erb.orig deleted file mode 100644 index c7e874a1..00000000 --- a/app/views/softapplications/show.html.erb.orig +++ /dev/null @@ -1,158 +0,0 @@ -<%= render :partial => 'layouts/base_softapplication_top_content' %> - - - -
- - - - - - - - - - - - <% contest = @softapplication.contests.first %> - - - - - - - - -======= - - - - - - - - - - - ->>>>>>> 2f709c92ba93d46c81adc49fac0d77584018a3fe - - - - - - - - - - -
<%= @softapplication.name %> - <%= link_to '删除', softapplication_path(@softapplication), method: :delete, data: {confirm: '您确定要删除吗?'} if @softapplication.destroyable_by? User.current %>  - <%= link_to '编辑', edit_softapplication_path(@softapplication), method: :get if @softapplication.destroyable_by? User.current %> -
所属类别：<%= @softapplication.app_type_name %>所属竞赛：<%= contest ? link_to(contest.name, show_attendingcontest_contest_path(contest)) : '尚未加入竞赛' %>
发布人员：<%= @softapplication.user.name %>系统支持：<%= @softapplication.android_min_version_available %>
- 作品下载： - - <% options = {:author => true, :deletable => @softapplication.user.eql?(User.current)} %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %> - -<<<<<<< HEAD - 开发人员：<%= @softapplication.application_developers %>
平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>发布时间：<%=format_time @softapplication.created_at %>
- <% if (@softapplication.deposit_project != "nil" && @softapplication.deposit_project != "") %> - <%#= textilizable ("托管项目： " + @project.name) %> - 托管项目：<%= link_to "#@project", project_path(@project.id) %> - <% end %> -
开发人员：<%= @softapplication.application_developers %>
平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>发布时间：<%= format_time @softapplication.created_at %>
- <% unless @softapplication.deposit_project_url.nil? %> - <%= textilizable ("托管项目网址： " + @softapplication.deposit_project_url) %> - <% end %> -
- - -
-
- -
- -
作品简介：
- - -
<%= @softapplication.description %>
-
-
- -
-
作品得分：
- -
-
-
得分比例
-
- <% 100.step(20, -20) do |star| %> -
-
-
-
-
-
- <%= @stars_status_map["star#{(star/20).to_s}".to_sym] %> -
- <% end %> -
-
-
-
最终得分
-
<%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %> - 分 -
-
<%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>
-
-
-
打分总人数
-
- <%= @softapplication.raters(:quality).count %>
-
-
-
-
- -
- -
作品截图：
- - -
-
    - <% @image_results.take(4).each do |attachment| %> -
  • -
    <%= attachment.filename.to_s -%>
    - <%= link_to_attachment_img attachment, :class => "soft-application", :download => "true"%> -
    • - <% end %> -
-
-
-
- -
- -
-
作品评论：
-
评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %> - (您可以重新打分，打分结果以最后一次打分为主！)
- -
- - -
- <%= render :partial => 'message_history', :locals => {:contest => @softapplication, :journals => @jour, :state => false} %> -
- - - - - -
-