From 274bfd795ff1f597f41e20213347256ea7adfb58 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 12 Jul 2019 09:52:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E7=BB=84=E7=AB=9E=E8=B5=9B=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitions/_qg_second_course_competition.html.erb | 9 +++++++-- public/stylesheets/educoder/edu-all.css | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/views/competitions/_qg_second_course_competition.html.erb b/app/views/competitions/_qg_second_course_competition.html.erb index 55862a23..fd224c46 100644 --- a/app/views/competitions/_qg_second_course_competition.html.erb +++ b/app/views/competitions/_qg_second_course_competition.html.erb @@ -21,8 +21,13 @@ <%= first_section.competition_entries[1].name %> - - +
  • + <%= first_section.competition_entries[2].name %> + + <%= first_section.competition_entries[2].name %> +
    • <% index += 1 %> diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index fa322449..9536c36f 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -722,11 +722,11 @@ li.challenge_box:last-child{ .second_course_2{min-height: 823px;} .second_course_3{min-height: 690px;} .second_course_4{min-height: 514px;} -.second_course_5{min-height: 627px;padding-top: 190px;box-sizing: border-box;position: relative} +.second_course_5{min-height: 657px;padding-top: 190px;box-sizing: border-box;position: relative} .second_course_6{min-height: 1225px;} .course_competition_panel{ margin:30px 40px 40px;border:1px solid #ABDCF1;background: #F1F8FD;justify-content: center;align-items: center;display: -webkit-flex; - height: 282px;text-align: center; + height: 220px;text-align: center; } .course_competition_panel a{ width: 320px;height: 60px;line-height: 60px;float: left;margin:0px 100px;background: #ccc;color: #fff!important; @@ -737,7 +737,7 @@ li.challenge_box:last-child{ } .ex_submit{ width: 360px;height: 70px;background: #2CDAD4;color: #fff!important;font-size: 30px;line-height: 70px;text-align: center; - margin:0px auto;display: block; + margin:0px auto;display: block;float: left;margin:0px 35px; } table.tBodyScroll tbody tr td{ padding:6px 5px;box-sizing: border-box;font-size: 16px;color: #05101A;font-weight: normal; From 6fa0ae62a45b90304cf7c8ee12e91a9ececf5f1a Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 12 Jul 2019 10:17:39 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_qg_second_course_competition.html.erb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/views/competitions/_qg_second_course_competition.html.erb b/app/views/competitions/_qg_second_course_competition.html.erb index fd224c46..5c9f295e 100644 --- a/app/views/competitions/_qg_second_course_competition.html.erb +++ b/app/views/competitions/_qg_second_course_competition.html.erb @@ -23,13 +23,22 @@
  • <%= first_section.competition_entries[2].name %> + class="ex_submit">报名参赛 - <%= first_section.competition_entries[2].name %> + 查看报名详情
    • <% index += 1 %>

    + + From 1a39655ccc9961d1a186d1f5969d273631c43b85 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 12 Jul 2019 10:32:31 +0800 Subject: [PATCH 3/8] competition course add btn --- .../_qg_second_course_competition.html.erb | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/app/views/competitions/_qg_second_course_competition.html.erb b/app/views/competitions/_qg_second_course_competition.html.erb index 5c9f295e..4997ec40 100644 --- a/app/views/competitions/_qg_second_course_competition.html.erb +++ b/app/views/competitions/_qg_second_course_competition.html.erb @@ -23,9 +23,9 @@
  • 报名参赛 + class="ex_submit"><%= first_section.competition_entries[2].name %> - 查看报名详情 + <%= first_section.competition_entries[3].name %>
    • @@ -34,11 +34,31 @@

    From 1c6eaa9de13d17d4777080c39446ae77113a1752 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 12 Jul 2019 10:36:16 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=88=87=E5=9B=BE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-all.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 9536c36f..a0457410 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -723,7 +723,7 @@ li.challenge_box:last-child{ .second_course_3{min-height: 690px;} .second_course_4{min-height: 514px;} .second_course_5{min-height: 657px;padding-top: 190px;box-sizing: border-box;position: relative} -.second_course_6{min-height: 1225px;} +.second_course_6{min-height: 1199px;} .course_competition_panel{ margin:30px 40px 40px;border:1px solid #ABDCF1;background: #F1F8FD;justify-content: center;align-items: center;display: -webkit-flex; height: 220px;text-align: center; From da1d9b750d5b8333d374d737bbf7983d356453be Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 12 Jul 2019 15:11:19 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/competitions/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/competitions/index.html.erb b/app/views/competitions/index.html.erb index fcfb7ddb..c8743251 100644 --- a/app/views/competitions/index.html.erb +++ b/app/views/competitions/index.html.erb @@ -75,7 +75,7 @@ <%= image_tag(url_to_avatar(competition), :width => "100%", :height => "100%") %> -
    +
    <%= [competition.name, competition.sub_title.presence].compact.join('——') %>
    From 35e8c6cc1a1083ae47a69a9d3ba4368d5351442d Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 12 Jul 2019 16:17:24 +0800 Subject: [PATCH 6/8] =?UTF-8?q?trustie=20=E6=94=B9=E6=88=90educoder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/500.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/500.html b/public/500.html index b0dc43d7..674febcf 100644 --- a/public/500.html +++ b/public/500.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - Trustie 500 error + EduCoder 500 error From 11b33541f64027d82fa5865fc78316d7f0fd6be7 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 12 Jul 2019 17:51:19 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E7=AB=9E=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/libraries/_form.html.erb | 252 ++++++++++++------------ public/stylesheets/educoder/edu-all.css | 4 +- 2 files changed, 131 insertions(+), 125 deletions(-) diff --git a/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb index 0bb1c30a..bdbc0118 100644 --- a/app/views/libraries/_form.html.erb +++ b/app/views/libraries/_form.html.erb @@ -1,146 +1,152 @@

    上传教学案例

    <%= form_for(@library) do |f| %> - <% tag_ids = @library.library_tags.map(&:id) %> - <%= hidden_field_tag :apply_publish, false %> - <%= hidden_field_tag :tag_ids, tag_ids.join(',') %> -
    -
    -
    - 标题 -
  • - <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-300-35 mr20 fl' %> -

    请输入标题

    -
    • - 简明扼要介绍文档/视频所包含的主要的内容 -
    -
    -
    -
    - 描述 -
    -
    - <%= f.text_area :content %> + <% tag_ids = @library.library_tags.map(&:id) %> + <%= hidden_field_tag :apply_publish, false %> + <%= hidden_field_tag :tag_ids, tag_ids.join(',') %> +
    +
    +
    + 标题 +
  • + <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-300-35 mr20 fl' %> +

    请输入标题

    +
    • + 简明扼要介绍文档/视频所包含的主要的内容 +
    +
    + 作者 +
  • + <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-300-35 mr20 fl' %> +

    请输入标题

    +
    • +
    +
    + 标签 +
      + <% LibraryTag.where(nil).each do |tag| %> +
    • <%= tag.name %>
      • + <% end %> +
    +
    +
    + 描述 +
    +
    + <%= f.text_area :content %> +
    +

    请输入描述内容

    -

    请输入描述内容

    +
    + +
    + <%= render partial: 'attachments/from_libraries', locals: { container: @library } %> +

    请上传附件

    -
    - 标签 -
      - <% LibraryTag.where(nil).each do |tag| %> -
    • <%= tag.name %>
      • - <% end %> +
      +
    • 审核说明
      • +
        +
      • 平台管理员将对每天新上传的文档进行审核，审核通过的文档将公开显示，否则将私有化或移除
      -
      - <%= render partial: 'attachments/from_libraries', locals: { container: @library } %> -

      请上传附件

      +
      +
    • 温馨提示
      • +
        +
      • 1.请勿上传已设置加密口令的文档资源；
        • +
      • 2.可以上传符合教学案例标准的文档资料，如案例入库标准、案例使用说明书以及其他资料等，上传支持的文件最大容量：100MB；
        • +
      • 3.请确保上传内容无侵权或违反国家关于互联网政策的不良行为；
        • +
      • 4.请使用Chrome，Firefox，Safari，IE11（及以上版本）浏览器；
        • +
      -
      -
    • 审核说明
      • -
        -
      • 平台管理员将对每天新上传的文档进行审核，审核通过的文档将公开显示，否则将私有化或移除
        • -
      -
      -
      -
    • 温馨提示
      • -
        -
      • 1.请勿上传已设置加密口令的文档资源；
        • -
      • 2.可以上传符合教学案例标准的文档资料，如案例入库标准、案例使用说明书以及其他资料等，上传支持的文件最大容量：100MB；
        • -
      • 3.请确保上传内容无侵权或违反国家关于互联网政策的不良行为；
        • -
      • 4.请使用Chrome，Firefox，Safari，IE11（及以上版本）浏览器；
        • -
      -
      -
    -
    - <% unless @library.published? %> - <%= link_to '申请发布', 'javascript:void(0)', class: 'white-btn edu-blueback-btn changebtn mr20 fl apply-publish-btn' %> - <% end %> - <%= link_to '保存', 'javascript:void(0)', class: 'white-btn edu-blueline-btn changebtn mr20 fl submit-btn' %> -
    +
    + <% unless @library.published? %> + <%= link_to '申请发布', 'javascript:void(0)', class: 'white-btn edu-blueback-btn changebtn mr20 fl apply-publish-btn' %> + <% end %> + <%= link_to '保存', 'javascript:void(0)', class: 'white-btn edu-blueline-btn changebtn mr20 fl submit-btn' %> +
    <% end %>
    \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index a0457410..0de1a091 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -649,7 +649,7 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important; .second_4{min-height: 610px;padding-top: 190px;box-sizing: border-box;position: relative} .second_5{min-height: 617px;padding-top: 190px;box-sizing: border-box;position: relative} .second_6{min-height: 1053px;} -.second_7{min-height: 1096px;} +.second_7{min-height: 1078px;} .second_8{min-height: 727px;} /*代码标注*/ @@ -736,7 +736,7 @@ li.challenge_box:last-child{ background: #47B6FC; } .ex_submit{ - width: 360px;height: 70px;background: #2CDAD4;color: #fff!important;font-size: 30px;line-height: 70px;text-align: center; + width: 250px;height: 60px;background: #2CDAD4;color: #fff!important;font-size: 22px;line-height: 60px;text-align: center; margin:0px auto;display: block;float: left;margin:0px 35px; } table.tBodyScroll tbody tr td{ From a8ef5257c9ce5b87786a0d7a4912567abe18cd48 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 12 Jul 2019 17:52:23 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/libraries/_form.html.erb | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb index bdbc0118..e1e6aa0b 100644 --- a/app/views/libraries/_form.html.erb +++ b/app/views/libraries/_form.html.erb @@ -6,7 +6,7 @@ <%= hidden_field_tag :tag_ids, tag_ids.join(',') %>
    -
    +
    标题
  • <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-300-35 mr20 fl' %> @@ -14,21 +14,8 @@
    • 简明扼要介绍文档/视频所包含的主要的内容
    -
    - 作者 -
  • - <%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-300-35 mr20 fl' %> -

    请输入标题

    -
    • -
    -
    - 标签 -
      - <% LibraryTag.where(nil).each do |tag| %> -
    • <%= tag.name %>
      • - <% end %> -
    -
    +
    +
    描述
    @@ -38,7 +25,14 @@

    请输入描述内容

    - +
    + 标签 +
      + <% LibraryTag.where(nil).each do |tag| %> +
    • <%= tag.name %>
      • + <% end %> +
    +
    <%= render partial: 'attachments/from_libraries', locals: { container: @library } %>

    请上传附件