jasder
/
trustieforge
forked from jacknudt/trustieforge
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

解决鼠标bug

This commit is contained in:
nieguanghui 2013-11-30 09:29:02 +08:00
parent fc78a2b876
commit 39bf4ff188
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/welcome_helper.rb
View File

@ -60,7 +60,7 @@ module WelcomeHelper
when 'reply' when 'reply'
'回复' '回复'
when 'bid' when 'bid'
'众包' '作业'
else else
event.event_type event.event_type
end end
@ -119,7 +119,7 @@ module WelcomeHelper
end end
#取得所有活动 #取得所有活动
def find_all_activities limit=5 def find_all_activities limit=6
# users = [] # users = []
# activities = Activity.find_by_sql("select distinct user_id from activities order by id DESC limit #{limit}" ) # activities = Activity.find_by_sql("select distinct user_id from activities order by id DESC limit #{limit}" )
# activities.each { |activity| # activities.each { |activity|

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

@ -129,7 +129,7 @@
<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %> <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
</div> </div>
<div class="inner-right" style="float: right; width:86%; height: 100%; "> <div class="inner-right" style="float: right; width:86%; height: 100%; ">
<span style="color: green;"><%= link_to event.event_author, user_path(event.event_author), :style => "color:green;" %></span>&nbsp;发表了<%= find_all_event_type event %>：<span style="color: blue;"><%= link_to truncate(event.event_description, length: 30, omission:'...'), event.event_url %> <span style="color: green;"><%= link_to event.event_author, user_path(event.event_author), :style => "color:green;" %></span>&nbsp;发表了<%= find_all_event_type event %>：<span style="color: blue;"><%= link_to truncate(event.event_title, length: 30, omission:'...'), event.event_url %>
</span> </span>
<p><span style="color: rgb(172, 174, 177)"><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!-- <span>评论(4)</span></p> --> <p><span style="color: rgb(172, 174, 177)"><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!-- <span>评论(4)</span></p> -->
</div> </div>
@ -151,7 +151,7 @@
<div style="float: left; margin-left: 10px; width: 360px;"> <div style="float: left; margin-left: 10px; width: 360px;">
<p class="layout"> <p class="layout">
<%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :title => "#{project.name}")%> <%= link_to( project.name, project_path(project.project_id), :class => "d-g-blue d-p-project-name", :title => "#{project.name}")%>
<span style="display: inline-block; float: right; color: red; background: url('/images/score.png') no-repeat scroll ;background-position: left center;" title="项目得分">&nbsp;&nbsp;&nbsp;&nbsp;<%= show_grade project %></span> <span style="display: inline-block; float: right; color: #ec6300; background: url('/images/score.png') no-repeat scroll ;background-position: left center;" title="项目得分">&nbsp;&nbsp;&nbsp;&nbsp;<%= show_grade project %></span>
</p> </p>
<p class="layout-1" > <p class="layout-1" >
<!-- <span class="d-p-project-intro" ><%= project.description.truncate(50, omission: '...') %></span> --> <!-- <span class="d-p-project-intro" ><%= project.description.truncate(50, omission: '...') %></span> -->
@ -221,7 +221,7 @@
</div> </div>
</div> </div>
<div class="clr"></div> <div class="clr">
</div> </div>

5
public/stylesheets/welcome.css
View File

@ -157,7 +157,7 @@ li {
line-height: 20px; line-height: 20px;
padding: 5px 5px 0px 9px; padding: 5px 5px 0px 9px;
width: 440px; width: 440px;
cursor: pointer; /*cursor: pointer;*/
font: 12px/1.5 tahoma,arial,\5b8b\4f53; font: 12px/1.5 tahoma,arial,\5b8b\4f53;
float: left; float: left;
/* display:block;*/ /* display:block;*/
@ -204,6 +204,9 @@ p.layout {
width: 45px; width: 45px;
height: 45px; height: 45px;
} }
.d-p-project-intro {
cursor: text;
}
/*p.clr, .clr { clear:both; padding:0; margin:0; background:none;}*/ /*p.clr, .clr { clear:both; padding:0; margin:0; background:none;}*/