diff --git a/app/views/layouts/_tag.html.erb b/app/views/layouts/_tag.html.erb index 382f35d46..5873c6294 100644 --- a/app/views/layouts/_tag.html.erb +++ b/app/views/layouts/_tag.html.erb @@ -12,7 +12,7 @@ <%= form_for "tag_for_save",:remote=>true,:url=>tag_path, :update => "tags_show", :complete => '$("#put-tag-form-issue").hide();' do |f| %> - <%= f.text_field :name ,:id => "name-issue"%> + <%= f.text_field :name ,:id => "name-issue",:size=>"30" %> <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> <%= f.submit "add"%> @@ -30,7 +30,7 @@ <%= form_for "tag_for_save",:remote=>true,:url=>tag_path, :update => "tags_show", :complete => '$("#put-tag-form").hide();' do |f| %> - <%= f.text_field :name ,:id => "name"%> + <%= f.text_field :name ,:id => "name",:size=>"28"%> <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> <%= f.submit "add"%> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index d51d8ce58..0ee2c64a0 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -19,8 +19,8 @@
-
- <%=render :partial => 'layouts/base_header'%> +
+ <%= render :partial => 'layouts/base_header'%>
@@ -32,77 +32,86 @@ <%= link_to image_tag(avatar_image(@project), :class => 'avatar') %> -
<%= textilizable @project.name %>
-
- <% if @project.watched_by?(User.current) %> - <%= watcher_link(@project, User.current) %> - <% end %> -
- - +
+ <%= textilizable @project.name %> +
+
+ <% if @project.watched_by?(User.current) %> + <%= watcher_link(@project, User.current) %> + <% end %> +
+
-
+
<%= render :partial => 'layouts/tag', :locals => {:obj => @project,:object_flag => "2"}%>
-
- +
+
- + - + - - - + + +
<%= @project.members.count %> <%= @project.issues.count %><%= @project.attachments.count %><%= @project.attachments.count %>
<%= link_to('成员 ', project_member_path(@project), :class => 'project_infor_tag') %><%= link_to('缺陷 ', project_issues_path(@project), :class => 'project_infor_tag') %><%= link_to('文件 ', 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_defect), project_issues_path(@project), :class => 'project_infor_tag') %> <%= link_to(l(:label_attachment), project_files_path(@project), :class => 'project_infor_tag') %>
- +
- 概述 + <%= l(:label_project_overview) %>
- <%= textilizable @project.description %> + <%= textilizable @project.description %> +
+
+ <%= l(:label_create_time) %>：<%= @project.created_on %>
-
- 创建时间：<%= @project.created_on %> -
- +
- 工具 + <%= l(:label_project_tool)%>
- - - + + + - - + + - - + +
<%= link_to l(:project_module_documents),project_documents_path(@project) %><%= link_to l(:project_module_wiki),project_wiki_path(@project) %>
+ <%= link_to l(:project_module_documents),project_documents_path(@project) %> + <%= link_to l(:project_module_wiki),project_wiki_path(@project) %>
<%= link_to l(:project_module_calendar),project_calendar_path(@project) %><%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> + <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> + + <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> +
<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
+ <%= link_to l(:project_module_boards) ,project_boards_path(@project) %> +
@@ -116,15 +125,15 @@ <%= call_hook :view_layouts_base_content %>
<%= render_flash_messages %> - +
- <%=render :partial => 'layouts/base_footer'%> + <%= render :partial => 'layouts/base_footer'%>
- + - +
<%= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 76ad7ef60..985fdc909 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -45,7 +45,8 @@
- 关注 (<%= User.watched_by(@user.id).count %>)  粉丝 (<%= @user.watcher_users.count %>) + <%= l(:label_user_watcher) %> (<%= User.watched_by(@user.id).count %>)   + <%= l(:label_user_fans) %> (<%= @user.watcher_users.count %>)
@@ -53,13 +54,13 @@
- + - + - +
加入时间：<%= format_date(@user.created_on) %><%= l(:label_user_joinin) %><%= format_date(@user.created_on) %>
最近登录：<%= format_date(@user.last_login_on) %><%= l(:label_user_login) %><%= format_date(@user.last_login_on) %>
邮件地址：<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %><%= l(:label_user_mail) %><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>
@@ -69,7 +70,7 @@
- 关注(<%= link_to User.watched_by(@user.id).count, home_path %>) + <%= l(:label_user_watcher) %>(<%= link_to User.watched_by(@user.id).count %>)
@@ -86,9 +87,8 @@
- 粉丝(<%= link_to @user.watcher_users.count, home_path %>) -
- + <%= l(:label_user_fans) %>(<%= link_to @user.watcher_users.count %>) +
@@ -99,14 +99,13 @@
-
- +
-
+
<%= render_menu :user_menu %>
<%= yield %> diff --git a/app/views/news/_news.html.erb b/app/views/news/_news.html.erb index 001ad8179..704e0eef3 100644 --- a/app/views/news/_news.html.erb +++ b/app/views/news/_news.html.erb @@ -5,22 +5,23 @@ <% unless news.summary.blank? %><%=h news.summary %><% end %> <%= authoring news.created_on, news.author %>

--> - - - diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index e183fc1df..e977ba8ca 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -33,7 +33,7 @@ <% end %> <% end %> --> - +
<% if @newss.empty? %>

<%= l(:label_no_data) %>

@@ -44,14 +44,14 @@
diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb index bef124796..6380cf0c1 100644 --- a/app/views/news/show.html.erb +++ b/app/views/news/show.html.erb @@ -34,7 +34,7 @@ <%= textilizable(comment.comments) %> <% end if @comments.any? %> --> - +

<%= l(:label_comment_plural) %>

<% @comments.each do |comment| %> @@ -44,7 +44,8 @@
- + - +
<%=link_to news.author,news_path(news)%> 分享了 <%= link_to h(news.title), news_path(news) %> <%=link_to news.author,news_path(news)%> + <%= l(:label_project_newshare) %> <%= link_to h(news.title), news_path(news) %> +

<%=h news.description%>
<%= news.created_on %><%= link_to"查看其他评论",news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %><%= link_to l(:label_project_newother),news_path(news)%> + <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %> +
<%= image_tag(url_to_avatar(news.author), :class => "avatar") %> - + - +
<%=link_to_user(news.author)if news.respond_to?(:author) %> 分享了 <%= link_to h(news.title), news_path(news) %><%=link_to_user(news.author)if news.respond_to?(:author) %> <%= l(:label_project_newshare)%> <%= link_to h(news.title), news_path(news) %>
<%= textilizable(news, :description) %>
<%= news.created_on %><%= link_to"查看其他评论",news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %>
<%= image_tag(url_to_avatar(comment.author), :class => "avatar")%> - + diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index a01186114..8595bfb84 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -6,7 +6,7 @@
    • <%=link_to_user(comment.author) if comment.respond_to?(:author) %> 添加了<%= l(:label_comment_plural) %><%=link_to_user(comment.author) if comment.respond_to?(:author) %> + <%= l(:label_project_newadd) %><%= l(:label_comment_plural) %>

    <%= textilizable(comment.comments) %>

    - +
    <%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar') %> @@ -31,6 +31,6 @@ <% end %> <% else %> -暂无项目，赶快去<%= link_to"新建",:controller=>'projects',:action=>'new'%>吧 +<%= l(:label_prohect_unadd) %><%= link_to"新建",:controller=>'projects',:action=>'new'%> <% end %> <%= call_hook :view_account_left_bottom, :user => @user %> \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index e1caac4ff..30534561d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -761,10 +761,22 @@ zh: label_user_edit: "修改资料" label_user_info: "个人简介" #huang 添加 label_user_watcher: "关注" # huang添加的 + label_user_fans: "粉丝" label_user_commits: "代码提交" label_user_watchered: "被关注" # huang添加的 label_user_newfeedback: "留言" ## huang添加的 - #。。 + label_user_login: "最后登录:" + label_user_mail: "邮件地址:" + label_user_joinin: "加入时间:" + label_project_overview: "概述" + label_project_tool: "工具" + label_project_defect: "缺陷" + label_project_newother: "查看其他评论" + label_project_newshare: "分享了" + label_project_newadd: "添加了" + label_prohect_unadd: "暂无项目，赶快去创建吧！" + + #end by huang label_user_mail_option_selected: "收取选中项目的所有通知..." label_user_mail_option_none: "不收取任何通知" label_user_mail_option_only_my_events: "只收取我跟踪或参与的项目的通知" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index aa740f2d2..8aa00453d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -196,7 +196,7 @@ ul.tool li{list-style-type:none; margin:0px 0px 0px 0px; height: auto; background-color:#fff; - padding-bottom:5px; + padding-bottom:0px; } .user_private{ padding-left:8px;