diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-03-14 11:41:52 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-03-14 11:41:52 +0100 |
| commit | 74de2d082e395c75e1c9fb3fc51f2870bb181ed8 (patch) | |
| tree | a3023670186c6c5904d17d767e684667f5322eb5 /sonar-server | |
| parent | cd3bdef9d3c907cc76feac2164b96d47214c1775 (diff) | |
| download | sonarqube-74de2d082e395c75e1c9fb3fc51f2870bb181ed8.tar.gz sonarqube-74de2d082e395c75e1c9fb3fc51f2870bb181ed8.zip | |
SONAR-2084 add the page "Settings Encryption"
Diffstat (limited to 'sonar-server')
3 files changed, 6 insertions, 1 deletions
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 %> |