From a78cbf2c7af3b923ccaaabbefb9b658cb0fe091e Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 1 Aug 2017 09:31:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=A5=97=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E=E9=98=B6=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/subjects/show.html.erb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index ca4d5a562..4c0a9cfab 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -166,15 +166,13 @@ if($("#new_stage_form").length == 1){ notice_box("请先保存正在编辑的内容"); } else{ - var counttage=$(".lesson-saved-list-stage").length; - var count=$(".lesson-edit-content .stage-item").length; - count++; - count=count+counttage; + var counttage=$(".lesson-saved-list-item").length; + counttage++; var edithtml=""; edithtml+='<%= form_for('', :url => {:controller => 'stages', :action => 'create', :subject => @subject.id}, :method => 'post', :html => {:id => 'new_stage_form'}) do |f| %>'; edithtml+="
"; edithtml+="
"; - edithtml+="
  • 阶段"+count+"
    • "; + edithtml+="
  • 阶段"+counttage+"
    • "; edithtml+="
  • "; edithtml+="删除"; edithtml+="保存"; From 239f375e2400c3090f76d363386e4ea9ab23a566 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 1 Aug 2017 09:34:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= 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 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/subjects/new.html.erb b/app/views/subjects/new.html.erb index bfd4eb1a0..495504139 100644 --- a/app/views/subjects/new.html.erb +++ b/app/views/subjects/new.html.erb @@ -5,7 +5,7 @@ > 新建

    - 新建实训套件 + 新建实训套件
    <%= labelled_form_for @subject do |f| %> diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index 7b66e742c..0c1978a70 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -7,7 +7,7 @@ <% end %>

    -
    +
    <%= @subject.description.blank? ? "暂未填写" : @subject.description %>
    @@ -55,14 +55,14 @@ <% end %>

    -

    <%= stage.description %>

    +

    <%= stage.description %>

    <% stage.stage_shixuns.each_with_index do |stage_shixun, index| %> <% shixun = stage_shixun.shixun %>
  • <%= index + 1 %> - <%= shixun.name %> + <%= shixun.name %>
  • From 63af6d4d23104682cda78a473e6f527556b9a4c3 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 1 Aug 2017 09:35:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/authentication.html.erb | 9 +++++++-- public/stylesheets/css/edu-user.css | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/views/account/authentication.html.erb b/app/views/account/authentication.html.erb index 8428d1ae8..3b37a9126 100644 --- a/app/views/account/authentication.html.erb +++ b/app/views/account/authentication.html.erb @@ -1,3 +1,4 @@ +<%# if false %>
    <% if !@user.authentication && (@apply_user_auth.nil? || @apply_user_auth && (@apply_user_auth.status == 2 || @apply_user_auth.status == 1)) %> <% unless @apply_user_auth && @apply_user_auth.status == 1 %> @@ -118,6 +119,8 @@ <%= render :partial => 'has_authentication' %> <% end %>
    + +<%# end%> <%if false%> @@ -133,7 +136,7 @@
    • -
    +

    实名认证

    @@ -196,6 +199,8 @@

    - +
    + +
    <% end%> \ No newline at end of file diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css index baffee28e..13acf365e 100644 --- a/public/stylesheets/css/edu-user.css +++ b/public/stylesheets/css/edu-user.css @@ -151,7 +151,7 @@ a.btn-focus:hover{color: #FFFFFF!important;background:#FC7033;border: 1px solid .-task-desc div{position: absolute;top: 10px;right: -7px;} /* 个人资料 20170324byLB */ -.panel-user-left{ width:20%; min-width:240px; background:#eaebec; height:800px;} +.panel-user-left{ width:20%; min-width:240px; background:#eaebec; min-height:672px;} .panel-user-right{width:80%; background:#fff;} .panel-user-info{ width:100%; height:240px; } .panel-user-img img{ display: block; width:240px; height:240px;} @@ -229,4 +229,6 @@ input.new_loggin_input_test{ -webkit-box-shadow: 0 0 0px 1000px white inset; ou .panel-cer-content{margin: 15px 40px;} .rz-label{width: 20%;min-width: 90px;text-align: right;line-height: 40px} .shilie{position: absolute;top: 0px;left: 0px;width:120px;} +.example{position: absolute;top:0px;left: 0px;width: 100%;background: rgba(0,0,0,0.6);height: 100%;} +.example-img{}