From e0cf3bd6de9914688c2e35f10bbb957ab454bb07 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 14 Nov 2014 10:54:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug<=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?>=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/tags_controller.rb | 1 - app/views/memos/show.html.erb | 6 ++++++ app/views/tags/_tag_name.html.erb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 1318e40a5..b64c18b33 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -16,7 +16,6 @@ class TagsController < ApplicationController include ActsAsTaggableOn::TagsHelper helper :projects helper :courses - include TagsHelper helper :tags include OpenSourceProjectsHelper diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 017a9a03c..b7e5e2749 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -1,3 +1,9 @@ +
<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index 6996e8891..3efbfcc1a 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -7,7 +7,7 @@ // }); // }) - + <% @tags = obj.reload.tag_list %> <% if non_list_all and (@tags.size > 0) %> From 857578dc92e6dbdab98ce8e092be8314ad71ac39 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 14 Nov 2014 11:15:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20Signed-off-by:?= =?UTF-8?q?=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contests/_new_softapplication.html.erb | 2 +- .../show_attendingcontest.html.erb.BASE.erb | 374 ------------------ .../show_attendingcontest.html.erb.LOCAL.erb | 315 --------------- .../show_attendingcontest.html.erb.REMOTE.erb | 374 ------------------ config/locales/zh.yml | 2 +- 5 files changed, 2 insertions(+), 1065 deletions(-) delete mode 100644 app/views/contests/show_attendingcontest.html.erb.BASE.erb delete mode 100644 app/views/contests/show_attendingcontest.html.erb.LOCAL.erb delete mode 100644 app/views/contests/show_attendingcontest.html.erb.REMOTE.erb diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb index fb16e9351..35eea6147 100644 --- a/app/views/contests/_new_softapplication.html.erb +++ b/app/views/contests/_new_softapplication.html.erb @@ -165,7 +165,7 @@ :onblur => 'regexDevelopers();' %> - + (<%= l(:label_workdescription_lengthlimit) %>) diff --git a/app/views/contests/show_attendingcontest.html.erb.BASE.erb b/app/views/contests/show_attendingcontest.html.erb.BASE.erb deleted file mode 100644 index c7c05b238..000000000 --- a/app/views/contests/show_attendingcontest.html.erb.BASE.erb +++ /dev/null @@ -1,374 +0,0 @@ - - - -<%= render_flash_messages %> - -
-
<%= l(:label_wellmeaning_intimation_contentone) %>
-
1) <%= l(:label_wellmeaning_intimation_contenttwo) %>
-
2) <%= l(:label_wellmeaning_intimation_contentthree) %>
-
- -<% if User.current.logged? %> -
-
- <%= 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 %> -
-<% end %> - - - - - - - -
- - - -<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %> - - <% @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) %> - <% end %> - <% else %> - <% case get_prize(c_project) %> - <% when '-1' %> - <%= image_tag("/images/bid/special_reward.png") %> - <% when '0' %> - <%= image_tag("/images/bid/first_reward.png") %> - <% when '1' %> - <%= image_tag("/images/bid/second_reward.png") %> - <% when '2' %> - <%= image_tag("/images/bid/third_reward.png") %> - <% when '3' %> - <%= image_tag("/images/bid/forth_reward.png") %> - <% when '4' %> - <%= image_tag("/images/bid/fifth_reward.png") %> - <% when '5' %> - <%= image_tag("/images/bid/qualified.png") %> - <% end %> - <% end %> - - - - - - <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %> - - <%= toggle_link l(:label_reward), c_project.id.to_s %> - - - - <% 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) %> - - <% unless c_project.nil? || c_project.user.nil? %> - ：<%= link_to c_project.user.name,user_path(c_project.user) %> - <% end %> -
- -
- -
-
- <% end %> -
- <% end %> -<% else %> - <% @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) %> - - <% unless c_softapplication.nil? || c_softapplication.softapplication.nil? || c_softapplication.softapplication.user.nil? %> - ：<%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %> - <% end %> -
- - -
- <% score = c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_f %> - <%= l(:label_final_scores) %> - ：<%= format("%.2f" , score) %> - 分 - - - - - <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %> - <% if @contest.deadline < Date.today %> - <%= l(:label_noawards) %> - <% else %> - <%= l(:label_noawards_current) %> - <% end %> - <% else %> - <% case get_prize(c_softapplication) %> - <% when '-1' %> - <%= image_tag("/images/bid/special_reward.png") %> - <% when '0' %> - <%= image_tag("/images/bid/first_reward.png") %> - <% when '1' %> - <%= image_tag("/images/bid/second_reward.png") %> - <% when '2' %> - <%= image_tag("/images/bid/third_reward.png") %> - <% when '3' %> - <%= image_tag("/images/bid/forth_reward.png") %> - <% when '4' %> - <%= image_tag("/images/bid/fifth_reward.png") %> - <% when '5' %> - <%= 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_softapplication.id.to_s %> - - -
- <% end %> - -
-
- <% end %> -
- <% end %> -<% end %> - - - diff --git a/app/views/contests/show_attendingcontest.html.erb.LOCAL.erb b/app/views/contests/show_attendingcontest.html.erb.LOCAL.erb deleted file mode 100644 index afdb96574..000000000 --- a/app/views/contests/show_attendingcontest.html.erb.LOCAL.erb +++ /dev/null @@ -1,315 +0,0 @@ - - - -<%= render_flash_messages %> - -
-
- <%= l(:label_wellmeaning_intimation_contentone) %> -
-
- 1) <%= l(:label_wellmeaning_intimation_contenttwo) %> -
-
- 2) <%= l(:label_wellmeaning_intimation_contentthree) %> -
-
- -<% if User.current.logged? %> -
-
- <%= l(:label_attending_contest) %>： - - <%= link_to l(:label_new_attendingcontest_work), - "javascript:void(0);", - onclick: "$('#put-project-form').slideToggle();" - %> - -
-
-
- <%= render "new_softapplication" %> -
- -<% else %> -
- <%= l(:label_user_login_attending_contest) %> - <%= link_to l(:label_user_login_new), signin_path %> -
-<% end %> -
- - - -<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %> - - <% @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) %> - <% end %> - <% else %> - <% case get_prize(c_project) %> - <% when '-1' %> - <%= image_tag("/images/bid/special_reward.png") %> - <% when '0' %> - <%= image_tag("/images/bid/first_reward.png") %> - <% when '1' %> - <%= image_tag("/images/bid/second_reward.png") %> - <% when '2' %> - <%= image_tag("/images/bid/third_reward.png") %> - <% when '3' %> - <%= image_tag("/images/bid/forth_reward.png") %> - <% when '4' %> - <%= image_tag("/images/bid/fifth_reward.png") %> - <% when '5' %> - <%= image_tag("/images/bid/qualified.png") %> - <% end %> - <% end %> - - - - - - <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %> - - <%= toggle_link l(:label_reward), c_project.id.to_s %> - - - - <% end %> -
-
-
-
-
-
- - <%= l(:label_profile) %>: - - <%#= c_project.project.description.truncate(90, omission: '...') %> - <%= c_project.project.description %> - - -
-
-
- <%= l(:label_attendingcontest_time) %> - ：<%= format_time c_project.created_at %> - <%= l(:label_attendingcontest_spoksman) %> - - <% unless c_project.nil? || c_project.user.nil? %> - ：<%= link_to c_project.user.name,user_path(c_project.user) %> - <% end %> -
- -
- -
-
- <% end %> -
- <% end %> -<% else %> - <% @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: '...') %> - <%= c_softapplication.softapplication.description %> - - -
-
- -
- <%= l(:label_attendingcontest_time) %> - ：<%= format_time c_softapplication.created_at %> - <%= l(:label_attendingcontest_spoksman) %> - - <% unless c_softapplication.nil? || c_softapplication.softapplication.nil? || c_softapplication.softapplication.user.nil? %> - ：<%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %> - <% end %> -
- - -
- <% score = c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_f %> - <%= l(:label_final_scores) %> - ：<%= format("%.2f" , score) %> - 分 - - - - - <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %> - <% if @contest.deadline < Date.today %> - <%= l(:label_noawards) %> - <% else %> - <%= l(:label_noawards_current) %> - <% end %> - <% else %> - <% case get_prize(c_softapplication) %> - <% when '-1' %> - <%= image_tag("/images/bid/special_reward.png") %> - <% when '0' %> - <%= image_tag("/images/bid/first_reward.png") %> - <% when '1' %> - <%= image_tag("/images/bid/second_reward.png") %> - <% when '2' %> - <%= image_tag("/images/bid/third_reward.png") %> - <% when '3' %> - <%= image_tag("/images/bid/forth_reward.png") %> - <% when '4' %> - <%= image_tag("/images/bid/fifth_reward.png") %> - <% when '5' %> - <%= 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_softapplication.id.to_s %> - - -
- <% end %> - -
-
- <% end %> -
- <% end %> -<% end %> - - -<% html_title(l(:label_contest_joincontest)) -%> diff --git a/app/views/contests/show_attendingcontest.html.erb.REMOTE.erb b/app/views/contests/show_attendingcontest.html.erb.REMOTE.erb deleted file mode 100644 index a1ed7015a..000000000 --- a/app/views/contests/show_attendingcontest.html.erb.REMOTE.erb +++ /dev/null @@ -1,374 +0,0 @@ - - - -<%= render_flash_messages %> - -
-
<%= l(:label_wellmeaning_intimation_contentone) %>
-
1) <%= l(:label_wellmeaning_intimation_contenttwo) %>
-
2) <%= l(:label_wellmeaning_intimation_contentthree) %>
-
- -<% if User.current.logged? %> -
-
- <%= 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 %> -
-<% end %> - - - - - - - -
- - - -<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %> - - <% @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) %> - <% end %> - <% else %> - <% case get_prize(c_project) %> - <% when '-1' %> - <%= image_tag("/images/bid/special_reward.png") %> - <% when '0' %> - <%= image_tag("/images/bid/first_reward.png") %> - <% when '1' %> - <%= image_tag("/images/bid/second_reward.png") %> - <% when '2' %> - <%= image_tag("/images/bid/third_reward.png") %> - <% when '3' %> - <%= image_tag("/images/bid/forth_reward.png") %> - <% when '4' %> - <%= image_tag("/images/bid/fifth_reward.png") %> - <% when '5' %> - <%= image_tag("/images/bid/qualified.png") %> - <% end %> - <% end %> - - - - - - <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %> - - <%= toggle_link l(:label_reward), c_project.id.to_s %> - - - - <% 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) %> - - <% unless c_project.nil? || c_project.user.nil? %> - ：<%= link_to c_project.user.name,user_path(c_project.user) %> - <% end %> -
- -
- -
-
- <% end %> -
- <% end %> -<% else %> - <% @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) %> - - <% unless c_softapplication.nil? || c_softapplication.softapplication.nil? || c_softapplication.softapplication.user.nil? %> - ：<%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %> - <% end %> -
- - -
- <% score = c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_f %> - <%= l(:label_final_scores) %> - ：<%= format("%.2f" , score) %> - 分 - - - - - <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %> - <% if @contest.deadline < Date.today %> - <%= l(:label_noawards) %> - <% else %> - <%= l(:label_noawards_current) %> - <% end %> - <% else %> - <% case get_prize(c_softapplication) %> - <% when '-1' %> - <%= image_tag("/images/bid/special_reward.png") %> - <% when '0' %> - <%= image_tag("/images/bid/first_reward.png") %> - <% when '1' %> - <%= image_tag("/images/bid/second_reward.png") %> - <% when '2' %> - <%= image_tag("/images/bid/third_reward.png") %> - <% when '3' %> - <%= image_tag("/images/bid/forth_reward.png") %> - <% when '4' %> - <%= image_tag("/images/bid/fifth_reward.png") %> - <% when '5' %> - <%= 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_softapplication.id.to_s %> - - -
- <% end %> - -
-
- <% end %> -
- <% end %> -<% end %> - - - diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 07e049d45..6c4216bc5 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2076,7 +2076,7 @@ zh: label_attending_contest: 参加竞赛 label_new_attendingcontest_work: 新建参赛作品 label_workname_lengthlimit: 25个汉字以内 - label_workdescription_lengthlimit: 125个汉字以内，用英文逗号隔开 + label_workdescription_lengthlimit: 125个汉字以内，用','隔开 label_please_input_password: 请输入竞赛密码 label_please_select_project: 请选择项目 label_upload_softworkpacket_photo: 上传作品软件包和作品截图