diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index cc6920635..10ff1538b 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -1,233 +1,222 @@ <% @nav_dispaly_project_label = 1 - @nav_dispaly_forum_label = 1 %> +@nav_dispaly_forum_label = 1 %> <%#@nav_dispaly_project_label = 1 %> - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %> - <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= hubspot_head %> - <%= call_hook :view_layouts_base_html_head %> - - <%= yield :header_tags -%> - - - -
-
-
- <%= render :partial => 'layouts/base_header'%> -
-
- - - - - + + + + +
<%= l(:label_projects_community)%> <%= l(:label_user_location) %> : -
+

+ <%= link_to l(:label_home),home_path %> > + <%= link_to @project, project_path(@project) %> +

+
+ + - - +
+
- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
-
- <%= render :partial => 'layouts/base_footer'%> -
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+
+ <%= render :partial => 'layouts/base_footer'%> +
- - - - - <%= call_hook :view_layouts_base_body_bottom %> - - + + + + + <%= call_hook :view_layouts_base_body_bottom %> + + diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb index 8608bdfb8..b6e5f8c0d 100644 --- a/app/views/projects/_tools_expand.html.erb +++ b/app/views/projects/_tools_expand.html.erb @@ -5,8 +5,8 @@
  • <% unless @project.enabled_modules.where("name = 'news'").empty? %> - <%= link_to l(:field_user_active_news), project_news_index_path(@project) %> - <% end%> + <%= link_to l(:project_module_news), project_news_index_path(@project) %> + <% end %>
  • <% unless @project.enabled_modules.where("name = 'wiki'").empty? %> @@ -33,6 +33,10 @@ <%= link_to l(:project_module_documents), project_documents_path(@project) %> <% end %>
  • + +
  • + <%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %> +
  • <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
  • diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index 184eb0f18..82a7a66e6 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -1,4 +1,7 @@ +
    +

    <%= l(:label_roadmap) %>

    +
    <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
    diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index bce5bc771..eb463300b 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -1,4 +1,7 @@ +
    +

    <%= l(:label_roadmap) %>

    +
    <%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %> <%= link_to_if_authorized(l(:button_edit_associated_wikipage, diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml index 3132bc6cd..8d98552ed 100644 --- a/config/locales/commons/en.yml +++ b/config/locales/commons/en.yml @@ -200,7 +200,7 @@ en: button_cancel: Cancel label_submit: Submit button_project_tags_add: Add - label_more: More + label_more: "More>>" button_download: Download button_delete: Delete diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 17d5cecf4..8febf8076 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -205,7 +205,7 @@ zh: button_cancel: 取消 label_submit: 提交 button_project_tags_add: 增加 - label_more: 更多>> + label_more: "更多>>" button_download: 下载 button_more: 更多 button_delete: 删除 diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 6c27d5685..1ee904948 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -56,6 +56,7 @@ en: label_expend_information: More Information + # # 项目托管平台 # diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index dfa0e241b..9411fb7d7 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -60,8 +60,29 @@ zh: project_module_repository: 版本库 project_module_create_repository: 创建版本库 + label_settings: 配置 + project_module_news: 新闻 + project_module_wiki: Wiki + project_module_code_review: 代码审查 + project_module_calendar: 日历 + project_module_gantt: 甘特图 + project_module_documents: 文档 + label_project_tool_response: 用户反馈 + label_module_share: DTS测试工具 + label_project_overview: "项目简介:" label_expend_information: 展开更多信息 + + + # + # 项目托管平台 + # + # 项目配置 + # + + + + # # 项目托管平台 # diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 925c0a309..76f14f0da 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -520,16 +520,14 @@ zh: project_module_issue_tracking: 问题跟踪 project_moule_boards_show: 项目论坛 project_module_time_tracking: 时间跟踪 - project_module_news: 新闻 - project_module_documents: 文档 - project_module_wiki: Wiki - project_module_calendar: 日历 - project_module_gantt: 甘特图 + + + project_module_course: 课程 - label_module_share: DTS测试工具 - project_module_code_review: 代码审查 + + label_user: 用户 label_user_plural: 用户列表 @@ -759,7 +757,7 @@ zh: label_news_latest: 最近的新闻 label_news_view_all: 查看所有新闻 label_news_added: 新闻已添加 - label_settings: 配置 + label_overview: 近期动态 label_course_overview: "课程动态" label_project_overview_new: "项目动态" @@ -1629,7 +1627,6 @@ zh: label_issue_appraise_over: 只能评价一次哦! label_welcome_my_respond: 请在此留下你的意见和建议! - label_project_tool_response: 用户反馈 label_course_feedback: 留言 label_tags_search_result: 搜索结果 label_tags_call: 需求