@@ -36,4 +36,4 @@
-<% html_title l(:label_softapplication_list)%>
\ No newline at end of file
+<% html_title l(:label_contest_work_list)%>
\ No newline at end of file
diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb
index c2f260e60..4bd6871a0 100644
--- a/app/views/softapplications/show.html.erb
+++ b/app/views/softapplications/show.html.erb
@@ -27,7 +27,7 @@
- 应用下载：
+ 作品下载：
<% options = {:author => true, :deletable => @softapplication.user.eql?(User.current) } %><%= render :partial => 'attachments/app_link', :locals => {:attachments => @app_items, :options => options} %>
@@ -56,13 +56,13 @@
- 应用简介：
+ 作品简介：
<%= @softapplication.description %>
- 应用得分：
+ 作品得分：
@@ -93,7 +93,7 @@
- 软件截图：
+ 作品截图：
<% @image_results.take(4).each do |attachment| %>
<%= link_to_attachment_img attachment, :class => "soft-application", :download => "true" %>
@@ -116,7 +116,7 @@
<% end %>
-->
- 软件评论：
+ 作品评论：
评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %>(您可以重新打分，打分结果以最后一次打分为主！)
diff --git a/app/views/test/index.html.erb b/app/views/test/index.html.erb
index 17c7089d1..de889b15b 100644
--- a/app/views/test/index.html.erb
+++ b/app/views/test/index.html.erb
@@ -1,12 +1,12 @@
test
-<% users = User.all%>
+<% user = User.find(1)%>
| id | name | C | I | S | filecount | issuecount | level | attachconut |
-<% users.each do |user| %>
+
@@ -22,7 +22,7 @@
<%= calculate_attachments(user) %> |
-<% end %>
+
diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb
index ee6ccb00b..47face839 100644
--- a/app/views/users/_mail_notifications.html.erb
+++ b/app/views/users/_mail_notifications.html.erb
@@ -1,5 +1,5 @@
-<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted" %>
+<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" %>
<%= select_tag(
'user[mail_notification]',
options_for_select(
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index dd912cfe6..d521d59f5 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -33,15 +33,24 @@
<% when 'JournalsForMessage' %>
<% if User.current.login == @user.login %>
<%# if e.user_id == act.jour.id %>
- | <%= link_to("#{e.user.name}", user_path(e.user_id)) %> 有了<%= link_to("#{e.act.user.name}", user_path(e.user.id))%>的留言 |
+ | <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %><%=
+ link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> |
<%# else %>
<%# end %>
<% else %>
- | <%= link_to("#{@user.name}", user_path(e.user_id)) %> 有了新的动态 |
+ | <%= link_to("#{e.user.name}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %><%=
+ link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> |
<% end %>
- | <%=textilizable act.notes %> |
- |
+ |
+ <%= textilizable act.notes %>
+ <%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %>
+
+ |
+
+
+
+ |
<%=(l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
@@ -171,9 +180,26 @@
<%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
-
+
|
+<% when 'Contest' %>
+
+ <% if e.user == User.current%>
+ | <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> |
+ <% else %>
+ <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> |
+ <% end %>
+
+ | <%= h act.description %> |
+
+ |
+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %>
+
+ |
+<% else %>
+ <% f=1 %>
<% end %>
|
@@ -244,7 +270,7 @@
<% else %>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 1b6336985..65c96e4d0 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -152,7 +152,11 @@
<%= link_to(contest.name, show_contest_contest_path(contest.id), :class => "d-g-blue d-p-project-name", :title => "#{contest.name}", :target => "_blank") %>
- (<%= link_to("含#{contest.contesting_softapplications.count}个app", show_softapplication_contest_path(contest), :target => "_blank") %>)
+ <% if contest.id == 2 or contest.id == 3 or contest.id == 6 %>
+ (<%= link_to("含#{contest.projects.where('is_public=1').count}个作品", show_attendingcontest_contest_path(contest), :target => "_blank") %>)
+ <% else %>
+ (<%= link_to("含#{contest.contesting_softapplications.count}个app", show_attendingcontest_contest_path(contest), :target => "_blank") %>)
+ <% end %>
@@ -201,7 +205,7 @@
-
最新参赛应用
+
最新参赛作品
<%= link_to "更多>>", {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %>
<% if Softapplication.count > 0%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f995d794..0215d43b6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1306,6 +1306,7 @@ en:
label_have_respond: had a respond
label_welcome: Welcome
+ label_goto: Go to>>
label_join: join Trustie！
label_repository_new: link to existing SVN repository
label_repository_path: path of repository
@@ -1411,6 +1412,8 @@ en:
label_user_activity_myself: About me
label_user_all_respond: All replies
label_layouts_feedback: Messages
+ label_have_feedback: Have
+ label_of_feedback: Of
label_welcome_participate: participates
#modify by men
label_x_welcome_participate:
@@ -1607,3 +1610,5 @@ en:
label_activity_time: publish date
+ # ajax异步验证
+ modal_valid_passing: can be used.
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 6b4a925c8..3d8a0e54e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -189,6 +189,8 @@ zh:
notice_unable_delete_time_entry: 无法删除工时
notice_issue_done_ratios_updated: 问题完成度已更新。
notice_gantt_chart_truncated: "这个表是截断的因为它超过了可以显示的最大数量(%{max})"
+
+ error_complete_occupation: "请您填写工作单位，否则本系统的部分功能将无法正常使用。"
error_can_t_load_default_data: "无法载入默认设置：%{value}"
error_scm_not_found: "版本库中不存在该条目和（或）其修订版本。"
@@ -1495,6 +1497,7 @@ zh:
label_issue_praise_over: 我刚才顶过了~
label_issue_tread_over: 我刚才踩过了~
#end
+ label_goto: 前往>>
label_issue_appraise_over: 只能评价一次哦！
label_welcome_my_respond: 请在此留下你的意见和建议！
label_no_current_fans: 该用户暂无粉丝
@@ -1575,6 +1578,8 @@ zh:
label_my_honework_no_homework: 暂无任何作业！
label_user_all_respond: 所有反馈
label_layouts_feedback: 留言
+ label_have_feedback: 有了
+ label_of_feedback: 的
label_welcome_participate: 参与了
#modify by men
label_x_welcome_participate:
@@ -1844,8 +1849,9 @@ zh:
label_contest_project: 参赛项目
label_contest_softapplication: 参赛应用
label_contest_response: 用户反馈
- label_contest_watchers: 关注人员
+ label_contest_watchers: 关注人数
label_contest_application: 参赛应用
+ label_contest_work: 参赛作品
button_contesting_as_project: 我要参赛（新建项目）
button_contesting_as_application: 我要参赛（发布应用）
label_release_softapplication: 发布应用
@@ -1874,6 +1880,8 @@ zh:
label_edit_softapplication: 修改应用
label_contest_delete: 删除竞赛
label_softapplication_list: 应用列表
+ label_contest_work_list: 参赛作品列表
+ label_attending_contest: 我要参赛
label_coursefile_sharingarea: 课程资源共享区
label_sort_by_activity: 按动态数排序
@@ -1887,4 +1895,7 @@ zh:
label_relation_files: 关联已有资源
label_contest_settings: 配置竞赛
label_contest_delete: 删除竞赛
+
+ # ajax异步验证
+ modal_valid_passing: 可以使用
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index a856deaf1..d93112c54 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,15 +67,16 @@ RedmineApp::Application.routes.draw do
end
member do
match 'add_softapplication'
- match 'update_contest' , via: [:put]
- match 'show_contest' , via: :get
- match 'show_project' , via: :get
- match 'show_softapplication', via: :get
- match 'show_participator' , via: :get
- match 'add' , via: [:get, :post]
- match 'add_softapplication' , via: [:get, :post]
- match 'create' , via: :post
- match 'settings' , via: [:get, :post]
+ match 'update_contest' , via: [:put]
+ match 'show_contest' , via: :get
+ match 'show_project' , via: :get
+ match 'show_softapplication' , via: :get
+ match 'show_attendingcontest' , via: :get
+ match 'show_participator' , via: :get
+ match 'add' , via: [:get, :post]
+ match 'add_softapplication' , via: [:get, :post]
+ match 'create' , via: :post
+ match 'settings' , via: [:get, :post]
end
end
@@ -126,6 +127,7 @@ RedmineApp::Application.routes.draw do
match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
match 'account/activate', :to => 'account#activate', :via => :get
+ match 'account/valid_ajax', :to => 'account#valid_ajax', :via => :get
match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put]
match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]
diff --git a/db/migrate/20140505082635_drop_user_scores.rb b/db/migrate/20140505082635_drop_user_scores.rb
new file mode 100644
index 000000000..fc65788f2
--- /dev/null
+++ b/db/migrate/20140505082635_drop_user_scores.rb
@@ -0,0 +1,5 @@
+class DropUserScores < ActiveRecord::Migration
+ def change
+ drop_table :user_scores
+ end
+end
diff --git a/db/migrate/20140505083218_create_user_levels.rb b/db/migrate/20140505083218_create_user_levels.rb
new file mode 100644
index 000000000..f0e201212
--- /dev/null
+++ b/db/migrate/20140505083218_create_user_levels.rb
@@ -0,0 +1,8 @@
+class CreateUserLevels < ActiveRecord::Migration
+ def change
+ create_table :user_levels do |t|
+ t.integer :user_id
+ t.integer :level
+ end
+ end
+end
diff --git a/db/migrate/20140505083430_create_user_scores.rb b/db/migrate/20140505083430_create_user_scores.rb
new file mode 100644
index 000000000..6c63aa327
--- /dev/null
+++ b/db/migrate/20140505083430_create_user_scores.rb
@@ -0,0 +1,11 @@
+class CreateUserScores < ActiveRecord::Migration
+ def change
+ create_table :user_scores do |t|
+ t.integer :user_id
+ t.integer :collaboration
+ t.integer :influence
+ t.integer :skill
+ t.integer :activity
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1d329f3c3..74310a946 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -863,6 +863,11 @@ ActiveRecord::Schema.define(:version => 20140509020307) do
add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
+ create_table "user_levels", :force => true do |t|
+ t.integer "user_id"
+ t.integer "level"
+ end
+
create_table "user_preferences", :force => true do |t|
t.integer "user_id", :default => 0, :null => false
t.text "others"
@@ -873,16 +878,11 @@ ActiveRecord::Schema.define(:version => 20140509020307) do
add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
create_table "user_scores", :force => true do |t|
- t.integer "user_id", :null => false
- t.integer "collaboration"
- t.integer "influence"
- t.integer "skill"
- t.integer "active"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- t.integer "level"
- t.integer "file"
- t.integer "issue"
+ t.integer "user_id"
+ t.integer "collaboration"
+ t.integer "influence"
+ t.integer "skill"
+ t.integer "activity"
end
create_table "user_statuses", :force => true do |t|
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 2c935074b..d22feb9fc 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -279,8 +279,10 @@ end
###new add by linchun
Redmine::MenuManager.map :contest_menu do |menu|
menu.push :respond, :show_contest_contest_path, :caption => :label_user_response
- menu.push :project, :show_project_contest_path, :caption => :label_contest_project
- menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application
+ #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 :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 }
end
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 4bb81d2f8..e1088c8c0 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -1,5 +1,14 @@
/* TODO: base/common/page 准备封装一些基本样式组合调用 参考YUI
*******************************************************************************/
+span[id^=valid_user]{
+ padding-left: 10px;
+}
+.red{
+ color: red;
+}
+.green{
+ color: green;
+}
.border_box {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -941,7 +950,7 @@ div.issue {
/* project 文件列表 资源库
*******************************************************************************/
.tags_area {
- height: 5px;
+ height: 13px;
}
#ver-zebra, .file_table_des {