diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html index 5fbd652..2db533d 100644 --- a/src/main/twirl/gitbucket/core/issues/create.scala.html +++ b/src/main/twirl/gitbucket/core/issues/create.scala.html @@ -10,90 +10,90 @@ @navigation("issues", false, repository)


-
-
-
@avatar(loginAccount.get.userName, 48)
-
-
- - -
- No one is assigned - @if(hasWritePermission){ - - @helper.html.dropdown() { -
  • Clear assignee
  • - @collaborators.map { collaborator => -
  • @avatar(collaborator, 20) @collaborator
  • - } - } - } -
    - No milestone +
    +
    +
    @avatar(loginAccount.get.userName, 48)
    +
    +
    + + +
    + No one is assigned @if(hasWritePermission){ - + @helper.html.dropdown() { -
  • Clear this milestone
  • - @milestones.filter(_.closedDate.isEmpty).map { milestone => -
  • - - @milestone.title -
    - @milestone.dueDate.map { dueDate => - @if(isPast(dueDate)){ - Due by @date(dueDate) - } else { - Due by @date(dueDate) - } - }.getOrElse { - No due date - } -
    -
    -
  • +
  • Clear assignee
  • + @collaborators.map { collaborator => +
  • @avatar(collaborator, 20) @collaborator
  • } } } +
    + No milestone + @if(hasWritePermission){ + + @helper.html.dropdown() { +
  • Clear this milestone
  • + @milestones.filter(_.closedDate.isEmpty).map { milestone => +
  • + + @milestone.title +
    + @milestone.dueDate.map { dueDate => + @if(isPast(dueDate)){ + Due by @date(dueDate) + } else { + Due by @date(dueDate) + } + }.getOrElse { + No due date + } +
    +
    +
  • + } + } + } +
    +
    +
    + @helper.html.preview( + repository = repository, + content = "", + enableWikiLink = false, + enableRefsLink = true, + enableTaskList = true, + hasWritePermission = hasWritePermission, + style = "width: 565px; height: 200px; max-height: 250px;", + elastic = true + ) +
    +
    +
    + +
    +
    +
    + @if(hasWritePermission){ + Labels +
    +
    + +
    -
    - @helper.html.preview( - repository = repository, - content = "", - enableWikiLink = false, - enableRefsLink = true, - enableTaskList = true, - hasWritePermission = hasWritePermission, - style = "width: 565px; height: 200px; max-height: 250px;", - elastic = true - ) -
    -
    -
    - + }
    -
    - @if(hasWritePermission){ - Labels -
    -
    - - -
    -
    - } -
    -
    } } diff --git a/src/main/twirl/gitbucket/core/pulls/commits.scala.html b/src/main/twirl/gitbucket/core/pulls/commits.scala.html index eacbb43..9b0f386 100644 --- a/src/main/twirl/gitbucket/core/pulls/commits.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/commits.scala.html @@ -9,7 +9,7 @@
    Commits on @date(day.head.commitTime)
    - +
    @day.map { commit =>
    diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index 0bae885..569b6a2 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -43,41 +43,49 @@ } } + @if(commits.nonEmpty && hasWritePermission){ -