diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2011-09-13 23:35:53 +0200 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2011-09-13 23:35:53 +0200 |
| commit | 49407df9377b4ec3e9ab887ffb748bb5ba6ca637 (patch) | |
| tree | f20b05d6c6a6493c3be6b4322ba2c95f2d153a98 | |
| parent | d23d4ea825fae92b432fd7f1c65ef661426d4551 (diff) | |
| download | sonarqube-49407df9377b4ec3e9ab887ffb748bb5ba6ca637.tar.gz sonarqube-49407df9377b4ec3e9ab887ffb748bb5ba6ca637.zip | |
Add some IDs to HTML elements in order to help Selenium tests
3 files changed, 5 insertions, 5 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb index ca851346123..0e2aaad99bb 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/server.rb @@ -59,7 +59,7 @@ class Server def sonar_info sonar_info=[] - add_property(sonar_info, 'Server Key') {sonar_property(ServerIdConfigurationController::PROPERTY_SERVER_ID)} + add_property(sonar_info, 'Server ID') {sonar_property(ServerIdConfigurationController::PROPERTY_SERVER_ID)} add_property(sonar_info, 'Version') {org.sonar.server.platform.Platform.getServer().getVersion()} add_property(sonar_info, 'Started at') {org.sonar.server.platform.Platform.getServer().getStartedAt()} add_property(sonar_info, 'Database') {"#{jdbc_metadata. getDatabaseProductName()} #{jdbc_metadata. getDatabaseProductVersion()}"} diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb index b5c39c8ac28..541f6d71ed6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb @@ -2,7 +2,7 @@ <% if @server_id %> <p> - <big><b><span class="<%= @bad_id ? 'error' : 'notice' -%>"><%= @server_id -%></span></b></big> + <big><b><span class="<%= @bad_id ? 'error' : 'notice' -%>" id="server_id"><%= @server_id -%></span></b></big> <% if @bad_id %> <span class="error"><%= message('server_id_configuration.bad_id') -%></span> <% end %> @@ -24,7 +24,7 @@ <tfoot> <tr> <td colspan="3"> - <%= submit_tag message('server_id_configuration.generate_button'), :disable_with => message('server_id_configuration.generating_button') %> + <%= submit_tag message('server_id_configuration.generate_button'), :disable_with => message('server_id_configuration.generating_button'), :id => 'generate-button' -%> </td> </tr> </tfoot> @@ -47,7 +47,7 @@ <p class="marginbottom10"><%= message('server_id_configuration.ip.desc') -%></p> <ul class="marginbottom10 bullet"> <% @valid_addresses.each_with_index do |ip_address, index| %> - <li><span class="address_<%= index -%>"><%= ip_address.getHostAddress() -%></span></li> + <li><span id="address_<%= index -%>"><%= ip_address.getHostAddress() -%></span></li> <% end %> </ul> <p> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb index 24b253c72de..9b926826500 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_special.html.erb @@ -1 +1 @@ -<iframe src="<%= url -%>" width="100%" height="600" frameborder="0" scrolling="no"></iframe>
\ No newline at end of file +<iframe src="<%= url -%>" width="100%" height="600" frameborder="0" scrolling="no" name="settings_iframe"></iframe>
\ No newline at end of file |