From b4dfffce1ed2bb532613eb2756232c14dd3db871 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 25 Aug 2017 19:12:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93tip=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=20=E5=AE=9E=E8=AE=AD=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E9=87=8C=E9=9D=A2=E5=AF=B9=E5=BA=94=E7=9A=84=E5=AE=9E?= =?UTF-8?q?=E8=AE=AD=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/shixun_show.html.erb | 6 ++++-- app/views/subjects/show.html.erb | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/views/repositories/shixun_show.html.erb b/app/views/repositories/shixun_show.html.erb index f5a2e19b3..27ccaa746 100644 --- a/app/views/repositories/shixun_show.html.erb +++ b/app/views/repositories/shixun_show.html.erb @@ -1,9 +1,11 @@
-
+

- 提交代码时，账号请用绑定的邮箱
密码请用平台登录密码 + 使用Git提交代码时，请在Git客户端填写如下信息：
+ * 用户名：请使用您绑定的邮箱
+ * 口令：请使用您的登录口令

diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index 92d0e97dd..b0edfe2c9 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -40,13 +40,17 @@ <% if @subject.status < 2 %> <%= shixun.shixun_status %> <% else %> - <% case my_shixun_status(shixun, User.current) %> - <% when '已通关' %> - 已通关   - <% when '未通关' %> - 未通关   - <% when '未开启' %> - 未开启   + <% if shixun.status > 1 %> + <% case my_shixun_status(shixun, User.current) %> + <% when '已通关' %> + 已通关   + <% when '未通关' %> + 未通关   + <% when '未开启' %> + 未开启   + <% end %> + <% else %> + 等待审核   <% end %> <% end %> <% if shixun.status > 1 %> @@ -160,10 +164,12 @@ $(".paragraph").hover(function(){ if($(this).find(".status_li a").length>0){ $(this).find(".status_li a").show(); + $(this).find(".status_li i").hide(); $(this).find(".status_li span").hide(); } },function(){ $(this).find(".status_li a").hide(); + $(this).find(".status_li i").show(); $(this).find(".status_li span").show(); }) From 833a40a68af1c9191f5006c745beb1e3c9f6e702 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 25 Aug 2017 20:25:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E9=87=8C=E5=BC=80=E5=A7=8B=E5=AE=9E=E6=88=98=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/subjects/new.html.erb | 2 +- app/views/subjects/show.html.erb | 224 ++++++++++++++++--------------- 2 files changed, 114 insertions(+), 112 deletions(-) diff --git a/app/views/subjects/new.html.erb b/app/views/subjects/new.html.erb index 0e7bd2b09..3d4e9e53d 100644 --- a/app/views/subjects/new.html.erb +++ b/app/views/subjects/new.html.erb @@ -22,7 +22,7 @@
  • - +
    请输入简介 diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index b0edfe2c9..0ec574ed7 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -1,115 +1,117 @@
    - -<% if !@subject.description.blank? || User.current.manager_of_subject?(@subject) %> -
    -

    - <% if User.current.manager_of_subject?(@subject) %> - - <% end %> -

    -
    - <%= @subject.description.blank? ? "暂未填写" : "简介:"+@subject.description %> -
    -
    -<% end %> - -
    - <% count = 0 %> - <% @stages.each_with_index do |stage, s_index| %> -
    -

    - - 第<%= s_index + 1 %>章  <%= stage.name %> - <% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %> - - - <% else %> - + + <% if !@subject.description.blank? || User.current.manager_of_subject?(@subject) %> +

    +

    + <% if User.current.manager_of_subject?(@subject) %> + <% end %>

    -
    -

    <%= stage.description %>

    - <% stage.stage_shixuns.each_with_index do |stage_shixun, index| %> - <% shixun = stage_shixun.shixun %> -
    -
  • - - <%= s_index + 1 %>-<%= index + 1 %>  <%= shixun.name %> -
    • -
  • - <% if @subject.status < 2 %> - <%= shixun.shixun_status %> - <% else %> - <% if shixun.status > 1 %> - <% case my_shixun_status(shixun, User.current) %> - <% when '已通关' %> - 已通关   - <% when '未通关' %> - 未通关   - <% when '未开启' %> - 未开启   - <% end %> - <% else %> - 等待审核   - <% end %> - <% end %> - <% if shixun.status > 1 %> - <% myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => shixun.id).first %> - <% if myshixun.blank? %> - <%= link_to "开始实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange ", :style=>"display: none", :id => "shixun_operation", :remote => true %> - <% else %> - <%= link_to "继续实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange", :style=>"display: none", :id => "shixun_operation", :remote => true %> - <% end %> - <% end %> -
    • -
    - <% end %> +
    + <%= @subject.description.blank? ? "暂未填写" : "简介:"+@subject.description %>
    <% end %> -
    - -<% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %> -
    - <% if @stages.count == 0 %> - <%= form_for('', :url => {:controller => 'stages', :action => 'create', :subject => @subject.id}, :method => "post", :html => {:id => 'new_stage_form'}) do |f| %> -
    -
    -
  • 阶段1
    • -
  • - 删除 - 保存 -
    • -
    -
    -
  • - - -

    -
    • -
  • - - -
    • -
  • - <%= link_to '+选择实训', choose_subject_shixun_subject_path(@subject), :remote => true, :class => 'add-sx' %> -

    - 至少选择一个实训 - 选择实训后，在页面上通过拖拽进行排序调整 -

    -
    • -
    -
    - -
    + +
    + <% count = 0 %> + <% @stages.each_with_index do |stage, s_index| %> +
    +

    + + 第<%= s_index + 1 %>章  <%= stage.name %> + <% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %> + + + <% else %> + + <% end %> +

    +
    +

    <%= stage.description %>

    + <% stage.stage_shixuns.each_with_index do |stage_shixun, index| %> + <% shixun = stage_shixun.shixun %> +
    1 ? "" : "onclick='shixun_link('#{shixun.identifier}')'" %>> +
  • + + <%= s_index + 1 %>-<%= index + 1 %>  <%= shixun.name %> +
    • +
  • + <% if @subject.status < 2 %> + <%= shixun.shixun_status %> + <% else %> + <% if shixun.status > 1 %> + <% case my_shixun_status(shixun, User.current) %> + <% when '已通关' %> + 已通关   + <% when '未通关' %> + 未通关   + <% when '未开启' %> + 未开启   + <% end %> + <% else %> + 等待审核   + <% end %> + <% end %> + <% if allow_shixun_exec(shixun) %> + <% if shixun.status > 1 %> + <% myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => shixun.id).first %> + <% if myshixun.blank? %> + <%= link_to "开始实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange ", :style=>"display: none", :id => "shixun_operation", :remote => true %> + <% else %> + <%= link_to "继续实战", operation_shixun_path(shixun, :myshixun_id => myshixun.try(:id)), :class => "task-btn task-btn-orange", :style=>"display: none", :id => "shixun_operation", :remote => true %> + <% end %> + <% end %> + <% end %> +
    • +
    + <% end %>
    - <% end %> - <% end %> -
    -
    - +点击新建阶段（选择1至多个实训项目，组成一个阶段） -
    -<% end %> +
    + <% end %> +
    + + <% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %> +
    + <% if @stages.count == 0 %> + <%= form_for('', :url => {:controller => 'stages', :action => 'create', :subject => @subject.id}, :method => "post", :html => {:id => 'new_stage_form'}) do |f| %> +
    +
    +
  • 阶段1
    • +
  • + 删除 + 保存 +
    • +
    +
    +
  • + + +

    +
    • +
  • + + +
    • +
  • + <%= link_to '+选择实训', choose_subject_shixun_subject_path(@subject), :remote => true, :class => 'add-sx' %> +

    + 至少选择一个实训 + 选择实训后，在页面上通过拖拽进行排序调整 +

    +
    • +
    +
    + +
    +
    + <% end %> + <% end %> +
    +
    + +点击新建阶段（选择1至多个实训项目，组成一个阶段） +
    + <% end %>
    @@ -123,7 +125,7 @@

    教学名师 <% if User.current == @subject.user %> - + <% end %>

    @@ -176,7 +178,7 @@ $("#user_produce_text").blur(function(){ if($(this).val() != $(this).siblings(".produce").html()){ $.post( - '/users/' + $("#current_user_id").val() + '/edit_brief_introduction', + '/users/' + $("#current_user_id").val() + '/edit_brief_introduction', { brief_introduction: $(this).val() }, function (data) { } @@ -285,8 +287,8 @@ } } - //缩放章节实训 - function for_paragraph(item){ - $(item).parent("p").siblings(".detail_for_paragraph").slideToggle(500); - } + //缩放章节实训 + function for_paragraph(item){ + $(item).parent("p").siblings(".detail_for_paragraph").slideToggle(500); + } \ No newline at end of file From c234125ee53148b882d18c5f627deed175db7ee6 Mon Sep 17 00:00:00 2001 From: miss <994230062@qq.com> Date: Fri, 25 Aug 2017 20:45:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=BB=E9=A1=B5tip=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82=E7=89=88=E6=9C=AC=E5=BA=93=E5=8F=8A?= =?UTF-8?q?=E8=AF=84=E6=B5=8B=E5=8C=BA=E5=9F=9F=E5=9B=BE=E6=A0=87=E5=8F=98?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_results.html.erb | 2 +- app/views/games/_repository.html.erb | 2 +- app/views/users/show.html.erb | 20 ++++++++++---------- public/javascripts/edu/edu_tpi.js | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 9fdf304f3..f5ff2f089 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -13,7 +13,7 @@
  • 评测信息
    • - +
    diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb index 577c94fc6..836429f10 100644 --- a/app/views/games/_repository.html.erb +++ b/app/views/games/_repository.html.erb @@ -14,7 +14,7 @@ <% if @path == @game.challenge.path.try(:strip) %> <% end %> - +
    diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 793c37db9..f7d89f19a 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -42,54 +42,54 @@
      <% if @user.authentication %> - <% else %> <% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id, :auth_type => 1).last %> <% if apply_auth && apply_auth.status == 0 %> - <% else %> - <% end %> <% end %> <% if @user.professional_certification %> - <% else %> <% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id, :auth_type => 2).last %> <% if apply_auth && apply_auth.status == 0 %> - <% else %> - <% end %> <% end %> <% if @user.try(:phone).blank? %> - <% else %> - <% end %> <% if @user.try(:mail).blank? %> - <% else %> - <% end %> diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index 09625847d..8310d9244 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -222,14 +222,14 @@ function repository_extend_and_zoom(){ nGameRes.addClass("-flex-basic100"); nGameEva.addClass("-flex-basic0"); nRIcon.addClass("fa-compress"); - nRIcon.removeClass("fa-arrows-alt"); + nRIcon.removeClass("fa-expand"); nMove.hide(); control = 1; }else if(control == 1){ nGameRes.removeClass("-flex-basic100"); nGameEva.removeClass("-flex-basic0"); nRIcon.removeClass("fa-compress"); - nRIcon.addClass("fa-arrows-alt"); + nRIcon.addClass("fa-expand"); nMove.show(); control = 0; } @@ -248,14 +248,14 @@ function valuation_extend_and_zoom(){ if(control_1 == 0){ nGameRes.addClass("-flex-basic0"); nGameEva.addClass("-flex-basic100"); - nVIcon.removeClass("fa-expand"); + nVIcon.removeClass("fa-arrows-alt"); nVIcon.addClass("fa-compress"); nMove.hide(); control_1 = 1; }else if(control_1 == 1){ nGameRes.removeClass("-flex-basic0"); nGameEva.removeClass("-flex-basic100"); - nVIcon.addClass("fa-expand"); + nVIcon.addClass("fa-arrows-alt"); nVIcon.removeClass("fa-compress"); nMove.show(); control_1 = 0;