hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

项目、课程列表显示修改

Browse Source
yuanke_1
yuanke 9 years ago
parent c357971e8a
commit c729c1252d
8 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File

6
app/views/blogs/_article.html.erb
Unescape View File

@ -25,7 +25,7 @@
<%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :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_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title 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="c_red ml10 fl">[已设为首页]</span> <span class="c_red ml10 fr">[已设为首页]</span>
<% 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>
@ -45,10 +45,10 @@
<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">
<span><%= count>0 ? "（#{count}）" : "" %></span> <span><%= count>0 ? "#{count}" :"0" %></span>
<span>回复</span> <span>回复</span>
<span>|</span> <span>|</span>
<span><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span> <span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" :"0" %></span>
<span>赞</span> <span>赞</span>
</p> </p>
</li> </li>

5
app/views/users/_course_boardlist.html.erb
Unescape View File

@ -29,8 +29,9 @@
<% 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%>
<span class="fr grayTxt"> <span class="fr grayTxt">
<%= activity.course.name.to_s %> 发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
</span> </span>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
@ -40,7 +41,7 @@
<% else %> <% else %>
<% content = activity.parent.content %> <% content = activity.parent.content %>
<% end %> <% end %>
<p><%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %></p> <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>36} %></p>
</div> </div>
<div class="ml15 mt10"> <div class="ml15 mt10">
<span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span> <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>

24
app/views/users/_intro_content_ex.html.erb
Unescape View File

@ -0,0 +1,24 @@
<div class="homepagePostIntro break_word upload_img list_style table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
<div id="intro_content_<%= user_activity_id%>">
<%= content.to_s.html_safe%>
</div>
</div>
<script type="text/javascript">
$(function(){
var heightType = <%= maxheight %>;
if (heightType > 0){
$("#activity_description_<%= user_activity_id%>").css("max-height",heightType+"px");
}
$("#intro_content_<%= user_activity_id%> p,#intro_content_<%= user_activity_id%> span,#intro_content_<%= user_activity_id%> em").each(function(){
var postContent = $(this).html();
postContent = postContent.replace(/&nbsp;/g," ");
postContent= postContent.replace(/ {2}/g,"&nbsp; ");
postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
postContent=postContent.replace(/&nbsp; /g,"&nbsp;&nbsp; ");
$(this).html(postContent);
});
description_show_hide(<%=user_activity_id %>);
});
</script>

7
app/views/users/_project_boardlist.html.erb
Unescape View File

@ -29,8 +29,9 @@
<% 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%>
<span class="fr grayTxt"> <span class="fr grayTxt">
<%= activity.project.name.to_s %> 发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
</span> </span>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
@ -40,7 +41,7 @@
<% else %> <% else %>
<% content = activity.parent.content %> <% content = activity.parent.content %>
<% end %> <% end %>
<p><%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>activity.id, :content=>content} %></p> <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>36 } %></p>
</div> </div>
<div class="ml15 mt10"> <div class="ml15 mt10">
<span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span> <span class="grayTxt">发帖时间：<%= format_time(activity.created_on) %></span>
@ -51,7 +52,7 @@
<% else %> <% else %>
<% count=activity.children.count%> <% count=activity.children.count%>
<% end %> <% end %>
<p class="list-info fr grayTxt"><span><%= count>0 ? "（#{count}）" : "" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span><span>赞</span></p> <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>

2
app/views/users/_user_course_list.html.erb
Unescape View File

@ -28,7 +28,7 @@
<div class="cl"></div> <div class="cl"></div>
<li class="ml15"> <li class="ml15">
<span class="grayTxt"> <span class="grayTxt">
<%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= current_time_and_term course %></span> 开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
</span> </span>
<% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
<% homework_num = course.homework_commons.count %> <% homework_num = course.homework_commons.count %>

2
public/stylesheets/courses.css
Unescape View File

@ -1320,7 +1320,7 @@ a{text-decoration:none}
a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;}
a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; }
.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:635px;} .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;}
.c_red{ font-weight:normal; font-size:12px;} .c_red{ 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;}

2
public/stylesheets/new_user.css
Unescape View File

@ -1514,7 +1514,7 @@ a{text-decoration:none}
a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;}
a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; }
.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:635px;} .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;}
.c_red{ font-weight:normal; font-size:12px;} .c_red{ 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;}

2
public/stylesheets/project.css
Unescape View File

@ -1218,7 +1218,7 @@ a{text-decoration:none}
a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;} a.sortupbtn{ background: url(../images/liststyle.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;}
a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; } a.sortdownbtn{ background: url(../images/liststyle.png) 0 -12px no-repeat; width:12px; height:17px; display:block;margin-right:10px;cursor:pointer; }
.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:635px;} .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;}
.c_red{ font-weight:normal; font-size:12px;} .c_red{ 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;}

Write Preview
Loading…
Cancel
Save