diff --git a/app/views/git_usage/ch_usage.html.erb b/app/views/git_usage/ch_usage.html.erb index b81242307..9ca7de9ec 100644 --- a/app/views/git_usage/ch_usage.html.erb +++ b/app/views/git_usage/ch_usage.html.erb @@ -1,3 +1,4 @@ + @@ -49,6 +50,12 @@ body table tr td p span4 { body table tr td p span4 { font-weight: bold; } +body table tr td span5 { + color: #F00; +} +body table tr td span5 { + font-weight: bold; +} @@ -126,7 +133,8 @@ body table tr td p span4 {

在桌面上点击鼠标右键，选择TortoiseGit的Settings进行设置

- Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到, 其中的name和email要和forge.trustie.net上的登陆名和密码保持一致，方便代码贡献统计 ）。 + Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到, 其中的name和email要和forge.trustie.net上的登陆名和密码保持一致 + ，方便代码贡献统计 ）。

接着可以定制上下文菜单：

diff --git a/app/views/git_usage/en_usage.html.erb b/app/views/git_usage/en_usage.html.erb index 7b712d852..e7ea39e53 100644 --- a/app/views/git_usage/en_usage.html.erb +++ b/app/views/git_usage/en_usage.html.erb @@ -45,6 +45,12 @@ span3 { span4 { color: #F00; } +body table tr td p span5 { + color: #F00; +} +body table tr td p span5 { + font-weight: bold; +} @@ -122,7 +128,8 @@ span4 { diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3b2257450..8e4799ae4 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -85,9 +85,9 @@ <% when 'Principal' %> <% if e.user == User.current%> - + <% else %> - + <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 4ac5c6109..41b64059b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -552,6 +552,7 @@ en: label_overall_activity: Overall activity label_user_activity: "%{value}'s activity" label_new: New + label_new_user: registered a new account label_logged_as: Logged in as label_environment: Environment label_authentication: Authentication @@ -1100,7 +1101,7 @@ en: label_logged_as_new: Current user button_register: Register issue_list: Issue list - lastest_respond: Lastest respond + lastest_respond: Lastest reply label_news_lastest: Lastest news label_version_display_settings: Display settings label_versions_progress: Complete schedule diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b37cda246..d1b9c5ee7 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -527,6 +527,7 @@ zh: label_overall_activity: 活动概览 label_user_activity: "%{value} 的活动" label_new: 新建 + label_new_user: 注册了一个新用户 # added by bai label_logged_as: 登录为 label_environment: 环境 label_authentication: 认证

Right-click on the desktop and select the "Settings" in the "TortoiseGit"

-

User name and email are used to set your own user name and contact information( user.name and user.email must be completed because these will be used when submitting the repository, the name and email must be the same with login name and email you registed in the forge.trustie.net).

+

User name and email are used to set your own user name and contact information( user.name and user.email must be completed because these will be used when submitting the repository, the name and email must be the same with login name and email you registed in the forge.trustie.net + ).

Then you can customize the "Context Menu":

Please check the "Clone","Sync" and "Commit" options in the "Context Menu",

check the "Import Svn Ignore", "Show Reflog", "Browse References", "Stash Apply" and "Submodule Sync" in the "Set Extend Menu Item".

<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> 新建了用户<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_new_user) %><%= link_to(h(e.user), user_path(e.user_id)) %> 新建了用户<%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_user) %>