aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2012-03-23 00:12:18 +0100
committerSimon Brandhof <simon.brandhof@gmail.com>2012-03-23 00:12:18 +0100
commita88334d64b20fe8401548f4cdcffa9104aecc19a (patch)
tree4629500115cf4c01262009089d39911baea73739
parent249ed1fc24d6c0482ba28fd0106ee3fffba938f8 (diff)
downloadsonarqube-a88334d64b20fe8401548f4cdcffa9104aecc19a.tar.gz
sonarqube-a88334d64b20fe8401548f4cdcffa9104aecc19a.zip
Add some HTML ids for integration tests
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb6
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb2
2 files changed, 4 insertions, 4 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
index eb7351c7bd9..b3236d737b6 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
@@ -2,10 +2,10 @@
<p class="spacer-bottom">Secret key is required to be able to encrypt properties. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p>
<div id="secret_content">
<%= button_to_remote 'Generate secret key',
- :url => {:action => 'generate_secret'},
+ {:url => {:action => 'generate_secret'},
:update => {:success => 'secret_content', :failure => 'secret_error'},
:failure => "$('secret_error').show()",
- :method => 'POST',
- :id => 'submit_generate_secret' -%>
+ :method => 'POST'},
+ {:id => 'submit_generate_secret'} -%>
<span id="secret_error" class="error" style="display:none"></span>
</div> \ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
index ba7aae6d40a..ff021a225ac 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
@@ -13,7 +13,7 @@
<div id="encrypted_section" style="display:none"></div>
<span id="encryption_error" class="error" style="display:none"></span>
-<p>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action' %>
+<p>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action', :id => 'link-generate-key' %>
but all the encrypted properties will have to be updated. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p>
<script>
$('clear_text').focus();