diff --git a/app/views/my/clear_user_avatar_temp.js.erb b/app/views/my/clear_user_avatar_temp.js.erb index 1d1ef48f0..3278adcb5 100644 --- a/app/views/my/clear_user_avatar_temp.js.erb +++ b/app/views/my/clear_user_avatar_temp.js.erb @@ -2,7 +2,7 @@ $('#ajax-modal').html($("#nh_tx_dialog_html").html()); showModal('ajax-modal','460px'); $('#ajax-modal').siblings().hide(); - $('#ajax-modal').parent().removeClass("alert_praise"); - //$('#ajax-modal').parent().css("top","").css("left",""); + $('#ajax-modal').parent().removeClass("alert_praise").removeClass("copyCoursePopup"); + $('#ajax-modal').parent().css("top","30%").css("left","40%"); $('#ajax-modal').parent().addClass("alert_box"); $('#ajax-modal').parent().css("border", "3px solid #269ac9").css("border-radius", "0").css(" -webkit-border-radius", "0").css(" -moz-border-radius", "0"); \ No newline at end of file diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 9457ae3ed..b3f9970c6 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -177,8 +177,9 @@ <%# end %>
- - <% if homework.homework_detail_manual.comment_status.to_i == 0 %> + <% allow_edit = homework.student_works.has_committed.count == 0 && homework.student_work_projects.count ==0 %> + + <% if allow_edit %> <%= calendar_for('homework_publish_time')%> <% end %>