SONAR-4466 Integrated feedback from users

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 122ce5bf81baf89e7704b7ab077e6719704e3bb9..094da23aaeb7a62ceaeba155153c89d36dd388b4 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -2261,7 +2261,7 @@ projects_role.codeviewer=Code Viewers
 projects_role.codeviewer.desc=Ability to view the source code of the project.
 projects_role.bulk_change=Bulk Change
 projects_role.apply_template=Apply permission template
-projects_role.apply_template_to_xxx=Apply permission template to {0}
+projects_role.apply_template_to_xxx=Apply permission template to "{0}"
 projects_role.no_projects=There are currently no results to apply the permission template to.
 
 
@@ -2276,7 +2276,7 @@ permission_templates.page=Permission Templates
 permission_template.new_template=New permission template
 permission_template.create_template=Create
 permission_template.delete_confirm_title=Delete permission template
-permission_template.do_you_want_to_delete_template=Are you sure that you want to delete this permission template?
+permission_template.do_you_want_to_delete_template_xxx=Are you sure that you want to delete permission template "{0}"?
 permission_template.delete_template=Delete
 permission_template.edit_template=Edit permission template
 permission_template.update_template=Update

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_delete_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_delete_form.html.erb
index e373a37142c349376fd4305631388516a67acc62..e308fccd73357bfbecee40c8d0de14cf8f89eaa9 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_delete_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_delete_form.html.erb
@@ -8,7 +8,7 @@
       <div id="permission-template-error" class="permission-template error errors" style="display:none;" />
       <div class="info">
         <img src="<%= ApplicationController.root_context -%>/images/information.png" style="vertical-align: text-bottom"/>
-        <%= message 'permission_template.do_you_want_to_delete_template' -%>
+        <%= message 'permission_template.do_you_want_to_delete_template_xxx', :params => @permission_template.name -%>
       </div>
     </div>
     <div class="modal-foot">

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_permission_template_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_permission_template_form.html.erb
index 2cf0a83d435a61d4a1a247c0cdabcb42e9be593e..ede87920cb32858f6d323dca9be20ee629e9a72c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_permission_template_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_permission_template_form.html.erb
@@ -14,7 +14,7 @@
       </div>
       <div class="modal-field">
         <label for="description"><%= h message('description') -%></label>
-        <input id="description" name="description" type="text" size="50" maxlength="4000" value="<%= @permission_template ? @permission_template.description : '' -%>"/>
+        <textarea id="description" name="description" maxlength="4000" rows="10" style="width: 330px;"><%= @permission_template ? @permission_template.description : '' -%></textarea>
       </div>
     </div>
     <div class="modal-foot">

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
index 1f3fe568467fad80df12c415aeff60760d2d1a3f..ebf45b3f70849ea307c76231ccd0be92eb0e5821 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
@@ -78,7 +78,8 @@
            end
            if qualifiers.length > 0
         %>
-          <%= image_tag 'tick.png', :alt => 'is_default' %><span class="small gray" id="<%= "is-default-#{u permission_template.name}" %>">(Default for <%= qualifiers.collect {|q| message('qualifier.' + q)}.join(', ') %>)</span>
+          <%= image_tag 'tick.png', :alt => 'is_default' %><br/>
+          <span class="small gray" id="<%= "is-default-#{u permission_template.name}" %>"><%= qualifiers.collect {|q| message('qualifier.' + q)}.join(', ') %></span>
         <% end %>
       </td>
       <td align="right">