From e3f9e7d5aa8ee6550c430136e3d541de77ac13d7 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 6 Feb 2014 15:18:21 +0600
Subject: [PATCH] New Issues Page: revert to gray colors, move rule/changelog
 under the actions

---
 .../templates/_issue_detail_inner.hbs.erb     | 141 +++++++++---------
 .../src/main/webapp/stylesheets/navigator.css |   2 +-
 .../webapp/stylesheets/navigator/base.css     |   2 +-
 .../webapp/stylesheets/navigator/base.less    |   2 +-
 .../src/main/webapp/stylesheets/style.css     |  19 ---
 5 files changed, 74 insertions(+), 92 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
index 76a50f4bea2..edf990aa59c 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
@@ -1,5 +1,5 @@
 <script id="issue-detail-inner-template" type="text/x-handlebars-template">
-  <div class="code-issue code-issue-collapsed code-issue-active" data-issue-key="{{key}}" data-issue-component="{{component}}" data-issue-rule="{{rule}}">
+  <div class="code-issue code-issue-collapsed" data-issue-key="{{key}}" data-issue-component="{{component}}" data-issue-rule="{{rule}}">
     <div class="code-issue-name">
       <div class="code-issue-name-rule">
         {{severityIcon severity}}&nbsp;<a class="code-issue-toggle rulename">{{message}}</a>
@@ -22,39 +22,6 @@
       </div>
     </div>
 
