]> source.dussan.org Git - redmine.git/commitdiff
Removes the 'Copy' checkbox on the copy/move form.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 6 Dec 2009 12:52:03 +0000 (12:52 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 6 Dec 2009 12:52:03 +0000 (12:52 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3127 e93f8b46-1217-0410-a6f0-8f06a7374b81

41 files changed:
app/views/issues/_action_menu.rhtml
app/views/issues/context_menu.rhtml
app/views/issues/move.rhtml
config/locales/bg.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/da.yml
config/locales/de.yml
config/locales/el.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hu.yml
config/locales/it.yml
config/locales/ja.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ro.yml
config/locales/ru.yml
config/locales/sk.yml
config/locales/sl.yml
config/locales/sr.yml
config/locales/sv.yml
config/locales/th.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-TW.yml
config/locales/zh.yml
public/images/copy.png
public/images/duplicate.png [new file with mode: 0644]
public/stylesheets/application.css

index 390488e6def1110aa8090c58d666bb56edcc9a3e..693b492379057279168ba16ba35e9c62bf90e28a 100644 (file)
@@ -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' %>
 </div>
index e408e3b70cc20ec5915889bd6e136ce87525d609..6cb05606abc373013c4899c8eb8510b3e41cff41 100644 (file)
 <% end %>
 
 <% if @issue.present? %>
-  <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
-               :class => 'icon-copy', :disabled => !@can[:copy] %></li>
-<% else %>
+  <li><%= context_menu_link l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
+               :class => 'icon-duplicate', :disabled => !@can[:copy] %></li>
+<% end %>
   <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>
-<% end %>
-
   <li><%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)},
                                :class => 'icon-move', :disabled => !@can[:move]  %></li>
   <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
index 0d5cb130dca624c0b3ae1b77b197db0fe7381007..d63e4e66c44655f0201575c284ffabb377fdbdc7 100644 (file)
@@ -1,4 +1,4 @@
-<h2><%= l(:button_move) %></h2>
+<h2><%= @copy ? l(:button_copy) : l(:button_move) %></h2>
 
 <ul>
 <% @issues.each do |issue| -%>
   <label><%= l(:field_due_date) %></label>
   <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
 </p>
-
-<p><label for="copy_options_copy"><%= l(:button_copy)%></label>
-<%= check_box_tag "copy_options[copy]", "1", @copy %></p>
 </div>
 
-<%= submit_tag l(:button_move) %> 
-<%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
+<% if @copy %>
+       <%= 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 %>
index 04d266e0500c9094260d83015530657ead9c4a9c..2e9b24785ce0a6e92771eda7fa5d4e1ba63449d5 100644 (file)
@@ -842,3 +842,5 @@ bg:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 57289116a542c34ed1662ad57213a6aee1c951b8..70d95cfa6e897bf5dc096afe7e5a84bd79ee2955 100644 (file)
@@ -866,3 +866,5 @@ bs:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 37e8a7449eb9dd2d5b5715b0bbc5de613d23284c..11daf4fb24ca73d11c82b768ccc319cbb4a2c7ab 100644 (file)
@@ -845,3 +845,5 @@ ca:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index a237b226f93b797b5c4ea861036000f25a0c1f71..c6b783740968b99df8a51498d0ba7e8443e1dd20 100644 (file)
@@ -848,3 +848,5 @@ cs:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 1353b06586464af611087c4a4c009daa0c686a70..18954df9b969233a8c055cda6a8645b0152141f1 100644 (file)
@@ -868,3 +868,5 @@ da:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index ce92fea4294ad3009baecc5f34ac0beb9a346c9e..38df64dbf482563a4087280d529a37e4db83eb1a 100644 (file)
@@ -868,3 +868,5 @@ de:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 475bf6d9c69b4fb20326dae12b2a80bc2ab3703e..74faa73062cfd01648b435d2d04e68baa3d87c24 100644 (file)
@@ -848,3 +848,5 @@ el:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index f3750a9a127c69882f36defaf1ef6f12b19c6e44..184788eeedfbc8a9a5db3806834a0e14dabf9e83 100644 (file)
@@ -753,10 +753,12 @@ en:
   button_rename: Rename
   button_change_password: Change password
   button_copy: Copy
+  button_copy_and_follow: Copy and follow
   button_annotate: Annotate
   button_update: Update
   button_configure: Configure
   button_quote: Quote
+  button_duplicate: Duplicate
   
   status_active: active
   status_registered: registered
index 409eb139a057f9ce26c321eda798d16bced0197f..14e0494c3d19ef5be9f944f0ead3e4decdc7a9ab 100644 (file)
@@ -889,3 +889,5 @@ es:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 30496646584c1c3db63cb87b8a579a5f8112e172..bc5ea3e08a800d95382d4b1bc5ed3a47ce66cc77 100644 (file)
@@ -878,3 +878,5 @@ fi:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index d1ea2608b7acb0061ed78ddd445397aedc4f8923..b39907c504a3e0fe504c1513a0e6502f82f1a475 100644 (file)
@@ -769,10 +769,12 @@ fr:
   button_rename: Renommer
   button_change_password: Changer de mot de passe
   button_copy: Copier
+  button_copy_and_follow: Copier et suivre
   button_annotate: Annoter
   button_update: Mettre à jour
   button_configure: Configurer
   button_quote: Citer
+  button_duplicate: Dupliquer
   
   status_active: actif
   status_registered: enregistré
