diff --git a/app/views/issues/_jounal_refresh.js.erb b/app/views/issues/_jounal_refresh.js.erb index df3d605f4..db5a068bf 100644 --- a/app/views/issues/_jounal_refresh.js.erb +++ b/app/views/issues/_jounal_refresh.js.erb @@ -1,8 +1,5 @@ -$("#reply_div_<%= @issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue}) %>"); -$("#issue_detail_show").html('<%= escape_javascript(render :partial => 'issues/detail') %>') -$("#issue_edit_show").html('<%= escape_javascript(render :partial => 'issues/edit') %>') -$("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => @issue}) %>"); -sd_create_editor_from_data(<%= @issue.id %>, null, "100%", "<%= @issue.class.name %>"); + +location.reload(); issue_desc_editor = KindEditor.create('#issue_description', {"width":"85%", "resizeType":0, @@ -17,5 +14,3 @@ issue_desc_editor = KindEditor.create('#issue_description', "uploadJson":"/kindeditor/upload", "fileManagerJson":"/kindeditor/filemanager"}); // $("#issue_test_<%#= @issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/edit', :locals => {:issue => Issue.find( @issue_id)}) %>"); -$(".homepagePostReplyBannerCount").html('<%= escape_javascript(render :partial => 'issues/issue_reply_banner') %>'); -sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%= @issue.class.name %>"); \ No newline at end of file diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb index 584970f16..2d6da0770 100644 --- a/app/views/layouts/_show_messages_list.html.erb +++ b/app/views/layouts/_show_messages_list.html.erb @@ -138,7 +138,7 @@
  • <%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>
    • <% end %> <% elsif ma.class == MemoMessage %> - <% if ma.memo_type == "Memo" %> + <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
  • <%= ma.memo.parent_id.nil? ? ma.memo.subject : message_content(ma.memo.content)%>"><%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : message_content(ma.memo.content)%>
    • <% end %> <% elsif ma.class == UserFeedbackMessage %> diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index 746064020..754cfd10b 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -2,10 +2,10 @@
  • <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %> -

    + <%= link_to course.syllabus.title, syllabus_path(course.syllabus_id), :target => '_blank', :class => 'hidden', :style => "max-width:85px; display:inline-block;"%> + · + <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => "max-width:85px; display:inline-block;"%>

    <%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%> @@ -104,4 +104,13 @@ $("#user_show_more_course").hide(); $('#user_hide_course').show(); } + + $(".course_list_menu").each(function(){ + var courseWidth = $(this).children().eq(0).width(); + var classWidth = 170 -courseWidth; + console.log(courseWidth, classWidth); + if(courseWidth < 80){ + $(this).children().eq(2).css("max-width",classWidth + "px"); + } + }) diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb index 4757aa401..5d6c5bcad 100644 --- a/app/views/users/_user_message_forum.html.erb +++ b/app/views/users/_user_message_forum.html.erb @@ -1,5 +1,5 @@ <% if ma.class == MemoMessage %> - <% if ma.memo_type == "Memo" %> + <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>