diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6cc7fd1b8..0e005690e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -403,7 +403,8 @@ class UsersController < ApplicationController def user_watchlist end ###add by huang - def user_fanslist + def user_fanslist + end private diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 75f1421e1..c06d4d65f 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -17,7 +17,6 @@ class WelcomeController < ApplicationController caches_action :robots - def index @news = News.latest User.current diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 704597c29..26abb6600 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -62,9 +62,9 @@ <%= @project.issues.count %> <%= @project.attachments.count %> - <%= link_to(l(:label_member), project_member_path(@project), :class => 'project_infor_tag') %> - <%= link_to(l(:label_project_defects), project_issues_path(@project), :class => 'project_infor_tag') %> - <%= link_to(l(:label_attachment), project_files_path(@project), :class => 'project_infor_tag') %> + <%= link_to(l(:label_member), project_member_path(@project), :class => 'project_infor_tag') %> + <%= link_to(l(:label_project_defects), project_issues_path(@project), :class => 'project_infor_tag') %> + <%= link_to(l(:label_attachment), project_files_path(@project), :class => 'project_infor_tag') %>
@@ -75,7 +75,7 @@
<%= l(:label_project_overview) %>
-
+
<%= textilizable @project.description %> @@ -92,24 +92,24 @@
<%= l(:label_project_tool)%>
-
+ - - - - - diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 0da3d1ac7..6c65e1507 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -29,11 +29,12 @@
+ <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_documents),project_documents_path(@project) %> + <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_wiki),project_wiki_path(@project) %>
+ <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> + <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
+ <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
- + +
<%= link_to image_tag(url_to_avatar(@user), :class => 'avatar'), :class => "avatar" %><%= link_to image_tag(url_to_avatar(@user), :class => 'avatar2'), :class => "avatar" %> - +
<%= h @user.name%> <%= h @user.name%> <%=image_tag("/images/sidebar/male.png", weight:"11px", height:"11px") %> +
<% unless User.current == @user %> @@ -43,12 +44,15 @@
+ <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id =>User.current.id}%> +
- <%= l(:label_user_watcher) %> (<%=link_to User.watched_by(@user.id).count %>)   + <%= l(:label_user_watcher) %> (<%=link_to User.watched_by(@user.id).count ,:controller=>"users", :action=>"user_watchlist"%>)   <%= render :partial => "watchers/fans_num",:locals => {:fans_num => get_fans_num(@user) }%> - <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id =>User.current.id}%> +
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index 459e30691..307eb9493 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -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 %>
\ No newline at end of file +<%= call_hook :view_account_left_bottom, :user => @user %> + diff --git a/app/views/watchers/_fans_num.html.erb b/app/views/watchers/_fans_num.html.erb index 010bf52e2..7c7f03691 100644 --- a/app/views/watchers/_fans_num.html.erb +++ b/app/views/watchers/_fans_num.html.erb @@ -1,3 +1,3 @@ -<%= l(:label_user_fans) %>(<%= fans_num %>) +<%= l(:label_user_fans) %>(<%=link_to fans_num %>) \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 3539f98ef..34e1be806 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -139,10 +139,10 @@ -
+
- @@ -269,7 +269,7 @@
Trustieforge +
Trustie 是一个社交化的项目管理、软件开发和众包平台。
Trustieforge is a socialized collaboration platform for project management, software development and software crowdsourcing.
<%= l(:label_milestone_description) %>
-
+
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 87e61e2d5..fe008c51c 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -63,7 +63,7 @@ ul.tool li{list-style-type:none; color:#7e7e7e; } .content_frame{ - padding-top: 0px; + padding-bottom: 30px; float: left; }