From f2113e735d8d4cf8a7707ccc45d0c2570483465c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 6 Dec 2009 12:52:03 +0000 Subject: [PATCH] Removes the 'Copy' checkbox on the copy/move form. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3127 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_action_menu.rhtml | 3 ++- app/views/issues/context_menu.rhtml | 8 +++----- app/views/issues/move.rhtml | 15 +++++++++------ config/locales/bg.yml | 2 ++ config/locales/bs.yml | 2 ++ config/locales/ca.yml | 2 ++ config/locales/cs.yml | 2 ++ config/locales/da.yml | 2 ++ config/locales/de.yml | 2 ++ config/locales/el.yml | 2 ++ config/locales/en.yml | 2 ++ config/locales/es.yml | 2 ++ config/locales/fi.yml | 2 ++ config/locales/fr.yml | 2 ++ config/locales/gl.yml | 2 ++ config/locales/he.yml | 2 ++ config/locales/hu.yml | 2 ++ config/locales/it.yml | 2 ++ config/locales/ja.yml | 2 ++ config/locales/ko.yml | 2 ++ config/locales/lt.yml | 2 ++ config/locales/nl.yml | 2 ++ config/locales/no.yml | 2 ++ config/locales/pl.yml | 2 ++ config/locales/pt-BR.yml | 2 ++ config/locales/pt.yml | 2 ++ config/locales/ro.yml | 2 ++ config/locales/ru.yml | 2 ++ config/locales/sk.yml | 2 ++ config/locales/sl.yml | 2 ++ config/locales/sr.yml | 2 ++ config/locales/sv.yml | 2 ++ config/locales/th.yml | 2 ++ config/locales/tr.yml | 2 ++ config/locales/uk.yml | 2 ++ config/locales/vi.yml | 2 ++ config/locales/zh-TW.yml | 2 ++ config/locales/zh.yml | 2 ++ public/images/copy.png | Bin 291 -> 1039 bytes public/images/duplicate.png | Bin 0 -> 1074 bytes public/stylesheets/application.css | 1 + 41 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 public/images/duplicate.png diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml index 390488e6..693b4923 100644 --- a/app/views/issues/_action_menu.rhtml +++ b/app/views/issues/_action_menu.rhtml @@ -3,7 +3,8 @@ <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time-add' %> <% replace_watcher ||= 'watcher' %> <%= watcher_tag(@issue, User.current, {:id => replace_watcher, :replace => ['watcher','watcher2']}) %> -<%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %> +<%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %> +<%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'move', :id => @issue, :copy_options => {:copy => 't'} }, :class => 'icon icon-copy' %> <%= link_to_if_authorized l(:button_move), {:controller => 'issues', :action => 'move', :id => @issue }, :class => 'icon icon-move' %> <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index e408e3b7..6cb05606 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -98,13 +98,11 @@ <% end %> <% if @issue.present? %> -
  • <%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, - :class => 'icon-copy', :disabled => !@can[:copy] %>
  • -<% else %> +
  • <%= context_menu_link l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, + :class => 'icon-duplicate', :disabled => !@can[:copy] %>
  • +<% end %>
  • <%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id), :copy_options => {:copy => 't'}}, :class => 'icon-copy', :disabled => !@can[:move] %>
  • -<% end %> -
  • <%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)}, :class => 'icon-move', :disabled => !@can[:move] %>
  • <%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)}, diff --git a/app/views/issues/move.rhtml b/app/views/issues/move.rhtml index 0d5cb130..d63e4e66 100644 --- a/app/views/issues/move.rhtml +++ b/app/views/issues/move.rhtml @@ -1,4 +1,4 @@ -

    <%= l(:button_move) %>

    +

    <%= @copy ? l(:button_copy) : l(:button_move) %>