竞赛页面我要参赛中添加判断,当用户未登录时提示登录后参赛
This commit is contained in:
parent
bcb3bf0c19
commit
dd43e2c3fc
|
@ -66,21 +66,27 @@
|
||||||
<div style="margin-left: 59px; padding-top: 2px">1) 若您已完成开发,且只希望发布您的作品,“托管项目”一项可以不选;</div>
|
<div style="margin-left: 59px; padding-top: 2px">1) 若您已完成开发,且只希望发布您的作品,“托管项目”一项可以不选;</div>
|
||||||
<div style="margin-left: 59px; padding-top: 2px">2) 若您希望托管竞赛数据和代码以及保留开发和提交代码的轨迹,请从“托管项目”中选择一项您已创建好的项目作为该参赛作品的托管项目,若您还没有创建项目,请点击右边的“创建项目”,然后回到本页再选择。</div>
|
<div style="margin-left: 59px; padding-top: 2px">2) 若您希望托管竞赛数据和代码以及保留开发和提交代码的轨迹,请从“托管项目”中选择一项您已创建好的项目作为该参赛作品的托管项目,若您还没有创建项目,请点击右边的“创建项目”,然后回到本页再选择。</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% if User.current.logged? %>
|
<% if User.current.logged? %>
|
||||||
|
<div style="padding-bottom: 10px; line-height: 15px">
|
||||||
<div style="padding-bottom: 10px; line-height: 15px">
|
<div style="padding-left: 82px; font-size: 14px">
|
||||||
<div style="padding-left: 82px; font-size: 14px">
|
<span><strong>参加竞赛:</strong></span>
|
||||||
<span><strong>参加竞赛:</strong></span>
|
<span><%= link_to '新建参赛作品', "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %></span>
|
||||||
<span><%= link_to '新建参赛作品', "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %></span>
|
</div>
|
||||||
|
<!-- <div style="padding-left: 82px; ">
|
||||||
|
<span style="padding-top: 50px">步骤1:</span>
|
||||||
|
<span><%#= link_to '新建参赛作品', new_softapplication_path(:target=>'_blank'), :target=>'_blank' %></span>
|
||||||
|
<span><%= link_to '新建参赛作品', "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %></span>
|
||||||
|
<span style="font-size: 12px; color: grey">(先点击“新建参赛作品”,然后刷新页面,再继续步骤2。)</span>
|
||||||
|
</div> -->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!-- <div style="padding-left: 82px; ">
|
<% else %>
|
||||||
<span style="padding-top: 50px">步骤1:</span>
|
<div style="font-size: 14px;margin:10px;padding-left: 73px">
|
||||||
<span><%#= link_to '新建参赛作品', new_softapplication_path(:target=>'_blank'), :target=>'_blank' %></span>
|
<%= l(:label_user_login_attending_contest) %>
|
||||||
<span><%= link_to '新建参赛作品', "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %></span>
|
<%= link_to l(:label_user_login_new), signin_path %>
|
||||||
<span style="font-size: 12px; color: grey">(先点击“新建参赛作品”,然后刷新页面,再继续步骤2。)</span>
|
</div>
|
||||||
</div> -->
|
<% end %>
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--点击新建参赛作品弹出框新建参赛作品并关联到竞赛中-->
|
<!--点击新建参赛作品弹出框新建参赛作品并关联到竞赛中-->
|
||||||
<div id="put-project-form" style="display: none; padding-left: 83px; width: 88%">
|
<div id="put-project-form" style="display: none; padding-left: 83px; width: 88%">
|
||||||
|
@ -162,7 +168,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<div class="underline-contests_three"></div>
|
<div class="underline-contests_three"></div>
|
||||||
|
|
||||||
|
|
|
@ -554,6 +554,7 @@ zh:
|
||||||
label_user_login_tips: 您还没有登录,请登录后留言
|
label_user_login_tips: 您还没有登录,请登录后留言
|
||||||
label_user_login_course_board: 您还没有登录,请登录后参与课程讨论
|
label_user_login_course_board: 您还没有登录,请登录后参与课程讨论
|
||||||
label_user_login_project_board: 您还没有登录,请登录后参与项目讨论
|
label_user_login_project_board: 您还没有登录,请登录后参与项目讨论
|
||||||
|
label_user_login_attending_contest: 您还没有登录,请登录后参赛
|
||||||
#end
|
#end
|
||||||
#by huang # modified by bai
|
#by huang # modified by bai
|
||||||
label_college: 高校进入
|
label_college: 高校进入
|
||||||
|
|
25
db/schema.rb
25
db/schema.rb
|
@ -23,6 +23,11 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
|
||||||
add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
|
add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
|
||||||
add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
|
add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
|
||||||
|
|
||||||
|
create_table "andoidcontests", :force => true do |t|
|
||||||
|
t.datetime "created_at", :null => false
|
||||||
|
t.datetime "updated_at", :null => false
|
||||||
|
end
|
||||||
|
|
||||||
create_table "apply_project_masters", :force => true do |t|
|
create_table "apply_project_masters", :force => true do |t|
|
||||||
t.integer "user_id"
|
t.integer "user_id"
|
||||||
t.string "apply_type"
|
t.string "apply_type"
|
||||||
|
@ -864,13 +869,6 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
|
||||||
add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
|
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"
|
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"
|
|
||||||
t.datetime "created_at", :null => false
|
|
||||||
t.datetime "updated_at", :null => false
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "user_preferences", :force => true do |t|
|
create_table "user_preferences", :force => true do |t|
|
||||||
t.integer "user_id", :default => 0, :null => false
|
t.integer "user_id", :default => 0, :null => false
|
||||||
t.text "others"
|
t.text "others"
|
||||||
|
@ -880,6 +878,19 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
|
||||||
|
|
||||||
add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
|
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"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "user_statuses", :force => true do |t|
|
create_table "user_statuses", :force => true do |t|
|
||||||
t.integer "changesets_count"
|
t.integer "changesets_count"
|
||||||
t.integer "watchers_count"
|
t.integer "watchers_count"
|
||||||
|
|
Loading…
Reference in New Issue