Fix ui bug on issue

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_edit_comment_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_edit_comment_form.html.erb
index 0edd80784cbe7cc431fb60c10b7a188dd193c5cc..05fc1eb9468f5021e6ca6cc803632595e22b5c3d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_edit_comment_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_edit_comment_form.html.erb
@@ -8,7 +8,7 @@
           name="text"
           style="width: 100%"
           autofocus="autofocus"
-          onkeyup="if (this.value == null || this.value=='') $j('#submit-comment').attr('disabled', 'true'); else $j('#submit-comment').attr('disabled', null);"><%= @comment.markdownText -%></textarea>
+          onkeyup="if (this.value == null || this.value=='') $j('#submit-comment').attr('disabled', 'true'); else $j('#submit-comment').attr('disabled', null);">werwer <%= @comment.markdownText -%></textarea>
       </td>
     </tr>
     <tr>
@@ -23,4 +23,4 @@
       </td>
     </tr>
   </table>
-</form>
\ No newline at end of file
+</form>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
index 18aca66d630e626f733a7fa1a9f04bfd1e18a2bf..07c7546c33d9672e0a3980dfe443cd7d90bdb3a5 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
@@ -13,16 +13,18 @@
 
   <ul class="code-issue-actions code-issue-list">
     <% if current_user %>
-      <li><a href='#' onclick="return issueForm('comment', this)" class="link-action spacer-right" autofocus><%= message('issue.comment.formlink') -%></a></li>
+      <li><a href='#' onclick="return issueForm('comment', this)" class="link-action" autofocus><%= message('issue.comment.formlink') -%></a></li>
     <% end %>
+    <% unless current_user %>
     <li>
       <i class="icon-status-<%= issue.status.downcase -%>"></i><%= message("issue.status.#{issue.status}") -%> <%= '(' + message("issue.resolution.#{issue.resolution}")  + ')' if issue.resolution -%>
     </li>
-    <% if current_user %>
+    <% else %>
       <% transitions = Internal.issues.listTransitions(issue).to_a
          if !transitions.empty? && transitions.first
            first_transition = transitions.first %>
           <li>
+            <i class="icon-status-<%= issue.status.downcase -%>"></i><%= message("issue.status.#{issue.status}") -%> <%= '(' + message("issue.resolution.#{issue.resolution}")  + ')' if issue.resolution -%>
              <!-- Display only the first transition -->
             <a href="#" onclick="return doIssueTransition(this, '<%= first_transition.key -%>')" class="link-action issue-transition spacer-left">
               <%= message("issue.transition.#{first_transition.key}") -%></a>
@@ -43,31 +45,27 @@
       <% end %>
     <% end %>
     <% unless issue.resolution %>
-      <li>
-        <% if issue.assignee %>
-          <% if current_user %>
-            <a href='#' onclick="return issueForm('assign', this)" class="link-action"><%= message('assigned_to') -%></a> <%= h @issue_results.user(issue.assignee).name -%>
-          <% else %>
-            <%= message('assigned_to') -%> <strong><%= h @issue_results.user(issue.assignee).name -%></strong>
-          <% end %>
-        <% elsif current_user %>
-          <a href='#' onclick="return issueForm('assign', this)" class="link-action"><%= message('issue.assign.formlink') -%></a>
-            <% if issue.assignee != current_user.login %>
-            [<a href="#" onclick="return assignIssueToMe(this)" class="link-action"><%= message('issue.assign.to_me') -%></a>]
-            <% end %>
+      <% if issue.assignee %>
+        <% if current_user %>
+          <li><a href='#' onclick="return issueForm('assign', this)" class="link-action"><%= message('assigned_to') -%></a> <%= h @issue_results.user(issue.assignee).name -%></li>
+        <% else %>
+          <li><%= message('assigned_to') -%> <strong><%= h @issue_results.user(issue.assignee).name -%></strong></li>
         <% end %>
-      </li>
-      <li>
+      <% elsif current_user %>
+        <li><a href='#' onclick="return issueForm('assign', this)" class="link-action"><%= message('issue.assign.formlink') -%></a></li>
+        <% if issue.assignee != current_user.login %>
+          <li>[<a href="#" onclick="return assignIssueToMe(this)" class="link-action"><%= message('issue.assign.to_me') -%></a>]</li>
+        <% end %>
+      <% end %>
       <% if issue.actionPlanKey %>
         <% if current_user %>
-          <a href="#" onclick="return issueForm('plan', this)" class="link-action"><%= message('issue.planned_for') -%></a> <%= h(@issue_results.actionPlan(issue).name()) -%>
+          <li><a href="#" onclick="return issueForm('plan', this)" class="link-action"><%= message('issue.planned_for') -%></a> <%= h(@issue_results.actionPlan(issue).name()) -%></li>
         <% else %>
-          <%= message('issue.planned_for') -%> <strong><%= h(@issue_results.actionPlan(issue).name()) -%></strong>
+          <li><%= message('issue.planned_for') -%> <strong><%= h(@issue_results.actionPlan(issue).name()) -%></strong></li>
         <% end %>
       <% elsif current_user %>
-        <a href="#" onclick="return issueForm('plan', this)" class="link-action"><%= message('issue.do_plan') -%></a>
+        <li><a href="#" onclick="return issueForm('plan', this)" class="link-action"><%= message('issue.do_plan') -%></a></li>
       <% end %>
-      </li>
     <% end %>
     <% if current_user %>
       <% plugin_actions = Internal.issues.listActions(issue)
@@ -140,7 +138,7 @@
             &nbsp;
             <%= image_tag 'sep12.png' -%>
             &nbsp;
-            <a class="link-action" href="#" onclick="return formEditIssueComment(this)"><%= message('edit') -%></a>
+            <a class="link-action" href="#" onclick="return formEditIssueComment(this)" ><%= message('edit') -%></a>
             <a class="link-action spacer-right" href="#" onclick="return deleteIssueComment(this, '<%= escape_javascript(message('issue.comment.delete_confirm_message')) -%>')"><%= message('delete') -%></a>
           <% end %>
         </h4>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb
index 19a919026172d9f59eb7a81d780540ad0f1e9b20..3c7b697508a2c9231282ec0e6b150dd018059a5d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_rule.html.erb
@@ -15,8 +15,8 @@
 <% end %>
 
 <p class="note">
-  <%= h @rule.plugin_name -%>:<%= h @rule.plugin_rule_key -%>
-  &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
+  <span class="spacer-right"><%= h @rule.plugin_name -%>:<%= h @rule.plugin_rule_key -%></span>
+  <%= image_tag 'sep12.png', :class => 'spacer-right' -%>
   <% if @requirement %>
     <%= @root_characteristic.name -%>&nbsp;&gt;&nbsp;<%= @characteristic.name -%>
   <% else %>