diff --git a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html index d06c5ec..9192e97 100644 --- a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html @@ -5,9 +5,7 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main(s"Labels - ${repository.owner}/${repository.name}"){ - @html.menu("issues", repository){ - @issues.html.navigation("labels", hasWritePermission, repository) -
+ @html.menu("labels", repository){ diff --git a/src/main/twirl/gitbucket/core/issues/list.scala.html b/src/main/twirl/gitbucket/core/issues/list.scala.html index 81ae631..a1d7240 100644 --- a/src/main/twirl/gitbucket/core/issues/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/list.scala.html @@ -13,7 +13,7 @@ @import gitbucket.core.view.helpers._ @html.main((if(target == "issues") "Issues" else "Pull requests") + s" - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu(target, repository){ - @navigation(target, true, repository, Some(condition)) + @navigation(target, true, repository, openCount, closedCount, condition) @listparts(target, issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission) @if(hasWritePermission){
diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html index d1af594..1a44b7c 100644 --- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html +++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html @@ -12,6 +12,7 @@ @import context._ @import gitbucket.core.view.helpers._ @import gitbucket.core.service.IssuesService.IssueInfo +@* @if(condition.nonEmpty){
@@ -20,22 +21,13 @@
} +*@ @@ -157,9 +149,11 @@ } else { No pull requests to show. } + @* @if(condition.labels.nonEmpty || condition.milestone.isDefined){ Clear active filters. } else { + *@ @if(repository.isDefined){ @if(target == "issues"){ Create a new issue. @@ -167,7 +161,9 @@ Create a new pull request. } } + @* } + *@ } @@ -177,7 +173,9 @@ @if(hasWritePermission){ } + @* + *@ @if(repository.isEmpty){ @issue.repositoryName ･ } @@ -204,7 +202,7 @@ } -
+
#@issue.issueId opened @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username") @milestone.map { milestone => @milestone diff --git a/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html index d82e2e0..dff0f46 100644 --- a/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html +++ b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html @@ -3,13 +3,10 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ - @html.menu("issues", repository){ + @html.menu("milestones", repository){ @if(milestone.isEmpty){

New milestone

Create a new milestone to help organize your issues and pull requests.
- } else { - @issues.html.navigation("milestones", false, repository) -

}
diff --git a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html index a81ed53..7f43d3f 100644 --- a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html @@ -5,9 +5,7 @@ @import context._ @import gitbucket.core.view.helpers._ @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ - @html.menu("issues", repository){ - @issues.html.navigation("milestones", hasWritePermission, repository) -
+ @html.menu("milestones", repository){
- - - - @openCount Open -    - - - @closedCount Closed - - -
+ @helper.html.dropdown("Author", flat = true) { @collaborators.map { collaborator =>
  • @@ -113,9 +105,9 @@
    • } -
    + @if(hasWritePermission){ -
    + @helper.html.dropdown("Mark as", flat = true) {
  • Open
  • Close
    • @@ -143,7 +135,7 @@
  • @avatar(collaborator, 20) @collaborator
    • } } -
    + }
    diff --git a/src/main/twirl/gitbucket/core/issues/navigation.scala.html b/src/main/twirl/gitbucket/core/issues/navigation.scala.html index 0ed056f..fadd6d3 100644 --- a/src/main/twirl/gitbucket/core/issues/navigation.scala.html +++ b/src/main/twirl/gitbucket/core/issues/navigation.scala.html @@ -1,42 +1,21 @@ @(active: String, newButton: Boolean, repository: gitbucket.core.service.RepositoryService.RepositoryInfo, - condition: Option[gitbucket.core.service.IssuesService.IssueSearchCondition] = None)(implicit context: gitbucket.core.controller.Context) + openCount: Int, + closedCount: Int, + condition: gitbucket.core.service.IssuesService.IssueSearchCondition)(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ + - @condition.map { condition => - @if(loginAccount.isDefined){ -
    -
    -
    - - -
    - -
    -
    - } else { - - } - } @if(loginAccount.isDefined){ @if(newButton){ @if(active == "issues"){ diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index a83d38a..d8f7599 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -55,10 +55,12 @@ }