diff --git a/src/main/twirl/gitbucket/core/account/application.scala.html b/src/main/twirl/gitbucket/core/account/application.scala.html index 3aa3792..f36e840 100644 --- a/src/main/twirl/gitbucket/core/account/application.scala.html +++ b/src/main/twirl/gitbucket/core/account/application.scala.html @@ -5,17 +5,17 @@ @import gitbucket.core.view.helpers._ @html.main("Applications"){

@menu("application", settings.ssh)

Personal access tokens

@if(personalTokens.isEmpty && gneratedToken.isEmpty){ No tokens. - }else{ + } else { Tokens you have generated that can be used to access the GitBucket API.

} @gneratedToken.map{ case (token, tokenString) => @@ -38,13 +38,13 @@

Generate new token

Token description

- +

What's this token for?

diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html index bba09ad..ba16103 100644 --- a/src/main/twirl/gitbucket/core/account/edit.scala.html +++ b/src/main/twirl/gitbucket/core/account/edit.scala.html @@ -4,46 +4,46 @@ @import gitbucket.core.view.helpers._ @html.main("Edit your profile"){

@menu("profile", settings.ssh)

@helper.html.information(info) @if(LDAPUtil.isDummyMailAddress(account)){

Please register your mail address.

} -

Profile

@if(account.password.nonEmpty){ -

Password (input to change password): - +

} -

Full Name: - +

Mail Address: - +

URL (optional): - +

Image (optional): @helper.html.uploadavatar(Some(account))

@@ -54,7 +54,7 @@ Delete account

- @if(!LDAPUtil.isDummyMailAddress(account)){Cancel} + @if(!LDAPUtil.isDummyMailAddress(account)){Cancel}

diff --git a/src/main/twirl/gitbucket/core/account/group.scala.html b/src/main/twirl/gitbucket/core/account/group.scala.html index 921beb2..92a840e 100644 --- a/src/main/twirl/gitbucket/core/account/group.scala.html +++ b/src/main/twirl/gitbucket/core/account/group.scala.html @@ -4,34 +4,34 @@ @html.main(if(account.isEmpty) "Create group" else "Edit group"){

Group name

- +

URL (Optional)

- +

Image (Optional) @helper.html.uploadavatar(account)

Members

@helper.html.account("memberName", 200) - +

@@ -42,12 +42,12 @@

@if(account.isDefined){

- Delete Group + Delete Group

} - + @if(account.isDefined){ - Cancel + Cancel }

diff --git a/src/main/twirl/gitbucket/core/account/main.scala.html b/src/main/twirl/gitbucket/core/account/main.scala.html index 22e9c28..0e17090 100644 --- a/src/main/twirl/gitbucket/core/account/main.scala.html +++ b/src/main/twirl/gitbucket/core/account/main.scala.html @@ -5,8 +5,8 @@ @html.main(account.userName){

@avatar(account.userName, 270)

@account.fullName

@@ -28,7 +28,7 @@ }

Repositories @if(account.isGroupAccount){ @@ -39,14 +39,14 @@ @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){

- Edit Your Profile + Edit Your Profile

} @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){

- Edit Group + Edit Group

} diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html index 2fe1915..c2dec33 100644 --- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html +++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html @@ -4,45 +4,56 @@ @import gitbucket.core.view.helpers._ @html.main("Create a New Repository"){

Create a new repository

+ A repository contains all the files for your project, including the revision history. +

- Repository name: - - / - - +

Owner

+ +

+ / +

Repository name: + + +

Description (optional): - +

- Public
-

- All users and guests can read this repository. + Public +

+ Anyone can see this repository. You choose who can commit.

- Private
-

- Only collaborators can read this repository. + Private +

+ You choose who can see and commit to this repository.

@@ -50,13 +61,13 @@ Initialize this repository with a README -

- This will allow you to git clone the repository immediately. +

+ This will let you immediately clone the repository to your computer. Skip this step if you’re importing an existing repository.

- +

diff --git a/src/main/twirl/gitbucket/core/account/register.scala.html b/src/main/twirl/gitbucket/core/account/register.scala.html index 507b5cf..07e798a 100644 --- a/src/main/twirl/gitbucket/core/account/register.scala.html +++ b/src/main/twirl/gitbucket/core/account/register.scala.html @@ -5,8 +5,8 @@

Create your account

Username: @@ -35,7 +35,7 @@

Image (optional): @helper.html.uploadavatar(None) diff --git a/src/main/twirl/gitbucket/core/account/ssh.scala.html b/src/main/twirl/gitbucket/core/account/ssh.scala.html index e87f5e7..fcf5bda 100644 --- a/src/main/twirl/gitbucket/core/account/ssh.scala.html +++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html @@ -4,14 +4,14 @@ @import gitbucket.core.view.helpers._ @html.main("SSH Keys"){

- SMTP Host -

- +

+ SMTP Host +

- SMTP Port -

- +

+ SMTP Port +

- SMTP User -

- +

+ SMTP User +

- SMTP Password -

- +

+ SMTP Password +

- - Enable SSL - +

+ Enable SSL +

- FROM Address -

- +

+ FROM Address +

- FROM Name -

- +

+ FROM Name +

@@ -322,4 +317,4 @@ $('.ldap input').prop('disabled', !$(this).prop('checked')); }).change(); }); - \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/admin/users/group.scala.html b/src/main/twirl/gitbucket/core/admin/users/group.scala.html index bac702b..2382360 100644 --- a/src/main/twirl/gitbucket/core/admin/users/group.scala.html +++ b/src/main/twirl/gitbucket/core/admin/users/group.scala.html @@ -4,14 +4,14 @@ @html.main(if(account.isEmpty) "New Group" else "Update Group"){ @admin.html.menu("users"){ -

Group name

- + @if(account.isDefined){ @@ -19,25 +19,25 @@ }

URL (Optional)

- +

Image (Optional) @helper.html.uploadavatar(account)

Members

@helper.html.account("memberName", 200) - +

@@ -47,7 +47,7 @@

- Cancel + Cancel

} diff --git a/src/main/twirl/gitbucket/core/admin/users/list.scala.html b/src/main/twirl/gitbucket/core/admin/users/list.scala.html index d18f4c6..47fcf02 100644 --- a/src/main/twirl/gitbucket/core/admin/users/list.scala.html +++ b/src/main/twirl/gitbucket/core/admin/users/list.scala.html @@ -4,8 +4,8 @@ @html.main("Manage Users"){ @admin.html.menu("users"){

- New User - New Group + New User + New Group

diff --git a/src/main/twirl/gitbucket/core/admin/users/user.scala.html b/src/main/twirl/gitbucket/core/admin/users/user.scala.html index fb54eb5..3237545 100644 --- a/src/main/twirl/gitbucket/core/admin/users/user.scala.html +++ b/src/main/twirl/gitbucket/core/admin/users/user.scala.html @@ -3,14 +3,14 @@ @html.main(if(account.isEmpty) "New User" else "Update User"){ @admin.html.menu("users"){

Username:

- + @if(account.isDefined){ @@ -22,7 +22,7 @@ }

@if(account.map(_.password.nonEmpty).getOrElse(true)){ -

Password @if(account.isDefined){ @@ -33,24 +33,24 @@

- +

} -

Full Name:

- +

Mail Address:

- +

User Type: Normal @@ -59,16 +59,16 @@ Administrator

URL (Optional):

- +

Image (Optional) @helper.html.uploadavatar(account)

@@ -76,7 +76,7 @@

- Cancel + Cancel

} diff --git a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html index f0df114..31eeaa0 100644 --- a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html @@ -10,53 +10,63 @@ @import gitbucket.core.service.IssuesService @import gitbucket.core.service.IssuesService.IssueInfo - - - - @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) => - - - - } + + + + + + + @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) => + + + + } + @if(issues.isEmpty){ + + + + } +

- @dashboard.html.header(openCount, closedCount, condition, groups) -
- @if(issue.isPullRequest){ - - } else { - - } - @issue.userName/@issue.repositoryName ･ - @if(issue.isPullRequest){ - @issue.title - } else { - @issue.title - } - @gitbucket.core.issues.html.commitstatus(issue, commitStatus) - @labels.map { label => - @label.labelName - } - - @issue.assignedUserName.map { userName => - @avatar(userName, 20, tooltip = true) - } - @if(commentCount > 0){ - - @commentCount - - } else { - - @commentCount - - } - - - #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate) - @milestone.map { milestone => - -@milestone - } - -
+ @dashboard.html.header(openCount, closedCount, condition, groups) +
+ @if(issue.isPullRequest){ + + } else { + + } + @issue.userName/@issue.repositoryName ･ + @if(issue.isPullRequest){ + @issue.title + } else { + @issue.title + } + @gitbucket.core.issues.html.commitstatus(issue, commitStatus) + @labels.map { label => + @label.labelName + } + + @issue.assignedUserName.map { userName => + @avatar(userName, 20, tooltip = true) + } + @if(commentCount > 0){ + + @commentCount + + } else { + + @commentCount + + } + + + #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate) + @milestone.map { milestone => + @milestone + } + +
+ No results matched your search. +

@helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), IssuesService.IssueLimit, 10, condition.toURL) diff --git a/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html b/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html index 5770f82..11c9e2b 100644 --- a/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html @@ -3,20 +3,18 @@ condition: gitbucket.core.service.IssuesService.IssueSearchCondition)(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ -

+
- Created
- Assigned
- +
- Mentioned
- -
  - -
  -
+
+ +
diff --git a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html index 4b6a159..3b081bf 100644 --- a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html @@ -4,17 +4,14 @@

- - News Feed + News Feed @if(loginAccount.isDefined){ - - Pull Requests + Pull Requests - - Issues + Issues }
@@ -27,8 +24,6 @@ margin-bottom: 20px; } - - div.dashboard-nav a { line-height: 10px; margin-left: 20px; @@ -38,7 +33,6 @@ color: #888; } - div.dashboard-nav .octicon{ width: 16px; height: 16px; diff --git a/src/main/twirl/gitbucket/core/helper/account.scala.html b/src/main/twirl/gitbucket/core/helper/account.scala.html index 8a6570c..0b414c9 100644 --- a/src/main/twirl/gitbucket/core/helper/account.scala.html +++ b/src/main/twirl/gitbucket/core/helper/account.scala.html @@ -1,6 +1,8 @@ @(id: String, width: Int)(implicit context: gitbucket.core.controller.Context) @import context._ - + + + } diff --git a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html index 5451506..8b1e8f4 100644 --- a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html +++ b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html @@ -7,8 +7,7 @@ @import gitbucket.core.view.helpers._ @helper.html.dropdown( value = if(branch.length == 40) branch.substring(0, 10) else branch, - prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree", - mini = false + prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree" ) {
Switch branches

@avatar(comment.commentedUserName, 48)

@user(comment.commentedUserName, styleClass="username strong") commented @@ -33,7 +33,7 @@ }

