From 6ab243383fc6c037289afc9390f73f5b1fe92f45 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Thu, 5 Jul 2012 10:02:41 +0200 Subject: [PATCH] Fix html input syntax --- .../org/sonar/plugins/core/widgets/complexity.html.erb | 8 ++++---- .../plugins/core/widgets/test_complexity.html.erb | 8 ++++---- .../webapp/WEB-INF/app/views/alerts/_edit.html.erb | 2 +- .../main/webapp/WEB-INF/app/views/alerts/_new.html.erb | 2 +- .../WEB-INF/app/views/dependencies/index.html.erb | 2 +- .../WEB-INF/app/views/filters/_criterion.html.erb | 2 +- .../WEB-INF/app/views/filters/_customize_list.html.erb | 6 +++--- .../webapp/WEB-INF/app/views/profiles/index.html.erb | 10 +++++----- .../WEB-INF/app/views/profiles/projects.html.erb | 4 ++-- .../app/views/project_roles/edit_groups.html.erb | 4 ++-- .../app/views/rules_configuration/edit.html.erb | 8 ++++---- .../WEB-INF/app/views/rules_configuration/new.html.erb | 6 +++--- .../app/views/updatecenter/_operations.html.erb | 4 ++-- .../WEB-INF/app/views/updatecenter/available.html.erb | 4 ++-- .../WEB-INF/app/views/updatecenter/index.html.erb | 2 +- .../app/views/updatecenter/system_updates.html.erb | 4 ++-- .../WEB-INF/app/views/updatecenter/updates.html.erb | 2 +- .../main/webapp/WEB-INF/app/views/users/new.html.erb | 8 ++++---- 18 files changed, 43 insertions(+), 43 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb index 3eb807b0847..f443933d80e 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb @@ -85,25 +85,25 @@ complexity=measure('complexity') if function_distribution count_dist+=1 %> -> +/> <% end if paragraph_distribution count_dist+=1 %> -> <%= '
' if count_dist==2 %> +/> <%= '
' if count_dist==2 %> <% end if class_distribution count_dist+=1 %> -> <%= '
' if count_dist==2 %> +/> <%= '
' if count_dist==2 %> <% end if file_distribution count_dist+=1 %> -> +/> <% end %> diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/test_complexity.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/test_complexity.html.erb index 3eb807b0847..f443933d80e 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/test_complexity.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/test_complexity.html.erb @@ -85,25 +85,25 @@ complexity=measure('complexity') if function_distribution count_dist+=1 %> -> +/> <% end if paragraph_distribution count_dist+=1 %> -> <%= '
' if count_dist==2 %> +/> <%= '
' if count_dist==2 %> <% end if class_distribution count_dist+=1 %> -> <%= '
' if count_dist==2 %> +/> <%= '
' if count_dist==2 %> <% end if file_distribution count_dist+=1 %> -> +/> <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb index 72a26668db3..273f8c23a7d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb @@ -20,7 +20,7 @@ <%= value_field(alert, alert.value_error, 'alert[value_error]') %> <%= alert.metric.suffix if alert.metric %> - + <%= link_to message('delete'), {:action => 'delete', :id => alert.id, :profile_id =>@profile.id}, :confirm => message('are_you_sure'), :method => :post, :class => 'action', :id => "delete_#{u alert.name}" %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb index e877483affe..028a58d9691 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb @@ -49,7 +49,7 @@ - + diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb index 0535341e2ca..631e84f3563 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb @@ -25,7 +25,7 @@ padding: 5px;
-
+

