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

1.#1181课程描述显示的问题 

2.修改项目首页用户动态显示按字符长度截取导致页面不协调的BUG
This commit is contained in:
sw 2014-10-10 09:53:58 +08:00
parent 8cd3dd0287
commit 2e3ff531f6
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers/welcome_helper.rb
View File

@ -303,27 +303,27 @@ module WelcomeHelper
str << content_tag("span", "发表了") <<
content_tag("span", find_all_event_type(event)) <<
':&nbsp;'.html_safe <<
link_to(truncate(strip_tags(event.event_description).gsub(/&nbsp;/,''), length: 30, omission:'...'), event.event_url)
link_to(strip_tags(event.event_description).gsub(/&nbsp;/,''), event.event_url)
when 'issue', 'message' , 'bid' , 'wiki-page' , 'document'
str << content_tag("span", "发表了") <<
content_tag("span", find_all_event_type(event)) <<
':&nbsp;'.html_safe <<
link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url)
link_to(event.event_title, event.event_url)
when 'reply' ,'Reply', 'Memo'
str << content_tag("span", "发表了") <<
content_tag("span", find_all_event_type(event)) <<
':&nbsp;'.html_safe <<
link_to(truncate(strip_tags(event.event_description).gsub(/&nbsp;/,''), length: 30, omission:'...'), event.event_url)
link_to(strip_tags(event.event_description).gsub(/&nbsp;/,''), event.event_url)
when 'attachment'
str << content_tag('span', '上传了') <<
content_tag('span', find_all_event_type(event)) <<
':&nbsp;'.html_safe <<
link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) <<
link_to(event.event_title, event.event_url) <<
link_to(('&nbsp;['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container.project), :class => "attachments_list_color")
else
str << content_tag("span", "更新了") <<
content_tag("span", find_all_event_type(event)) <<
':&nbsp;'.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url)
':&nbsp;'.html_safe << link_to(event.event_title, event.event_url)
end
str
rescue Exception => e

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

@ -189,7 +189,7 @@
</div>
<div style="padding-bottom: 8px">
<% if @course.description && @course.description.size>0 %>
<% if @course.description && @course.description.lstrip.rstrip.size>0 %>
<div class="font_lighter_sidebar" style="word-break:break-all; word-wrap:break-word;">
<%= textilizable @course.description %>

4
app/views/welcome/index.html.erb
View File

@ -75,9 +75,7 @@
</span>
<div class="d-p-projectlist-box">
<ul class="d-p-projectlist">
<% #projects = find_miracle_project(10, 3) %>
<% @projects.map do |project| %>
<!--<%# cache cache_key_for_project(project) do %> -->
<li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
<div style="float: left;">
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
@ -122,7 +120,7 @@
<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
</div>
<div class="inner-right" style="float: right; width:86%; height: 100%; ">
<div class="inner-right" style="float: right; width:86%; height: 100%; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" >
<span style="color: green;">
<%= link_to event.event_author, (user_path(event.event_author) if event.event_author),
:style => "color:green;", :target => "_blank" %>

2
config/locales/zh.yml
View File

@ -1634,7 +1634,7 @@ zh:
label_issue_cancel_query: 取消查询
field_reward_type: 奖励类型
label_tags_no: 暂无标签！
label_course_description_no: 你还未对该课程添加描述！
label_course_description_no: 该课程未添加描述！
label_bid_publish: 发布了
label_bid_project: 项目
label_project_no_follow: 该项目暂未被关注！