From 0607cf326c6aaefec999ada5efbc2ff018b0dfa1 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 11:42:23 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E9=A1=B5=E9=9D=A2=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/revisions.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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, From 3620cd99b62f07902075fbe54fbd3887464bc969 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 12:00:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 3bba1f93b484f70b422aee55ad19b85c6fd43e2e Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 12:01:31 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=9D=A1=E4=BB=B6=E6=8F=8F=E8=BF=B0=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=8D=A2=E8=A1=8C=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/projects/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: 隐藏代码库 From 5e8848f962a395cd84e5ed93a77a61bb6e00a59c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 12:44:27 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settings/_new_repositories.html.erb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index aa188bd69..a5f476079 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -4,7 +4,7 @@ $("#pro_st_edit_ku").toggle(); } -<%= 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 @@
  • - + <%= select_tag('repository_scm', options_for_select(["Git"],@repository.class.name.demodulize), :data => {:remote => true, :method => 'get'})%> @@ -73,25 +73,24 @@ <% end %>
  • - + <%= f.check_box :is_default, :label => "" %>

  • - + <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>""%> <% unless @repository.identifier_frozen? %> - 长度必须在 1 到 254 个字符之间。 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。 -一旦保存，标识无法修改。 + <%=l(:text_length_between,:min=>1,:max=>254)< <% end %>
  • - + <%= f.password_field :upassword, :label=> "" %> - 该密码在项目组内可共享 + <%= l(:label_upassword_info)%>
- 保存 - 取消 + <%=l(:button_save)%> + <%=l(:button_cancel)%>
<% end %> \ No newline at end of file From f8951c004468248f25e713778ce388228b5b21d4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 12:55:07 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_versions.html.erb | 14 +++++++------- app/views/versions/_form.html.erb | 12 ++++++------ app/views/versions/edit.html.erb | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) 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 @@
  • - + <%= f.text_field :name, :maxlength => 60, :required => true %>
  • - + <%= f.text_field :description, :maxlength => 60 %>
  • - + <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>
  • - + <%= f.text_field :wiki_page_title, :size =>60, :label => :label_wiki_page, :disabled => @project.wiki.nil? %>
  • - + <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>" fl" %> <%= calendar_for('version_effective_date') %>
  • - + <%= f.select :sharing, @project.versions.build.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>
    • - 保存 + <%=l(:button_save)%>
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 @@
  • - + <%= f.text_field :name, :maxlength => 60,:class=>" w280", :label => ""%>
  • - + <%= f.text_field :description, :maxlength => 60,:class=>" w280", :label => "" %>
  • - + <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]}, :label => "" %>
  • - + <%= f.text_field :wiki_page_title, :size =>60, :label => "", :disabled => @project.wiki.nil? %>
  • - + <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>"fl" ,:style=>"margin-left:7px;",:label=>""%> <%= calendar_for('version_effective_date') %>
  • - + <%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]},:label=>"" %>
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 %> From fc8dacbd5f0141af39d9d2d3863b8e3c85cea719 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 12:56:54 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=BC=95=E5=85=A5=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/files_helper.rb | 2 +- app/views/files/_show_quote_resource_project.html.erb | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) 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/_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 %> - -
From 14a0d885f0afbb2e60f7d3ac70524751bb1f94ee Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 13:49:40 +0800 Subject: [PATCH 7/8] settings --- .../projects/settings/_new_members.html.erb | 164 +++++++++--------- 1 file changed, 82 insertions(+), 82 deletions(-) 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? %> -
    +
    • <%= l(:label_user) %><%= l(:label_role_plural) %>
      • <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> <% members.each do |member| %>
    • - <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %> - + <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %> + <%= h member.roles.sort.collect(&:to_s).join(', ') %> - <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), - :method => :put, - :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} - ) do |f| %> + <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), + :method => :put, + :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} + ) do |f| %> <% roles.each do |role| %> -
        +
          <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
        <% end %> - <%= hidden_field_tag 'membership[role_ids][]', '' %> -
        - - <%= l(:button_change)%> - - - <%= l(:button_cancel)%> - -
        + <%= hidden_field_tag 'membership[role_ids][]', '' %> +
        + + <%= l(:button_change)%> + + + <%= l(:button_cancel)%> + +
        <% end %> - <% unless member.user_id == @project.user_id %> - 编辑 - <%= delete_link membership_path(member), - :remote => true, - :class => "c_dblue ml30 fl", - :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> - <% end%> - + <% unless member.user_id == @project.user_id %> + 编辑 + <%= delete_link membership_path(member), + :remote => true, + :class => "c_dblue ml30 fl", + :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> + <% end%> + <% end%> -
      +
    <% else %> -

    <%= l(:label_no_data) %>

    +

    <%= l(:label_no_data) %>

    <% end %>
<% 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_role_plural) %>:
    • - <% roles.each do |role| %> -
  • +
    + + <% 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_role_plural) %>:
      • + <% roles.each do |role| %> +
    • <%= check_box_tag 'membership[role_ids][]', role.id %> -
      • - <% end %> -
    - - <%= 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') }')" %> -
    +
    • + <% end %> +
+ + <%= 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) %> +
+
-
    -
  • - <%= l(:label_role_plural) %>： -
    • - <% roles.each do |role| %> -
  • - <%= check_box_tag 'membership[role_ids][]', role.id %> - +
      +
    • + <%= l(:label_role_plural) %>：
      • - <% end %> -
    -
    - - 新增成员 - -
- <% end%> -
+ <% roles.each do |role| %> +
  • + <%= check_box_tag 'membership[role_ids][]', role.id %> + +
    • + <% end %> + +
    + + 新增成员 + +
    + <% end%> +
    <% end %>