Merged r19382 to 4.1-stable.

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19386 e93f8b46-1217-0410-a6f0-8f06a7374b81

5 files changed, 17 insertions, 9 deletions

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 18ec61849..c3c339851 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -2,9 +2,6 @@
   <% if User.current.allowed_to?(:add_issues, @project, :global => true) && (@project.nil? || Issue.allowed_target_trackers(@project).any?) %>
     <%= link_to l(:label_issue_new), _new_project_issue_path(@project), :class => 'icon icon-add new-issue' %>
   <% end %>
-  <%= link_to_if_authorized l(:label_settings),
-              {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'issues'},
-              :class => 'icon icon-settings' if User.current.allowed_to?(:manage_categories, @project) %>
   <%= actions_dropdown do %>
     <% if @project %>
       <%= link_to l(:field_summary), project_issues_report_path(@project) %>
@@ -13,6 +10,10 @@
     <% if User.current.allowed_to?(:import_issues, @project, :global => true) %>
       <%= link_to l(:button_import), new_issues_import_path %>
     <% end %>
+
+    <%= link_to_if_authorized l(:label_settings),
+              {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'issues'},
+              :class => 'icon icon-settings' if User.current.allowed_to?(:manage_categories, @project) %>
   <% end %>
 </div>
 
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index a3ac9b14f..de99eeabe 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,8 +1,10 @@
 <div class="contextual">
+  <%= bookmark_link @project %>
+
+  <%= actions_dropdown do %>
   <% if User.current.allowed_to?(:add_subprojects, @project) %>
     <%= link_to l(:label_subproject_new), new_project_path(:parent_id => @project), :class => 'icon icon-add' %>
   <% end %>
-  <%= bookmark_link @project %>
   <% if User.current.allowed_to?(:close_project, @project) %>
     <% if @project.active? %>
       <%= link_to l(:button_close), close_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock' %>
@@ -13,7 +15,7 @@
   <%= link_to_if_authorized l(:label_settings),
               {:controller => 'projects', :action => 'settings', :id => @project},
               :class => 'icon icon-settings' if User.current.allowed_to?(:edit_project, @project) %>
-
+  <% end %>
 </div>
 
 <h2><%=l(:label_overview)%></h2>
diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb
index 37a2f177c..730cec42f 100644
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@@ -15,9 +15,11 @@
             {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
             :class => 'icon icon-stats' if @repository.supports_all_revisions? %>
 
-<%= link_to_if_authorized l(:label_settings),
+<%= actions_dropdown do %>
+  <%= link_to_if_authorized l(:label_settings),
             {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'repositories'},
             :class => 'icon icon-settings' if User.current.allowed_to?(:manage_repository, @project) %>
+<% end %>
 
 <%= form_tag({:action => controller.action_name,
              :id => @project,
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index e33855cd8..1e243debb 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -2,13 +2,14 @@
 <%= link_to l(:button_log_time),
             _new_time_entry_path(@project, @query.filtered_issue_id),
             :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
-<%= link_to_if_authorized l(:label_settings),
-            {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'activities'},
-            :class => 'icon icon-settings' if User.current.allowed_to?(:manage_project_activities, @project) %>
 <%= actions_dropdown do %>
   <% if User.current.allowed_to?(:import_time_entries, @project, :global => true) %>
     <%= link_to l(:button_import), new_time_entries_import_path %>
   <% end %>
+
+  <%= link_to_if_authorized l(:label_settings),
+            {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'activities'},
+            :class => 'icon icon-settings' if User.current.allowed_to?(:manage_project_activities, @project) %>
 <% end %>
 </div>
 
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 02952b209..afe9b463c 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -1,9 +1,11 @@
 <div class="contextual">
   <%= link_to(l(:label_version_new), new_project_version_path(@project),
               :class => 'icon icon-add') if User.current.allowed_to?(:manage_versions, @project) %>
+  <%= actions_dropdown do %>
   <%= link_to_if_authorized l(:label_settings),
               {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'versions'},
               :class => 'icon icon-settings' if User.current.allowed_to?(:manage_versions, @project) %>
+  <% end %>
 </div>
 
 <h2><%=l(:label_roadmap)%></h2>