From 8c9514146027043ac6de498a7612b6ef5cf6e00c Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 9 Sep 2016 16:48:43 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BE=A7=E5=AF=BC=E8=88=AA=E7=AE=AD?= =?UTF-8?q?=E5=A4=B4=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/structure.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 8c55bd102..0675f51e4 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -599,6 +599,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;} .user_sub_menu li p {padding:0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;} .user_sub_menu li p:hover {background:#fff;} .user_sub_menu li p:hover a {background:#fff;} +.user_sub_menu li p:hover,.user_sub_menu li p:target {color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;} .users_accordion li > .user_sub_menu { display: none; } From fc01558e551d8beb16d232499c2795cae230923f Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 9 Sep 2016 17:09:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/edit_class.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/wechat/edit_class.html b/public/assets/wechat/edit_class.html index 68b84aee6..b4f5d8cc3 100644 --- a/public/assets/wechat/edit_class.html +++ b/public/assets/wechat/edit_class.html @@ -5,7 +5,7 @@
课程名称
-
班级名称删除
+
班级名称删除
+新增班级
完成
From 3d68e8963a07c86debc6a3d6c43a75c0016b28ac Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 9 Sep 2016 17:11:51 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BE=A7=E5=AF=BC=E8=88=AA=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=92=8C=E7=8F=AD=E7=BA=A7=E8=B6=85=E9=95=BF=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=9C=81=E7=95=A5=E5=8F=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_user_courses.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index 21858fbea..0d54fc06a 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:80px; display:inline-block;"%> + · + <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => "max-width:80px; 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)+"）"%> From f9a905a344425e02c9cd388470fe9a66555bc1ca Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 9 Sep 2016 17:22:10 +0800 Subject: [PATCH 4/9] =?UTF-8?q?issue=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=EF=BC=8C=E7=82=B9=E5=87=BB=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=B8=8B=E8=BD=BD=EF=BC=88=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=98=AF=E9=A2=84=E8=A7=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_jounal_refresh.js.erb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 From 121537bfcbdf9a8fd1fc315eddbc1c600e73515d Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 9 Sep 2016 17:22:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=B6=88=E6=81=AF404=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_forum.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb index 4757aa401..4544fd651 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 %>
    • <%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %> From 7fd73348a611b3b09b744cf094d57c52a813bfdc Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 9 Sep 2016 17:41:09 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B6=88=E6=81=AF404=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_message_forum.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb index 4544fd651..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" && ma.memo %> + <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
      • <%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %> From ddb369928fcbfac96e35bacdb22a3470d6959af9 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 9 Sep 2016 17:44:41 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_show_messages_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %> From 34a1bb0b49567cb3085a4c87e30a1587d121353f Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 9 Sep 2016 17:54:54 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BE=A7=E5=AF=BC=E8=88=AA=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E7=8F=AD=E7=BA=A7=E5=90=8D=E7=A7=B0=E8=BF=87?= =?UTF-8?q?=E9=95=BF=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_user_courses.html.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index d1699b776..7e3249a55 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -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 = 160 -courseWidth; + console.log(courseWidth, classWidth); + if(courseWidth < 80){ + $(this).children().eq(2).css("max-width",classWidth + "px"); + } + }) From 1fe8b35fc9305bff968069ba8ef82aca4edabfb6 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 9 Sep 2016 17:58:21 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=8C=E7=8F=AD=E7=BA=A7=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=9C=81=E7=95=A5=E5=8F=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_user_courses.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index 7e3249a55..754cfd10b 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -3,9 +3,9 @@ <% 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:80px; display:inline-block;"%> + <%= 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:80px; 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)+"）"%> @@ -107,7 +107,7 @@ $(".course_list_menu").each(function(){ var courseWidth = $(this).children().eq(0).width(); - var classWidth = 160 -courseWidth; + var classWidth = 170 -courseWidth; console.log(courseWidth, classWidth); if(courseWidth < 80){ $(this).children().eq(2).css("max-width",classWidth + "px");