SONAR-1973, SONAR-2327 Fix minor UI issues

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb
index 71065ec421f3760ea5996c4148074116600cc2d5..94eadb0f8b2aaaac1ccdd4e09711a02a3861d6f7 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb
@@ -43,7 +43,7 @@
         <%= link_to_remote (violation.review && violation.review.assignee_id ? "Reassign" : "Assign"),  
                        :url => { :controller => "reviews", :action => "violation_assign_form", :violation_id => violation.id},
                        :update => "vActions" + violation.id.to_s,
-                       :complete => "$('vActions" + violation.id.to_s + "').show();$('assignee_id').focus();" -%>
+                       :complete => "$('vActions" + violation.id.to_s + "').show();$('commentActions" + violation.id.to_s + "').hide();$('assignee_id').focus();" -%>
         <%
             end 
           else 
@@ -52,14 +52,14 @@
         <%= link_to_remote "Review",
                :url => { :controller => "reviews", :action => "violation_comment_form", :id => violation.id },
                :update => "reviewForm" + violation.id.to_s,
-               :complete => "$('vActions#{violation.id}').hide();$('reviewForm" + violation.id.to_s + "').show();$('commentText" + violation.id.to_s + "').focus()" -%>
+               :complete => "$('reviewForm" + violation.id.to_s + "').show();$('commentText" + violation.id.to_s + "').focus();$('vActions#{violation.id}').hide();" -%>
         <% end %>
       
         &nbsp;
         <%= link_to_remote (violation.switched_off? ? "Unflag as false-positive" : "Flag as false-positive"),
                        :url => { :controller => "reviews", :action => "violation_false_positive_form", :id => violation.id, :false_positive => !violation.switched_off? },
                        :update => "reviewForm" + violation.id.to_s,
-                       :complete => "$('vActions" + violation.id.to_s + "').hide();$('reviewForm" + violation.id.to_s + "').show();$('commentText" + violation.id.to_s + "').focus();" -%>
+                       :complete => "$('reviewForm" + violation.id.to_s + "').show();$('commentText" + violation.id.to_s + "').focus();$('vActions" + violation.id.to_s + "').hide();$('commentActions" + violation.id.to_s + "').hide();" -%>
     </span>
     <% end %>
     
@@ -93,7 +93,7 @@
           <%= link_to_remote "Edit", 
             :url => { :controller => "reviews", :action => "violation_comment_form", :comment_id => review_comment.id, :id => violation.id },
             :update => "lastComment" + violation.id.to_s,
-            :complete => "$('reviewForm#{violation.id}').hide();$('vActions#{violation.id}').hide();$('commentAction#{violation.id}').hide();$('commentText#{violation.id}').focus();" -%>
+            :complete => "$('vActions#{violation.id}').hide();$('commentActions#{violation.id}').hide();$('commentText#{violation.id}').focus();" -%>
           <% unless comment_index == 0 %>
           &nbsp;
           <%= link_to_remote "Delete",

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_comment_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_comment_form.html.erb
index 58beeb5ac6544116f91a8856ccd058980cd8a619..2a7723c832473c7cc0c06e0a1b1ede2d4cd2a33f 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_comment_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_comment_form.html.erb
@@ -13,6 +13,7 @@
         <textarea id="commentText" rows="8" name="text" style="width: 100%" onkeyup="if (this.value=='') $('submit_btn').disabled='true'; else $('submit_btn').disabled='';"><%= @comment.text if @comment -%></textarea>
         <br/>
         <%= submit_to_remote "submit_btn", button, :url => { :action => 'save_comment'}, :html => { :id => "submit_btn", :disabled => "true" }, :update => 'review' -%>
+        &nbsp;
         <%= link_to_remote 'Cancel', :url => {:action => 'show', :id => params[:id]}, :update => 'review' -%>
       </td>
       <td class="sep"></td>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_false_positive_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_false_positive_form.html.erb
index 6cc844cb38e1a510609580f16c06c4e4cff2af2b..98f329bd088e1877ed5ad0cbd5cbe742bc2b69b5 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_false_positive_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_false_positive_form.html.erb
@@ -3,5 +3,6 @@
   <h3>Why is it a false-positive ?</h3>
   <textarea id="commentText" rows="8" name="comment" style="width: 100%" onkeyup="if (this.value=='') $('submit_btn').disabled='true'; else $('submit_btn').disabled='';"></textarea>
   <%= submit_to_remote "submit_btn", "Flag as false-positive", :url => { :action => 'flag_as_false_positive' }, :html => { :id => "submit_btn", :disabled => "true" }, :update => 'review' -%>
+  &nbsp;
   <%= link_to_remote 'Cancel', :url => {:action => 'show', :id => params[:id]}, :update => 'review' -%>
 </form>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_review.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_review.html.erb
index 9b69baadc633718237fb09c7b798a107517737ed..be8cccb920fe7ad5cbc4153757a42fc029164a66 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_review.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_review.html.erb
@@ -11,13 +11,13 @@
         <%= link_to_remote (review.assignee_id ? "Reassign" : "Assign"),  
                        :url => { :controller => "reviews", :action => "assign_form", :review_id => review.id},
                        :update => "assignForm",
-                       :complete => "$('rActions').hide(); $('commentAction').hide(); $('assignee_id').focus();" -%>
+                       :complete => "$('rActions').hide(); $('editActions').hide(); $('assignee_id').focus();" -%>
       
         &nbsp;
         <%= link_to_remote ("Flag as false-positive"),
                        :url => { :controller => "reviews", :action => "false_positive_form", :id => review.id },
                        :update => "reviewForm",
-                       :complete => "$('rActions').hide(); $('commentAction').hide(); $('reviewForm').show();$('commentText').focus();" -%>
+                       :complete => "$('reviewForm').show(); $('rActions').hide(); $('editActions').hide(); $('commentText').focus();" -%>
     </span>
     <% end %>
     

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_comment_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_comment_form.html.erb
index a080d8b0e5e4c77b1090c5971a6e8d95d420a694..d045ad90c2818092537176569cf9a98fa98b77fd 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_comment_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_comment_form.html.erb
@@ -13,6 +13,7 @@
         <textarea id="commentText<%= params[:id] -%>" rows="8" name="text" style="width: 100%" onkeyup="if (this.value=='') $('submit_btn').disabled='true'; else $('submit_btn').disabled='';"><%= @comment.text if @comment -%></textarea>
         <br/>
         <%= submit_to_remote "submit_btn", button, :url => { :action => 'violation_save_comment'}, :html => { :id => "submit_btn", :disabled => "true" }, :update => 'vId'+params[:id] -%>
+        &nbsp;
         <%= link_to_remote 'Cancel', :url => {:action => 'display_violation', :id => params[:id]}, :update => 'vId' + params[:id] -%>
 
         <% if @violation.review.nil? || @violation.review.comments.size==0 %>