diff options
4 files changed, 7 insertions, 1 deletions
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties index 32e934c4bf0..d5bca7a5bdc 100644 --- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -298,6 +298,7 @@ default_filters.page=Default Filters dependencies.page=Dependencies duplications.page=Duplications email_configuration.page=Email Settings +encryption.page=Settings Encryption event_categories.page=Event Categories filters.page=Filters global_roles.page=Global Roles diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/encryption_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/encryption_controller.rb index cc7d49ee848..46fa00700d6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/encryption_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/encryption_controller.rb @@ -39,6 +39,7 @@ class EncryptionController < ApplicationController def encrypt bad_request('No secret key') unless java_facade.hasSecretKey() @encrypted=java_facade.encrypt(params[:text]) + render :action => 'encrypt', :layout => false end private diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption/generate_secret.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption/generate_secret.html.erb index 15b8f4b5fbf..0ef07ca0301 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption/generate_secret.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption/generate_secret.html.erb @@ -1 +1,4 @@ -<span class=""><%= @secret -%></span>
\ No newline at end of file +<textarea rows="2" cols="80"><%= @secret -%></textarea> +<p> +<%= link_to 'Continue', {:action => 'index'}, {:class => 'link-action'} -%> +</p>
\ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index 4e84f710ebe..daa06004930 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -141,6 +141,7 @@ <li class="<%= 'selected' if controller.controller_path=='updatecenter' -%>"> <a href="<%= ApplicationController.root_context -%>/updatecenter"><%= message('update_center.page') -%></a></li> <% end %> + <li class="<%= 'selected' if request.request_uri.include?('/encryption') -%>"><a href="<%= ApplicationController.root_context -%>/encryption"><%= message('encryption.page') -%></a></li> <% end %> <% end %> |