@markdown(comment.content, repository, false, true, true, hasWritePermission)

diff --git a/src/main/twirl/gitbucket/core/helper/copy.scala.html b/src/main/twirl/gitbucket/core/helper/copy.scala.html index 55c4d0d..7811063 100644 --- a/src/main/twirl/gitbucket/core/helper/copy.scala.html +++ b/src/main/twirl/gitbucket/core/helper/copy.scala.html @@ -1,7 +1,7 @@ @(id: String, value: String, prepend: Boolean = false)(html: Html) -

@html - +

diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html index 09f5975..99749fc 100644 --- a/src/main/twirl/gitbucket/core/helper/diff.scala.html +++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html @@ -45,13 +45,13 @@ -

+	@if(diff.changeType == ChangeType.COPY \|\| diff.changeType == ChangeType.RENAME){ @if(newCommitId.isDefined){ - Ignore Space - Show notes - View + Ignore Space + Show notes + View } @@ -61,9 +61,9 @@ @if(diff.changeType == ChangeType.ADD \|\| diff.changeType == ChangeType.MODIFY){ @if(newCommitId.isDefined){ - Ignore Space - Show notes - View + Ignore Space + Show notes + View } @@ -78,8 +78,8 @@ @if(diff.changeType == ChangeType.DELETE){ @if(oldCommitId.isDefined){ - Show notes - View + Show notes + View } diff --git a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html index f374647..4356ee2 100644 --- a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html +++ b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html @@ -1,13 +1,12 @@ @(value : String = "", prefix: String = "", - mini : Boolean = true, style : String = "", right : Boolean = false, flat : Boolean = false)(body: Html) @@ -24,55 +24,53 @@ @if(loginAccount.isEmpty){ @signinform(settings) } else { - - - New repository - - Your repositories @userRepositories.size - - @if(userRepositories.isEmpty){ - - No repositories + + + + New repository - } else { - + Your repositories @userRepositories.size + + + @if(userRepositories.isEmpty){ + No repositories + } else { @defining(20){ max => @userRepositories.zipWithIndex.map { case (repository, i) => - + @helper.html.repositoryicon(repository, false) @if(repository.owner == loginAccount.get.userName){ @repository.name } else { @repository.owner/@repository.name } - + } @if(userRepositories.size > max){ - + Show more @{userRepositories.size - max} pages... - + } } - - } + } + + } - - Recent updated repositories + + Recent updated repositories + + @if(recentRepositories.isEmpty){ + No repositories + } else { + @recentRepositories.map { repository => + + @helper.html.repositoryicon(repository, false) + @repository.owner/@repository.name + + } + } + - @if(recentRepositories.isEmpty){ - - No repositories - - } else { - - @recentRepositories.map { repository => - - @helper.html.repositoryicon(repository, false) - @repository.owner/@repository.name - - } - - } @@ -80,8 +78,8 @@ \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html index 040b9e0..b293d8c 100644 --- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html +++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html @@ -8,8 +8,8 @@ @avatar(loginAccount.get.userName, 48) - - + + @helper.html.preview( repository = repository, content = "", @@ -21,12 +21,12 @@ elastic = true, tabIndex = 1 ) - + @if((reopenable \|\| !issue.closed) && (hasWritePermission \|\| issue.openedUserName == loginAccount.get.userName)){ - + } - + diff --git a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html index dcfa16c..fa656b4 100644 --- a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html +++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html @@ -8,8 +8,8 @@ @import gitbucket.core.model.CommitComment @if(issue.isDefined){ @avatar(issue.get.openedUserName, 48) - - + + @user(issue.get.openedUserName, styleClass="username strong") commented @helper.html.datetimeago(issue.get.registeredDate) @if(hasWritePermission \|\| loginAccount.map(_.userName == issue.get.openedUserName).getOrElse(false)){ @@ -17,7 +17,7 @@ } - + @markdown(issue.get.content getOrElse "No description provided.", repository, false, true, true, hasWritePermission) @@ -27,8 +27,8 @@ case comment: gitbucket.core.model.IssueComment => { @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){ @avatar(comment.commentedUserName, 48) - - + + @user(comment.commentedUserName, styleClass="username strong") @if(comment.action == "comment"){ @@ -38,20 +38,22 @@ } @helper.html.datetimeago(comment.registeredDate) - - @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer" - && (hasWritePermission \|\| loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){ + @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer" + && (hasWritePermission \|\| loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){ + - } - - - + + } @if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){ @defining(comment.content.substring(comment.content.length - 40)){ id => - @id.substring(0, 7) - @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true, true, hasWritePermission) + @id.substring(0, 7) } + } + + + @if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){ + @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true, true, hasWritePermission) } else { @if(comment.action == "refer"){ @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) => diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html index d36fab8..bf24d44 100644 --- a/src/main/twirl/gitbucket/core/issues/create.scala.html +++ b/src/main/twirl/gitbucket/core/issues/create.scala.html @@ -7,16 +7,14 @@ @import gitbucket.core.view.helpers._ @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("issues", repository){ - @navigation("issues", false, repository) - - - - + + + @avatar(loginAccount.get.userName, 48) - - + + - + @helper.html.preview( repository = repository, content = "", @@ -24,16 +22,16 @@ enableRefsLink = true, enableTaskList = true, hasWritePermission = hasWritePermission, - style = "width: 690px; height: 200px; max-height: 250px;", + style = "width: 680px; height: 200px; max-height: 250px;", elastic = true ) - + - + @issueinfo(None, Nil, Nil, collaborators, milestones.map(x => (x, 0, 0)), labels, hasWritePermission, repository) diff --git a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html index 9c6aa73..e8c5d4e 100644 --- a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html +++ b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html @@ -2,11 +2,11 @@ @import context._ @helper.html.attached(owner, repository){ - @content + @content } - - + + - + diff --git a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html index 891f31a..791b5e8 100644 --- a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html +++ b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html @@ -6,8 +6,8 @@ @import gitbucket.core.view.helpers._
- - + + @@ -17,13 +17,13 @@ - + @counts.get(label.labelName).getOrElse(0) open issues @if(hasWritePermission){ - + Edit 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 d82a00d..7331129 100644 --- a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html @@ -12,24 +12,28 @@

@if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){ @if(newCommitId.isDefined){

- Ignore Space - Show notes - View + Ignore Space + Show notes + View

} @@ -61,9 +61,9 @@ @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){ @if(newCommitId.isDefined){

- Ignore Space - Show notes - View + Ignore Space + Show notes + View

} @@ -78,8 +78,8 @@ @if(diff.changeType == ChangeType.DELETE){ @if(oldCommitId.isDefined){

- Show notes - View + Show notes + View

} diff --git a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html index f374647..4356ee2 100644 --- a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html +++ b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html @@ -1,13 +1,12 @@ @(value : String = "", prefix: String = "", - mini : Boolean = true, style : String = "", right : Boolean = false, flat : Boolean = false)(body: Html)

@@ -24,55 +24,53 @@ @if(loginAccount.isEmpty){ @signinform(settings) } else { -

- New repository -

- Your repositories @userRepositories.size -

- @if(userRepositories.isEmpty){ -

- No repositories +

+ New repository

- } else { -

+ Your repositories @userRepositories.size +

No repositories

Show more @{userRepositories.size - max} pages... -

- } + } + +

} -

- Recent updated repositories +

Recent updated repositories

No repositories
+ @helper.html.repositoryicon(repository, false) + @repository.owner/@repository.name +

- @if(recentRepositories.isEmpty){ -

- No repositories -

- } else { -

- @recentRepositories.map { repository => -

- @helper.html.repositoryicon(repository, false) - @repository.owner/@repository.name -

- } -

- }

@@ -80,8 +78,8 @@ \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/issues/commentform.scala.html b/src/main/twirl/gitbucket/core/issues/commentform.scala.html index 040b9e0..b293d8c 100644 --- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html +++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html @@ -8,8 +8,8 @@

@avatar(loginAccount.get.userName, 48)

@helper.html.preview( repository = repository, content = "", @@ -21,12 +21,12 @@ elastic = true, tabIndex = 1 ) -

@if((reopenable || !issue.closed) && (hasWritePermission || issue.openedUserName == loginAccount.get.userName)){ - + } - +

diff --git a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html index dcfa16c..fa656b4 100644 --- a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html +++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html @@ -8,8 +8,8 @@ @import gitbucket.core.model.CommitComment @if(issue.isDefined){

@avatar(issue.get.openedUserName, 48)

@user(issue.get.openedUserName, styleClass="username strong") commented @helper.html.datetimeago(issue.get.registeredDate) @if(hasWritePermission || loginAccount.map(_.userName == issue.get.openedUserName).getOrElse(false)){ @@ -17,7 +17,7 @@ }

@markdown(issue.get.content getOrElse "No description provided.", repository, false, true, true, hasWritePermission)

@@ -27,8 +27,8 @@ case comment: gitbucket.core.model.IssueComment => { @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){

@avatar(comment.commentedUserName, 48)

@user(comment.commentedUserName, styleClass="username strong") @if(comment.action == "comment"){ @@ -38,20 +38,22 @@ } @helper.html.datetimeago(comment.registeredDate) - - @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer" - && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){ + @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer" + && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){ + - } - -

+ + } @if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){ @defining(comment.content.substring(comment.content.length - 40)){ id => -

@id.substring(0, 7)

- @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true, true, hasWritePermission) + @id.substring(0, 7) } + } +

+ @if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){ + @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true, true, hasWritePermission) } else { @if(comment.action == "refer"){ @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) => diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html index d36fab8..bf24d44 100644 --- a/src/main/twirl/gitbucket/core/issues/create.scala.html +++ b/src/main/twirl/gitbucket/core/issues/create.scala.html @@ -7,16 +7,14 @@ @import gitbucket.core.view.helpers._ @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("issues", repository){ - @navigation("issues", false, repository) -

- -

+ +

@avatar(loginAccount.get.userName, 48)

- + @helper.html.preview( repository = repository, content = "", @@ -24,16 +22,16 @@ enableRefsLink = true, enableTaskList = true, hasWritePermission = hasWritePermission, - style = "width: 690px; height: 200px; max-height: 250px;", + style = "width: 680px; height: 200px; max-height: 250px;", elastic = true )

- +

@issueinfo(None, Nil, Nil, collaborators, milestones.map(x => (x, 0, 0)), labels, hasWritePermission, repository)

diff --git a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html index 9c6aa73..e8c5d4e 100644 --- a/src/main/twirl/gitbucket/core/issues/editcomment.scala.html +++ b/src/main/twirl/gitbucket/core/issues/editcomment.scala.html @@ -2,11 +2,11 @@ @import context._ @helper.html.attached(owner, repository){ - + }

- - + +

- + diff --git a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html index 891f31a..791b5e8 100644 --- a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html +++ b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html @@ -6,8 +6,8 @@ @import gitbucket.core.view.helpers._

@@ -17,13 +17,13 @@

@counts.get(label.labelName).getOrElse(0) open issues

@if(hasWritePermission){ -

Edit 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 d82a00d..7331129 100644 --- a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html @@ -12,24 +12,28 @@

- - - - @labels.map { label => - @gitbucket.core.issues.labels.html.label(label, counts, repository, hasWritePermission) - } - @if(labels.isEmpty){ - - + + + - } + + + @labels.map { label => + @gitbucket.core.issues.labels.html.label(label, counts, repository, hasWritePermission) + } + @if(labels.isEmpty){ + + + + } +

- @labels.size labels -
- No labels to show. - @if(hasWritePermission){ - Create a new label. - } -
+ @labels.size labels +
+ No labels to show. + @if(hasWritePermission){ + Create a new label. + } +

} } diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html index bd2aafe..d27d3ae 100644 --- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html +++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html @@ -12,9 +12,8 @@ @import context._ @import gitbucket.core.view.helpers._ @import gitbucket.core.service.IssuesService.IssueInfo -
@if(condition.nonEmpty){ -

Clear current search query, filters, and sorts @@ -22,196 +21,199 @@

} - - + + - - @if(issues.isEmpty){ - - - - } - @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) => - - + - } + + + @if(issues.isEmpty){ + + + + } + @issues.map { case IssueInfo(issue, labels, milestone, commentCount, commitStatus) => + + + + } +

