SONAR-1608 Improve input fields (size and example)

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 e869ba2ecb73fe10ba580a4f2771019e313eeee8..089ea73a2accb250a1033c1dd7102f4c15fe0858 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
@@ -974,6 +974,10 @@ update_key.bulk_change_description=The bulk update allows to replace the beginni
 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.are_you_sure_to_bulk_rename_x_into_x=Are you sure you want to rename "<b>{0}</b>{1}" into "<b>{2}</b>{1}", as well as all its modules and resources ?
+update_key.replace=Replace
+update_key.by=By
+update_key.replace_example=Ex.: "org.myCompany"
+update_key.by_example=Ex.: "com.myNewCompany"
 
 
 #------------------------------------------------------------------------------

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/_key_modules.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/_key_modules.html.erb
index cbd8bb3009a4524fdcbb8129e457457238656431..11eeb27ecc4db631896952bf4e363fcdc93ad0d8 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/_key_modules.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/_key_modules.html.erb
@@ -4,7 +4,7 @@
       </td>
       <td class="thin nowrap">
         <% form_tag( {:action => 'update_key', :id => current_module.id }, :onsubmit => "update_launched();$('loading_#{id_prefix}').show();") do -%>
-          <input type="text" value="<%= h(current_module.key) -%>" name="new_key" id="key_<%= id_prefix -%>" size="40">
+          <input type="text" value="<%= h(current_module.key) -%>" name="new_key" id="key_<%= id_prefix -%>" size="80">
           <%= submit_tag message('update_key.rename'), :id => 'update_key_' + id_prefix, :class => 'action',
                          :confirm => message('update_key.are_you_sure_to_rename_x', :params => current_module.key) %>                         
           <a href="#" onclick="$('key_<%= id_prefix -%>').value='<%= h(current_module.key) -%>';"><%= message('update_key.reset') -%></a>

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 e827469becee6098e03e94cc962a3bfab74fb189..e28d9f59481ea526438edbbc195f649b0e878807 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
@@ -51,12 +51,14 @@
   <% form_tag( {:action => 'prepare_key_bulk_update', :id => @project.id }) do -%>
     <table>
       <tr>
-        <td style="padding-right: 20px">Replace:</td>
+        <td style="padding-right: 20px"><%= message('update_key.replace') -%>:</td>
         <td><input type="text" value="" name="old_prefix" id="old_prefix" size="40"></td>
+        <td class="form-val-note" style="padding-left: 10px;"><%= message('update_key.replace_example') -%></td>
       </tr>
       <tr>
-        <td style="padding-right: 20px">By:</td>
+        <td style="padding-right: 20px"><%= message('update_key.by') -%>:</td>
         <td><input type="text" value="" name="new_prefix" id="new_prefix" size="40"></td>
+        <td class="form-val-note" style="padding-left: 10px;"><%= message('update_key.by_example') -%></td>
       </tr>
       <tr>
         <td></td>
@@ -65,6 +67,7 @@
                          :onclick => "update_launched();$('loading_bulk_update').show();" %>
           <span class="loading" id="loading_bulk_update" style="display: none; padding: 3px 10px;"></span>
         </td>
+        <td></td>
       </tr>      
     </table>
   <% end %>