<%= textilizable @project.description %>
@@ -92,24 +92,24 @@
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b90867e20..9a8217b02 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1055,7 +1055,9 @@ zh:
zero: 0 问题
one: 1 问题
other: "%{count} 问题"
- label_repository_new: 新建版本库
+ label_repository_new: 配置版本库
+ label_repository_no: 还没有版本库？
+ label_repository_new_repos: 新建版本库
field_repository_is_default: 主版本库
label_copy_attachments: 复制附件
label_item_position: "%{position}/%{count}"
@@ -1229,4 +1231,4 @@ zh:
label_in_issues: 在问题：
label_in_bids: 在需求：
label_in_users: 在用户：
- label_have_respond: 进行了反馈
\ No newline at end of file
+ label_have_respond: 进行了反馈
diff --git a/config/routes.rb b/config/routes.rb
index 0562cba47..72e8ca27c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -204,7 +204,12 @@ RedmineApp::Application.routes.draw do
match 'committers', :via => [:get, :post]
end
end
-
+ resources :repositories, :except => [:index, :show] do
+ member do
+ get 'newrepo', :via => [:get, :post]
+ # get 'create', :via=>[:get, :post]
+ end
+ end
match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
resources :wiki, :except => [:index, :new, :create], :as => 'wiki_page' do
member do
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 87e61e2d5..fe008c51c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -63,7 +63,7 @@ ul.tool li{list-style-type:none;
color:#7e7e7e;
}
.content_frame{
- padding-top: 0px;
+ padding-bottom: 30px;
float: left;
}
<%= l(:label_project_tool)%>
-
+
+ | <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_documents),project_documents_path(@project) %> | -
+ | <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_wiki),project_wiki_path(@project) %> | ||
|
+ | <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> | -
+ | <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> | ||
|
+ | <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_boards) ,project_boards_path(@project) %> |
| <%= link_to image_tag(url_to_avatar(@user), :class => 'avatar'), :class => "avatar" %> | +<%= link_to image_tag(url_to_avatar(@user), :class => 'avatar2'), :class => "avatar" %> |
|
|||
| + <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id =>User.current.id}%> + |
- <%= l(:label_user_watcher) %> (<%=link_to User.watched_by(@user.id).count %>)
+ <%= 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) }%>
- <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id =>User.current.id}%>
+
<%= link_to l(:label_repository_new), new_project_repository_path(@project), :class => 'icon icon-add' %>
<% end %> + +<% if User.current.allowed_to?(:manage_repository, @project) %> +<%= l(:label_repository_no) %> + <%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project), :class => 'icon icon-add' %>
+<% end %> \ No newline at end of file diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index 459e30691..307eb9493 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -36,5 +36,7 @@ <%= l(:label_project_un) %> <% else %><%= l(:label_project_unadd) %><%= link_to"新建",:controller=>'projects',:action=>'new'%> <% end %> + <% end %> -<%= call_hook :view_account_left_bottom, :user => @user %> \ No newline at end of file +<%= call_hook :view_account_left_bottom, :user => @user %> + diff --git a/app/views/watchers/_fans_num.html.erb b/app/views/watchers/_fans_num.html.erb index 010bf52e2..7c7f03691 100644 --- a/app/views/watchers/_fans_num.html.erb +++ b/app/views/watchers/_fans_num.html.erb @@ -1,3 +1,3 @@ -<%= l(:label_user_fans) %>(<%= fans_num %>) +<%= l(:label_user_fans) %>(<%=link_to fans_num %>) \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index b129db12a..b1528602b 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -139,10 +139,10 @@ -
+
-
-
+
| Trustieforge + |
| Trustie 是一个社交化的项目管理、软件开发和众包平台。 |
| Trustieforge is a socialized collaboration platform for project management, software development and software crowdsourcing. | 在这里您可以可以看见任何一个版本的工程！ |