From 62ff95c4af16a46a4f68b3b4ae1ed80f4ece20ec Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Mon, 12 Aug 2013 21:54:59 +0800 Subject: [PATCH] =?UTF-8?q?user=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E2=80=9C=E6=A0=87=E7=AD=BE=E2=80=9D=E5=8A=9F=E8=83=BD=20projec?= =?UTF-8?q?t=E7=95=8C=E9=9D=A2=E9=A3=8E=E6=A0=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 40 +++++++++++++----------- app/views/layouts/base_users.html.erb | 16 ++++++++-- public/stylesheets/application.css | 12 +++++++ 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 961206480..849e7a3bc 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -30,7 +30,7 @@
- + -
<%= link_to image_tag(url_to_avatar(@project), :class => 'avatar') %><%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %>
<%= textilizable @project.name %> @@ -41,30 +41,22 @@ <% end %>
- - -
- -
- <%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%> -
-
+
-
+ - - - - - - - + + + + + + +
<%= @project.members.count %><%= @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 "#{@project.members.count}", project_member_path(@project) %><%=link_to "#{@project.issues.count}", project_issues_path(@project) %><%=link_to "#{@project.attachments.count}", project_files_path(@project) %>
<%= l(:label_member) %> <%= l(:label_project_defects) %><%= l(:label_attachment) %>
@@ -86,8 +78,20 @@
+ + + + +
+ +
+
+ <%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%> +
+
+
<%= l(:label_project_tool)%> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 6670e87ce..8c1515ef1 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -48,8 +48,8 @@
<%= 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) }%> - + + <%= l(:label_user_fans) %> (<%=link_to @user.watcher_users(@user.id).count, :controller=>"users", :action=>"user_fanslist" %>)
@@ -69,9 +69,19 @@
+ +
+
+ +
+
+ <%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%> +
+
+ - +
<%= l(:label_user_watcher) %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 8696d5fb5..cd0fd5aad 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -58,6 +58,11 @@ ul.tool li{list-style-type:none; font-family: 微软雅黑; color:#068d9c; } +.font_aram{ + font-size: 14px; + font-family: 微软雅黑; + font-weight: bold; +} .font_content{ font-size:14px; font-family: 微软雅黑; @@ -270,6 +275,13 @@ ul.tool li{list-style-type:none; height: auto; /*color:#fff; */ } + +.user_tags{ + padding-top: 5px; + padding-bottom: 5px; + padding-left: 8px; +} + .tool{ padding-left:0px; margin:0px 0px 0px 0px;