From f0791fe132661ecd8aa7e8f98d1bdc3346db5cfc Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 2 Sep 2013 21:32:15 +0800 Subject: [PATCH 1/3] modify created project info as a fist activity --- app/controllers/projects_controller.rb | 3 ++- app/views/projects/show.html.erb | 6 +++++- config/locales/en.yml | 1 + config/locales/zh.yml | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d9ead306d..0c49e8e7e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -320,7 +320,8 @@ class ProjectsController < ApplicationController @subprojects = @project.children.visible.all @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all @trackers = @project.rolled_up_trackers - + @user = User.find_by_id(ProjectInfo.find_by_project_id(@project.id).user_id) + cond = @project.project_condition(Setting.display_subprojects_issues?) @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker) diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 7b3241b2d..4713ecce7 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -42,5 +42,9 @@ <% else %> -

<%= l(:label_project_no_activity) %>

+

+
<%=link_to image_tag(url_to_avatar(@user), :class => "avatar"), user_path(@user)%> + + +
<%=link_to @user.login.to_s,user_path(@user) %> <%= l(:label_user_create_project)+" "+ @project.name %>
<%= format_time(@project.created_on) %>

<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 4ac5c6109..7d79cb93c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1343,3 +1343,4 @@ en: label_in_issues: in the issue： label_in_bids: in the call： label_in_users: in the user： + label_user_create_project: has created diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b37cda246..f74ba4a9c 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1354,4 +1354,5 @@ zh: label_projects_feedback_respond: 回复 label_projects_feedback_respond_success: 回复成功 button_projects_feedback_respond: 回复 - label_projects_feedback_respond_content: 请输入回复内容 \ No newline at end of file + label_projects_feedback_respond_content: 请输入回复内容 + label_user_create_project: 创建了 \ No newline at end of file From 07b0409c578d77b690a144ba3d34352ffcd42cdd Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 2 Sep 2013 21:40:48 +0800 Subject: [PATCH 2/3] delete UTC --- app/views/layouts/base_projects.html.erb | 2 +- app/views/projects/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index db80b0071..0994dcec0 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -83,7 +83,7 @@ <%= textilizable @project.description %>
- <%= l(:label_create_time) %>：<%= @project.created_on %> + <%= l(:label_create_time) %>：<%= format_time(@project.created_on) %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 4713ecce7..cb7707781 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -45,6 +45,6 @@

<%=link_to image_tag(url_to_avatar(@user), :class => "avatar"), user_path(@user)%> - +
<%=link_to @user.login.to_s,user_path(@user) %> <%= l(:label_user_create_project)+" "+ @project.name %>
<%=link_to @user.login.to_s,user_path(@user) %> <%= l(:label_user_create_project) %> <%=link_to @project.name %> !
<%= format_time(@project.created_on) %>

<% end %> From e0336e6d9e2fdfc9cd17458e01f4936166ee0136 Mon Sep 17 00:00:00 2001 From: xianbo Date: Mon, 2 Sep 2013 21:45:27 +0800 Subject: [PATCH 3/3] modify the usage of git --- app/views/git_usage/ch_usage.html.erb | 10 +++++++++- app/views/git_usage/en_usage.html.erb | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) 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 {

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