diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb old mode 100644 new mode 100755 index 27a27de..87d89b1 --- a/app/views/projects/settings/_activities.html.erb +++ b/app/views/projects/settings/_activities.html.erb @@ -1,3 +1,10 @@ +
+ <%= link_to(l(:button_reset), project_enumerations_path(@project), + :method => :delete, + :data => {:confirm => l(:text_are_you_sure)}, + :class => 'icon icon-del') %> +
+ <%= form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %> @@ -31,12 +38,5 @@ <% end %>
-
-<%= link_to(l(:button_reset), project_enumerations_path(@project), - :method => :delete, - :data => {:confirm => l(:text_are_you_sure)}, - :class => 'icon icon-del') %> -
- <%= submit_tag l(:button_save) %> <% end %> diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb old mode 100644 new mode 100755 index f402fff..4b6f276 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -1,4 +1,11 @@ -

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

+<% if @versions.any? %> +
+ <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :class => 'icon icon-locked', :method => :put %> +
+<% end %> +

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

<%= form_tag(settings_project_path(@project, :tab => 'versions'), :method => :get) do %>
<%= l(:label_filter_plural) %> @@ -45,9 +52,3 @@ <% else %>

<%= l(:label_no_data) %>

<% end %> - -
-<% if @versions.any? %> - <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %> -<% end %> -
diff --git a/app/views/projects/settings/_wiki.html.erb b/app/views/projects/settings/_wiki.html.erb old mode 100644 new mode 100755 index 8374abb..7df3241 --- a/app/views/projects/settings/_wiki.html.erb +++ b/app/views/projects/settings/_wiki.html.erb @@ -1,3 +1,11 @@ +<% if @wiki && !@wiki.new_record? %> +
+ <%= link_to(l(:button_delete), {:controller => 'wikis', :action => 'destroy', :id => @project}, + :class => 'icon icon-del') %> +
+

 

+<% end %> + <%= labelled_form_for @wiki, :as => :wiki, :url => { :controller => 'wikis', :action => 'edit', :id => @project }, @@ -10,10 +18,5 @@ <%= l(:text_unallowed_characters) %>: , . / ? ; : |

-
-<%= link_to(l(:button_delete), {:controller => 'wikis', :action => 'destroy', :id => @project}, - :class => 'icon icon-del') if @wiki && !@wiki.new_record? %> -
- <%= submit_tag((@wiki.nil? || @wiki.new_record?) ? l(:button_create) : l(:button_save)) %> <% end %>