diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index 97af6cd..503ae60 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -227,7 +227,7 @@ milestoneId("milestoneId").map { milestoneId => getMilestonesWithIssueCount(repository.owner, repository.name) .find(_._1.milestoneId == milestoneId).map { case (_, openCount, closeCount) => - issues.milestones.html.progress(openCount + closeCount, closeCount, false) + issues.milestones.html.progress(openCount + closeCount, closeCount) } getOrElse NotFound } getOrElse Ok() }) diff --git a/src/main/twirl/issues/issuedetail.scala.html b/src/main/twirl/issues/issuedetail.scala.html index ac9101e..63cfb63 100644 --- a/src/main/twirl/issues/issuedetail.scala.html +++ b/src/main/twirl/issues/issuedetail.scala.html @@ -47,7 +47,7 @@
@issue.milestoneId.map { milestoneId => @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) => - @issues.milestones.html.progress(openCount + closeCount, closeCount, false) + @issues.milestones.html.progress(openCount + closeCount, closeCount) } }
diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index 16b266d..9228888 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -11,8 +11,8 @@ hasWritePermission: Boolean)(implicit context: app.Context) @import context._ @import view.helpers._ -@html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){ - @html.menu("issues", repository){ +@html.main((if(target == "issues") "Issues" else "Pull requests") + s" - ${repository.owner}/${repository.name}", Some(repository)){ + @html.menu(target, repository){ @tab(target, true, repository)
diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html index 0941701..ba7def7 100644 --- a/src/main/twirl/issues/milestones/list.scala.html +++ b/src/main/twirl/issues/milestones/list.scala.html @@ -8,68 +8,71 @@ @html.menu("issues", repository){ @issues.html.tab("milestones", false, repository)
- -
- +
+
+ + + @defining(milestones.filter { case (milestone, _, _) => milestone.closedDate.map(_ => state == "closed").getOrElse(state == "open") }){ milestones => @milestones.map { case (milestone, openCount, closedCount) => -
+ + + + @milestones.filter(_._1.closedDate.isEmpty).size Open +    + + + @milestones.filter(_._1.closedDate.isDefined).size Closed + + +
+
- @milestone.title
- @if(milestone.closedDate.isDefined){ - Closed @datetime(milestone.closedDate.get) - } else { - @milestone.dueDate.map { dueDate => - @if(isPast(dueDate)){ - Due in @date(dueDate) - } else { - Due in @date(dueDate) + @milestone.title +
+ @if(milestone.closedDate.isDefined){ + Closed @datetime(milestone.closedDate.get) + } else { + @milestone.dueDate.map { dueDate => + @if(isPast(dueDate)){ + Due in @date(dueDate) + } else { + Due in @date(dueDate) + } + }.getOrElse { + No due date } - }.getOrElse { - No due date } - } +
-
-
+ @progress(openCount + closedCount, closedCount) +
+
+ @if(closedCount == 0){ + 0% + } else { + @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)% + } complete    + @openCount open    + @closedCount closed +
+
@if(hasWritePermission){ - Edit + Edit    @if(milestone.closedDate.isDefined){ - Open + Open    } else { - Close + Close    } Delete } - Browse issues
- @closedCount closed - @openCount open
- @progress(openCount + closedCount, closedCount, true)
@if(milestone.description.isDefined){ diff --git a/src/main/twirl/issues/milestones/progress.scala.html b/src/main/twirl/issues/milestones/progress.scala.html index b446688..d099190 100644 --- a/src/main/twirl/issues/milestones/progress.scala.html +++ b/src/main/twirl/issues/milestones/progress.scala.html @@ -1,15 +1,6 @@ -@(total: Int, progress: Int, showPercentage: Boolean) +@(total: Int, progress: Int)
@if(progress > 0){ } - @if(showPercentage){ - - @if(progress == 0){ - 0% - } else { - @((progress.toDouble / total.toDouble * 100).toInt)% - } - - }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 774e251..cf3289a 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -687,8 +687,7 @@ } a.milestone-title { - font-size: 120%; - font-weight: bold; + font-size: 180%; } div.milestone-description { @@ -696,13 +695,12 @@ color: #666; } -div.milestone-menu { - font-size: 80%; +a.milestone-title { + color: #333; } -div.milestone-menu a { - margin-left: 8px; - font-weight: bold; +div.milestone-menu { + margin-top: 8px; } div.milestone-menu a.delete { @@ -741,11 +739,6 @@ -moz-border-radius: 4px; } -span.milestone-percentage { - position: absolute; - padding-left: 8px; -} - div.issue-header { padding-left: 8px; padding-right: 8px;