From 41a8f9d6a20a17b0ae9ed475182751cd98c5c676 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 09:28:13 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=8E=BB=E6=8E=89marginB?= =?UTF-8?q?ottom:10px=20=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E5=8A=A0?= =?UTF-8?q?=E5=BA=95=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/login.html.erb | 6 ++++++ public/stylesheets/header.css | 2 +- public/stylesheets/new_user.css | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 3cd1fc25e..81b647b65 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -26,3 +26,9 @@ <%= yield %> +
+<%= render :partial => 'layouts/footer' %> +
+<%= call_hook :view_layouts_base_body_bottom %> + + \ No newline at end of file diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index eda554eaf..b448e03af 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -96,7 +96,7 @@ a.topnav_login_box:hover {color:#a1ebff;} .topnav_login_list li{ } /*底部*/ -#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;} +#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} .footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 22e13709b..4e88ebf3f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -647,7 +647,7 @@ ul.list_watch{ .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px;} /*底部*/ -#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;} +#Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} .footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} From 0a898342d97bc6ddd02067a6cd2aa64fc6ee8311 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 10:01:13 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=94=A8enter=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/login.html.erb | 10 ++++++++-- app/views/layouts/login.html.erb | 14 +++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 816ef4a77..d2c686785 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -47,6 +47,12 @@ $("#loginInBox").css({display:"none"}); } }); + +// $('#regist_btn').bind('keyup', function(event) { +// if (event.keyCode == "13" && $("#signUpBox").css('display') == 'block')) { +// register(); +// } +//}); function clearInfo(id, content) { var text = $('#' + id); if (text.val() == content) { @@ -206,7 +212,7 @@ <% end %>
- 登录 + 登录
@@ -248,7 +254,7 @@ 我已阅读并接受Trustie服务协议条款
- 注册 + 注册
<% end %> diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 81b647b65..e7810d45a 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -15,7 +15,19 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - +< +
<% is_current_user = User.current.logged? && User.current == @user%> <% if User.current.logged? %> From 54c849cccb9c70d0572b7871c6d0bcfe938872df Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 11:02:20 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E9=80=89=E4=BB=BB=E4=BD=95?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=BC=B9=E5=87=BA=E6=A1=86=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 23 +++++++++++++++++-- .../users/add_exist_file_to_course.js.erb | 5 +++- .../users/add_exist_file_to_project.js.erb | 7 ++++-- app/views/users/user_resource.html.erb | 2 +- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a8243c5a5..2b6f2d28f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1066,10 +1066,14 @@ class UsersController < ApplicationController # 将资源发送到对应的课程,分为发送单个，或者批量发送 def add_exist_file_to_course + @flag = true if params[:send_id].present? send_id = params[:send_id] ori = Attachment.find_by_id(send_id) course_ids = params[:course_ids] + if course_ids.nil? + @flag = false + end unless course_ids.nil? course_ids.each do |id| next if ori.blank? @@ -1087,9 +1091,13 @@ class UsersController < ApplicationController end elsif params[:send_ids].present? send_ids = params[:send_ids].split(" ") + course_ids = params[:course_ids] + if course_ids.nil? + @flag = false + end send_ids.each do |send_id| ori = Attachment.find_by_id(send_id) - course_ids = params[:course_ids] + unless course_ids.nil? course_ids.each do |id| next if ori.blank? @@ -1106,6 +1114,8 @@ class UsersController < ApplicationController end end end + else + @flag = false end respond_to do |format| format.js @@ -1114,9 +1124,13 @@ class UsersController < ApplicationController # 添加资源到对应的项目 def add_exist_file_to_project + @flag = true if params[:send_id].present? send_id = params[:send_id] project_ids = params[:projects_ids] + if project_ids.nil? + @flag = false + end ori = Attachment.find_by_id(send_id) unless project_ids.nil? project_ids.each do |project_id| @@ -1134,8 +1148,12 @@ class UsersController < ApplicationController end elsif params[:send_ids].present? send_ids = params[:send_ids].split(" ") + project_ids = params[:projects_ids] + if project_ids.nil? + @flag = false + end send_ids.each do |send_id| - project_ids = params[:projects_ids] + ori = Attachment.find_by_id(send_id) unless project_ids.nil? project_ids.each do |project_id| @@ -1153,6 +1171,7 @@ class UsersController < ApplicationController end end else + @flag=true end respond_to do |format| diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb index c5b9f8fbe..93c572fa0 100644 --- a/app/views/users/add_exist_file_to_course.js.erb +++ b/app/views/users/add_exist_file_to_course.js.erb @@ -1,2 +1,5 @@ +<% if @flag == true%> alert('发送成功') -closeModal(); \ No newline at end of file +closeModal(); +<% else%> +<% end %> \ No newline at end of file diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb index 6ed846821..93c572fa0 100644 --- a/app/views/users/add_exist_file_to_project.js.erb +++ b/app/views/users/add_exist_file_to_project.js.erb @@ -1,2 +1,5 @@ -alert('发送成功'); -closeModal(); \ No newline at end of file +<% if @flag == true%> +alert('发送成功') +closeModal(); +<% else%> +<% end %> \ No newline at end of file diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index c36fdc293..1a45b7870 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -161,7 +161,7 @@ $(".resourcesList").mousedown(function(e) { line = line.parent(); } //将当前的元素的所有子元素的背景色改为蓝色 - line.children().css("background-color", '#00ffff'); + line.children().css("background-color", '#e1e1e1'); //将当前元素赋给 上一个对象 保存起来。 last_line = line; } From cff93331b28a216eec35e8f351929feb4672e98d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 11:06:04 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E6=A0=87=E7=82=B9=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/login.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index d2c686785..8bdace544 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -167,7 +167,7 @@
-
欢迎加入Trustie高校创新实践社区，老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。
+
欢迎加入Trustie高校创新实践社区！老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。
From d99c1dd72a3850424aa6993a49a92040e5d372ef Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 14:11:56 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E7=9A=84base=E9=94=99=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 1e4b01df0..58044d1d4 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -79,7 +79,7 @@ class AccountController < ApplicationController return end end - render :layout => 'static_base', :template => "account/password_recovery" + render :template => "account/password_recovery" return else if request.post? From a4e30d119d2209af8b49baafc6c2730119bf5607 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 14:27:49 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=A0=E4=B8=8D=E6=8E=89=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 1a45b7870..457390834 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -258,7 +258,7 @@ $(".resourcesList").click(function(e) { //批量删除 function batch_delete(){ var data = $("#resources_list_form").serialize(); - if(data != "" && confirm('您可能会删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) { + if(data != "" && confirm('您删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) { $.post( '<%= user_resource_delete_user_path(@user)%>', $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交 From b7daa643c806d432e73e543ef6f247f8574ad731 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 14:49:51 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E7=A9=BA?= =?UTF-8?q?=E7=99=BD=E5=A4=84=E5=8D=95=E5=87=BB=E4=B9=9F=E8=A6=81=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E5=BC=B9=E5=87=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 457390834..2b88fed1c 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -166,9 +166,10 @@ $(".resourcesList").mousedown(function(e) { last_line = line; } }); -$(".resourcesList").click(function(e) { +$(document.body).click(function(e) { //在列表上的任何单击事件都要恢复原来的样子 //隐藏右键菜单 + e.preventDefault() $("#contextMenu").hide(); document.oncontextmenu = function() {return true;} //如果当前行为空，那么要将当前行的拿到 From 7916ca2ee34e2181ea8d394591335fc49894f82c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 15:15:06 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 4 +-- app/views/account/password_recovery.html.erb | 33 ++++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 58044d1d4..5c64ad332 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -62,12 +62,12 @@ class AccountController < ApplicationController if params[:token] @token = Token.find_token("recovery", params[:token].to_s) if @token.nil? || @token.expired? - redirect_to home_url + redirect_to signin_path return end @user = @token.user unless @user && @user.active? - redirect_to home_url + redirect_to signin_path return end if request.post? diff --git a/app/views/account/password_recovery.html.erb b/app/views/account/password_recovery.html.erb index 568d4d4bb..5cd438336 100644 --- a/app/views/account/password_recovery.html.erb +++ b/app/views/account/password_recovery.html.erb @@ -1,20 +1,19 @@ -

<%=l(:label_password_lost)%>

- <%= error_messages_for 'user' %> +
+
+

重置密码

+
+ <%= form_tag(lost_password_path) do %> + <%= hidden_field_tag 'token', @token.value %> + + <%= password_field_tag 'new_password', nil, :size => 25,:placeholder=>'新密码',:style=>"width:308px; height:38px; border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px; " %> +

至少需要 6 个字符

+ + <%= password_field_tag 'new_password_confirmation', nil, :size => 25,:placeholder=>'确定密码',:style=>"width:308px; height:38px; border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;margin-bottom:20px; " %> + + <% end %> +
-<%= form_tag(lost_password_path) do %> - <%= hidden_field_tag 'token', @token.value %> -
-

- - <%= password_field_tag 'new_password', nil, :size => 25 %> - <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %> -

-

- - <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %> -

-
-

<%= submit_tag l(:button_save) %>

-<% end %> +
+
From 149ac07cf94bd63fe7bf55aa8e11aec5f4b81324 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 27 Aug 2015 16:20:47 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84css=EF=BC=8C=20=E8=A7=A3=E5=86=B3=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E5=9C=A8=E9=A1=B5=E9=9D=A2=E5=85=B6=E4=BB=96=E5=9C=B0=E6=96=B9?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=93=BE=E6=8E=A5=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=83=8C=E6=99=AF=E8=89=B2=E5=8F=98=E7=99=BD?= =?UTF-8?q?=E8=89=B2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_resource.html.erb | 23 +++++++++++++++++++---- public/stylesheets/new_user.css | 4 ++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 2b88fed1c..35baf4a77 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -165,11 +165,22 @@ $(".resourcesList").mousedown(function(e) { //将当前元素赋给 上一个对象 保存起来。 last_line = line; } -}); +}); + //元素包含关系计算 + var contains = function(root, el) { + if (root.compareDocumentPosition) + return root === el || !!(root.compareDocumentPosition(el) & 16); + if (root.contains && el.nodeType === 1){ + return root.contains(el) && root !== el; + } + while ((el = el.parentNode)) + if (el === root) return true; + return false; + } $(document.body).click(function(e) { //在列表上的任何单击事件都要恢复原来的样子 //隐藏右键菜单 - e.preventDefault() + //e.preventDefault(); $("#contextMenu").hide(); document.oncontextmenu = function() {return true;} //如果当前行为空，那么要将当前行的拿到 @@ -181,9 +192,13 @@ $(document.body).click(function(e) { if(line.get(0).tagName === 'LI'){ line = line.parent(); } + } - //将当前行改变为白色 - line.children().css("background-color", 'white'); + //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了 + if( contains($(".resourcesList").get(0),line.get(0))){ + line.children().css("background-color", 'white'); + } + //当前行恢复编辑状态到链接状态 if(ele && ele.nodeName != 'INPUT') { restore(); diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4e88ebf3f..4040971fd 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -385,8 +385,8 @@ a.sendButtonBlue:hover {color:#ffffff;} a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;} a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;} .resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;} -.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;} -.resourcesUploadBox:hover {background-color:#0781b4;} +/*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/ +/*.resourcesUploadBox:hover {background-color:#0781b4;}*/ /* 个人主页右边部分*/ .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;} a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}