diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index e7490f5b0..b51a11436 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -5,7 +5,8 @@ class ContestsController < ApplicationController
menu_item :project, :only => :show_project
menu_item :application, :only => :show_softapplication
menu_item :attendingcontest, :only => :show_attendingcontest
- before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :show_attendingcontest, :set_reward_project, :set_reward_softapplication, :create,:destroy,:more,:back,:add,:add_softapplication,:new,:show_results, :set_reward,
+ menu_item :contestnotification, :only => :show_notification
+ before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :show_attendingcontest, :show_notification, :set_reward_project, :set_reward_softapplication, :create,:destroy,:more,:back,:add,:add_softapplication,:new,:show_results, :set_reward,
:show_contest_project, :show_contest_user, :join_in_contest, :unjoin_in_contest, :new_join,:show_participator, :settings]
# added by fq
@@ -355,6 +356,17 @@ class ContestsController < ApplicationController
end
###end
+
+def show_notification
+ @contest = Contest.find_by_id(params[:id])
+ respond_to do |format|
+ format.html {
+ render :layout => 'base_newcontest'
+ }
+ format.api
+ end
+end
+
def set_reward_project
@c_p = nil
diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb
index 31675ca5d..b8d81b108 100644
--- a/app/controllers/softapplications_controller.rb
+++ b/app/controllers/softapplications_controller.rb
@@ -47,7 +47,7 @@ class SoftapplicationsController < ApplicationController
def show
@softapplication = Softapplication.find(params[:id])
- @project = Project.find_by_identifier(@softapplication.deposit_project)
+ @project = @softapplication.project
# 打分统计
stars_reates = @softapplication.
rates(:quality)
@@ -142,13 +142,16 @@ class SoftapplicationsController < ApplicationController
def create
@softapplication = Softapplication.new(params[:softapplication])
@softapplication.user = User.current
- @softapplication.deposit_project = params[:project]
+ #@softapplication.deposit_project = params[:project]
+ @softapplication.project = Project.find_by_id(params[:project])
@softapplication.save_attachments(params[:attachments])
respond_to do |format|
if @softapplication.save
ContestingSoftapplication.create(:contest_id => params[:contest_id], :softapplication_id => @softapplication.id)
+ #ProjectingSoftapplication.create_softapplication_projecting(:project_id => params[:project_id], :softapplication_id => @softapplication.id)
+ #ProjectingSoftapplication.create_softapplication_projecting(@project.id, softapplication.id)
format.html { redirect_to show_attendingcontest_contest_path(:id => params[:contest_id]), notice: l(:notice_attendingcontest_work_successfully_created) }
# format.json { render json: @softapplication, status: :created, location: @softapplication }
else
@@ -170,7 +173,8 @@ class SoftapplicationsController < ApplicationController
# @softapplication = Softapplication.find(params[:id])
@softapplication.attachments.map{|attach| attach.destroy }
@softapplication.save_attachments(params[:attachments])
- @softapplication.deposit_project = params[:project]
+ #@softapplication.deposit_project = params[:project]
+ @softapplication.project = Project.find_by_id(params[:project])
respond_to do |format|
if @softapplication.update_attributes(params[:softapplication])
format.html { redirect_to @softapplication, notice: l(:notice_softapplication_was_successfully_updated) }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 76da3b684..fd1f6f162 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -745,7 +745,7 @@ module ApplicationHelper
tmp = Hash.new
tmp={"" => ""}
option.each do |project|
- tmp[project.name] = project.identifier
+ tmp[project.name] = project.id
end
tmp
end
diff --git a/app/models/softapplication.rb b/app/models/softapplication.rb
index 5e1e1bd50..f7eed43fc 100644
--- a/app/models/softapplication.rb
+++ b/app/models/softapplication.rb
@@ -6,10 +6,11 @@ class Softapplication < ActiveRecord::Base
has_many :journals_for_messages, :as => :jour, :dependent => :destroy
has_many :contesting_softapplications, :dependent => :destroy
- has_many :projecting_softapplications, :dependent => :destroy
+ #has_many :projecting_softapplications, :dependent => :destroy
belongs_to :user
belongs_to :project
has_many :contests, :through => :contesting_softapplications
+ belongs_to :project
def add_jour(user, notes, reference_user_id = 0, options = {})
if options.count == 0
diff --git a/app/views/contests/_list_softapplications.html.erb b/app/views/contests/_list_softapplications.html.erb
index 9b99b675c..89e8a3172 100644
--- a/app/views/contests/_list_softapplications.html.erb
+++ b/app/views/contests/_list_softapplications.html.erb
@@ -4,7 +4,7 @@
- 应用软件: |
+ <%=l(:label_softapplication)%>: |
<%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %>
|
@@ -12,7 +12,7 @@
- 简介: |
+ <%=l(:label_profile)%>: |
<%= c_softapplication.softapplication.description.truncate(90, omission: '...') %>
|
@@ -20,7 +20,7 @@
- 发布时间: |
+ <%=l(:label_activity_time)%>: |
<%=format_time c_softapplication.created_at %>
|
diff --git a/app/views/contests/_new.html.erb b/app/views/contests/_new.html.erb
index 2462d3fb1..804c59429 100644
--- a/app/views/contests/_new.html.erb
+++ b/app/views/contests/_new.html.erb
@@ -45,7 +45,7 @@
<% else %>
-
+
<%= l(:label_user_login_tips) %>
<%= link_to l(:label_user_login_new), signin_path %>
diff --git a/app/views/contests/_new_join.html.erb b/app/views/contests/_new_join.html.erb
index c764690de..3b0cff690 100644
--- a/app/views/contests/_new_join.html.erb
+++ b/app/views/contests/_new_join.html.erb
@@ -36,7 +36,7 @@
}
-
请输入竞赛密码
+
<%=l(:label_please_input_password)%>
<%= form_tag( join_in_contest_contests_path(id: contest.id),
:remote => true,
diff --git a/app/views/contests/add.js.erb b/app/views/contests/add.js.erb
index 9c696d8aa..0706d0c56 100644
--- a/app/views/contests/add.js.erb
+++ b/app/views/contests/add.js.erb
@@ -1,4 +1,4 @@
$('#contesting_project_list').html('<%= escape_javascript(render(:partial => 'project_list', :locals => {:contesting_project => @contesting_project})) %>');
-$("#project_id").val("请选择项目");
+$("#project_id").val("<%= l(:label_please_select_project) %>");
$("#contest_message").val( "<%= l(:label_bid_reason) %>" );
$("#put-bid-form").hide();
\ No newline at end of file
diff --git a/app/views/contests/add_softapplication.js.erb b/app/views/contests/add_softapplication.js.erb
index 6071c7070..dfe774100 100644
--- a/app/views/contests/add_softapplication.js.erb
+++ b/app/views/contests/add_softapplication.js.erb
@@ -1,4 +1,4 @@
$('#contesting_softapplication_list').html('<%= escape_javascript(render(:partial => 'softapplication_list', :locals => {:contesting_softapplication => @contesting_softapplication})) %>');
-$("#softapplication_id").val("请选择参赛应用");
+$("#softapplication_id").val("<%= l(:label_please_select_contestingsoftapplication) %>");
$("#contest_message").val( "<%= l(:label_bid_reason) %>" );
$("#put-bid-form").hide();
\ No newline at end of file
diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb
index bbd01c241..8a567bd53 100644
--- a/app/views/contests/show_attendingcontest.html.erb
+++ b/app/views/contests/show_attendingcontest.html.erb
@@ -1,170 +1,177 @@
<%= render_flash_messages %>
-
温馨提示:如果您准备参加竞赛,请点击下面的"新建参赛作品"!
-
1) 若您已完成开发,且只希望发布您的作品,“托管项目”一项可以不选;
-
2) 若您希望托管竞赛数据和代码以及保留开发和提交代码的轨迹,请从“托管项目”中选择一项您已创建好的项目作为该参赛作品的托管项目,若您还没有创建项目,请点击右边的“创建项目”,然后回到本页再选择。
+
<%= l(:label_wellmeaning_intimation_contentone) %>
+
1) <%= l(:label_wellmeaning_intimation_contenttwo) %>
+
2) <%= l(:label_wellmeaning_intimation_contentthree) %>
<% if User.current.logged? %>
-
-
- 参加竞赛:
- <%= link_to '新建参赛作品', "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %>
-
-
-
-
+
+
+ <%= l(:label_attending_contest) %>:
+ <%= link_to l(:label_new_attendingcontest_work), "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %>
+
+
<% else %>
-
- <%= l(:label_user_login_attending_contest) %>
- <%= link_to l(:label_user_login_new), signin_path %>
-
+
+ <%= l(:label_user_login_attending_contest) %>
+ <%= link_to l(:label_user_login_new), signin_path %>
+
<% end %>
- <%= form_for Softapplication.new, :url => softapplications_path do |f| %>
-
+
+
+
-
- <%= l(:label_work_type) %>
+
+ <%= l(:label_work_type) %>
- * : <%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %> |
+ * :
+ <%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %> |
-
-
-
+
+
+
+
-
- <%= l(:label_work_description) %>
- * : <%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %> |
- (125个汉字以内)
-
-
-
+
+ <%= l(:label_work_description) %>
+ * :
+ <%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %> |
+ (<%= l(:label_workdescription_lengthlimit) %>)
+
+
+
+
-
- <%= l(:label_softapplication_developers) %>
- * : <%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %> |
+
+ <%= l(:label_softapplication_developers) %>
+ * :
+ <%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %> |
-
-
-
-
-
- <%= l(:label_work_deposit_project) %>:
- <%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2' %>
- <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target=>'_blank'%>
-
-
-
+
+
+
+
-
-
- <%#= render_flash_messages %>
-
- <%= render :partial => 'attachments/form' %>
-
-
- 1、<%= l(:label_upload_softapplication_packets_mustpacketed)%>
-
- 2、<%= l(:label_upload_softapplication_photo_condition)%>
-
+
+ <%= l(:label_work_deposit_project) %>:
+ <%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2' %>
+ <%= link_to l(:label_create_new_projects), new_project_path(course: 0, project_type: 0), :target => '_blank' %>
+
+
+
+
-
-
-
- <%= submit_tag l(:button_create) %>
- <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
- :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'",
- :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
-
- <% end %>
+
+
+ <%#= render_flash_messages %>
+
+ <%= render :partial => 'attachments/form' %>
+
+
+
+ 1、<%= l(:label_upload_softapplication_packets_mustpacketed) %>
+
+ 2、<%= l(:label_upload_softapplication_photo_condition) %>
+
+
+
+
+
+ <%= submit_tag l(:button_create) %>
+ <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
+ :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'",
+ :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
+
+ <% end %>
@@ -176,173 +183,185 @@
<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %>
-<% @contesting_project.sort.reverse.each do |c_project|%>
-<% if c_project.project %>
-
-
-
-
参赛作品: <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %>
-
-
-
-
- <% if get_prize(c_project).nil? or get_prize(c_project) == "" %>
+ <% @contesting_project.sort.reverse.each do |c_project| %>
+ <% if c_project.project %>
+
+
+
+ <%= l(:label_contest_work) %>
+ : <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %>
+
+
+
+
+
+ <% if get_prize(c_project).nil? or get_prize(c_project) == "" %>
<% if @contest.deadline < Date.today %>
- <%= l(:label_noawards)%>
- <% else%>
- <%= l(:label_noawards_current)%>
+ <%= l(:label_noawards) %>
+ <% else %>
+ <%= l(:label_noawards_current) %>
<% end %>
<% else %>
- <% case get_prize(c_project) %>
+ <% case get_prize(c_project) %>
<% when '-1' %>
- <%= image_tag("/images/bid/special_reward.png")%>
+ <%= image_tag("/images/bid/special_reward.png") %>
<% when '0' %>
- <%= image_tag("/images/bid/first_reward.png")%>
+ <%= image_tag("/images/bid/first_reward.png") %>
<% when '1' %>
- <%= image_tag("/images/bid/second_reward.png")%>
+ <%= image_tag("/images/bid/second_reward.png") %>
<% when '2' %>
- <%= image_tag("/images/bid/third_reward.png")%>
+ <%= image_tag("/images/bid/third_reward.png") %>
<% when '3' %>
- <%= image_tag("/images/bid/forth_reward.png")%>
+ <%= image_tag("/images/bid/forth_reward.png") %>
<% when '4' %>
- <%= image_tag("/images/bid/fifth_reward.png")%>
+ <%= image_tag("/images/bid/fifth_reward.png") %>
<% when '5' %>
- <%= image_tag("/images/bid/qualified.png")%>
+ <%= image_tag("/images/bid/qualified.png") %>
<% end %>
<% end %>
-
- |
-
-
- <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
-
- <%= toggle_link '评奖', c_project.id.to_s %>
-
-
- <%= form_for "set_reward_project",:remote=>true,:url=>set_reward_project_contest_path do |f| %>
- <%= f.text_field :c_id,:style => "display:none",:value => c_project.id,:size=>"0" %>
- <%= f.select :reward,"
+
+ |
+
+
+ <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
+
+ <%= toggle_link l(:label_reward), c_project.id.to_s %>
+
+
+ <%= form_for "set_reward_project", :remote => true, :url => set_reward_project_contest_path do |f| %>
+ <%= f.text_field :c_id, :style => "display:none", :value => c_project.id, :size => "0" %>
+ <%= f.select :reward, "
-
-
-
- ".html_safe %>
- <%= f.submit "提交",:class=>"submit" %>
+
+
+
+ ".html_safe %>
+ <%= f.submit :value => l(:button_submit), :class => "submit" %>
<% end %>
-
- |
- <% end %>
-
-
-
-
-
-
- 简介: |
- <%= c_project.project.description.truncate(90, omission: '...') %> |
-
-
-
- 参赛时间:<%= format_time c_project.created_at%>
- 参赛代表:<%= c_project.user.name %>
-
+
+ |
+ <% end %>
+
+
+
+
+
+
+
+ <%= l(:label_profile) %>: |
+ <%= c_project.project.description.truncate(90, omission: '...') %> |
+
+
+
+
+ <%= l(:label_attendingcontest_time) %>
+ :<%= format_time c_project.created_at %>
+ <%= l(:label_attendingcontest_spoksman) %>
+ :<%= c_project.user.name %>
+
-
-<% end %>
-
-<% end %>
+
+
+ <% end %>
+
+ <% end %>
<% else %>
-<% @contesting_softapplication.each do |c_softapplication|%>
-<% if c_softapplication.softapplication %>
-
-
-
- 参赛作品: |
- <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> |
-
-
-
-
-
- 简介: |
- <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> |
-
-
-
-
- 参赛时间:<%= format_time c_softapplication.created_at %>
- 参赛代表:<%= c_softapplication.softapplication.user.name %>
-
-
-
-
-
最终得分:<%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s%>分
+ <% @contesting_softapplication.each do |c_softapplication| %>
+ <% if c_softapplication.softapplication %>
+
+
+
+ <%= l(:label_contest_work) %>: |
+ <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> |
+
+
+
+
+
+
+ <%= l(:label_profile) %>: |
+ <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> |
+
+
+
+
+
+ <%= l(:label_attendingcontest_time) %>
+ :<%= format_time c_softapplication.created_at %>
+ <%= l(:label_attendingcontest_spoksman) %>
+ :<%= c_softapplication.softapplication.user.name %>
+
+
+
+
+
<%= l(:label_final_scores) %>
+ :<%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>
+ 分
-
-
- <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %>
+
+
+ <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %>
<% if @contest.deadline < Date.today %>
- <%= l(:label_noawards)%>
- <% else%>
- <%= l(:label_noawards_current)%>
+ <%= l(:label_noawards) %>
+ <% else %>
+ <%= l(:label_noawards_current) %>
<% end %>
<% else %>
- <% case get_prize(c_softapplication) %>
+ <% case get_prize(c_softapplication) %>
<% when '-1' %>
- <%= image_tag("/images/bid/special_reward.png")%>
+ <%= image_tag("/images/bid/special_reward.png") %>
<% when '0' %>
- <%= image_tag("/images/bid/first_reward.png")%>
+ <%= image_tag("/images/bid/first_reward.png") %>
<% when '1' %>
- <%= image_tag("/images/bid/second_reward.png")%>
+ <%= image_tag("/images/bid/second_reward.png") %>
<% when '2' %>
- <%= image_tag("/images/bid/third_reward.png")%>
+ <%= image_tag("/images/bid/third_reward.png") %>
<% when '3' %>
- <%= image_tag("/images/bid/forth_reward.png")%>
+ <%= image_tag("/images/bid/forth_reward.png") %>
<% when '4' %>
- <%= image_tag("/images/bid/fifth_reward.png")%>
+ <%= image_tag("/images/bid/fifth_reward.png") %>
<% when '5' %>
- <%= image_tag("/images/bid/qualified.png")%>
+ <%= image_tag("/images/bid/qualified.png") %>
<% end %>
<% end %>
-
- |
+
+
- <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
-
+ <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
+
<%= toggle_link '评奖', c_softapplication.id.to_s %>
-
- <%= form_for "set_reward_softapplication",:remote=>true,:url=>set_reward_softapplication_contest_path do |f| %>
- <%= f.text_field :c_id,:style => "display:none",:value => c_softapplication.id,:size=>"0" %>
- <%= f.select :reward,"
+
+ <%= form_for "set_reward_softapplication", :remote => true, :url => set_reward_softapplication_contest_path do |f| %>
+ <%= f.text_field :c_id, :style => "display:none", :value => c_softapplication.id, :size => "0" %>
+ <%= f.select :reward, "
-
-
-
- ".html_safe %>
- <%= f.submit "提交",:class=>"submit" %>
+
+
+
+ ".html_safe %>
+ <%= f.submit :value => l(:button_submit), :class => "submit" %>
<% end %>
-
-
+
+
<% end %>
-
-
-
-<% end %>
-
-<% end %>
+
+
+
+ <% end %>
+
+ <% end %>
<% end %>
diff --git a/app/views/contests/show_notification.html.erb b/app/views/contests/show_notification.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/contests/show_project.html.erb b/app/views/contests/show_project.html.erb
index 202d3b632..3e759cfc1 100644
--- a/app/views/contests/show_project.html.erb
+++ b/app/views/contests/show_project.html.erb
@@ -68,7 +68,7 @@
- <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target=>'_blank'%>
+ <%= link_to l(:label_create_new_projects), new_project_path(course: 0, project_type: 0), :target=>'_blank'%>
|
diff --git a/app/views/contests/show_softapplication.html.erb b/app/views/contests/show_softapplication.html.erb
index 14c907d82..d12a70e35 100644
--- a/app/views/contests/show_softapplication.html.erb
+++ b/app/views/contests/show_softapplication.html.erb
@@ -68,7 +68,7 @@
- <%= link_to '发布应用', new_softapplication_path(:target=>'_blank'), :target=>'_blank' %>
+ <%= link_to l(:label_release_softapplication), new_softapplication_path(:target=>'_blank'), :target=>'_blank' %>
|
diff --git a/app/views/softapplications/_form.html.erb b/app/views/softapplications/_form.html.erb
index 4703af9be..fd946cfc5 100644
--- a/app/views/softapplications/_form.html.erb
+++ b/app/views/softapplications/_form.html.erb
@@ -65,7 +65,7 @@
-
+
<%= render_flash_messages %>
<%= render :partial => 'attachments/form' %>
diff --git a/app/views/softapplications/index.html.erb b/app/views/softapplications/index.html.erb
index 841a8a207..5b355f65c 100644
--- a/app/views/softapplications/index.html.erb
+++ b/app/views/softapplications/index.html.erb
@@ -16,13 +16,13 @@
<%= softapplication.description.truncate(95, omission: '...') %>
<%contest = softapplication.contests.first%>
-
所属竞赛:<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>
-
所属类别:<%= softapplication.app_type_name.truncate(10, omission: '...') %>
-
系统支持:<%= softapplication.android_min_version_available %>
+
<%=l(:label_attendingcontestwork_belongs_contest)%>:<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>
+
<%=l(:label_attendingcontestwork_belongs_type)%>:<%= softapplication.app_type_name.truncate(10, omission: '...') %>
+
<%=l(:label_attendingcontestwork_adaptive_system)%>:<%= softapplication.android_min_version_available %>
- 开发人员:<%= softapplication.application_developers %>
- 发布时间:<%=format_time softapplication.created_at %>
+ <%=l(:label_attendingcontestwork_developers)%>:<%= softapplication.application_developers %>
+ <%=l(:label_attendingcontestwork_release_time)%>:<%=format_time softapplication.created_at %>
diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb
index 8b9b3260d..e41ecb842 100644
--- a/app/views/softapplications/show.html.erb
+++ b/app/views/softapplications/show.html.erb
@@ -16,38 +16,35 @@
- 所属类别:<%= @softapplication.app_type_name %> |
+ <%=l(:label_attendingcontestwork_belongs_type)%>:<%= @softapplication.app_type_name %> |
<% contest = @softapplication.contests.first %>
- 所属竞赛:<%= 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)) : '尚未加入竞赛' %> |
- 发布人员:<%= @softapplication.user.name %> |
- 系统支持:<%= @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} %>
|
- 开发人员:<%= @softapplication.application_developers %> |
+ <%=l(:label_attendingcontestwork_developers)%>:<%= @softapplication.application_developers %> |
- 平均评分: <%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %> |
- 发布时间:<%=format_time @softapplication.created_at %> |
+ <%=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.deposit_project != "nil" && @softapplication.deposit_project != "") %>
- <%#= textilizable ("托管项目: " + @project.name) %>
- 托管项目:<%= link_to "#@project", project_path(@project.id) %>
- <% end %>
+ <% if @project %>
+ <%=l(:label_attendingcontestwork_deposit_project)%>:<%= link_to "#@project", project_path(@project) %>
+ <% end %>
|
-
-
@@ -56,7 +53,7 @@
- 作品简介:
+ <%=l(:label_work_description)%>:
<%= @softapplication.description %>
@@ -64,11 +61,11 @@
-
作品得分:
+
<%=l(:label_work_scores)%>:
-
得分比例
+
<%=l(:label_work_scores_proportion)%>
<% 100.step(20, -20) do |star| %>
@@ -83,14 +80,12 @@
-
最终得分
-
<%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>
- 分
-
+
<%=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)%>
<%= @softapplication.raters(:quality).count %>
@@ -100,7 +95,7 @@
- 作品截图:
+ <%=l(:label_work_photo)%>:
@@ -119,10 +114,10 @@
-
作品评论:
+
<%=l(:label_work_comment)%>:
<% if (User.current.logged? and User.current.id != @softapplication.user_id) %>
-
评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
- (您可以重新打分,打分结果以最后一次打分为主!)
+
<%=l(:label_work_rating)%>: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>
+ (<%=l(:label_attendingcontestwork_sorting_intimation)%>)
<% end %>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index d8d8a2d8a..e6c3ab1f5 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -187,7 +187,7 @@
<% find_new_forum_topics(11).each do |topic|%>
- -
+
-
<%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 96b37e768..f86a757c6 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1722,6 +1722,8 @@ zh:
label_first_reward: 一等奖
label_second_reward: 二等奖
label_third_reward: 三等奖
+ label_fourth_reward: 四等奖
+ label_fifth_reward: 五等奖
label_excellence_reward: 优秀奖
label_comfort_reward: 入围奖
label_course_settings: 课程设置
@@ -1878,8 +1880,14 @@ zh:
label_work_name: 作品名称
label_softapplication_description: 应用简介
label_work_description: 作品简介
+ label_work_scores: 作品得分
+ label_work_rating: 评分
+ label_work_tishi: 您可以重新打分,打分结果以最后一次打分为主!
+ label_work_scores_proportion: 得分比例
label_softapplication_type: 应用分类
label_work_type: 作品分类
+ label_work_photo: 作品截图
+ label_work_comment: 作品评论
label_softapplication_version_available: 适配版本
label_running_platform: 运行平台
label_softapplication_developer: 上传人员
@@ -1894,6 +1902,8 @@ zh:
label_button_ok: 确定
label_tags_contest: 竞赛标签
label_tags_contest: 竞赛名称
+ label_final_scores: 最终得分
+ label_rating_person_amount: 打分总人数
label_tags_contest_description: 竞赛描述
label_release_add_contest_succeed: 该应用发布并添加成功.
label_add_contest_succeed_fail: 添加失败,该应用已参赛.
@@ -1904,6 +1914,7 @@ zh:
label_softapplication_list: 应用列表
label_contest_work_list: 参赛作品列表
label_attending_contest: 我要参赛
+ label_contest_notification: 竞赛通知
label_coursefile_sharingarea: 课程资源共享区
label_sort_by_activity: 按动态数排序
@@ -1918,10 +1929,40 @@ zh:
label_contest_settings: 配置竞赛
label_contest_delete: 删除竞赛
label_noawards_current: 暂未评奖
+
+ label_softapplication: 应用软件
+ label_attending_contest: 参加竞赛
+ label_new_attendingcontest_work: 新建参赛作品
+ label_workname_lengthlimit: 25个汉字以内
+ label_workdescription_lengthlimit: 125个汉字以内
+ label_please_input_password: 请输入竞赛密码
+ label_please_select_project: 请选择项目
+ label_upload_softworkpacket_photo: 上传作品软件包和作品截图
+ label_reward: 评奖
+ label_please_select_contestingsoftapplication: 请选择参赛应用
+ label_attendingcontest_time: 参赛时间
+ label_attendingcontest_spoksman: 参赛代表
+ label_wellmeaning_intimation_contentone: 温馨提示:如果您准备参加竞赛,请点击下面的"新建参赛作品"!
+ label_wellmeaning_intimation_contenttwo: 若您已完成开发,且只希望发布您的作品,“托管项目”一项可以不选;
+ label_wellmeaning_intimation_contentthree: 若您希望托管竞赛数据和代码以及保留开发和提交代码的轨迹,请从“托管项目”中选择一项您已创建好的项目作为该参赛作品的托管项目,若您还没有创建项目,请点击右边的“创建项目”,然后回到本页再选择。
notice_account_updated: 帐号更新成功
notice_attendingcontest_work_successfully_created: 恭喜您,参赛作品创建成功!
notice_softapplication_was_successfully_updated: 恭喜您,参赛作品更新成功!
+
+ label_attendingcontestwork_belongs_contest: 所属竞赛
+ label_attendingcontestwork_belongs_type: 所属类别
+ label_attendingcontestwork_release_person: 发布人员
+ label_attendingcontestwork_adaptive_system: 系统支持
+ label_attendingcontestwork_download: 作品下载
+ label_attendingcontestwork_developers: 开发人员
+ label_attendingcontestwork_average_scores: 平均评分
+ label_attendingcontestwork_release_time: 发布时间
+ label_attendingcontestwork_deposit_project: 托管项目
+ label_attendingcontestwork_sorting_intimation: 您可以重新打分,打分结果以最后一次打分为主!
+
+ #end
+
# ajax异步验证
modal_valid_passing: 可以使用
label_bug: 漏洞
diff --git a/config/routes.rb b/config/routes.rb
index bbb95d360..f7139fba4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -83,6 +83,7 @@ RedmineApp::Application.routes.draw do
match 'show_project' , via: :get
match 'show_softapplication' , via: :get
match 'show_attendingcontest' , via: :get
+ match 'show_notification' , via: :get
match 'show_participator' , via: :get
match 'set_reward_project' , via: [:get, :post]
match 'set_reward_softapplication' , via: [:get, :post]
diff --git a/db/migrate/20140526031949_create_projecting_softapplications.rb b/db/migrate/20140526031949_create_projecting_softapplications.rb
new file mode 100644
index 000000000..cc739e8b5
--- /dev/null
+++ b/db/migrate/20140526031949_create_projecting_softapplications.rb
@@ -0,0 +1,7 @@
+class CreateProjectingSoftapplications < ActiveRecord::Migration
+ def up
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20140526104509_add_project_to_softapplication.rb b/db/migrate/20140526104509_add_project_to_softapplication.rb
new file mode 100644
index 000000000..f7b6690c9
--- /dev/null
+++ b/db/migrate/20140526104509_add_project_to_softapplication.rb
@@ -0,0 +1,5 @@
+class AddProjectToSoftapplication < ActiveRecord::Migration
+ def change
+ add_column :softapplications, :project_id, :integer
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f6c83ac65..68b9ad655 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 => 20140519074133) do
+ActiveRecord::Schema.define(:version => 20140526104509) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -28,6 +28,11 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
t.datetime "updated_at", :null => false
end
+ create_table "applied_projects", :force => true do |t|
+ t.integer "project_id", :null => false
+ t.integer "user_id", :null => false
+ end
+
create_table "apply_project_masters", :force => true do |t|
t.integer "user_id"
t.string "apply_type"
@@ -798,6 +803,7 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
t.string "application_developers"
t.string "deposit_project_url"
t.string "deposit_project"
+ t.integer "project_id"
end
create_table "students_for_courses", :force => true do |t|
diff --git a/lib/redmine.rb b/lib/redmine.rb
index dd0973902..944dd473b 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -287,6 +287,7 @@ Redmine::MenuManager.map :contest_menu do |menu|
#menu.push :project, :show_project_contest_path, :caption => :label_contest_project
#menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application
menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest
+ menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification
# menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest
# menu.push :result, { :controller => 'bids', :action => 'show_results' },
# :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p }