Skip to content

O
OHR Support
Commit f2113e73 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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
parent a2b4bb0d
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 12 deletions
app/views/issues/_action_menu.rhtml
View file @ f2113e73
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time-add' %> <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time-add' %>
<% replace_watcher ||= 'watcher' %> <% replace_watcher ||= 'watcher' %>
<%= watcher_tag(@issue, User.current, {:id => replace_watcher, :replace => ['watcher','watcher2']}) %> <%= 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_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' %> <%= 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' %>
</div> </div>
app/views/issues/context_menu.rhtml
View file @ f2113e73
...@@ -98,13 +98,11 @@ ...@@ -98,13 +98,11 @@
<% end %> <% end %>
<% if @issue.present? %> <% if @issue.present? %>
<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue}, <li><%= context_menu_link l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
:class => 'icon-copy', :disabled => !@can[:copy] %></li> :class => 'icon-duplicate', :disabled => !@can[:copy] %></li>
<% else %> <% end %>
<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id), :copy_options => {:copy => 't'}}, <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id), :copy_options => {:copy => 't'}},
:class => 'icon-copy', :disabled => !@can[:move] %></li> :class => 'icon-copy', :disabled => !@can[:move] %></li>
<% end %>
<li><%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)}, <li><%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)},
:class => 'icon-move', :disabled => !@can[:move] %></li> :class => 'icon-move', :disabled => !@can[:move] %></li>
<li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)}, <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
......
app/views/issues/move.rhtml
View file @ f2113e73
<h2><%= l(:button_move) %></h2> <h2><%= @copy ? l(:button_copy) : l(:button_move) %></h2>
<ul> <ul>
<% @issues.each do |issue| -%> <% @issues.each do |issue| -%>
...@@ -42,11 +42,14 @@ ...@@ -42,11 +42,14 @@
<label><%= l(:field_due_date) %></label> <label><%= l(:field_due_date) %></label>
<%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %> <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
</p> </p>
<p><label for="copy_options_copy"><%= l(:button_copy)%></label>
<%= check_box_tag "copy_options[copy]", "1", @copy %></p>
</div> </div>
<%= submit_tag l(:button_move) %> <% if @copy %>
<%= submit_tag l(:button_move_and_follow), :name => 'follow' %> <%= hidden_field_tag("copy_options[copy]", "1") %>
<%= submit_tag l(:button_copy) %>
<%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
<% else %>
<%= submit_tag l(:button_move) %>
<%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
<% end %>
<% end %> <% end %>
config/locales/bg.yml
View file @ f2113e73
...@@ -842,3 +842,5 @@ bg: ...@@ -842,3 +842,5 @@ bg:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/bs.yml
View file @ f2113e73
...@@ -866,3 +866,5 @@ bs: ...@@ -866,3 +866,5 @@ bs:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/ca.yml
View file @ f2113e73
...@@ -845,3 +845,5 @@ ca: ...@@ -845,3 +845,5 @@ ca:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/cs.yml
View file @ f2113e73
...@@ -848,3 +848,5 @@ cs: ...@@ -848,3 +848,5 @@ cs:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/da.yml
View file @ f2113e73
...@@ -868,3 +868,5 @@ da: ...@@ -868,3 +868,5 @@ da:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/de.yml
View file @ f2113e73
...@@ -868,3 +868,5 @@ de: ...@@ -868,3 +868,5 @@ de:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/el.yml
View file @ f2113e73
...@@ -848,3 +848,5 @@ el: ...@@ -848,3 +848,5 @@ el:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/en.yml
View file @ f2113e73
...@@ -753,10 +753,12 @@ en: ...@@ -753,10 +753,12 @@ en:
button_rename: Rename button_rename: Rename
button_change_password: Change password button_change_password: Change password
button_copy: Copy button_copy: Copy
button_copy_and_follow: Copy and follow
button_annotate: Annotate button_annotate: Annotate
button_update: Update button_update: Update
button_configure: Configure button_configure: Configure
button_quote: Quote button_quote: Quote
button_duplicate: Duplicate
status_active: active status_active: active
status_registered: registered status_registered: registered
......
config/locales/es.yml
View file @ f2113e73
...@@ -889,3 +889,5 @@ es: ...@@ -889,3 +889,5 @@ es:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/fi.yml
View file @ f2113e73
...@@ -878,3 +878,5 @@ fi: ...@@ -878,3 +878,5 @@ fi:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/fr.yml
View file @ f2113e73
...@@ -769,10 +769,12 @@ fr: ...@@ -769,10 +769,12 @@ fr:
button_rename: Renommer button_rename: Renommer
button_change_password: Changer de mot de passe button_change_password: Changer de mot de passe
button_copy: Copier button_copy: Copier
button_copy_and_follow: Copier et suivre
button_annotate: Annoter button_annotate: Annoter
button_update: Mettre à jour button_update: Mettre à jour
button_configure: Configurer button_configure: Configurer
button_quote: Citer button_quote: Citer
button_duplicate: Dupliquer
status_active: actif status_active: actif
status_registered: enregistré status_registered: enregistré
......
config/locales/gl.yml
View file @ f2113e73
...@@ -868,3 +868,5 @@ gl: ...@@ -868,3 +868,5 @@ gl:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/he.yml
View file @ f2113e73
...@@ -852,3 +852,5 @@ he: ...@@ -852,3 +852,5 @@ he:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/hu.yml
View file @ f2113e73
...@@ -873,3 +873,5 @@ ...@@ -873,3 +873,5 @@
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/it.yml
View file @ f2113e73
...@@ -855,3 +855,5 @@ it: ...@@ -855,3 +855,5 @@ it:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/ja.yml
View file @ f2113e73
...@@ -877,3 +877,5 @@ ja: ...@@ -877,3 +877,5 @@ ja:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/ko.yml
View file @ f2113e73
...@@ -908,3 +908,5 @@ ko: ...@@ -908,3 +908,5 @@ ko:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/lt.yml
View file @ f2113e73
...@@ -878,3 +878,5 @@ lt: ...@@ -878,3 +878,5 @@ lt:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/nl.yml
View file @ f2113e73
...@@ -830,3 +830,5 @@ nl: ...@@ -830,3 +830,5 @@ nl:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/no.yml
View file @ f2113e73
...@@ -843,3 +843,5 @@ ...@@ -843,3 +843,5 @@
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/pl.yml
View file @ f2113e73
...@@ -871,3 +871,5 @@ pl: ...@@ -871,3 +871,5 @@ pl:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/pt-BR.yml
View file @ f2113e73
...@@ -874,3 +874,5 @@ pt-BR: ...@@ -874,3 +874,5 @@ pt-BR:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/pt.yml
View file @ f2113e73
...@@ -860,3 +860,5 @@ pt: ...@@ -860,3 +860,5 @@ pt:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/ro.yml
View file @ f2113e73
...@@ -845,3 +845,5 @@ ro: ...@@ -845,3 +845,5 @@ ro:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/ru.yml
View file @ f2113e73
...@@ -956,3 +956,5 @@ ru: ...@@ -956,3 +956,5 @@ ru:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/sk.yml
View file @ f2113e73
...@@ -847,3 +847,5 @@ sk: ...@@ -847,3 +847,5 @@ sk:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/sl.yml
View file @ f2113e73
...@@ -844,3 +844,5 @@ sl: ...@@ -844,3 +844,5 @@ sl:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/sr.yml
View file @ f2113e73
...@@ -863,3 +863,5 @@ ...@@ -863,3 +863,5 @@
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/sv.yml
View file @ f2113e73
...@@ -896,3 +896,5 @@ sv: ...@@ -896,3 +896,5 @@ sv:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/th.yml
View file @ f2113e73
...@@ -845,3 +845,5 @@ th: ...@@ -845,3 +845,5 @@ th:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/tr.yml
View file @ f2113e73
...@@ -875,3 +875,5 @@ tr: ...@@ -875,3 +875,5 @@ tr:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/uk.yml
View file @ f2113e73
...@@ -844,3 +844,5 @@ uk: ...@@ -844,3 +844,5 @@ uk:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/vi.yml
View file @ f2113e73
...@@ -907,3 +907,5 @@ vi: ...@@ -907,3 +907,5 @@ vi:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/zh-TW.yml
View file @ f2113e73
...@@ -939,3 +939,5 @@ ...@@ -939,3 +939,5 @@
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
config/locales/zh.yml
View file @ f2113e73
...@@ -872,3 +872,5 @@ zh: ...@@ -872,3 +872,5 @@ zh:
label_version_sharing_tree: With project tree label_version_sharing_tree: With project tree
label_version_sharing_none: Not shared label_version_sharing_none: Not shared
error_can_not_archive_project: This project can not be archived error_can_not_archive_project: This project can not be archived
button_duplicate: Duplicate
button_copy_and_follow: Copy and follow
public/images/copy.png
View replaced file @ a2b4bb0d View file @ f2113e73
public/images/copy.png

291 Bytes | W: | H:

public/images/copy.png

1.01 KB | W: | H:

public/images/copy.png
public/images/copy.png
public/images/copy.png
public/images/copy.png
  • 2-up
  • Swipe
  • Onion skin
public/stylesheets/application.css
View file @ f2113e73
...@@ -694,6 +694,7 @@ vertical-align: middle; ...@@ -694,6 +694,7 @@ vertical-align: middle;
.icon-add { background-image: url(../images/add.png); } .icon-add { background-image: url(../images/add.png); }
.icon-edit { background-image: url(../images/edit.png); } .icon-edit { background-image: url(../images/edit.png); }
.icon-copy { background-image: url(../images/copy.png); } .icon-copy { background-image: url(../images/copy.png); }
.icon-duplicate { background-image: url(../images/duplicate.png); }
.icon-del { background-image: url(../images/delete.png); } .icon-del { background-image: url(../images/delete.png); }
.icon-move { background-image: url(../images/move.png); } .icon-move { background-image: url(../images/move.png); }
.icon-save { background-image: url(../images/save.png); } .icon-save { background-image: url(../images/save.png); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment