diff --git a/Gemfile b/Gemfile index 7309c6e99..dd19b4435 100644 --- a/Gemfile +++ b/Gemfile @@ -20,8 +20,6 @@ group :openid do end # Optional gem for exporting the gantt to a PNG file, not supported with jruby - - platforms :jruby do # jruby-openssl is bundled with JRuby 1.7.0 gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' diff --git a/app/views/git_usage/ch_usage.html.erb b/app/views/git_usage/ch_usage.html.erb index f7b622c44..b81242307 100644 --- a/app/views/git_usage/ch_usage.html.erb +++ b/app/views/git_usage/ch_usage.html.erb @@ -126,7 +126,7 @@ body table tr td p span4 {

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

- Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到）。 + 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 d312a86c0..7b712d852 100644 --- a/app/views/git_usage/en_usage.html.erb +++ b/app/views/git_usage/en_usage.html.erb @@ -122,7 +122,7 @@ span4 { diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index f63baa955..53e125845 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -76,7 +76,8 @@ <% end %> <% end %> -<%= l(:label_how_commit_code) %> <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path)%> <%= link_to('English', en_usage_path)%> + +<%= l(:label_how_commit_code) %> <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path, :class => "usage")%> | <%= link_to('English', en_usage_path, :class => "usage")%> diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 423911689..212b85183 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1698,6 +1698,10 @@ img.avatar3 { a.bid_path { font-size: 14px; } +a.usage { + color: #F63; + font-weight: bold; +} a.bid_user { font-family:微软雅黑; color:#acaeb1;

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).

+

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".