p49726105
/
bigdir
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-11 21:41:29 +08:00
parent 2868d19ca0 6902fc3c74
commit 224a5615c1
8 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/users_controller.rb
View File

@ -403,7 +403,8 @@ class UsersController < ApplicationController
def user_watchlist
end
###add by huang
def user_fanslist
def user_fanslist
end
private

1
app/controllers/welcome_controller.rb
View File

@ -17,7 +17,6 @@
class WelcomeController < ApplicationController
caches_action :robots
def index
@news = News.latest User.current

20
app/views/layouts/base_projects.html.erb
View File

@ -62,9 +62,9 @@
<td class="font_index"><%= @project.issues.count %></td>
<td class="font_index"><%= @project.attachments.count %></td>
<tr>
<td align="center" width="80px"><strong> <%= link_to(l(:label_member), project_member_path(@project), :class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong> <%= link_to(l(:label_project_defects), project_issues_path(@project), :class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong> <%= link_to(l(:label_attachment), project_files_path(@project), :class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong style="font-size:13px"> <%= link_to(l(:label_member), project_member_path(@project), :class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong style="font-size:13px"> <%= link_to(l(:label_project_defects), project_issues_path(@project), :class => 'project_infor_tag') %></strong></td>
<td align="center" width="80px"><strong style="font-size:13px"> <%= link_to(l(:label_attachment), project_files_path(@project), :class => 'project_infor_tag') %></strong></td>
</tr>
</table>
<div class="user_underline"></div>
@ -75,7 +75,7 @@
<div class="font_title_left">
<%= l(:label_project_overview) %>
</div>
<div class="user_underline2"></div>
<div style="padding-bottom: 8px">
<div class="font_lighter_sidebar">
<%= textilizable @project.description %>
@ -92,24 +92,24 @@
<div class="font_title_left">
<%= l(:label_project_tool)%>
</div>
<div class="user_underline2"></div>
<table class="font_tool">
<tr>
<td align="left" width="60px" valign="center"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:project_module_documents),project_documents_path(@project) %></td>
<td align="left" width="60px" valign="center"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:project_module_wiki),project_wiki_path(@project) %></td>
</tr>
<tr>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
</td>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
</td>
</tr>
<tr>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
</td>
</tr>

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

@ -29,11 +29,12 @@
<div class="inf_user_image">
<table>
<tr>
<td align="left" valign="middle" ><%= link_to image_tag(url_to_avatar(@user), :class => 'avatar'), :class => "avatar" %></td>
<td align="left" valign="middle" ><%= link_to image_tag(url_to_avatar(@user), :class => 'avatar2'), :class => "avatar" %></td>
<td>
<table>
<tr>
<td class="info_font" align="center"><%= h @user.name%> <img src="/images/sidebar/male.png" width="11" height="11"/></td>
<td class="info_font" align="center"><%= h @user.name%> <%=image_tag("/images/sidebar/male.png", weight:"11px", height:"11px") %>
</td>
</tr>
<tr>
<td align="center"> <% unless User.current == @user %>
@ -43,12 +44,15 @@
</tr>
</table></td>
</tr>
<tr><td>
<span id="praise_tread" style="float:left;"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id =>User.current.id}%> </span>
</td></tr>
</table>
<div>
<%= l(:label_user_watcher) %> (<strong class="font_small_watch"><%=link_to User.watched_by(@user.id).count %></strong>) &nbsp;
<%= l(:label_user_watcher) %> (<strong class="font_small_watch"><%=link_to User.watched_by(@user.id).count ,:controller=>"users", :action=>"user_watchlist"%></strong>) &nbsp;
<%= render :partial => "watchers/fans_num",:locals => {:fans_num => get_fans_num(@user) }%>
<span id="praise_tread" style="float:right;"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id =>User.current.id}%> </span>
</div>
</div>

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

@ -36,5 +36,7 @@
<%= l(:label_project_un) %>
<% else %><%= l(:label_project_unadd) %><%= link_to"新建",:controller=>'projects',:action=>'new'%>
<% end %>
<% end %>
<%= call_hook :view_account_left_bottom, :user => @user %></div>
<%= call_hook :view_account_left_bottom, :user => @user %>
</div>

2
app/views/watchers/_fans_num.html.erb
View File

@ -1,3 +1,3 @@
<span id="fans_num">
<%= l(:label_user_fans) %>(<strong class="font_small_watch"><%= fans_num %></strong>)
<%= l(:label_user_fans) %>(<strong class="font_small_watch"><%=link_to fans_num %></strong>)
</span>

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

@ -139,10 +139,10 @@
<!--add by huang-->
<div style="height:200px;">
<div style="height:220px;">
<div class="welcone_left">
<table width="350px">
<tr><td><span class="font_welcome_trustie">Trustieforge</span>
<tr><td><span class="font_welcome_trustie">Trustie</span>
<span class="font_welcome_Cdescription">是一个社交化的项目管理、软件开发和众包平台。</span></td></tr>
<tr><td class="font_welcome_Edescription">Trustieforge is a socialized collaboration platform for project management,
software development and software crowdsourcing.</td></tr>
@ -269,7 +269,7 @@
<td><%= l(:label_milestone_description) %></td>
</tr>
</table>
</div></div>
</div>
<div style="padding-top: 40px">
</div>

2
public/stylesheets/application.css
View File

@ -63,7 +63,7 @@ ul.tool li{list-style-type:none;
color:#7e7e7e;
}
.content_frame{
padding-top: 0px;
padding-bottom: 30px;
float: left;
}