New Issues Page: Change ordering

5 files changed, 17 insertions, 12 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
index 6253543707f..272b3c06c77 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issues_actions.hbs.erb
@@ -7,14 +7,8 @@
     {{/if}}
   </div>
   <ul class="navigator-actions-order-choices">
-    <li data-sort="CREATION_DATE" data-asc="true"><%= message('issues.sort.creation_date') -%> <i class="icon-arrow-up"></i></li>
-    <li data-sort="CREATION_DATE" data-asc="false"><%= message('issues.sort.creation_date') -%> <i class="icon-arrow-down"></i></li>
     <li data-sort="UPDATE_DATE" data-asc="true"><%= message('issues.sort.update_date') -%> <i class="icon-arrow-up"></i></li>
     <li data-sort="UPDATE_DATE" data-asc="false"><%= message('issues.sort.update_date') -%> <i class="icon-arrow-down"></i></li>
-    <li data-sort="CLOSE_DATE" data-asc="true"><%= message('issues.sort.close_date') -%> <i class="icon-arrow-up"></i></li>
-    <li data-sort="CLOSE_DATE" data-asc="false"><%= message('issues.sort.close_date') -%> <i class="icon-arrow-down"></i></li>
-    <li data-sort="ASSIGNEE" data-asc="true"><%= message('issues.sort.assignee') -%> <i class="icon-arrow-up"></i></li>
-    <li data-sort="ASSIGNEE" data-asc="false"><%= message('issues.sort.assignee') -%> <i class="icon-arrow-down"></i></li>
     <li data-sort="SEVERITY" data-asc="true"><%= message('issues.sort.severity') -%> <i class="icon-arrow-up"></i></li>
     <li data-sort="SEVERITY" data-asc="false"><%= message('issues.sort.severity') -%> <i class="icon-arrow-down"></i></li>
     <li data-sort="STATUS" data-asc="true"><%= message('issues.sort.status') -%> <i class="icon-arrow-up"></i></li>
diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues.js b/sonar-server/src/main/webapp/javascripts/navigator/issues.js
index 7d2fc6dfaed..d9517844cc8 100644
--- a/sonar-server/src/main/webapp/javascripts/navigator/issues.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/issues.js
@@ -135,19 +135,33 @@ jQuery(function() {
     },
 
 
+    ui: {
+      orderChoices: '.navigator-actions-order-choices'
+    },
+
+
     onRender: function() {
       this.$el.toggle(this.collection.length > 0);
       this.$('.open-modal').modal();
     },
 
 
-    toggleOrderChoices: function() {
-      this.$('.navigator-actions-order-choices').toggleClass('open');
+    toggleOrderChoices: function(e) {
+      e.stopPropagation();
+      this.ui.orderChoices.toggleClass('open');
+      if (this.ui.orderChoices.is('.open')) {
+        var that = this;
+        jQuery('body').on('click.issues_actions', function() {
+          that.ui.orderChoices.removeClass('open');
+        });
+      }
     },
 
 
     sort: function(e) {
-      this.$('.navigator-actions-order-choices').removeClass('open');
+      e.stopPropagation();
+      this.ui.orderChoices.removeClass('open');
+      jQuery('body').off('click.issues_actions');
       var el = jQuery(e.target),
           sort = el.data('sort'),
           asc = el.data('asc');
diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.css b/sonar-server/src/main/webapp/stylesheets/navigator.css
index c3be826f0d2..479c74f1043 100644
--- a/sonar-server/src/main/webapp/stylesheets/navigator.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator.css
@@ -173,7 +173,6 @@
   bottom: 30px;
   left: 0;
   min-width: 160px;
-  max-height: 180px;
   background-color: #fff;
   border-top: 1px solid #e1e1e1;
   border-right: 1px solid #e1e1e1;
diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.css b/sonar-server/src/main/webapp/stylesheets/navigator/base.css
index 5096d6f4bd9..90e13bebe89 100644
--- a/sonar-server/src/main/webapp/stylesheets/navigator/base.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.css
@@ -173,7 +173,6 @@
   bottom: 30px;
   left: 0;
   min-width: 160px;
-  max-height: 180px;
   background-color: #fff;
   border-top: 1px solid #e1e1e1;
   border-right: 1px solid #e1e1e1;
diff --git a/sonar-server/src/main/webapp/stylesheets/navigator/base.less b/sonar-server/src/main/webapp/stylesheets/navigator/base.less
index b57451c871c..fa3660d7746 100644
--- a/sonar-server/src/main/webapp/stylesheets/navigator/base.less
+++ b/sonar-server/src/main/webapp/stylesheets/navigator/base.less
@@ -206,7 +206,6 @@
   bottom: @navigatorStatusHeight;
   left: 0;
   min-width: @navigatorResultsWidth / 2;
-  max-height: @navigatorStatusHeight * 6;
   background-color: #fff;
   border-top: 1px solid @navigatorBorderLightColor;
   border-right: 1px solid @navigatorBorderLightColor;