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/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..8557b6c40 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 %>
  • @@ -167,15 +167,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+="保存"; 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{}