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..3cfc529 --- a/app/views/projects/settings/_activities.html.erb +++ b/app/views/projects/settings/_activities.html.erb @@ -1,5 +1,12 @@ <%= form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %> +
+<%= link_to(l(:button_reset), project_enumerations_path(@project), + :method => :delete, + :data => {:confirm => l(:text_are_you_sure)}, + :class => 'icon icon-del') %> +
+ @@ -31,12 +38,5 @@ <% end %>
<%= l(:field_name) %>
-
-<%= 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/_wiki.html.erb b/app/views/projects/settings/_wiki.html.erb old mode 100644 new mode 100755 index 8374abb..18284ee --- a/app/views/projects/settings/_wiki.html.erb +++ b/app/views/projects/settings/_wiki.html.erb @@ -6,14 +6,13 @@ <%= error_messages_for 'wiki' %>
-

<%= f.text_field :start_page, :size => 60, :required => true %> -<%= l(:text_unallowed_characters) %>: , . / ? ; : |

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

<%= f.text_field :start_page, :size => 60, :required => true %> +<%= l(:text_unallowed_characters) %>: , . / ? ; : |

+ <%= submit_tag((@wiki.nil? || @wiki.new_record?) ? l(:button_create) : l(:button_save)) %> <% end %>