-    <div class="code-issue-details">
-      <ul class="tabs">
-        <li>
-          <a href="#tab-issue-rule"><%= message('rule') -%></a>
-        </li>
-        <li>
-          <a href="#tab-issue-changelog"><%= message('changelog') -%></a>
-        </li>
-      </ul>
-
-      <div id="tab-issue-rule">
-        <div class="rule-desc"></div>
-      </div>
-
-      <div id="tab-issue-changelog">
-        <table class="spaced">
-          <tbody>
-          {{#each changelog}}
-            <tr>
-              <td class="thin left top" nowrap>{{fCreationDate}}</td>
-              <td class="thin left top" nowrap>{{userName}}</td>
-              <td class="left top">
-                {{#each diffs}}
-                  {{this}}<br>
-                {{/each}}
-              </td>
-            </tr>
-          {{/each}}
-          </tbody>
-        </table>
-      </div>
-    </div>
-
 
     <ul class="code-issue-actions code-issue-list">
       {{#inArray actions "comment"}}
@@ -69,37 +36,37 @@
         {{#if resolution}}({{translate "resolutions" resolution}}){{/if}}
 
         {{#ifNotEmpty transitions}}
-            {{#withFirst transitions}}
-              <a class="link-action issue-transition spacer-left" data-transition="{{this}}">{{translate "transitions" this}}</a>
-            {{/withFirst}}
-
-            {{#ifHasExtraTransitions transitions}}
-              <div class="dropdown">
-                <a class="link-action link-more" onclick="showDropdownMenuOnElement($j(this).next('.dropdown-menu')); return false;"></a>
-                <ul style="display: none" class="dropdown-menu">
-                  {{#withoutFirst transitions}}
-                    <li>
-                      <a class="link-action issue-transition" data-transition="{{this}}">{{translate "transitions" this}}</a>
-                    </li>
-                  {{/withoutFirst}}
-                </ul>
-              </div>
-
-            {{/ifHasExtraTransitions}}
+          {{#withFirst transitions}}
+            <a class="link-action issue-transition spacer-left" data-transition="{{this}}">{{translate "transitions" this}}</a>
+          {{/withFirst}}
+
+          {{#ifHasExtraTransitions transitions}}
+            <div class="dropdown">
+              <a class="link-action link-more" onclick="showDropdownMenuOnElement($j(this).next('.dropdown-menu')); return false;"></a>
+              <ul style="display: none" class="dropdown-menu">
+                {{#withoutFirst transitions}}
+                  <li>
+                    <a class="link-action issue-transition" data-transition="{{this}}">{{translate "transitions" this}}</a>
+                  </li>
+                {{/withoutFirst}}
+              </ul>
+            </div>
+
+          {{/ifHasExtraTransitions}}
         {{/ifNotEmpty}}
       </li>
 
 
       {{#inArray actions "assign"}}
-        <li>
-          {{#if assigneeName}}
-            <a id="issue-assign" class="link-action"><%= message('assigned_to') -%></a> {{assigneeName}}</li>
-          {{else}}
-            <a id="issue-assign" class="link-action">{{translate "actions.assign" }}</a>
-            {{#inArray actions "assign_to_me"}}
-              [<a id="issue-assign-to-me" class="link-action">{{translate "actions.assign_to_me" }}</a>]
-            {{/inArray}}
-          {{/if}}
+      <li>
+        {{#if assigneeName}}
+          <a id="issue-assign" class="link-action"><%= message('assigned_to') -%></a> {{assigneeName}}</li>
+        {{else}}
+          <a id="issue-assign" class="link-action">{{translate "actions.assign" }}</a>
+          {{#inArray actions "assign_to_me"}}
+            [<a id="issue-assign-to-me" class="link-action">{{translate "actions.assign_to_me" }}</a>]
+          {{/inArray}}
+        {{/if}}
         </li>
       {{else}}
         {{#if assigneeName}}
@@ -109,17 +76,17 @@
 
 
       {{#inArray actions "plan"}}
-        <li>
-          {{#if actionPlanName}}
-            <a id="issue-plan" class="link-action"><%= message('issue.planned_for') -%></a> {{actionPlanName}}
-          {{else}}
-            <a id="issue-plan" class="link-action"><%= message('issue.do_plan') -%></a>
-          {{/if}}
+      <li>
+        {{#if actionPlanName}}
+          <a id="issue-plan" class="link-action"><%= message('issue.planned_for') -%></a> {{actionPlanName}}
         {{else}}
-          {{#if actionPlanName}}
-            <%= message('issue.planned_for') -%> <strong>{{actionPlanName}}</strong>
-          {{/if}}
-        </li>
+          <a id="issue-plan" class="link-action"><%= message('issue.do_plan') -%></a>
+        {{/if}}
+      {{else}}
+        {{#if actionPlanName}}
+          <%= message('issue.planned_for') -%> <strong>{{actionPlanName}}</strong>
+        {{/if}}
+      </li>
       {{/inArray}}
 
 
@@ -147,6 +114,40 @@
     <div class="code-issue-form"></div>
 
 
+    <div class="code-issue-details">
+      <ul class="tabs">
+        <li>
+          <a href="#tab-issue-rule"><%= message('rule') -%></a>
+        </li>
+        <li>
+          <a href="#tab-issue-changelog"><%= message('changelog') -%></a>
+        </li>
+      </ul>
+
+      <div id="tab-issue-rule">
+        <div class="rule-desc"></div>
+      </div>
+
+      <div id="tab-issue-changelog">
+        <table class="spaced">
+          <tbody>
+          {{#each changelog}}
+            <tr>
+              <td class="thin left top" nowrap>{{fCreationDate}}</td>
+              <td class="thin left top" nowrap>{{userName}}</td>
+              <td class="left top">
+                {{#each diffs}}
+                  {{this}}<br>
+                {{/each}}
+              </td>
+            </tr>
+          {{/each}}
+          </tbody>
+        </table>
+      </div>
+    </div>
+
+
     <div class="code-issue-comments">
       {{#each comments}}
         <div class="code-issue-comment" data-comment-key="{{key}}">
diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.css b/sonar-server/src/main/webapp/stylesheets/navigator.css
index bfeba2c35e9..90c0c33fe9e 100644
--- a/sonar-server/src/main/webapp/stylesheets/navigator.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator.css
@@ -108,7 +108,7 @@
 }
 .navigator-fetching.code-issue-actions:before,
 .navigator-fetching#tab-issue-rule:before {
-  background-color: #CAE3F2;
+  background-color: #EFEFEF;
 }
 .navigator-header {
   padding: 0 10px;
diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.css b/sonar-server/src/main/webapp/stylesheets/navigator/base.css
index a1a994a0ac5..778972800aa 100644
--- a/sonar-server/src/main/webapp/stylesheets/navigator/base.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.css
@@ -108,7 +108,7 @@
 }
 .navigator-fetching.code-issue-actions:before,
 .navigator-fetching#tab-issue-rule:before {
-  background-color: #CAE3F2;
+  background-color: #EFEFEF;
 }
 .navigator-header {
   padding: 0 10px;
diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.less b/sonar-server/src/main/webapp/stylesheets/navigator/base.less
index 6ce05b3dfa0..b963d1e212f 100644
--- a/sonar-server/src/main/webapp/stylesheets/navigator/base.less
+++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.less
@@ -108,7 +108,7 @@
     position: relative;
 
     &:before {
-      background-color: #CAE3F2;
+      background-color: #EFEFEF;
     }
   }
 }
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 2201b027d29..fe48610d1f9 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -972,25 +972,6 @@ th.operations, td.operations {
   display: none;
 }
 
-.code-issue-active .code-issue-name,
-.code-issue-active .code-issue-details,
-.code-issue-active .code-issue-actions,
-.code-issue-active .code-issue-form,
-.code-issue-active .code-issue-comments,
-.code-issue-active .code-issue-comment {
-  background-color: #CAE3F2;
-  border-color: #4B9FD5;
-}
-
-.code-issue-active .code-issue-name,
-.code-issue-active .code-issue-details {
-  border-bottom: none;
-}
-
-.code-issue-active .code-issue-details .tabs {
-  border-color: #4B9FD5;
-}
-
 .tab_header {
   border-bottom: 1px solid #DDD;
   background-color: #EFEFEF;
-- 
2.39.5