From: Stas Vilchik Date: Tue, 10 Mar 2015 16:51:07 +0000 (+0100) Subject: remove some usages of deprecated css X-Git-Tag: 5.2-RC1~2611 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f866ab2a6a97e0cef8513b3c1ea96cbe4dc2a804;p=sonarqube.git remove some usages of deprecated css --- diff --git a/server/sonar-web/src/main/hbs/dashboard/widgets.hbs b/server/sonar-web/src/main/hbs/dashboard/widgets.hbs index 26f9bca7e00..62a85c46aa5 100644 --- a/server/sonar-web/src/main/hbs/dashboard/widgets.hbs +++ b/server/sonar-web/src/main/hbs/dashboard/widgets.hbs @@ -1,5 +1,5 @@
-
+
{{#unless state.configure}} {{else}} diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb index 4f474906a13..ae9e6bea1dd 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb @@ -4,7 +4,7 @@ <%= message('name') -%> <%= message('shared_by') -%> <%= message('order') -%> - <%= message('operations') -%> + <%= message('operations') -%> @@ -34,7 +34,7 @@ <%= image_tag('transparent_16.gif') %> <% end %> - + <% if active_dashboards.size() > 1 %> <%= link_to 'Remove from defaults', {:action => :remove, :id => active.id}, {:confirm => 'Are you sure to remove it from default dashboards?', :method => :post, :id => "remove-#{u active.name}", :class => 'link-action'} %> <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb index 3173e62554b..e264a11f413 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb @@ -24,7 +24,7 @@ <%= message('name') -%> <%= message('shared_by') -%> <%= message('global') -%> - <%= message('operations') -%> + <%= message('operations') -%> @@ -45,7 +45,7 @@ <%= boolean_icon(dashboard.global) -%> - + <%= link_to 'Add to defaults', {:action => 'add', :id => dashboard.id}, {:method => :post, :id => "add-#{u dashboard.name}", :class => 'link-action'} %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb index 9d887ac38de..21807504e75 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb @@ -2,7 +2,7 @@

<%= h @dashboard.name -%>

-
+
<% if @snapshot %> <% if @snapshot.project_snapshot.periods? %> <% period_options = period_select_option_tags(@snapshot, 'small') %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/_header.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/_header.html.erb index e777522b3c2..b078b0a5d43 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/_header.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/_header.html.erb @@ -2,7 +2,7 @@
<% if logged_in? %> -
+
<% if back %> <%= link_to message('dashboard.back_to_dashboard'), dashboard_action(:index), :class => 'button' -%> <% else %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb index 5737650fb80..35cd88de775 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb @@ -5,7 +5,7 @@ <%= message('shared') -%> <%= message('owner') -%>   - <%= message('operations') -%> + <%= message('operations') -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_dashboard_operations.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_dashboard_operations.html.erb index e2276a1ba9b..cb78673c34b 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_dashboard_operations.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_dashboard_operations.html.erb @@ -1,4 +1,4 @@ - + <% resource_id = @resource.id if @resource %> <% if dashboard.editable_by?(current_user) %> <%= link_to message('dashboard.configure_widgets'), {:controller => :dashboard, :action => :configure, :did => dashboard.id, :id => (resource_id unless dashboard.global?)}, diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb index 68240dea729..3c2425053b5 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb @@ -5,7 +5,7 @@ <%= message('shared') -%> <%= message('owner') -%> <%= message('order') -%> - <%= message('operations') -%> + <%= message('operations') -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb index 1f53684aca7..4f491935685 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb @@ -24,7 +24,7 @@ Name Description Members - Operations + Operations @@ -42,7 +42,7 @@ <%= group.users.count -%> (select) - + Edit   <%= link_to_action message('delete'), "#{ApplicationController.root_context}/groups/delete/#{group.id}", diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb index 46be63b0b40..c246e348b57 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb @@ -10,13 +10,15 @@ <%= render :partial => 'roles/tabs', :locals => {:selected_tab => 'Permission templates'} %>
-
-
- <%= link_to message('permission_template.set_default_templates'), {:action => :default_templates_form, :qualifiers => @root_qualifiers}, - :id => 'configure-defaults-permission-template', :class => 'open-modal link-action button' %> - <%= link_to message('create'), {:action => :create_form}, :id => 'create-link-permission-template', :class => 'open-modal link-action button' %> +
+ diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb index bcbcafa012d..36ae86f612a 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/_diff_rule.html.erb @@ -1,8 +1,6 @@ - - - <%= h(arule.rule.name) -%> - - + + <%= h(arule.rule.name) -%> +<%= h(arule.rule.plugin_name) -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb index 585c8890fd7..9c8488a8835 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb @@ -3,7 +3,7 @@ - + @@ -31,7 +31,7 @@ - diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb index 5c661103188..abc5db3d9d7 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb @@ -38,14 +38,16 @@ <% end %> -
-
- <%= link_to message('projects_role.bulk_change'), {:action => :apply_template_form, :names => @components_names, - :keys => @components_keys, :qualifiers => @components_qualifiers, - :results_count => @query_result.paging.total}, - :id => 'apply-template-modal', :class => 'open-modal link-action button' %> +
+
<%= message('key') -%> <%= message('name') -%> <%= message('created') -%><%= message('operations') -%><%= message('operations') -%>
<%= h resource.name -%> <%= format_datetime(resource.created_at) -%> + <%= link_to message('delete'), {:action => :delete_form, :id => resource.id}, {:id => "delete-#{resource.key.parameterize}", :class => 'open-modal link-action link-red'} -%>