From 5870cacf4453c748bf18e713c536656fe08ff52d Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 22 Sep 2014 18:29:30 +0900
Subject: [PATCH] (refs #488)Fix presentation of issue list header

---
 src/main/twirl/helper/dropdown.scala.html       |  4 ++--
 src/main/twirl/issues/listparts.scala.html      | 13 +------------
 src/main/webapp/assets/common/css/gitbucket.css |  7 +++++++
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html
index 49ae716b5..20e2f4a62 100644
--- a/src/main/twirl/helper/dropdown.scala.html
+++ b/src/main/twirl/helper/dropdown.scala.html
@@ -4,10 +4,10 @@
   style : String  = "",
   right : Boolean = false,
   flat  : Boolean = false)(body: Html)
-<div class="btn-group"@if(style.nonEmpty){ style="@style"}>
+<div class="btn-group" @if(style.nonEmpty){style="@style"}>
   <button
       @if(flat){style="border: none; background-color: #eee;"}
-      class="dropdown-toggle @if(!flat){btn} @if(mini){btn-mini} else {btn-small}" data-toggle="dropdown">
+      class="dropdown-toggle @if(!flat){btn} else {flat} @if(mini){btn-mini} else {btn-small}" data-toggle="dropdown">
     @if(value.isEmpty){
       <i class="icon-cog"></i>
     } else {
diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html
index fcbb76489..0730d4139 100644
--- a/src/main/twirl/issues/listparts.scala.html
+++ b/src/main/twirl/issues/listparts.scala.html
@@ -129,18 +129,7 @@
                   </li>
                 }
               }
-              @helper.html.dropdown(
-                value  = (condition.sort, condition.direction) match {
-                  case ("created" , "desc") => "Newest"
-                  case ("created" , "asc" ) => "Oldest"
-                  case ("comments", "desc") => "Most commented"
-                  case ("comments", "asc" ) => "Least commented"
-                  case ("updated" , "desc") => "Recently updated"
-                  case ("updated" , "asc" ) => "Least recently updated"
-                },
-                prefix = "Sort",
-                flat   = true
-              ){
+              @helper.html.dropdown("Sort", flat = true){
                 <li>
                   <a href="@condition.copy(sort="created",  direction="desc").toURL">
                   @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index a158f357f..21431e09e 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -620,6 +620,13 @@ span.simplified-path {
 /****************************************************************************/
 /* Issues */
 /****************************************************************************/
+.btn-group.open .dropdown-toggle.flat {
+    background-image: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+}
+
 a.button-link {
     font-weight: normal;
     color: gray;