Move left bottom links from project settings above (#25853).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17497 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 15 insertions, 14 deletions

diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb
index 2cd066ee2..1669c1278 100644
--- a/app/views/projects/settings/_activities.html.erb
+++ b/app/views/projects/settings/_activities.html.erb
@@ -1,3 +1,10 @@
+<div class="contextual">
+<%= link_to(l(:button_reset), project_enumerations_path(@project),
+            :method => :delete,
+            :data => {:confirm => l(:text_are_you_sure)},
+            :class => 'icon icon-del') %>
+</div>
+
 <%= form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
 
 <table class="list">
@@ -31,12 +38,5 @@
   <% end %>
 </table>
 
-<div class="contextual">
-<%= link_to(l(:button_reset), project_enumerations_path(@project),
-            :method => :delete,
-            :data => {:confirm => l(:text_are_you_sure)},
-            :class => 'icon icon-del') %>
-</div>
-
 <%= submit_tag l(:button_save) %>
 <% end %>
diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb
index 4651b405d..388c6ae0a 100644
--- a/app/views/projects/settings/_versions.html.erb
+++ b/app/views/projects/settings/_versions.html.erb
@@ -1,4 +1,11 @@
-<p><%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %></p>
+<% if @versions.any? %>
+  <div class="contextual">
+    <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :class => 'icon icon-locked', :method => :put %>
+  </div>
+<% end %>
+<p>
+  <%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
+</p>
 
 <%= form_tag(settings_project_path(@project, :tab => 'versions'), :method => :get) do %>
 <fieldset><legend><%= l(:label_filter_plural) %></legend>
@@ -47,9 +54,3 @@
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
-
-<div class="contextual">
-<% if @versions.any? %>
-  <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
-<% end %>
-</div>