jro_apps/redmine Commit - r3013:f2113e735d8d

0

public/images/duplicate.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

app/views/issues/_action_menu.rhtml +2 -1

             <%= 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>

0

app/views/issues/context_menu.rhtml +3 -5

             <% end %>
             <% 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'}},
             	                        :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)},

0

app/views/issues/move.rhtml +9 -6

-            <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) %>
+            <% 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 %>

0

config/locales/bg.yml +2 0

               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

0

config/locales/bs.yml +2 0

               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

0

config/locales/ca.yml +2 0

               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

0

config/locales/cs.yml +2 0

               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

0

config/locales/da.yml +2 0

               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

0

config/locales/de.yml +2 0

               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

0

config/locales/el.yml +2 0

               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

0

config/locales/en.yml +2 0

               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

0

config/locales/es.yml +2 0

               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

0

config/locales/fi.yml +2 0

               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

0

config/locales/fr.yml +2 0

               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é

0

config/locales/gl.yml +2 0

               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

0

config/locales/he.yml +2 0

               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

0

config/locales/hu.yml +2 0

               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

0

config/locales/it.yml +2 0

               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

0

config/locales/ja.yml +2 0

               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

0

config/locales/ko.yml +2 0

               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

0

config/locales/lt.yml +2 0

               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

0

config/locales/nl.yml +2 0

               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

0

config/locales/no.yml +2 0

               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

0

config/locales/pl.yml +2 0

               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

0

config/locales/pt-BR.yml +2 0

               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

0

config/locales/pt.yml +2 0

               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

0

config/locales/ro.yml +2 0

               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

0

config/locales/ru.yml +2 0

               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

0

config/locales/sk.yml +2 0

               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

0

config/locales/sl.yml +2 0

               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

0

config/locales/sr.yml +2 0

               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

0

config/locales/sv.yml +2 0

               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

0

config/locales/th.yml +2 0

               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

0

config/locales/tr.yml +2 0

               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

0

config/locales/uk.yml +2 0

               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

0

config/locales/vi.yml +2 0

               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

0

config/locales/zh-TW.yml +2 0

               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

0

config/locales/zh.yml +2 0

               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

0

public/images/copy.png binary modified 0 0

1

NO CONTENT: modified file, binary diff hidden

0

public/stylesheets/application.css +1 0

             .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); }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages