From d3aed91b4163f9b9e15c49b5a2d4b9316bf8f481 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 20 Jul 2019 14:47:51 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=AB=9E=E8=B5=9B-=E5=BC=80=E6=BA=90?= =?UTF-8?q?=E5=88=9B=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitions/_qg_second_opensource.html.erb | 17 +++++++++++++++++ public/stylesheets/educoder/edu-all.css | 17 ++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/views/competitions/_qg_second_opensource.html.erb b/app/views/competitions/_qg_second_opensource.html.erb index b7e878e9..3b88b612 100644 --- a/app/views/competitions/_qg_second_opensource.html.erb +++ b/app/views/competitions/_qg_second_opensource.html.erb @@ -4,6 +4,23 @@
<% index += 1 %> + +
+
+

+ 为推动我国基于开源的开放创新生态环境建设，加快面向自主创新的高校信息技术新工科人才培养模式变革，大力培养实践能力强、创新能力强、具备国际竞争力的信息技术领域高素质人才，教育部高等学校计算机类专业教学指导委员会、教育部高等学校软件工程专业教学指导委员会、全国高等学校计算机教育研究会。 + + 创新能力强、具备国际竞争力的信息技术领域高素质人才，教育部高等学校计算机类专业教学指导委员会、教育部高等学校软件工程专业教学指导委员会、全国高等学校计算机教育研究会、信息技术新工科产学研联盟、中国计算机学会软件工程专委会、中国计算机学会系统软件专委会、绿色计算产业联盟等共同研究，决定举办第二届全国高校绿色计算创新大赛。 +

+
+
+ +
+
+ +
+
+ <% @competition.competition_stages.each_with_index do |stage, i| %>
<% diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 0c3c23ce..e013221c 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -663,13 +663,16 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important; .second_code_7{min-height: 1116px;} .second_code_8{min-height: 711px;} /*开源创新竞赛*/ -.openSource_1{min-height: 803px;} -.openSource_2{min-height: 427px;} -.openSource_3{min-height: 524px;padding-top: 190px;box-sizing: border-box;position: relative} -.openSource_4{min-height: 526px;padding-top: 190px;box-sizing: border-box;position: relative} -.openSource_5{min-height: 1061px;} -.openSource_6{min-height: 1090px;} -.openSource_7{min-height: 683px;} +.openSource_1{min-height: 659px;} +.openSource_2{min-height: 436px;} +.openSource_3{min-height: 539px;padding-top: 190px;box-sizing: border-box;position: relative} +.openSource_4{min-height: 282px;box-sizing: border-box;position: relative} +.openSource_5{min-height: 367px;} +.openSource_6{min-height: 689px;} +.openSource_7{min-height: 574px;} +.openSource_8{min-height: 632px;} + +.desc_game{color: #0B8298;font-weight: 400;text-align: justify;font-size: 18px;white-space: pre-wrap;line-height:30px;} .challenge_title{ color: #41ABEF;font-size: 30px;font-weight: bold;text-align: center;letter-spacing: 1px;line-height: 60px;margin-bottom: 20px; From 68d8f10482610c68fcdf6973594e06748e135425 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 20 Jul 2019 16:01:07 +0800 Subject: [PATCH 2/8] competition modify --- app/controllers/managements_controller.rb | 6 ++ app/models/competition_text_config.rb | 2 +- .../_qg_second_opensource.html.erb | 99 ++++++++++--------- .../_competition_list_page.html.erb | 25 ++++- config/routes.rb | 2 + ...0074324_change_competition_text_configs.rb | 8 ++ 6 files changed, 90 insertions(+), 52 deletions(-) create mode 100644 db/migrate/20190720074324_change_competition_text_configs.rb diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 156ae951..6a377933 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1133,6 +1133,12 @@ end render :json => {:status => 1} end + def update_competition_text + text = CompetitionTextConfig.find(params[:id]) + text.update_attributes(name: params[:name], description: params[:description]) + render :json => {:status => 1} + end + def delete_competition_text ctc = CompetitionTextConfig.find params[:id] ctc.destroy diff --git a/app/models/competition_text_config.rb b/app/models/competition_text_config.rb index 25ddb28e..436818bf 100644 --- a/app/models/competition_text_config.rb +++ b/app/models/competition_text_config.rb @@ -1,4 +1,4 @@ class CompetitionTextConfig < ActiveRecord::Base - # attr_accessible :title, :body + attr_accessible :name, :description, :competition_id belongs_to :competition end diff --git a/app/views/competitions/_qg_second_opensource.html.erb b/app/views/competitions/_qg_second_opensource.html.erb index 3b88b612..ddaad572 100644 --- a/app/views/competitions/_qg_second_opensource.html.erb +++ b/app/views/competitions/_qg_second_opensource.html.erb @@ -4,71 +4,59 @@
<% index += 1 %> - -
-
-

- 为推动我国基于开源的开放创新生态环境建设，加快面向自主创新的高校信息技术新工科人才培养模式变革，大力培养实践能力强、创新能力强、具备国际竞争力的信息技术领域高素质人才，教育部高等学校计算机类专业教学指导委员会、教育部高等学校软件工程专业教学指导委员会、全国高等学校计算机教育研究会。 - - 创新能力强、具备国际竞争力的信息技术领域高素质人才，教育部高等学校计算机类专业教学指导委员会、教育部高等学校软件工程专业教学指导委员会、全国高等学校计算机教育研究会、信息技术新工科产学研联盟、中国计算机学会软件工程专委会、中国计算机学会系统软件专委会、绿色计算产业联盟等共同研究，决定举办第二届全国高校绿色计算创新大赛。 -

-
-
- -
-
- +
+
+

+ <%= @competition.competition_text_configs.first.try(:description) %> +

+<% index += 1 %> -<% @competition.competition_stages.each_with_index do |stage, i| %> -
- <% - first_section = stage.competition_stage_sections[0] - second_section = stage.competition_stage_sections[1] - %> -
-
    -

    - - <%= first_section.try(:name) %> - <%= first_section.start_time.try(:strftime, '%Y年%m月%d日') %>~<%= first_section.end_time.try(:strftime, '%Y年%m月%d日') %> - - - <%= second_section.try(:name) %> - <%= second_section.try(:start_time).try(:strftime, '%Y年%m月%d日') %>~<%= second_section.try(:end_time).try(:strftime, '%Y年%m月%d日') %> - -

    -
  • - <% is_start = Time.now > first_section.start_time %> - <% first_section.competition_entries.each_with_index do |entry, j| %> - <% - competition_url = User.current.logged? ? "#{entry.url}?eid=#{User.current.id}" : "#{entry.url}" - btn_url = is_start ? "#{competition_url}" : "javascript:void(0);" - %> - <%= entry.name %> - <% end %> -
    • -
+<% + first_stage = @competition.competition_stages.first + first_section = first_stage.competition_stage_sections.first + first_entry = first_section.competition_entries.first + is_start = Time.now > first_section.start_time + competition_url = User.current.logged? ? "#{first_entry.url}?eid=#{User.current.id}" : "#{first_entry.url}" + btn_url = is_start ? "#{competition_url}" : "javascript:void(0);" +%> +
+
+
<% index += 1 %> -<% end %>
<% index += 1 %>
<% index += 1 %>
+<% index += 1 %> +