jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

班级列表的公开私有

This commit is contained in:
cxt 2016-07-27 14:07:16 +08:00
parent aafe0aa4ae
commit a1149c1104
7 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/_course_base_info.html.erb
View File

@ -41,7 +41,7 @@
<div class="sy_class_info fl ml15">
<div class="sy_class_titbox">
<h3 class="fl sy_class_title"><%=@course.name %></h3>
<span class="icon_si fl mr20"><%=@course.is_public == 0 ? '私有' : '公开' %></span>
<span class="<%= @course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
<p class="sy_cgrey fl mt3">
<span class=" mr15">教师：<%= course_teacher_link teacher_num %></span>
<span class=" mr15">学生：<%= course_student_link student_num %></span>

2
app/views/syllabuses/_syllabus_course_list.html.erb
View File

@ -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 %>
<span class="icon_si fl mr20"><%=course.is_public? ? '公开' : '私有' %></span>
<span class="<%= course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
<div class="cl"></div>
<p class="sy_cgrey">
<span class=" mr15">主讲老师：<%=link_to course.teacher.show_name, user_path(course.teacher), :class => 'sy_cblue' %></span>

2
app/views/syllabuses/show.html.erb
View File

@ -53,7 +53,7 @@
<% comments = @syllabus.journals_for_messages.reorder("created_on desc").limit(3) %>
<% if count > 0 %>
<div class="" id="reply_div_<%= @syllabus.id %>">
<%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'Syllabus'} %>
<%=render :partial => 'users/news_replies', :locals => {:comments => comments, :type => 'Syllabus', :activity_id => @syllabus.id} %>
</div>
<% end %>
<div class="homepagePostReplyContainer borderBottomNone minHeight48">

2
app/views/users/_courses_list.html.erb
View File

@ -7,7 +7,7 @@
<div class="fl">
<div class="syllabus_class_w ">
<p class="syllabus_class_title fl"><%=course.name %></p>
<span class="icon_si fl"><%=course.is_public == 0 ? '私有' : '公开' %></span>
<span class="<%= course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl"></span>
<span class="fr sy_p_grey hidden" style="max-width: 120px;">主讲老师：<%=course.teacher.show_name %></span>
<div class="cl"></div>
</div>

2
app/views/users/_user_blog.html.erb
View File

@ -50,7 +50,7 @@
<% comments = get_all_children(all_comments, activity)[0..2] %>
<% if count > 0 %>
<div class="" id="reply_div_<%= user_activity_id %>">
<%= 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}%>
</div>
<% end %>

BIN
public/images/sy/icons_sy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 27 KiB

21
public/stylesheets/syllabus.css
View File

@ -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;