From 45433b0f0d7d5ee5f28f1322fc1749511cfec806 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 14 Jun 2016 10:51:00 +0200 Subject: [PATCH] fix padding on the "Update Key" page --- .../project/prepare_key_bulk_update.html.erb | 87 ++++++++++--------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb index 49064fa4d88..7c5bcc61074 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb @@ -1,4 +1,4 @@ -<% +<% if @string_to_replace && @replacement_string # validation screen for bulk update reset_cycle 'modules_tree' @@ -10,47 +10,52 @@ input.disabled=true; }); } - - -

<%= @can_update ? message('update_key.bulk_update_confirmation_page') : message('update_key.bulk_update_impossible') -%>

-
-

- <% if @can_update %> - <%= message('update_key.keys_will_be_updated_as_follows') -%> - <% else %> - <% if @duplicate_key_found %> - <%= message('update_key.cant_update_because_duplicate_keys', :params => [@string_to_replace, @replacement_string]) -%> + + +

+ +

+ <% if @can_update %> + <%= message('update_key.keys_will_be_updated_as_follows') -%> <% else %> - <%= message('update_key.no_key_to_update', :params => @string_to_replace) -%> + <% if @duplicate_key_found %> + <%= message('update_key.cant_update_because_duplicate_keys', :params => [@string_to_replace, @replacement_string]) -%> + <% else %> + <%= message('update_key.no_key_to_update', :params => @string_to_replace) -%> + <% end %> <% end %> - <% end %> -

- - - - - - - - - - <%= render :partial => 'prepare_keys', :locals => {:current_module => @project, :module_depth => 0, :key_check_results => @key_check_results} -%> - -
<%= message('update_key.old_key') -%><%= message('update_key.new_key') -%>
- - <% if @can_update %> - <% form_tag( {:action => 'perform_key_bulk_update', :id => @project.id }, :onsubmit => "update_launched();$j('#loading_bulk_update').show();") do -%> - - - +

+ + + + + + + + + + <%= render :partial => 'prepare_keys', :locals => {:current_module => @project, :module_depth => 0, :key_check_results => @key_check_results} -%> + +
<%= message('update_key.old_key') -%><%= message('update_key.new_key') -%>
+ + <% if @can_update %> + <% form_tag( {:action => 'perform_key_bulk_update', :id => @project.id }, :onsubmit => "update_launched();$j('#loading_bulk_update').show();") do -%> + + + +
+ <%= submit_tag message('update_key.rename'), :id => 'bulk_update_button', :class => 'action' -%> +  <%= message('cancel') -%> + + <% end %> + <% else %>
- <%= submit_tag message('update_key.rename'), :id => 'bulk_update_button', :class => 'action' -%> -  <%= message('cancel') -%> - + <%= message('back') -%> <% end %> - <% else %> -
- <%= message('back') -%> - <% end %> - -<% end %> \ No newline at end of file +
+ +<% end %> -- 2.39.5