From 6af0d8f40cb0d5f6c319b9abca74fae7699cb4c4 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 18:06:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=86=85=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E9=A2=91=E9=97=AD=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_common/index.html.erb | 5 +++-- app/views/layouts/base_courses.html.erb | 2 +- app/views/student_work/index.html.erb | 2 +- public/stylesheets/courses.css | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index 4a804ae60..44e1b43b6 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -9,7 +9,7 @@ <%= @obj_count%> <%= l(:label_homework_count)%>

- <%= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %> + <%#= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
<% @homeworks.each do |homework|%> @@ -27,7 +27,8 @@ <% if @is_teacher%> <%= homework_anonymous_comment(homework)%> <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit") %> - <%= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %> + <%#= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %> + <%= link_to(l(:button_edit),"javascript:void(0)", :class => "fr mr10 un_work_edit",:title => "编辑功能正在维护中") %> <% elsif @is_student%> <%= student_anonymous_comment homework %> <%= student_new_homework homework %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index adec9e6fd..c2f159f28 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -123,7 +123,7 @@
<%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%> <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%> - <%= link_to( "+#{l(:label_course_homework_new)}", new_homework_common_path(:course => @course.id), :class => 'subnav_green c_white') if is_teacher %> + <%#= link_to( "+#{l(:label_course_homework_new)}", new_homework_common_path(:course => @course.id), :class => 'subnav_green c_white') if is_teacher %>
<%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %> diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 0250a7eed..82f412eb3 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -124,7 +124,7 @@ <% if @is_teacher%> <%= homework_anonymous_comment(@homework)%> - <%= link_to(l(:button_edit),edit_homework_common_path(@homework), :class => "fr mr10 work_edit") %> + <%= link_to(l(:button_edit),"javascript:void(0)", :class => "fr mr10 un_work_edit",:title => "编辑功能正在维护中") %> <% else%> <%= student_anonymous_comment @homework %> <%= student_new_homework @homework %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 5cd0b6418..d810c4891 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -139,6 +139,7 @@ a:hover.tb_all{ background:#ff5d31; color:#fff; text-decoration:none;} .work_tb_{ background-color: #eaeaea; height:40px; } a.work_edit{color: #64bdd9; display:block; padding:1px 5px; border:1px solid #64bdd9;} a:hover.work_edit{color: #fff; background: #64bdd9;} +a.un_work_edit{color: white; display:block; padding:1px 5px; background-color: darkgray;border:1px solid darkgray;} /* 控制显示与隐藏css类 */ .normaltab { color:#64bdd9 ; } From 5135f749a42665f30763c8cd55dbd2c5b2ee4f90 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 2 Sep 2015 18:10:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/init_KindEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js index 46aadb503..f9ebece36 100644 --- a/public/javascripts/init_KindEditor.js +++ b/public/javascripts/init_KindEditor.js @@ -1,6 +1,6 @@ function init_editor(params){ var editor = params.kindutil.create(params.textarea, { - resizeType : 1,minWidth:"1px",width:"100%",minHeight:"25px", + resizeType : 0,minWidth:"1px",width:"100%",minHeight:"40px", items:['emoticons'], afterChange:function(){//按键事件 nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea}); From 69cba799266a27503746204c5e724279b1d4dc76 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 2 Sep 2015 18:18:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_homework.html.erb | 2 +- app/views/users/_course_message.html.erb | 4 ++-- app/views/users/_course_news.html.erb | 4 ++-- app/views/users/_course_poll.html.erb | 2 +- app/views/users/_project_issue.html.erb | 4 ++-- app/views/users/_project_message.html.erb | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 2bbafb4df..f29512b0e 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -19,7 +19,7 @@
<%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(:homework => activity.id), :class=> "c_blue" %>
-
截止时间：<%= format_date(activity.end_time) %>
+
截止时间：<%= activity.end_time.to_s %>
作业描述：<%= activity.description.html_safe %> diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index a68aa7575..cbd7a916b 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -21,7 +21,7 @@ <% end %>
- 发帖时间：<%= format_date(activity.created_on) %> + 发帖时间：<%= format_time(activity.created_on) %>
@@ -100,7 +100,7 @@ <% else %> <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% end %> - <%= format_date(reply.created_on) %> + <%= format_time(reply.created_on) %>
<%= reply.content.html_safe %> diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index b01bdb791..a558911c1 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -16,7 +16,7 @@ <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
- 发布时间：<%= format_date(activity.created_on) %> + 发布时间：<%= format_time(activity.created_on) %>
通知描述： @@ -72,7 +72,7 @@ <% else %> <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% end %> - <%= format_date(comment.created_on) %> + <%= format_time(comment.created_on) %>
<%= comment.comments.html_safe %>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 15e549ad8..436ae2f46 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -26,7 +26,7 @@ <% end %>
- 发布时间：<%= format_date(activity.published_at) %> + 发布时间：<%= format_time(activity.published_at) %>
问卷描述：<%=activity.polls_description.html_safe.to_s%>
时间： - <%=format_date(activity.created_on) %> + <%=format_time(activity.created_on) %>
缺陷描述： @@ -109,7 +109,7 @@ <% else %> <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> <% end %> - <%= format_date(reply.created_on) %> + <%= format_time(reply.created_on) %>
<% if reply.details.any? %> <% details_to_strings(reply.details).each do |string| %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 7a6060433..6c3842f73 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -24,7 +24,7 @@ <% end %>
- 时间：<%= format_date(activity.created_on) %> + 时间：<%= format_time(activity.created_on) %>
帖子描述： <% if activity.parent_id.nil? %> @@ -86,7 +86,7 @@ <% else %> <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% end %> - <%= format_date(reply.created_on) %> + <%= format_time(reply.created_on) %>
<%= reply.content.html_safe %>
From 0e68bbc5bd1b19afaa42d26ffa8df5aa24b8eadf Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 2 Sep 2015 18:32:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/init_KindEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js index f9ebece36..31f0efe81 100644 --- a/public/javascripts/init_KindEditor.js +++ b/public/javascripts/init_KindEditor.js @@ -1,6 +1,6 @@ function init_editor(params){ var editor = params.kindutil.create(params.textarea, { - resizeType : 0,minWidth:"1px",width:"100%",minHeight:"40px", + resizeType : 0,minWidth:"1px",width:"100%",minHeight:"28px", items:['emoticons'], afterChange:function(){//按键事件 nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea}); From b4ae6117180331d42b44eee92de8d4ac9779f153 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 2 Sep 2015 19:14:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E4=BA=A4=E6=B5=81url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_footer.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index d6368b4a0..812873045 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -5,7 +5,7 @@
  • 服务协议|
  • <%= l(:label_surpport_group)%>|
    • -
  • <%= l(:label_forums)%>
    • +
  • <%= l(:label_forums)%>