diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html index d5e2c11..6c86e96 100644 --- a/src/main/twirl/helper/dropdown.scala.html +++ b/src/main/twirl/helper/dropdown.scala.html @@ -1,7 +1,11 @@ -@(body: Html) +@(buttonValue: String = "")(body: Html)
}
} diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index d9566e9..8a79cee 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -51,7 +51,7 @@ Milestone: @milestones.find(_.milestoneId == condition.milestoneId.get.get).map(_.title) } } - @helper.html.dropdown { + @helper.html.dropdown() { @if(condition.milestoneId.isDefined){
  • @@ -166,23 +166,6 @@ - @issues.map { case (issue, labels, commentCount) => - - - - } @if(issues.isEmpty){ + } else { + + + + } + @issues.map { case (issue, labels, commentCount) => + + + }
    - @issue.title - @labels.map { label => - @label.labelName - } - #@issue.issueId -
    - Opened by @issue.openedUserName @datetime(issue.registeredDate)  - @if(commentCount > 0){ - @commentCount @plural(commentCount, "comment") - } -
    -
    @@ -194,6 +177,56 @@ }
    +
    + +
    + @helper.html.dropdown("Label") { + @labels.map { label => +
  • + + +   + @label.labelName + +
    • + } + } + @helper.html.dropdown("Assignee") { +
  • Clear assignee
    • +
  • + } + @helper.html.dropdown("Milestone") { +
  • Clear this milestone
    • +
  • + @milestones.map { milestone => +
  • @milestone.title
    • + } + } +
    + +
    @@ -215,6 +248,11 @@ }); } }); + + $('.table-issues input[type=checkbox]').change(function(){ + $('.table-issues button').prop('disabled', + !$('.table-issues input[type=checkbox]').filter(':checked').length); + }).change(); }); }