From ec21b4c075668a1ab2d4a62135a2a9fb968e3f52 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Sat, 5 Mar 2011 19:55:16 -0800
Subject: [PATCH] Merge issue context menu changes

---
 app/views/context_menus/issues.html.erb | 71 +++++++++++++++----------
 public/stylesheets/main.css             |  8 ---
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index 71bac63b03..1abfb2c39f 100644
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -1,52 +1,59 @@
-<ul>
+<%# Added: classes to the li %>
+<%# Added: classes to the a %>
+<%# Added: div for submenu icons %>
+<%# Removed: icon-* on links %>
+<ul class="menu">
   <%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
 
 <% if !@issue.nil? -%>
-	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
+	<li class="edit"><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
 <% else %>
-	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
+	<li class="edit"><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
 <% end %>
 
   <% if @allowed_statuses.present? %>
-	<li class="folder">
-		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
+	<li class="folder status">			
+		<a href="#" class="context_item" onclick="return false;"><%= l(:field_status) %></a>
 		<ul>
 		<% @statuses.each do |s| -%>
 		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {:status_id => s}, :back_url => @back}, :method => :post,
 		                              :selected => (@issue && s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li>
 		<% end -%>
 		</ul>
+    <div class="submenu"></div>
 	</li>
   <% end %>
 
 	<% unless @trackers.nil? %>
-	<li class="folder">
-		<a href="#" class="submenu"><%= l(:field_tracker) %></a>
+	<li class="folder tracker">			
+		<a href="#" class="context_item"><%= l(:field_tracker) %></a>
 		<ul>
 		<% @trackers.each do |t| -%>
 		    <li><%= context_menu_link t.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'tracker_id' => t}, :back_url => @back}, :method => :post,
 		                              :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
 		<% end -%>
 		</ul>
+    <div class="submenu"></div>
 	</li>
 	<% end %>
 
-	<li class="folder">
-		<a href="#" class="submenu"><%= l(:field_priority) %></a>
+	<li class="folder priority">			
+		<a href="#" class="context_item"><%= l(:field_priority) %></a>
 		<ul>
 		<% @priorities.each do |p| -%>
 		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post,
 		                              :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
 		<% end -%>
 		</ul>
+    <div class="submenu"></div>
 	</li>
 
   <% #TODO: allow editing versions when multiple projects %>
 	<% unless @project.nil? || @project.shared_versions.open.empty? -%>
-	<li class="folder">
-		<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
+	<li class="folder fixed_version">			
+		<a href="#" class="context_item"><%= l(:field_fixed_version) %></a>
 		<ul>
 		<% @project.shared_versions.open.sort.each do |v| -%>
 		    <li><%= context_menu_link format_version_name(v), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'fixed_version_id' => v}, :back_url => @back}, :method => :post,
@@ -55,11 +62,13 @@
 		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'fixed_version_id' => 'none'}, :back_url => @back}, :method => :post,
 		                              :selected => (@issue && @issue.fixed_version.nil?), :disabled => !@can[:update] %></li>
 		</ul>
+    <div class="submenu"></div>
 	</li>
 	<% end %>
+
 	<% if @assignables.present? -%>
-	<li class="folder">
-		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
+	<li class="folder assigned">			
+		<a href="#" class="context_item"><%= l(:field_assigned_to) %></a>
 		<ul>
 		<% @assignables.each do |u| -%>
 		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => u}, :back_url => @back}, :method => :post,
@@ -68,11 +77,13 @@
 		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => 'none'}, :back_url => @back}, :method => :post,
 		                              :selected => (@issue && @issue.assigned_to.nil?), :disabled => !@can[:update] %></li>
 		</ul>
+    <div class="submenu"></div>
 	</li>
 	<% end %>
+
 	<% unless @project.nil? || @project.issue_categories.empty? -%>
-	<li class="folder">
-		<a href="#" class="submenu"><%= l(:field_category) %></a>
+	<li class="folder">			
+		<a href="#" class="context_item"><%= l(:field_category) %></a>
 		<ul>
 		<% @project.issue_categories.each do |u| -%>
 		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'category_id' => u}, :back_url => @back}, :method => :post,
@@ -81,28 +92,30 @@
 		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'category_id' => 'none'}, :back_url => @back}, :method => :post,
 		                              :selected => (@issue && @issue.category.nil?), :disabled => !@can[:update] %></li>
 		</ul>
-	</li>
+    <div class="submenu"></div>
+  </li>
 	<% end -%>
 
   <% if Issue.use_field_for_done_ratio? %>
-	<li class="folder">
-		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
+	<li class="folder done_ratio">
+		<a href="#" class="context_item"><%= l(:field_done_ratio) %></a>
 		<ul>
 		<% (0..10).map{|x|x*10}.each do |p| -%>
 		    <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :issue => {'done_ratio' => p}, :back_url => @back}, :method => :post,
 		                                  :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
 		<% end -%>
 		</ul>
+    <div class="submenu"></div>
 	</li>
   <% end %>
-
+	
 <% if !@issue.nil? %>
 	<% if @can[:log_time] -%>
-	<li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue},
-	        :class => 'icon-time-add' %></li>
+	<li class="log_time"><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue},
+	        :class => 'context_item' %></li>
 	<% end %>
 	<% if User.current.logged? %>
-	<li><%= watcher_link(@issue, User.current) %></li>
+	<li class="watch"><%= watcher_link(@issue, User.current) %></li>
 	<% end %>
 <% end %>
 
@@ -110,12 +123,14 @@
   <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), new_issue_move_path(:ids => @issues.collect(&:id), :copy_options => {:copy => 't'}),
-	                        :class => 'icon-copy', :disabled => !@can[:move]  %></li>
-  <li><%= context_menu_link l(:button_move), new_issue_move_path(: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), :back_url => @back},
-                            :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %></li>
+
+  <li class="move"><%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)},
+	                        :class => 'context_item', :disabled => !@can[:move]  %></li>
+  <%# All users can copy because the copy acton will check their permissions on the target project %>
+  <li class="copy"><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'bulk_copy', :project_id => @project, :ids => @issues.collect(&:id)},
+                                :class => 'context_item' %></li>
+  <li class="delete"><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
+                            :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'context_item', :disabled => !@can[:delete] %></li>
 
   <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
 </ul>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index bcf74bb095..054c918168 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -978,14 +978,6 @@ td.issue div.issue-wrap-outer {
 	border-bottom:1px solid #ddd !important;
 }
 
-#context-menu .edit a.context_item  {background-image:url(../images/edit.png) !important; background-position: left center !important;}
-#context-menu .status a.context_item {background-image:url(../images/tag.png) !important; background-position: left center !important;}
-#context-menu .priority a.context_item {background-image:url(../images/clock.png) !important; background-position: left center !important;}
-#context-menu .assigned a.context_item {background-image:url(../images/user.png) !important; background-position: left center !important;}
-#context-menu .copy a.context_item {background-image:url(../images/copy.png) !important; background-position: left center !important;}
-#context-menu .move a.context_item {background-image:url(../images/move.png) !important; background-position: left center !important;}
-#context-menu .delete a.context_item {background-image:url(../images/delete.png) !important; background-position: left center !important;}
-
 #context-menu li.folder div.submenu {
     background:url(../images/arrow-right.png) no-repeat right;
     position: absolute;