From 48045cf85b8e9e65f36795ff4efb32958436ad7e Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 16 Dec 2016 19:55:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B6=88=E6=81=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../users/_anonymous_evaluation_list.html.erb | 2 +- app/views/users/_unapproval_applied_list.html.erb | 14 +++++++++++++- app/views/users/_user_message_course.html.erb | 4 ++-- app/views/users/_user_message_list.html.erb | 3 +-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/views/users/_anonymous_evaluation_list.html.erb b/app/views/users/_anonymous_evaluation_list.html.erb index 3a6be81ff..4fc1d9fe1 100644 --- a/app/views/users/_anonymous_evaluation_list.html.erb +++ b/app/views/users/_anonymous_evaluation_list.html.erb @@ -19,7 +19,7 @@
  • - <%= link_to ae.course.try(:name),"", :target => "_blank", :class => "homepageTabTitle ml5"%> + <%= link_to ae.course.name, course_path(ae.course), :target => "_blank", :class => "homepageTabTitle ml5"%>
  • diff --git a/app/views/users/_unapproval_applied_list.html.erb b/app/views/users/_unapproval_applied_list.html.erb index 5256b1082..362307d43 100644 --- a/app/views/users/_unapproval_applied_list.html.erb +++ b/app/views/users/_unapproval_applied_list.html.erb @@ -5,4 +5,16 @@
    <%= render :partial => 'users/new_user_message', :locals => { :message_alls => @message_alls } %> -
    \ No newline at end of file + + + \ No newline at end of file diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index c3566c39c..411ff64c9 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -38,7 +38,7 @@ <%=link_to User.find(ma.course_message.author_id).show_name, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 评论了通知:
  • -
  • +
  • <%= link_to ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id }, :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" , :target => '_blank', @@ -820,7 +820,7 @@ <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %> 将您移出了班级:
  • -
  • +
  • <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> diff --git a/app/views/users/_user_message_list.html.erb b/app/views/users/_user_message_list.html.erb index 833b424ed..1cea4f989 100644 --- a/app/views/users/_user_message_list.html.erb +++ b/app/views/users/_user_message_list.html.erb @@ -16,9 +16,8 @@ var parentWidth = $(this).parent().width(); var eq0Width = $(this).parent().children().eq(0).width(); var eq1Width = $(this).parent().children().eq(1).width(); - var classWidth = parentWidth - eq0Width - eq1Width - 10; + var classWidth = parentWidth - eq0Width - eq1Width - 20; $(this).css("max-width",classWidth + "px"); }); - //$(".messageInformationContents").width() }); \ No newline at end of file