index 9c734eccc924fb1a5e771257aff4320bff13b959..7c6b4b30b9c37466345edc864153f18c54e713da 100644 (file)
@@ -868,3 +868,5 @@ gl:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index c15bd51f5ee87a7c100191a93b1bbb1fea0ca36e..f9c926cb969f1ad0937c5bb77cf0643db775e79d 100644 (file)
@@ -852,3 +852,5 @@ he:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index ddf055036b763f51f90676187142ca6823f6cc0d..a78c5ce70f4d5f270a71a050ef4aa0e820e45101 100644 (file)
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 1bf5c1ab57c82dd3296315206d8f5a3bd8669e97..4a3d767181f978758fb65d5ae45f15da38e17817 100644 (file)
@@ -855,3 +855,5 @@ it:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index ab54db063e6f008d7c15b7a60ce10dbde8a37efa..0ff9e0f0defe7198ab14a0b7b03377304a4efe23 100644 (file)
@@ -877,3 +877,5 @@ ja:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 8b3ad999412aca37e2d017871d78038bf11fa4eb..d27df3aefb6159e3677db2baa2c71653079b65b8 100644 (file)
@@ -908,3 +908,5 @@ ko:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index dfd3bcd641cd571b94b731d7392183e5ef4668ec..fe4c8eb4f3b0ab553ab49338bfae9f5242f70c42 100644 (file)
@@ -878,3 +878,5 @@ lt:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 33d3854d49383df0b71881d0d209ca1ea4c8709d..f481d3b4886b2968e9c76c1b51864709985c7e00 100644 (file)
@@ -830,3 +830,5 @@ nl:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 104d0cb56c5569a8ab940d850ecd20c222fa569f..2e20571617fb166825390aa22599be29a97c3db8 100644 (file)
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 4dc267c5d0b958c1e09ca6beb91c3eb66e060d82..b97f731c8af0fe81e1745146f7858c9169295757 100644 (file)
@@ -871,3 +871,5 @@ pl:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index d10820cd70ea32648ef93b23b291dcfe76fdfb44..ec329151908fff8fd769919ba8081cd3c5342f48 100644 (file)
@@ -874,3 +874,5 @@ pt-BR:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 004e64879a6bcb0d084024e323f8dd2b8c6600d9..02ef3d4e289dafe462b9712c0564776b82768bae 100644 (file)
@@ -860,3 +860,5 @@ pt:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 48ae95eb542714d97ecde25b93e1f533076b6952..38c80977d5efcca9859bd889f8edaccfbfda4717 100644 (file)
@@ -845,3 +845,5 @@ ro:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 4341f51d9512882c05de8973b68487273dad042c..61c73ed3d122a5c97abb88ee474c9e6e7f74e8bb 100644 (file)
@@ -956,3 +956,5 @@ ru:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index c6cae4643ef0819f9a0043d8fae637407f4f9d96..fb5cca3eb340e4e878692a1c5bdd4599dfdd9a04 100644 (file)
@@ -847,3 +847,5 @@ sk:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index ce9c702ce23150c014654d618fe241766f3ff074..2ec4cfb4f082ca061b789f4e9827f2a3c58adac8 100644 (file)
@@ -844,3 +844,5 @@ sl:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 3351a57b527a5fe2452b2f903add8d42425fc3cb..52db52401485d5f47dd086d361695ae9fc12fa47 100644 (file)
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index d1296ce9545486100d071abf80d57ef0b750bddb..9536719cee85bc6803c36315346d33d209d57258 100644 (file)
@@ -896,3 +896,5 @@ sv:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 10d522163a06c9e05a956097ce81d4055ff25799..a3838e8f1f9a559a1775d40f3b0005b705e59f9b 100644 (file)
@@ -845,3 +845,5 @@ th:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 16fea8738672bcd1541d3be4a243a14b9471bd6e..8c58be628d88e9d50618e055a975989c760f86c0 100644 (file)
@@ -875,3 +875,5 @@ tr:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index eadbfd3822a5f2285c55a085d650a6f58faad6fd..4e018fb81688b894480d2fc501de95155f8e3122 100644 (file)
@@ -844,3 +844,5 @@ uk:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 43f4e1038bb64f036749797ce21151e39b562172..1067b463b2d860db70b71f239b9bbfe4a99f7c04 100644 (file)
@@ -907,3 +907,5 @@ vi:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index 26f18294c04d19e3b1b2519927252318ef824bea..81faf7d7f710e301829f2a84c45d204e293572c9 100644 (file)
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index a627ff45eb9c0fa7a9beb6aeec73459312fe211d..f4609c8675ee88f1db4f45191a5cb904dba1c4bb 100644 (file)
@@ -872,3 +872,5 @@ zh:
   label_version_sharing_tree: With project tree
   label_version_sharing_none: Not shared
   error_can_not_archive_project: This project can not be archived
+  button_duplicate: Duplicate
+  button_copy_and_follow: Copy and follow
index dccaa0614c0018226b20f390d96f269764f18aff..be7a17ba87c9e5810dbde47e014edfbad57d79f6 100644 (file)
Binary files a/public/images/copy.png and b/public/images/copy.png differ
diff --git a/public/images/duplicate.png b/public/images/duplicate.png
new file mode 100644 (file)
index 0000000..eabadf1
Binary files /dev/null and b/public/images/duplicate.png differ
index 7f5d1b2b7f9a50d3876c34365de6caf7fcd43790..8f328a2daa4a2ddb6bcf91b9d12434f79af23840 100644 (file)
@@ -694,6 +694,7 @@ vertical-align: middle;
 .icon-add { background-image: url(../images/add.png); }
 .icon-edit { background-image: url(../images/edit.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-move { background-image: url(../images/move.png); }
 .icon-save { background-image: url(../images/save.png); }