aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorFabrice Bellingard <bellingard@gmail.com>2012-07-04 15:21:21 +0200
committerFabrice Bellingard <bellingard@gmail.com>2012-07-04 16:03:00 +0200
commit68e2d32eab695583d34826b3ba11e294acdbc938 (patch)
treeced8c6ba45eaafe1b507f46b84defa4eb973f5bc /sonar-server
parente6fa0eca60331bf2a050c19bca1b7c61b4b9284e (diff)
downloadsonarqube-68e2d32eab695583d34826b3ba11e294acdbc938.tar.gz
sonarqube-68e2d32eab695583d34826b3ba11e294acdbc938.zip
SONAR-1608 Update labels
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb24
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb2
2 files changed, 15 insertions, 11 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb
index aa2bd82a763..1dd74cc78c3 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb
@@ -4,16 +4,20 @@
reset_cycle 'modules_tree'
%>
- <script type="text/javascript">
- function update_launched() {
- $$('input.action').each(function(input) {
- input.disabled=true;
- });
- }
- </script>
+<script type="text/javascript">
+ function update_launched() {
+ $$('input.action').each(function(input) {
+ input.disabled=true;
+ });
+ }
+</script>
+
+<h1><%= message('update_key.update_resource_key') -%></h1>
+
+<p style="margin: 15px 0px"><%= message('update_key.description') -%></p>
<% if has_modules %>
- <h1><%= message('update_key.bulk_update') -%></h1>
+ <h2><%= message('update_key.bulk_update') -%></h2>
<br/>
<p>
<%= message('update_key.bulk_change_description') -%>
@@ -46,10 +50,10 @@
<% end %>
<br/>
<br/>
+ <h2><%= message('update_key.fine_grained_key_update') -%></h2>
+ <br/>
<% end %>
- <h1><%= has_modules ? message('update_key.fine_grained_key_update') : message('update_key.update_resource_key') -%></h1>
- <br/>
<table class="data" style="width:1%">
<thead>
<tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb
index 7d03a1af676..bbdb6d43631 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/prepare_key_bulk_update.html.erb
@@ -12,7 +12,7 @@
}
</script>
- <h1><%= message('update_key.bulk_update') -%></h1>
+ <h1><%= message('update_key.bulk_update_confirmation_page') -%></h1>
<br/>
<p>
<%= @can_update ? message('update_key.keys_will_be_updated_as_follows') : message('update_key.cant_update_because_duplicate_keys', :params => [@old_prefix, @new_prefix]) -%>