diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 51c209e9d..5e67e0a2c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -337,7 +337,7 @@ class ProjectsController < ApplicationController end end if params[:repository] == "pswd_is_null" - html << l(:label_password_not_null)<< ";" + html << l(:label_password_not_null) end flash[:error] = html if !html.to_s.blank? end diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb index d57cd68eb..04363653f 100644 --- a/app/helpers/files_helper.rb +++ b/app/helpers/files_helper.rb @@ -61,7 +61,7 @@ module FilesHelper s = '' projects.each do |project| if !project_contains_attachment?(project,attachment) && User.current.allowed_to?(:manage_files, project) - s << "" + s << "
" end end s.html_safe diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb index c7e0cec29..53ff70bbe 100644 --- a/app/views/files/_project_file_list.html.erb +++ b/app/views/files/_project_file_list.html.erb @@ -45,8 +45,8 @@
- <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "10"} %> - <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "10"} %> + <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %> + <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
diff --git a/app/views/files/_show_quote_resource_project.html.erb b/app/views/files/_show_quote_resource_project.html.erb index 7df1dc2f3..9ea9126fb 100644 --- a/app/views/files/_show_quote_resource_project.html.erb +++ b/app/views/files/_show_quote_resource_project.html.erb @@ -1,6 +1,6 @@
-

将此课件引入我的资源库

+

将此文件件引入我的资源库

<% if error == '403' %>
您没有权限引用此资源
@@ -13,13 +13,11 @@ remote: true, id: "relation_file_form" do %> <%= hidden_field_tag(:file_id, file.id) %> - <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects')%> + <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects', :class => "hidden")%> 引  用取  消 <% end -%>
<% end %> - -
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index 3356a351a..22fb70292 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -11,113 +11,113 @@
<% if members.any? %> -
<% if roles.any? %> -
- - <% if @project.applied_projects.any? %> -
-

<%= l(:label_apply_project) %>

- <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> -
- <%= render_principals_for_applied_members_new(@project) %> -
- + + <%= l(:label_approve) %> + + + <%= l(:label_refusal) %> + + <% end %> +
+
+ <% end %> +
+ +

<%= l(:label_member_new) %>

+ <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> +
+ + <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %> +
-
- <%= render_principals_for_new_project_members(@project) %> -
-
+
+ <%= render_principals_for_new_project_members(@project) %> +
+
-
- <% end%> -
+ <% roles.each do |role| %> +
  • + <%= check_box_tag 'membership[role_ids][]', role.id %> + +
    • + <% end %> + +
    + + 新增成员 + + + <% end%> + <% end %> -<%= error_messages_for 'repository' %> +<%= str = error_messages_for 'repository' %> <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> <% if @project.repositories.any? %> @@ -64,7 +64,7 @@
    - 保存 - 取消 + <%=l(:button_save)%> + <%=l(:button_cancel)%>
    <% end %> \ No newline at end of file diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index 6365354c3..ffc301cf5 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -57,32 +57,32 @@
    diff --git a/app/views/repositories/revisions.html.erb b/app/views/repositories/revisions.html.erb index 184674637..b1b69d624 100644 --- a/app/views/repositories/revisions.html.erb +++ b/app/views/repositories/revisions.html.erb @@ -1,7 +1,8 @@

    <%= l(:label_repository_plural) %>

    -
    +
    +

    <%= l(:label_revision_plural) %>

    <%= form_tag( {:controller => 'repositories', :action => 'revision', :id => @project, :repository_id => @repository.identifier_param}, @@ -12,7 +13,7 @@ <% end %>
    -

    <%= l(:label_revision_plural) %>

    + <%= render :partial => 'revisions', :locals => {:project => @project, diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index d9a02b8f1..f0ed7c84f 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -3,29 +3,29 @@
    diff --git a/app/views/versions/edit.html.erb b/app/views/versions/edit.html.erb index c249572aa..7f6fe3658 100644 --- a/app/views/versions/edit.html.erb +++ b/app/views/versions/edit.html.erb @@ -2,6 +2,6 @@ <%= labelled_form_for @version,:html=>{:id=>"new_project_version_form"} do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> - 保存 + <%=l(:button_save)%> <% end %> diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index bd09f2538..3c4d4a97c 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -352,7 +352,7 @@ zh: field_enterprise_name: 组织名称 label_organization_choose: --请选择组织-- text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。" - text_project_identifier_info: "小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。
    一旦保存，标识无法修改。" + text_project_identifier_info: "小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。一旦保存，标识无法修改。" field_is_public: 公开 field_hidden_repo: 隐藏代码库