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

班级的讨论区列表与通知列表、项目的讨论区列表、博客列表：显示请微调

This commit is contained in:
cxt 2016-11-25 11:25:04 +08:00
parent 8efcf876c6
commit a614b4eb93
7 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/blogs/_article.html.erb
View File

@ -1,7 +1,7 @@
<div class = "cl"> </div> <div class = "cl"> </div>
<div id="blog-list"> <div id="blog-list">
<div class="listbox mt10" > <div class="listbox mt10" >
<h2 class="list-h2">博客列表</h2> <p class="list-h2">博客列表</p>
<div class="category"> <div class="category">
<span class="grayTxt ">排序：</span> <span class="grayTxt ">排序：</span>
<%= link_to "时间", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <%= link_to "时间", {:controller => 'blogs', :action => 'index', :id =>@user, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
@ -21,9 +21,9 @@
<ul class="list-file"> <ul class="list-file">
<li><span class="item_list fl"></span> <li><span class="item_list fl"></span>
<% if activity.parent_id.nil? %> <!--+"(帖子标题)"--> <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
<%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=> activity.author, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl" %> <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=> activity.author, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title-normal fl" %>
<% else %> <% else %>
<%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl"%> <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title-normal fl"%>
<% end %> <% end %>
<%# if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> <%# if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %>
<!--<span class="font_normal ml10 fr">[已设为首页]</span>--> <!--<span class="font_normal ml10 fr">[已设为首页]</span>-->
@ -36,7 +36,8 @@
<% end %> <% end %>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<% count=BlogComment.where("root_id = #{activity.id}").count%> <li class="ml15"> <% count=BlogComment.where("root_id = #{activity.id}").count%>
<li class="ml15">
<span class="grayTxt">发布：<%= format_time(activity.created_on) %></span> <span class="grayTxt">发布：<%= format_time(activity.created_on) %></span>
<span class="grayTxt">更新：<%= format_time(activity.updated_on) %></span> <span class="grayTxt">更新：<%= format_time(activity.updated_on) %></span>
<p class="list-info fr grayTxt"> <p class="list-info fr grayTxt">

28
app/views/users/_course_boardlist.html.erb
View File

@ -1,7 +1,7 @@
<div class = "cl"> </div> <div class = "cl"> </div>
<div id="course-boardlist"> <div id="course-boardlist">
<div class="listbox mt10" > <div class="listbox mt10" >
<h2 class="list-h2">讨论区列表</h2> <p class="list-h2">讨论区列表</p>
<div class="category"> <div class="category">
<span class="grayTxt ">排序：</span> <span class="grayTxt ">排序：</span>
<%= link_to "时间", {:controller => 'boards', :action => 'index', :board_id =>@board.id, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <%= link_to "时间", {:controller => 'boards', :action => 'index', :board_id =>@board.id, :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
@ -20,9 +20,9 @@
<div class="list-file"> <div class="list-file">
<div><span class="item_list fl"></span> <div><span class="item_list fl"></span>
<% if activity.parent_id.nil? %> <!--+"(帖子标题)"--> <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
<%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title fl" %> <%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title-normal fl" %>
<% else %> <% else %>
<%= link_to activity.parent.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title f1" %> <%= link_to activity.parent.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class => "list-title-normal f1" %>
<% end %> <% end %>
<% if activity.sticky == 1 %> <% if activity.sticky == 1 %>
<span class="fl ml10 red-cir-btn">顶</span> <span class="fl ml10 red-cir-btn">顶</span>
@ -30,20 +30,20 @@
<% if activity.locked %> <% if activity.locked %>
<span class="fl ml10 green-cir-btn" title="已锁定">锁</span> <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
<% end %> <% end %>
<% u = User.where("id=?",activity.author_id).first%> <%# u = User.where("id=?",activity.author_id).first%>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="massages-content ml15"> <!--<div class="massages-content ml15">-->
<% if activity.parent_id.nil? %> <!--<%# if activity.parent_id.nil? %>-->
<% content = activity.content %> <!--<% content = activity.content %>-->
<% else %> <!--<%# else %>-->
<% content = activity.parent.content %> <!--<%# content = activity.parent.content %>-->
<% end %> <!--<%# end %>-->
<p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p> <!--<p><%#=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p>-->
</div> <!--</div>-->
<div class="ml15 mt10"> <div class="ml15 mt10">
<span class="grayTxt"> <span class="grayTxt mr15">
发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %> 发帖人：<%= link_to activity.author.show_name, user_path(activity.author), :class => "link-blue" %>
</span> </span>
<span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span> <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
<% all_comments = []%> <% all_comments = []%>

17
app/views/users/_course_newslist.html.erb
View File

@ -1,7 +1,7 @@
<div class = "cl"> </div> <div class = "cl"> </div>
<div id="course-newslist"> <div id="course-newslist">
<div class="listbox mt10" > <div class="listbox mt10" >
<h2 class="list-h2">通知列表</h2> <p class="list-h2">通知列表</p>
<div class="category"> <div class="category">
<span class="grayTxt ">排序：</span> <span class="grayTxt ">排序：</span>
<%= link_to "时间", {:controller => 'news', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <%= link_to "时间", {:controller => 'news', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
@ -19,18 +19,19 @@
<% topics.each do |activity| %> <% topics.each do |activity| %>
<div class="list-file"> <div class="list-file">
<div><span class="item_list fl"></span> <div><span class="item_list fl"></span>
<%= link_to activity.title.to_s, User.current.logged? ? news_path(activity) : signin_url_without_domain, :class => "list-title fl" %> <%= link_to activity.title.to_s, User.current.logged? ? news_path(activity) : signin_url_without_domain, :class => "list-title-normal fl" %>
<% if activity.sticky == 1 %> <% if activity.sticky == 1 %>
<span class="fl ml10 red-cir-btn">顶</span> <span class="fl ml10 red-cir-btn">顶</span>
<% end%> <% end%>
<% u = User.where("id=?",activity.author_id).first%> <div class="cl"></div> <% u = User.where("id=?",activity.author_id).first%>
</div> <div class="cl"></div>
<div class="massages-content ml15">
<p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100, :maxwidth=>563} %></p>
</div> </div>
<!--<div class="massages-content ml15">-->
<!--<p><%#=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100, :maxwidth=>563} %></p>-->
<!--</div>-->
<div class="ml15 mt10"> <div class="ml15 mt10">
<span class="grayTxt"> <span class="grayTxt mr15">
发布者: <%= activity.author.show_name %> 发布者：<%= link_to activity.author.show_name, user_path(activity.author), :class => "link-blue" %>
</span> </span>
<span class="grayTxt">更新：<%= format_time(activity.course_acts.first.try(:updated_at)) %></span> <span class="grayTxt">更新：<%= format_time(activity.course_acts.first.try(:updated_at)) %></span>
<% count=0 %> <% count=0 %>

28
app/views/users/_project_boardlist.html.erb
View File

@ -1,7 +1,7 @@
<div class = "cl"> </div> <div class = "cl"> </div>
<div id="project-boardlist"> <div id="project-boardlist">
<div class="container-big mt10" > <div class="container-big mt10" >
<h2 class="list-h2">讨论区列表</h2> <p class="list-h2">讨论区列表</p>
<div class="category"> <div class="category">
<span class="grayTxt ">排序：</span> <span class="grayTxt ">排序：</span>
<%= link_to "时间", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <%= link_to "时间", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
@ -20,9 +20,9 @@
<div class="list-file"> <div class="list-file">
<div><span class="item_list fl"></span> <div><span class="item_list fl"></span>
<% if activity.parent_id.nil? %> <!--+"(帖子标题)"--> <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
<%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class=> "list-title fl", :style => "max-width:950px;" %> <%= link_to activity.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class=> "list-title-normal fl", :style => "max-width:950px;" %>
<% else %> <% else %>
<%= link_to activity.parent.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class=> "list-title f1", :style => "max-width:950px;" %> <%= link_to activity.parent.subject.to_s.html_safe, User.current.logged? ? board_message_path(activity.board_id, activity) : signin_url_without_domain, :class=> "list-title-normal f1", :style => "max-width:950px;" %>
<% end %> <% end %>
<% if activity.sticky == 1 %> <% if activity.sticky == 1 %>
<span class="fl ml10 red-cir-btn">顶</span> <span class="fl ml10 red-cir-btn">顶</span>
@ -30,20 +30,20 @@
<% if activity.locked %> <% if activity.locked %>
<span class="fl ml10 green-cir-btn" title="已锁定">锁</span> <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
<% end %> <% end %>
<% u = User.where("id=?",activity.author_id).first%> <%# u = User.where("id=?",activity.author_id).first%>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="ml15"> <!--<div class="ml15">-->
<% if activity.parent_id.nil? %> <!--<%# if activity.parent_id.nil? %>-->
<% content = activity.content %> <!--<%# content = activity.content %>-->
<% else %> <!--<%# else %>-->
<% content = activity.parent.content %> <!--<%# content = activity.parent.content %>-->
<% end %> <!--<%# end %>-->
<p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>225, :maxwidth=>950} %></p> <!--<p><%#=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>225, :maxwidth=>950} %></p>-->
</div> <!--</div>-->
<div class="ml15 mt10 f12"> <div class="ml15 mt10 f12">
<span class="grayTxt"> <span class="grayTxt mr15">
发帖人:<%=(u.try(:realname) != " " ? u.try(:lastname) + u.try(:firstname) : u.try(:login)) unless u.nil? %> 发帖人：<%= link_to activity.author.show_name, user_path(activity.author), :class => "link-blue" %>
</span> </span>
<span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span> <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
<% all_comments = []%> <% all_comments = []%>

4
app/views/users/_user_course_list.html.erb
View File

@ -1,5 +1,5 @@
<div class="listbox" id="course-list"> <div class="listbox" id="course-list">
<h2 class="list-h2">课程列表</h2> <p class="list-h2">课程列表</p>
<div class="category"> <div class="category">
<span class="grayTxt ">排序：</span> <span class="grayTxt ">排序：</span>
<%= link_to "时间", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <%= link_to "时间", {:controller => 'users', :action => 'user_courselist', :id =>@user, :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
@ -19,7 +19,7 @@
<ul class="list-file"> <ul class="list-file">
<li> <li>
<span class="item_list fl"></span> <span class="item_list fl"></span>
<%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title-normal fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
:style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%> :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
<% teacher = User.where("id=?",course.tea_id).first%> <% teacher = User.where("id=?",course.tea_id).first%>
<span class="fr grayTxt"> <span class="fr grayTxt">

4
app/views/users/_user_project_list.html.erb
View File

@ -82,7 +82,7 @@
<div class="listbox" id="project-list"> <div class="listbox" id="project-list">
<h2 class="list-h2">项目列表</h2> <p class="list-h2">项目列表</p>
<div class="category"> <div class="category">
<span class="grayTxt ">排序：</span> <span class="grayTxt ">排序：</span>
<%= link_to "时间", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %> <%= link_to "时间", {:controller => 'users', :action => 'user_projectlist', :id =>@user, :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
@ -102,7 +102,7 @@
<ul class="list-file"> <ul class="list-file">
<li> <li>
<span class="item_list fl"></span> <span class="item_list fl"></span>
<%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "list-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%> <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "list-title-normal fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
<% projectUser = User.where("id=?",project.user_id).first%> <% projectUser = User.where("id=?",project.user_id).first%>
<span class="fr grayTxt"> <span class="fr grayTxt">
<%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %> <%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %>

4
public/stylesheets/css/public.css
View File

@ -493,7 +493,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
/*博客列表界面样式*/ /*博客列表界面样式*/
.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; } .listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
/*.bloglistbox{ min-height:690px;}*/ /*.bloglistbox{ min-height:690px;}*/
.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;} .list-h2{ font-size:16px; color:#000; padding-bottom:5px;}
.category{ padding:10px 0; border-bottom:1px solid #ddd;} .category{ padding:10px 0; border-bottom:1px solid #ddd;}
.category a,.category span{ float:left; margin-right:5px;} .category a,.category span{ float:left; margin-right:5px;}
.grayTxt{ color:#9093a6;} .grayTxt{ color:#9093a6;}
@ -504,6 +504,8 @@ a.sortdownbtn{ background: url(/images/liststyle.png) 0 -12px no-repeat; width:1
.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;} .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
.list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;} .list-file a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;}
a:hover.list-title{ color:#269ac9;} a:hover.list-title{ color:#269ac9;}
.list-file a.list-title-normal{ font-size:14px; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:550px;}
a:hover.list-title-normal{ color:#269ac9;}
.font_normal{ font-weight:normal; font-size:12px;} .font_normal{ font-weight:normal; font-size:12px;}
.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;} .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}
.list-file li{ line-height:1.9;} .list-file li{ line-height:1.9;}