SONAR-1608 Update labels

diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index bc17add3c7207cd3051ef615c11ff81a38b3e681..e06725d0d8351496aec600688ce5f8c5482ed378 100644 (file)
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -957,6 +957,7 @@ project_history.event_already_exists=Event "{0}" already exists.
 #
 #------------------------------------------------------------------------------
 update_key.update_resource_key=Update Key
+update_key.description=This administration page allows to change the key of a project and of its modules. Those changes must be done BEFORE analyzing the project with the new keys otherwise this operation will fail.
 update_key.bulk_update=Bulk Update
 update_key.fine_grained_key_update=Fine-grained Update
 update_key.old_key=Old key
@@ -969,7 +970,7 @@ update_key.cant_update_x_because_resource_already_exist_with_key_x="{0}" can not
 update_key.error_occured_while_renaming_key_of_x=An error occurred while renaming the key "{0}": {1}
 update_key.key_updated=The key has successfully been updated for all required resources.
 update_key.fieds_cant_be_blank_for_bulk_update=The two fields can not be blank for the bulk update.
-update_key.bulk_change_description=The bulk update allows to replace the beginning of the current key by another string on the current project and all its submodules - if applicable.
+update_key.bulk_change_description=The bulk update allows to replace a part of the current key(s) by another string on the current project and all its submodules - if applicable.
 update_key.current_key_for_project_x_is_x=The key of the "{0}" project is currently "<b>{1}</b>".
 update_key.are_you_sure_to_rename_x=Are you sure you want to rename "{0}", as well as all its modules and resources ?
 update_key.replace=Replace
@@ -979,6 +980,7 @@ update_key.by_example=Ex.: "com.myNewCompany"
 update_key.cant_update_because_duplicate_keys=The replacement of "{0}" by "{1}" is impossible as it would result in duplicate keys (in red below):
 update_key.keys_will_be_updated_as_follows=The resources will be updated as follows (updated keys in bold): 
 update_key.duplicate_key=Duplicate key
+update_key.bulk_update_confirmation_page=Do you really want to perform the bulk update on project keys?
 
 
 #------------------------------------------------------------------------------

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 aa2bd82a76391b8c32d7af98ed7f6c2df01eed63..1dd74cc78c391b44455057e97c0fca9c0c40d1c5 100644 (file)
--- 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 7d03a1af67661f406a021e2a66759a40f2876add..bbdb6d43631812e69ad0ddebc6c67f696abe7045 100644 (file)
--- 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]) -%>