diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-07-12 18:38:42 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-07-12 18:38:52 +0200 |
| commit | a2a1a000cb251bd814d1977cd7037a3e69681dd2 (patch) | |
| tree | 916fed94e97bc2d01a7c22df8717bb8d3857e33b /sonar-server | |
| parent | c4ff8b4179f9d8701085179ca54aa6e17547bbba (diff) | |
| download | sonarqube-a2a1a000cb251bd814d1977cd7037a3e69681dd2.tar.gz sonarqube-a2a1a000cb251bd814d1977cd7037a3e69681dd2.zip | |
Merge branch 'master' of /Users/sbrandhof/projects/github/sonar with conflicts.
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb index 432284408f9..83becec1f0a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb @@ -17,14 +17,14 @@ %> <% form_tag( {:action => 'index'}, :method => :get ) do %> - <%= message('bulk_deletion.resource_name_filter_by_name') -%>: <input type="text" id="resource_filter" name="name_filter" size="40px" value=""/> + <%= message('bulk_deletion.resource_name_filter_by_name') -%> <input type="text" id="resource_filter" name="name_filter" size="40px" value=""/> <input type="hidden" name="resource_type" value="<%= @selected_tab -%>"/> <%= submit_tag message('bulk_deletion.search'), :id => 'filter_resources' %> <% end %> <% if @resources.empty? %> <br/> - <%= message('bulk_deletion.no_resource_to_delete') -%> + <%= message('no_results') -%> <% else %> <% form_remote_tag( :url => {:action => 'delete_resources'}, :loading => "window.location='#{url_for :action => 'pending_deletions'}';") do %> |