diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index 0e41fba..4264e54 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -19,6 +19,7 @@ @html.menu("issues", repository){ @tab("issues", false, repository)
+ @*
+ *@ @***** show issue list *****@ @listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html index 8a96492..9721664 100644 --- a/src/main/twirl/issues/listparts.scala.html +++ b/src/main/twirl/issues/listparts.scala.html @@ -11,7 +11,8 @@ @import context._ @import view.helpers._ -
+
+ @* @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ Clear milestone and label filters @@ -72,110 +73,117 @@ } + *@ - @if(issues.isEmpty){ - + - } else { - @if(hasWritePermission){ - - - - } - } - @issues.map { case (issue, labels, commentCount) => - - + + + } else { + @* + @if(hasWritePermission){ + + + + } + *@ + } + @issues.map { case (issue, labels, commentCount) => + + - - } + @if(hasWritePermission){ + + } + + + }
- No issues to show. - @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ - Clear active filters. - } else { - @if(repository.isDefined){ - Create a new issue. - } - } - + + @openCount Open + @closedCount Closed +
-
- -
- @helper.html.dropdown("Label") { - @labels.map { label => -
  • - - -   - @label.labelName - -
    • - } - } - @helper.html.dropdown("Assignee") { -
  • Clear assignee
    • - @collaborators.map { collaborator => -
  • @avatar(collaborator, 20) @collaborator
    • - } - } - @helper.html.dropdown("Milestone") { -
  • Clear this milestone
    • - @milestones.map { milestone => -
  • - - @milestone.title -
    - @milestone.dueDate.map { dueDate => - @if(isPast(dueDate)){ - Due in @date(dueDate) - } else { - Due in @date(dueDate) - } - }.getOrElse { - No due date - } -
    -     -
    • - } - } -
    - @if(hasWritePermission){ -
    + No issues to show. + @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ + Clear active filters. } else { - + @if(repository.isDefined){ + Create a new issue. + } + } +
    +
    + +
    + @helper.html.dropdown("Label") { + @labels.map { label => +
  • + + +   + @label.labelName + +
    • + } + } + @helper.html.dropdown("Assignee") { +
  • Clear assignee
    • + @collaborators.map { collaborator => +
  • @avatar(collaborator, 20) @collaborator
    • + } + } + @helper.html.dropdown("Milestone") { +
  • Clear this milestone
    • + @milestones.map { milestone => +
  • + + @milestone.title +
    + @milestone.dueDate.map { dueDate => + @if(isPast(dueDate)){ + Due in @date(dueDate) + } else { + Due in @date(dueDate) + } + }.getOrElse { + No due date + } +
    +     +
    • + } + } +
    + @if(hasWritePermission){ +
    @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL) diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html index b5cfe32..f6a4ebd 100644 --- a/src/main/twirl/issues/tab.scala.html +++ b/src/main/twirl/issues/tab.scala.html @@ -1,9 +1,11 @@ @(active: String, create: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ @import view.helpers._ -
      - Browse Issues - Milestones +
        + Issues + Pull requests + Labels + Milestones @if(loginAccount.isDefined){
      • diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index fecaa36..a158f35 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -620,6 +620,16 @@ /****************************************************************************/ /* Issues */ /****************************************************************************/ +a.button-link { + font-weight: normal; + color: gray; +} + +a.selected { + font-weight: bold; + color: black; +} + span.issue-status { display: block; font-size: large; @@ -634,7 +644,7 @@ a.issue-title { color: #333; font-weight: bold; - size: 110%; + font-size: 120%; } ul.label-list {