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

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
kaizheng 2013-08-17 10:49:56 +08:00
parent 7c634dc5f3 647781effa
commit 516d213ac4
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/helpers/application_helper.rb
View File

@ -1300,6 +1300,14 @@ module ApplicationHelper
#added by nie
# Display watcher picture
def show_more_watchers?(obj)
if User.watched_by(obj.id).count > 12
return true
else
return false
end
end
def show_watcher_profile(obj)
count = 0
html = ''
@ -1314,6 +1322,14 @@ module ApplicationHelper
end
#display fans picture
def show_more_fans?(obj)
if obj.watcher_users.count > 12
return true
else
return false
end
end
def show_fans_picture(obj)
html = ''
count = 0

8
app/views/layouts/base_users.html.erb
View File

@ -69,7 +69,7 @@
</table>
</div>
<!--Modified by nie-->
<!--tags-->
<div class="user_underline"></div>
<!-- <div class="user_fans"> -->
@ -86,6 +86,9 @@
<div class="user_fans">
<div class="font_title_left">
<strong><%= l(:label_user_watcher) %></strong>
<% if show_more_watchers?(@user) %>
<div style="font-size: 11px; display: inline; float: right; margin-top: 5px; margin-right: 20px" ><%= link_to l(:label_more), :controller => "users", :action => "user_watchlist"%></div>
<% end %>
</div>
<div class="left_wf">
@ -101,6 +104,9 @@
<div class="user_fans">
<div class="font_title_left">
<strong><%= l(:label_user_fans) %></strong>
<% if show_more_fans?(@user) %>
<div style="font-size: 11px; display: inline; float: right; margin-top: 5px; margin-right: 20px" ><%= link_to l(:label_more), :controller => "users", :action => "user_fanslist"%></div>
<% end %>
</div>
<div class="left_wf">
<table>

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

@ -137,7 +137,7 @@ software development and software crowdsourcing.</td></tr>
<!--add by huang-->
<!--add by huang-->
<div style="height:230px;">
<div style="height:250px;">
<div class="welcone_left">
<table width="350px">
<tr>