diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index d364f84e1..8994dab10 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -41,7 +41,7 @@

<%=@course.name %>

- <%=@course.is_public == 0 ? '私有' : '公开' %> +

教师:<%= course_teacher_link teacher_num %> 学生:<%= course_student_link student_num %> diff --git a/app/views/syllabuses/_syllabus_course_list.html.erb b/app/views/syllabuses/_syllabus_course_list.html.erb index cdb566412..4384ba2ee 100644 --- a/app/views/syllabuses/_syllabus_course_list.html.erb +++ b/app/views/syllabuses/_syllabus_course_list.html.erb @@ -24,7 +24,7 @@ <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "sy_classlist_title fl", :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级:":"私有班级:")+course.name+"("+current_time_and_term(course)+")"%> <% end %> - <%=course.is_public? ? '公开' : '私有' %> +

主讲老师:<%=link_to course.teacher.show_name, user_path(course.teacher), :class => 'sy_cblue' %> diff --git a/app/views/syllabuses/show.html.erb b/app/views/syllabuses/show.html.erb index 062b9aeb4..e39d538ce 100644 --- a/app/views/syllabuses/show.html.erb +++ b/app/views/syllabuses/show.html.erb @@ -53,7 +53,7 @@ <% comments = @syllabus.journals_for_messages.reorder("created_on desc").limit(3) %> <% if count > 0 %>

- <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'Syllabus'} %> + <%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'Syllabus', :activity_id => @syllabus.id} %>
<% end %>
diff --git a/app/views/users/_courses_list.html.erb b/app/views/users/_courses_list.html.erb index 9187008ee..1abe77b81 100644 --- a/app/views/users/_courses_list.html.erb +++ b/app/views/users/_courses_list.html.erb @@ -7,7 +7,7 @@

<%=course.name %>

- <%=course.is_public == 0 ? '私有' : '公开' %> +
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb index b6cd9ebc3..5361a37ad 100644 --- a/app/views/users/_user_blog.html.erb +++ b/app/views/users/_user_blog.html.erb @@ -50,7 +50,7 @@ <% comments = get_all_children(all_comments, activity)[0..2] %> <% if count > 0 %>
- <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 0}%> + <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 0, :user_id => activity.author_id}%>
<% end %> diff --git a/public/images/sy/icons_sy.png b/public/images/sy/icons_sy.png index 09cdd32cb..645dc4e35 100644 Binary files a/public/images/sy/icons_sy.png and b/public/images/sy/icons_sy.png differ diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 926c41525..6978e1c55 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -403,6 +403,27 @@ a.postOptionLink:hover { padding-left:10px; line-height: 22px; } +.hw_icon_private{ + display:block; + width:30px; + height:22px; + background:url(../images/sy/icons_sy.png) 0 -458px no-repeat; + color:#fff; + font-size:12px; + padding-left:10px; + line-height: 22px; +} +.hw_icon_open{ + display:block; + width:30px; + height:22px; + background:url(../images/sy/icons_sy.png) 0 -436px no-repeat; + color:#fff; + font-size:12px; + padding-left:10px; + line-height: 22px; +} + .sy_class_titbox{margin-bottom:5px; padding-top:10px; } a.sy_btn_orange{ display:block;