<%= message('dependencies.search_help') -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_criterion.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_criterion.html.erb index 34d80b2abce..f1c6c016dcb 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_criterion.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_criterion.html.erb @@ -28,5 +28,5 @@ - + <%= message('reset_verb') -%> \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_customize_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_customize_list.html.erb index 34d2879e6e3..59f7e5313af 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_customize_list.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_customize_list.html.erb @@ -27,7 +27,7 @@ <% end %> - + @@ -55,8 +55,8 @@ <%= message('page_size') -%>:
- - + + <%= message('min') -%> <%= ::Filter::MIN_PAGE_SIZE -%>, <%= message('max').downcase -%> <%= ::Filter::MAX_PAGE_SIZE -%> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb index 10f67a4e247..f107558bf23 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb @@ -50,17 +50,17 @@ <% if administrator? %> - + - + <% importers.to_a.sort{|x,y| x.getName() <=> y.getName()}.each do |importer| %> @@ -68,7 +68,7 @@ @@ -124,7 +124,7 @@ diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb index dec38c67172..8a155a8adbd 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/projects.html.erb @@ -4,7 +4,7 @@
<% if is_admin? %> - +
<%= message('name') -%>:
<%= importer.getName() -%>: - <%= file_field_tag "backup[#{importer.getKey()}]" %> + <%= file_field_tag "backup[#{importer.getKey()}]" %> <%= message('quality_profiles.optional_configuration_file') -%>
- + <%= message('cancel') -%>
<% if !profile.provided? %> <% form_tag(:action => 'backup', :id => profile.id) do -%> - + <% end end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_groups.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_groups.html.erb index 79dc598dbce..26546c894d4 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_groups.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/edit_groups.html.erb @@ -7,8 +7,8 @@
- - + +
@@ -27,7 +27,7 @@ <%= options_from_collection_for_select(@profile.projects, "id", "name") %>
- +
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/edit.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/edit.html.erb index 63990f20cd0..408e3d325c6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/edit.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/edit.html.erb @@ -28,7 +28,7 @@ - + @@ -44,7 +44,7 @@ @@ -59,8 +59,8 @@ diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/new.html.erb index fc3374104f0..5eb908c96f0 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/new.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/new.html.erb @@ -14,7 +14,7 @@ - + @@ -30,7 +30,7 @@ @@ -45,7 +45,7 @@
<%= message('name') -%>:
<%= message('default_severity') -%>:<%= parameter.name %>: - + <%= parameter.description %>
- - + + <%= message('cancel') -%>
<%= message('name') -%>:
<%= message('default_severity') -%>:<%= parameter.name %>: - + <%= parameter.description %>
- <%= message('cancel') -%> + <%= message('cancel') -%>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb index 6798933c73c..dec69e8c8f8 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb @@ -16,7 +16,7 @@
  • <%= uninstall -%>
  • <% end %> - +

    <% end %> @@ -28,7 +28,7 @@
  • <%= download -%>
  • <% end %> - +

    <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb index 0e82b72feef..d96b398f17a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb @@ -71,10 +71,10 @@ function installPlugin(key) { <% if plugin.getTermsConditionsUrl() %> - I accept the <%= link_to 'Terms and Conditions', plugin.getTermsConditionsUrl(), :class => 'external' %> + I accept the <%= link_to 'Terms and Conditions', plugin.getTermsConditionsUrl(), :class => 'external' %> <% end %>
    - +
    diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb index 710b6071d8a..7f3e3191e01 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb @@ -46,7 +46,7 @@
    - +
    diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb index 1c71d8c1649..a52a6d89968 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb @@ -66,14 +66,14 @@ <% update.getIncompatiblePlugins().each do |incompatible_plugin| %>
  • - <%= image_tag 'warning.png' -%> the plugin <%= incompatible_plugin.getName() -%> which is not compatible with Sonar <%= release.getVersion() -%>. + <%= image_tag 'warning.png' -%> the plugin <%= incompatible_plugin.getName() -%> which is not compatible with Sonar <%= release.getVersion() -%>.
  • <% end %> <% update.getPluginsToUpgrade().each do |plugin_to_upgrade| %>
  • - + the plugin <%= plugin_to_upgrade.getArtifact().getName() -%> to version <%= plugin_to_upgrade.getVersion() -%>
  • diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb index d7b3e30696f..1966fd95241 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb @@ -53,7 +53,7 @@ function upgradePlugin(key) {
    - +
    diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb index 8c775b96406..e53d6638f74 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb @@ -5,20 +5,20 @@

    <%= label_tag 'user_login', message('login') %>

    - +
    <%= message('sessions.old_account', :params => [url_for(:controller => 'sessions', :action => 'new')]) -%>

    <%= label_tag 'user_name', message('name') %>

    - +

    <%= label_tag 'user_password', message('password') %>

    -

    +

    <%= label_tag 'user_password_confirmation', message('sessions.confirm_password') %>

    - +

    <%= submit_tag message('sessions.sign_up') %> <%= message('cancel') -%> -- 2.39.5