SONAR-4444 Rename some assign options

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 4e3eeafbdd57907f0f01297c8d6f25da9fc7dab5..a0ad74750fa4dad9692d7c565919a6121e98407e 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
@@ -9,7 +9,7 @@ activation=Activation
 active=Active
 add_verb=Add
 age=Age
-assign_to_me=Assign to me
+assigned_to_me=Assigned to me
 alerts=Alerts
 all=All
 and=And
@@ -84,7 +84,7 @@ more_actions=More actions
 name=Name
 name_too_long_x=Name is too long (maximum is {0} characters)
 none=None
-unassign=Unassign
+unassigned=Unassigned
 off=Off
 on=On
 open=Open
@@ -478,6 +478,7 @@ issue.comment.submit=Comment
 issue.comment.delete_confirm_title=Delete Comment
 issue.comment.delete_confirm_message=Do you want to delete this comment?
 issue.comment.delete_confirm_button=Delete
+issue.transition=Transition
 issue.transition.confirm=Confirm
 issue.transition.unconfirm=Unconfirm
 issue.transition.resolve=Resolve

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb
index 245534ee64f6bfd9b5d75c77c32374f126d33dc3..c1c12f57770ad89a743103c62b1c29cb4cf95f4c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_assign_form.html.erb
@@ -7,8 +7,8 @@
       <td style="vertical-align:top">
         <%
            choices = {}
-           choices[current_user.login] = escape_javascript(message('assign_to_me')) if !@issue.assignee || @issue.assignee != current_user.login
-           choices[''] = escape_javascript(message('unassign')) if @issue.assignee
+           choices[current_user.login] = escape_javascript(message('assigned_to_me')) if !@issue.assignee || @issue.assignee != current_user.login
+           choices[''] = escape_javascript(message('unassigned')) if @issue.assignee
         %>
         <%=
             user_select_tag('assignee', :html_id => user_select_box_id, :open => true, :include_choices => choices)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb
index 2fd386e4bf46813f26263350cc85bc2756487b10..6da3bf0c22442d1f59b0994fb4e6a1efd5c9531a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb
@@ -14,7 +14,7 @@
         </label>
         <input id="assign-action" name="actions[]" type="checkbox" value="assign"/>
         <%= user_select_tag('assign.assignee', :html_id => 'assignee', :open => false,
-                            :include_choices => {'' => escape_javascript(message('unassign')), current_user.login => escape_javascript(message('assign_to_me'))}) -%>
+                            :include_choices => {'' => escape_javascript(message('unassigned')), current_user.login => escape_javascript(message('assigned_to_me'))}) -%>
       </div>
       <%
          if @project && !@project.blank?
@@ -51,6 +51,9 @@
                          {:id => 'severity'}) -%>
       </div>
       <div class="modal-field">
+        <label>
+          <%= message('issue.transition') -%>
+        </label>
         <% @transitions_by_issues.keys.each do |transition| %>
           <input type="radio" name="transition.transition" value="<%= transition -%>" onClick="addTransitionAction();">&nbsp;<%= message("issue.transition.#{transition}") -%>
           (<%= @transitions_by_issues[transition].to_s %>) <br>

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 7e314e02ebb1ddcfc37d3f4e8f7456ef73ea5417..3c06841e814d6fc59e38007a95e5d454db7df563 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2332,7 +2332,8 @@ ul.modal-head-metadata li {
 }
 
 .modal-field input {
-  position: relative;
+  margin-right: 5px;
+  margin-bottom: 10px;
 }
 
 .modal-foot {