From 0c82824439d092d2bf88f5a78d11eb2409f283a7 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 27 Apr 2019 21:15:29 +0800 Subject: [PATCH] 1 --- app/views/layouts/login.html.erb | 2 +- public/javascripts/educoder/edu_account.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index e8ad5ae9..1672c110 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -8,7 +8,7 @@ <%= csrf_meta_tag %> <%= favicon %> <%= stylesheet_link_tag 'educoder/edu-main','educoder/edu-all' %> - <%= javascript_include_tag 'jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'educoder/edu_application', 'educoder/edu_account' %> + <%= javascript_include_tag 'jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'jquery.colorbox-min','educoder/edu_application', 'educoder/edu_account' %>
diff --git a/public/javascripts/educoder/edu_account.js b/public/javascripts/educoder/edu_account.js index a93916db..e01baef0 100644 --- a/public/javascripts/educoder/edu_account.js +++ b/public/javascripts/educoder/edu_account.js @@ -836,12 +836,12 @@ $(function(){ var image = $("#ren_zheng_image"); var element = $("").attr("href", image.attr('src')+".png"); image.wrap(element); - //image.parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false}); + image.parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false}); var auth_image = $("#upload_id_image"); var auth_element = $("").attr("href", auth_image.attr('src')+".png"); auth_image.wrap(auth_element); - //auth_image.parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false}); + auth_image.parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false}); $("#user_auth_submit_a").one("click", function(){ user_auth_submit(1);