From 3798a5c01c847cbbae50da1dd41de1e62b111b51 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Wed, 7 Nov 2012 15:28:20 +0100 Subject: [PATCH] SONAR-1924 Highlight line of table when mouse comes over a line --- .../WEB-INF/app/views/email_configuration/index.html.erb | 7 ++++--- .../generate_secret_form.html.erb | 2 +- .../app/views/encryption_configuration/index.html.erb | 9 ++++++--- .../app/views/server_id_configuration/index.html.erb | 2 +- .../WEB-INF/app/views/settings/_properties.html.erb | 2 +- .../settings/_type_PROPERTY_SET_DEFINITION.html.erb | 2 +- sonar-server/src/main/webapp/stylesheets/style.css | 9 +++++++++ 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb index dbbe4155ff0..6fe6ebf1d21 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb @@ -5,7 +5,7 @@ <% form_tag({:action => 'save'}) do -%> - +
@@ -23,7 +23,8 @@ - + @@ -61,7 +62,7 @@
<% form_tag({:action => 'send_test_email'}) do -%> -
<%= message('email_configuration.page') -%><%= message('email_configuration.smtp_port.description') -%>
+ <%= select_tag 'smtp_secure_connection', options_for_select({'No' => '', 'SSL' => 'ssl'}, @smtp_secure_connection) %> <%= message('email_configuration.smtp_secure_connection.description') -%>
+
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 c07fd9bd74a..1aad74f2d2b 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 @@ -4,7 +4,7 @@ } -
<%= message('email_configuration.test.title') -%>
+
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 1924163a8fa..e2b58311662 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 @@ -4,7 +4,7 @@ } -
Encryption
+
@@ -27,8 +27,11 @@ -

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. More information.

+

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. + More + information.

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 6b751f7bd57..6c5283bc8ef 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 @@ -5,7 +5,7 @@ <% form_tag :action => 'generate' do %> -
Encryption
+
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb index fed0c43bc2b..583c7cb827f 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb @@ -7,7 +7,7 @@ :update => 'properties', :script => false do -%> -
<%= message('server_id_configuration.page') -%>
+
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET_DEFINITION.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET_DEFINITION.html.erb index beec593636c..24e78c41ed9 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET_DEFINITION.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_type_PROPERTY_SET_DEFINITION.html.erb @@ -1,6 +1,6 @@ <% resource_id = @resource.id if @resource -%> -
<%= h category_name(@category) -%>
+
<% unless key_field(property) -%> diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css index 369a734ddd7..4f0359c0f52 100644 --- a/sonar-server/src/main/webapp/stylesheets/style.css +++ b/sonar-server/src/main/webapp/stylesheets/style.css @@ -23,6 +23,7 @@ color: #EEE; background: #FF5252; padding: 0 5px; + padding: 0 5px; } #ftlinks a { @@ -440,6 +441,14 @@ table.data th img, table.data td img { background-color: #CAE3F2 !important; } +table.nohighlight .odd:hover { + background-color: #fff !important; +} + +table.nohighlight .even:hover { + background-color: #EFEFEF !important; +} + .hoverable:hover a { color: #111; } -- 2.39.5