- - - - - @openCount Open - - - - @closedCount Closed - - - - @helper.html.dropdown("Author", flat = true) { - @collaborators.map { collaborator => - - - @helper.html.checkicon(condition.author == Some(collaborator)) - @avatar(collaborator, 20) @collaborator - - - } - } - @helper.html.dropdown("Label", flat = true) { - @labels.map { label => - - - @helper.html.checkicon(condition.labels.contains(label.labelName)) - - @label.labelName - - - } - } - @helper.html.dropdown("Milestone", flat = true) { - - - @helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone - - - @milestones.filter(_.closedDate.isEmpty).map { milestone => - - - @helper.html.checkicon(condition.milestone == Some(Some(milestone.title))) @milestone.title - - - } - } - @helper.html.dropdown("Assignee", flat = true) { - @collaborators.map { collaborator => - - - @helper.html.checkicon(condition.assigned == Some(collaborator)) - @avatar(collaborator, 20) @collaborator - - - } - } - @helper.html.dropdown("Sort", flat = true){ - - - @helper.html.checkicon(condition.sort == "created" && condition.direction == "desc") Newest - - - - - @helper.html.checkicon(condition.sort == "created" && condition.direction == "asc") Oldest - - - - - @helper.html.checkicon(condition.sort == "comments" && condition.direction == "desc") Most commented - - - - - @helper.html.checkicon(condition.sort == "comments" && condition.direction == "asc") Least commented - - - - - @helper.html.checkicon(condition.sort == "updated" && condition.direction == "desc") Recently updated - - - - - @helper.html.checkicon(condition.sort == "updated" && condition.direction == "asc") Least recently updated - - - } - - @if(hasWritePermission){ - - @helper.html.dropdown("Mark as", flat = true) { - Open - Close +
+ + + + + @openCount Open + + + + @closedCount Closed + + + + @helper.html.dropdown("Author", flat = true) { + @collaborators.map { collaborator => + + + @helper.html.checkicon(condition.author == Some(collaborator)) + @avatar(collaborator, 20) @collaborator + + + } } @helper.html.dropdown("Label", flat = true) { @labels.map { label => - - - + + @helper.html.checkicon(condition.labels.contains(label.labelName)) + @label.labelName } } @helper.html.dropdown("Milestone", flat = true) { - No milestone + + + @helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone + + @milestones.filter(_.closedDate.isEmpty).map { milestone => - @milestone.title + + + @helper.html.checkicon(condition.milestone == Some(Some(milestone.title))) @milestone.title + + } } @helper.html.dropdown("Assignee", flat = true) { - Clear assignee @collaborators.map { collaborator => - @avatar(collaborator, 20) @collaborator + + + @helper.html.checkicon(condition.assigned == Some(collaborator)) + @avatar(collaborator, 20) @collaborator + + } } + @helper.html.dropdown("Sort", flat = true){ + + + @helper.html.checkicon(condition.sort == "created" && condition.direction == "desc") Newest + + + + + @helper.html.checkicon(condition.sort == "created" && condition.direction == "asc") Oldest + + + + + @helper.html.checkicon(condition.sort == "comments" && condition.direction == "desc") Most commented + + + + + @helper.html.checkicon(condition.sort == "comments" && condition.direction == "asc") Least commented + + + + + @helper.html.checkicon(condition.sort == "updated" && condition.direction == "desc") Recently updated + + + + + @helper.html.checkicon(condition.sort == "updated" && condition.direction == "asc") Least recently updated + + + } - } -
- @if(target == "issues"){ - No issues to show. - } 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. - } else { - Create a new pull request. - } - } - } -
@if(hasWritePermission){ - + + @helper.html.dropdown("Mark as", flat = true) { + Open + Close + } + @helper.html.dropdown("Label", flat = true) { + @labels.map { label => + + + + + @label.labelName + + + } + } + @helper.html.dropdown("Milestone", flat = true) { + No milestone + @milestones.filter(_.closedDate.isEmpty).map { milestone => + @milestone.title + } + } + @helper.html.dropdown("Assignee", flat = true) { + Clear assignee + @collaborators.map { collaborator => + @avatar(collaborator, 20) @collaborator + } + } + } - - @if(repository.isEmpty){ - @issue.repositoryName ･ - } - @if(target == "issues"){ - @issue.title - } else { - @issue.title - } - @commitstatus(issue, commitStatus) - @labels.map { label => - @label.labelName - } - - @issue.assignedUserName.map { userName => - @avatar(userName, 20, tooltip = true) - } - @if(commentCount > 0){ - - @commentCount - - } else { - - @commentCount - - } - - - #@issue.issueId opened @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username") - @milestone.map { milestone => - -@milestone - } - -
+ @if(target == "issues"){ + No issues to show. + } 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. + } else { + Create a new pull request. + } + } + } +
+ @if(hasWritePermission){ + + } + + @if(repository.isEmpty){ + @issue.repositoryName ･ + } + @if(target == "issues"){ + @issue.title + } else { + @issue.title + } + @commitstatus(issue, commitStatus) + @labels.map { label => + @label.labelName + } + + @issue.assignedUserName.map { userName => + @avatar(userName, 20, tooltip = true) + } + @if(commentCount > 0){ + + @commentCount + + } else { + + @commentCount + + } + + + #@issue.issueId opened @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username") + @milestone.map { milestone => + @milestone + } + +

@helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), gitbucket.core.service.IssuesService.IssueLimit, 10, condition.toURL) 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 dc4ef3b..d82e2e0 100644 --- a/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html +++ b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html @@ -13,16 +13,16 @@ }

- +

Description - +

Due Date @helper.html.datepicker("dueDate", milestone.flatMap(_.dueDate)) @@ -30,16 +30,16 @@

@if(milestone.isEmpty){ - + } else { @if(milestone.get.closedDate.isDefined){ - } else { - } - + }

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 11d5332..327e5aa 100644 --- a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html @@ -9,89 +9,93 @@ @issues.html.navigation("milestones", hasWritePermission, repository)
- - - - @defining(milestones.filter { case (milestone, _, _) => - milestone.closedDate.map(_ => state == "closed").getOrElse(state == "open") - }){ milestones => - @milestones.map { case (milestone, openCount, closedCount) => + - + + + + @defining(milestones.filter { case (milestone, _, _) => + milestone.closedDate.map(_ => state == "closed").getOrElse(state == "open") + }){ milestones => + @milestones.map { case (milestone, openCount, closedCount) => + + - - } - @if(milestones.isEmpty){ - - - - } + @if(milestone.description.isDefined){ +

+ @markdown(milestone.description.get, repository, false, false) +

+ } + + + } + @if(milestones.isEmpty){ + + + + } + }

- - - - @milestones.count(_._1.closedDate.isEmpty) Open - - - - @milestones.count(_._1.closedDate.isDefined) Closed - - -
- - - @milestone.title - - @if(milestone.closedDate.isDefined){ - Closed @helper.html.datetimeago(milestone.closedDate.get) - } else { - @milestone.dueDate.map { dueDate => - @if(isPast(dueDate)){ - Due by @date(dueDate) - } else { - Due by @date(dueDate) - } - }.getOrElse { - No due date - } - } - - - - @progress(openCount + closedCount, closedCount) - +	+ + + + @milestones.count(_._1.closedDate.isEmpty) Open + + + + @milestones.count(_._1.closedDate.isDefined) Closed + + +
+ + + @milestone.title - @if(closedCount == 0){ - 0% + @if(milestone.closedDate.isDefined){ + Closed @helper.html.datetimeago(milestone.closedDate.get) } else { - @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)% - } complete - @openCount open - @closedCount closed - - - @if(hasWritePermission){ - Edit - @if(milestone.closedDate.isDefined){ - Open - } else { - Close + @milestone.dueDate.map { dueDate => + @if(isPast(dueDate)){ + Due by @date(dueDate) + } else { + Due by @date(dueDate) + } + }.getOrElse { + No due date } - Delete } + + @progress(openCount + closedCount, closedCount) + + + @if(closedCount == 0){ + 0% + } else { + @((closedCount.toDouble / (openCount + closedCount).toDouble * 100).toInt)% + } complete + @openCount open + @closedCount closed + + + @if(hasWritePermission){ + Edit + @if(milestone.closedDate.isDefined){ + Open + } else { + Close + } + Delete + } + + + - - @if(milestone.description.isDefined){ - - @markdown(milestone.description.get, repository, false, false) - - } -
- No milestones to show. - @if(hasWritePermission){ - Create a new milestone. - } -
+ No milestones to show. + @if(hasWritePermission){ + Create a new milestone. + } +

} diff --git a/src/main/twirl/gitbucket/core/issues/milestones/progress.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/progress.scala.html index d099190..3bfb39d 100644 --- a/src/main/twirl/gitbucket/core/issues/milestones/progress.scala.html +++ b/src/main/twirl/gitbucket/core/issues/milestones/progress.scala.html @@ -1,6 +1,5 @@ @(total: Int, progress: Int) -

- @if(progress > 0){ - - } +

diff --git a/src/main/twirl/gitbucket/core/issues/navigation.scala.html b/src/main/twirl/gitbucket/core/issues/navigation.scala.html index eb2f077..f8bce35 100644 --- a/src/main/twirl/gitbucket/core/issues/navigation.scala.html +++ b/src/main/twirl/gitbucket/core/issues/navigation.scala.html @@ -4,55 +4,53 @@ condition: Option[gitbucket.core.service.IssuesService.IssueSearchCondition] = None)(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ -

Issues

Issues
Pull requests
Labels
Milestones
-
- @condition.map { condition => - @if(loginAccount.isDefined){ -
-
- -
- Open issues and pull requests
- Your issues
- Your pull requests
- Everything assigned to you
- Everything mentioning you
-
- -
- } else { - - } - } - @if(loginAccount.isDefined){ -
- @if(newButton){ - @if(active == "issues"){ - New issue - } - @if(active == "pulls"){ - New pull request - } - @if(active == "labels"){ - New label - } - @if(active == "milestones"){ - New milestone - } - } -
- } -
-
Milestones

- - -

GitBucket - @defining(AutoUpdate.getCurrentVersion){ version => - @version.majorVersion.@version.minorVersion - } - - + +

+ @* TODO: for plugi-ins? + + *@ + + @if(loginAccount.isDefined){ @repository.map { repository => - + } - @if(loginAccount.isDefined){ - - + + + } else { + @* TODO: merge with below *@ + @repository.map { repository => + + + } -

- @if(loginAccount.isDefined){ -

- - -

- } else { - - } -

+ } + @if(loginAccount.isDefined){ +

+ + +

+ } else { + + }

+ @body \ No newline at end of file + diff --git a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html index 7e76d43..39a8457 100644 --- a/src/main/twirl/gitbucket/core/settings/edithooks.scala.html +++ b/src/main/twirl/gitbucket/core/settings/edithooks.scala.html @@ -13,30 +13,28 @@ @html.menu("settings", repository){ @menu("hooks", repository){ @helper.html.information(info) - -

- Webhook / Manage webhook -

+ -

Create a new repository

Create your account

Installed plugins

Installed plugins

Create a new repository

Create your account

Installed plugins

Installed plugins

Where should we fork this repository?

Where should we fork this repository?

WebHook Test