From 6f002613d0eb64ac117ad0e66e717eb8046cadd5 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 10:55:35 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=AD=94=E7=96=91=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/sidebar_bg.png | Bin 9913 -> 7281 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png index 9ceea0f9176902560fa21d8eddd17a372d761edd..e4d12da4dffa4b7d73d9767af38102b57212c1fa 100644 GIT binary patch literal 7281 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 F{{uzF(gXki literal 9913 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 Xn+&$9^GF@=?I574sG(3UXBP55+E<+Q From b84628af9df5a88d5ff0e40db5216aa350dd1e34 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:23:56 +0800 Subject: [PATCH 02/10] regist_btn color --- app/views/account/login.html.erb | 19 ++++++++++++++++--- public/stylesheets/new_user.css | 2 ++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index ed43f455a..fadf5e465 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -86,6 +86,9 @@ } function register(){ + if($("#loginUpButton").hasClass('loginUpDisableButton')){ + return; + } if($login_correct && $mail_correct && $passwd_correct && $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){ $("#main_reg_form").submit(); }else{ @@ -182,6 +185,16 @@ $('#main_login_form').submit(); } } + + function changeRegisterBtn(checkbox){ + if(checkbox.checked == true){ + $("#loginUpButton").removeClass('loginUpDisableButton'); + $("#loginUpButton").addClass('loginUpButton'); + }else{ + $("#loginUpButton").removeClass('loginUpButton') + $("#loginUpButton").addClass('loginUpDisableButton'); + } + }
@@ -270,11 +283,11 @@
- +
我已阅读并接受Trustie服务协议条款
-
- 注册 +
+ 注册
<% end %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 8b3c8f3ce..0c7cda2c7 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -726,6 +726,8 @@ a.loginChooseTab {color:#484848; height:30px; display:block;} .loginUpButton {width:315px; height:40px; background-color:#269ac9; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;} .loginInButton:hover {background-color: #297fb8} .loginUpButton:hover {background-color: #297fb8} +.loginUpDisableButton {width:315px; height:40px; background-color:#C1C1C1; margin-left:46px; font-size:14px; text-align:center; line-height:40px; vertical-align:middle; margin-top:30px;} +.loginUpDisableButton:hover {background-color: #C1C1C1} .loginChooseBorder {width:295px; height:30px; border-bottom:1px solid #e3e3e3;} .loginSign {width:405px; background-color:#ffffff;} .loginSignBox {width:308px; height:38px; margin-left:46px; border:1px solid #98a1a6; outline:none;} From 3d87f65021c173a6dbc16e9f4f5abd92299637ce Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:27:43 +0800 Subject: [PATCH 03/10] new_feedback --- app/views/layouts/_new_feedback.html.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index fd25fc224..e3c0540fd 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -21,12 +21,11 @@ <% end %>
-
+
<%#= l(:label_technical_support) %> - -

请加入师姐师姐答疑群

173184401

 +

请加入师姐师姐答疑群

173184401

From 4342c510a7f4f0e4e908e4b9d50219c3137fc9bb Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:31:09 +0800 Subject: [PATCH 04/10] new_feedback --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index e3c0540fd..aa7540d61 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -25,7 +25,7 @@ <%#= l(:label_technical_support) %> -

请加入师姐师姐答疑群

173184401

+

请加入师姐师哥答疑群

173184401

From 4d1800e690868f0e320ebd5778356698c3ef652d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:31:27 +0800 Subject: [PATCH 05/10] new_feedback --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index aa7540d61..80a4c0fb2 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -25,7 +25,7 @@ <%#= l(:label_technical_support) %> -

请加入师姐师哥答疑群

173184401

+

请加入师哥师姐答疑群

173184401

From d4218fc81be07a60e17059e4f4a698459d1cbe34 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:33:42 +0800 Subject: [PATCH 06/10] new_feedback --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 80a4c0fb2..763b5a5d9 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -25,7 +25,7 @@ <%#= l(:label_technical_support) %> -

请加入师哥师姐答疑群

173184401

+

请加入师姐师兄答疑群

173184401

From 8ffbe8f30086ce4bdcf92ed2c1eee912225adc86 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 11:42:33 +0800 Subject: [PATCH 07/10] course manager can not apply to join that course --- app/services/courses_service.rb | 3 +++ app/views/courses/join.js.erb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 74580632f..c8af509f8 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -303,6 +303,7 @@ class CoursesService #@state == 7 您已经发送过申请了，请耐心等待 #@state == 8 您已经是该课程的教师了 #@state == 9 您已经是该课程的教辅了 + #@state == 10 您已经是该课程的管理员了 #@state 其他 未知错误，请稍后再试 def join_course params,current_user course = Course.find_by_id params[:object_id] @@ -325,6 +326,8 @@ class CoursesService #如果加入的角色教辅并且当前为教辅 elsif params[:role] == "7" && roleName == "TeachingAsistant" @state = 9 + elsif roleName == "Manager" + @state = 10 #如果加入角色为教师或者教辅，并且当前是学生，或者是要成为教辅，当前不是教辅，或者要成为教师，当前不是教师。那么要发送请求 elsif (params[:role] != "10" && roleName == "Student") || (params[:role] == "7" && roleName != "TeachingAsistant" ) || (params[:role] == "9" && roleName != "Teacher" ) #如果已经发送过消息了，那么就要给个提示 diff --git a/app/views/courses/join.js.erb b/app/views/courses/join.js.erb index 2b4927f48..8102098d5 100644 --- a/app/views/courses/join.js.erb +++ b/app/views/courses/join.js.erb @@ -32,6 +32,10 @@ window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @co alert("您已经是该课程的教辅了"); hidden_join_course_form(); window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +<% elsif @state == 10%> +alert("您已经是该课程的管理员了"); +hidden_join_course_form(); +window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" <% else %> alert("未知错误，请稍后再试"); <% end %> From f1092d5072951920686ed934a9c360eb19cc0fac Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 14:33:59 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E6=97=B6=E5=80=99=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=90=8E=E7=9A=84=20=E5=8F=AF=E9=80=89=E7=9A=84?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/attachments.js | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 685699064..813c10dee 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -552,27 +552,27 @@ function addFileCourseSource(inputEl, file, eagerUpload,checkBox) { fileSpan.append( $('', { 'type': 'text', - 'class': 'filename readonly', + 'class': 'upload_filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly' }).val(file.name), - $('', { - 'type': 'text', - 'class': 'description', - 'name': 'attachments[' + attachmentId + '][description]', - 'maxlength': 254, - 'placeholder': $(inputEl).data('descriptionPlaceholder') - }).toggle(!eagerUpload), - $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ - 'class': 'ispublic-label' - }), - $('', { - 'type': 'checkbox', - 'class': 'is_public_checkbox', - 'value': 1, - 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', - checked: 'checked' - }).toggle(!eagerUpload), +// $('', { +// 'type': 'text', +// 'class': 'description', +// 'name': 'attachments[' + attachmentId + '][description]', +// 'maxlength': 254, +// 'placeholder': $(inputEl).data('descriptionPlaceholder') +// }).toggle(!eagerUpload), +// $('' + $(inputEl).data('fieldIsPublic') + ':').attr({ +// 'class': 'ispublic-label' +// }), +// $('', { +// 'type': 'checkbox', +// 'class': 'is_public_checkbox', +// 'value': 1, +// 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', +// checked: 'checked' +// }).toggle(!eagerUpload), $(' ').attr({ 'href': "#", 'class': 'remove-upload' From 8d25b5676c6d6eb899a8828848054824e382d1b9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 14:56:32 +0800 Subject: [PATCH 09/10] =?UTF-8?q?tag=5Fname=E5=90=8D=E7=A7=B0=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E6=89=A9=E5=A4=A7=E8=87=B3120=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/index.html.erb | 6 ++--- app/views/layouts/base_forums.html.erb | 4 +-- config/settings.yml | 2 +- public/stylesheets/application.css | 34 +++++++++++++++++++------- public/stylesheets/leftside.css | 2 +- public/stylesheets/pleft.css | 2 +- public/stylesheets/user_leftside.css | 2 +- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 782efbb22..3dad88868 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -247,7 +247,7 @@ tagId = id; taggableType = type; width = parseInt(domEle.css('width').replace('px', '')) >= 100 ? parseInt(domEle.css('width').replace('px', '')) : 100 - domEle.html(''); + domEle.html(''); domEle.parent().css("border", "1px solid #ffffff"); $("#renameTagName").focus(); } @@ -295,8 +295,8 @@ // }else{ //否则就要更新tag名称了 //// if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){ 去掉询问 // $.post( -// '<%= update_tag_name_path %>', -// {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>} +// '<%#= update_tag_name_path %>', +// {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%#= @course.id%>} // ) //// }else{ //// ele.parent().css("border",""); diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index d32fbf4ed..e03ac2fc5 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -61,14 +61,14 @@ function addTag(){ if(<%=@forum.creator.id == User.current.id%>) { if ($("input[name='addTag']").val().trim() != "" ) { - if($("input[name='addTag']").val().trim().length <= 14) { + if($("input[name='addTag']").val().trim().length <= 120) { $.get( '<%= add_forum_tag_forum_path(@forum)%>' + "?tag_str=" + $("input[name='addTag']").val(), {} ); $("input[name='addTag']").val(''); }else{ - alert("标签名字长度不能超过14个字符"); + alert("标签名字长度不能超过120个字符"); } } } diff --git a/config/settings.yml b/config/settings.yml index d0af6d7a1..4286e0930 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -259,7 +259,7 @@ tags_min_length: default: 1 tags_max_length: format: int - default: 14 + default: 120 tags_show_search_results: format: int default: 5 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index f8b5395d5..5646737f5 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2745,15 +2745,31 @@ h2 img { vertical-align:middle; } /*added by william*/ #tag { - background: url(../images/issue_tag.png) no-repeat right -19px; - border-radius: 3px; - color: #3a587d !important; - padding: 1px 4px 2px 4px; - margin: 3px; - display: inline-block; - font-size: 13px; /*modified by linchun*/ - text-decoration: none; - cursor: pointer; + /*background: url(../images/issue_tag.png) no-repeat right -19px;*/ + /*border-radius: 3px;*/ + /*color: #3a587d !important;*/ + /*padding: 1px 4px 2px 4px;*/ + /*margin: 3px;*/ + /*display: inline-block;*/ + /*font-size: 13px; *//*modified by linchun*/ + /*text-decoration: none;*/ + /*cursor: pointer;*/ + border-radius: 3px; + color: #3a587d !important; + padding: 1px 4px 2px 4px; + margin: 3px; + display: inline-block; + font-size: 13px; + text-decoration: none; + cursor: pointer; + width: auto; + padding: 0 5px; + padding-top: 2px; + border: 1px solid #f8df8c; + background: #fffce6; + margin-right: 5px; + word-wrap: break-word; + word-break: break-all; } /*tanxianbo*/ diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css index 990c02d54..26976343e 100644 --- a/public/stylesheets/leftside.css +++ b/public/stylesheets/leftside.css @@ -56,7 +56,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;} diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index 1f48c9166..1ce12bdda 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -59,7 +59,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;} diff --git a/public/stylesheets/user_leftside.css b/public/stylesheets/user_leftside.css index e33e2c7d6..c8dfbe316 100644 --- a/public/stylesheets/user_leftside.css +++ b/public/stylesheets/user_leftside.css @@ -56,7 +56,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;} From 42ae539ffa355402803402168c27c1f96efb4025 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 3 Nov 2015 15:51:11 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E7=AD=94=E7=96=91=E7=BE=A4=20=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_new_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index 763b5a5d9..ffec82bce 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -25,7 +25,7 @@ <%#= l(:label_technical_support) %> -

请加入师姐师兄答疑群

173184401

+

请加入师姐师兄答疑群

QQ群号：173184401