From a9fa958f7f3caa8e75b64f358aafd46811938644 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 19 Oct 2016 16:56:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8E=E6=A8=A1=E5=9D=97=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- .../projects/settings/_new_edit.html.erb | 4 +- .../projects/settings/_new_members.html.erb | 76 ++++++++++--------- .../projects/settings/_new_modules.html.erb | 6 +- 4 files changed, 45 insertions(+), 43 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0f6798328..9358c0907 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1906,7 +1906,7 @@ module ApplicationHelper end def check_all_links(form_name) - link_to_function_none(l(:button_check_all), "checkAll('#{form_name}', true)") + "  ".html_safe + " | "+ "  ".html_safe + + link_to_function_none(l(:button_check_all), "checkAll('#{form_name}', true)") + " ".html_safe + " | "+ " ".html_safe + link_to_function_none(l(:button_uncheck_all), "checkAll('#{form_name}', false)") end diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb index 673fbde3b..3463be8ad 100644 --- a/app/views/projects/settings/_new_edit.html.erb +++ b/app/views/projects/settings/_new_edit.html.erb @@ -24,12 +24,12 @@ <% end %>
  • - > + > （打钩为公开项目，不打钩为私有项目；私有项目仅项目成员可见。）
  • - > + >
  • <% if Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") %> diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index 1bb0757c0..2b4997dfe 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -15,6 +15,45 @@ %>
    + <% if roles.any? %> + 添加成员 + <% end %> +
    +
    + <%= 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_project_members(@project) %> +
      +
    +
      + <% roles.each do |role| %> +
    • + <%= radio_button_tag 'membership[role_ids][]', role.id, role.name == "报告人员" || role.name == "Reporter", :class=>"fl" %> + <% if User.current.language == "zh" %> + <% if role.id == 3 %> +
      管理人员
      + <% elsif role.id == 4 %> +
      开发人员
      + <% else %> +
      报告人员
      + <% end %> + <% else %> +
      <%= h role %>
      + <% end %> +
      • + <% end %> +
    +
    + + 取消 + 保存 + <%end%> +
    <% if members.any? %> @@ -76,45 +115,8 @@ <% else %>

    <%= l(:label_no_data) %>

    <% end %> - <% if roles.any? %> - 添加成员 - <% end %> -
    - <%= 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_project_members(@project) %> -
      -
    -
      - <% roles.each do |role| %> -
    • - <%= radio_button_tag 'membership[role_ids][]', role.id, role.name == "报告人员" || role.name == "Reporter", :class=>"fl" %> - <% if User.current.language == "zh" %> - <% if role.id == 3 %> -
      管理人员
      - <% elsif role.id == 4 %> -
      开发人员
      - <% else %> -
      报告人员
      - <% end %> - <% else %> -
      <%= h role %>
      - <% end %> -
      • - <% end %> -
    -
    - 取消 - 保存 - <%end%> -
    diff --git a/app/views/projects/settings/_new_modules.html.erb b/app/views/projects/settings/_new_modules.html.erb index 693acaba0..7d5e57354 100644 --- a/app/views/projects/settings/_new_modules.html.erb +++ b/app/views/projects/settings/_new_modules.html.erb @@ -3,13 +3,13 @@ <%= form_for @project,:url => { :action => 'modules', :id => @project },:html => {:id => 'modules-form',:method => :post} do |f| %> <% Redmine::AccessControl.available_project_modules.each do |m| %>
  • - <%= check_box_tag('enabled_module_names[]', m, @project.module_enabled?(m), :class=>"fl").html_safe -%> + <%= check_box_tag('enabled_module_names[]', m, @project.module_enabled?(m), :class=>"fl mt8").html_safe -%>

    <%= l_or_humanize(m, :prefix => "project_module_").html_safe %>

    • <% end %>
  • - -

    <%= check_all_links('modules-form').html_safe %>

    + +

    <%= check_all_links('modules-form').html_safe %>

    • <% end %>