diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 7807be1ae..808bb2aba 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -128,42 +128,7 @@
-
- <%= l(:label_project_tool)%> -
- - - - - - - - - - - - - - - - - - -
<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_documents),project_documents_path(@project) %><%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_wiki),project_wiki_path(@project) %>
<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> - <%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> -
<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %> - <%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:project_module_files) ,project_files_path(@project) %> -
<%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:label_module_share) ,share_show_path(@project) %> - <%=image_tag("/images/sidebar/tool_tag.png", weight:"15px", height:"15px") %> - <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project) %> -
+ <%= render 'projects/tools_expand' %>
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb new file mode 100644 index 000000000..d513fa035 --- /dev/null +++ b/app/views/projects/_tools_expand.html.erb @@ -0,0 +1,71 @@ + +
+ <%= l(:label_project_tool)%> +
+ +
+ + + + +
diff --git a/config/locales/zh.yml b/config/locales/zh.yml index e7dc73931..2c1909b6d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -851,7 +851,7 @@ zh: label_user_activities: 您没有关注该用户,请尝试重新输入! label_user_activities_other: 该用户暂无任何动态! label_project_overview: "概述" - label_project_tool: "工具" + label_project_tool: "项目工具集" label_project_issues: "缺陷" label_project_newother: "查看其他评论" label_project_newshare: "分享了" @@ -1728,17 +1728,17 @@ zh: label_newbie_faq: '新手指引 & 问答' label_hot_project: '热门项目' + label_borad_project: 项目讨论区 + label_borad_course: 课程讨论区 label_memo_create_succ: 发布成功 label_memo_create_fail: 发布失败 - label_forum_create_succ: 讨论吧新建成功 - label_forum_create_fail: 讨论吧新建失败 + label_forum_create_succ: 贴吧新建成功 + label_forum_create_fail: 贴吧新建失败 label_memo_create: 发布 label_memo_new: 新建主题 label_memo_edit: 修改主题 - label_borad_project: 项目讨论区 - label_borad_course: 课程讨论区 label_memo_new_from_forum: 发布帖子 - label_forum: 讨论吧 - label_forum_new: 新建讨论吧 - label_tags_forum_description: 讨论吧描述 - label_tags_forum: 讨论吧名称 + label_forum: 公共贴吧 + label_forum_new: 新建贴吧 + label_tags_forum_description: 贴吧描述 + label_tags_forum: 贴吧名称 diff --git a/public/images/sidebar/tool_tag_alpha.png b/public/images/sidebar/tool_tag_alpha.png new file mode 100644 index 000000000..902d19988 Binary files /dev/null and b/public/images/sidebar/tool_tag_alpha.png differ