mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-09 23:15:49 +01:00
Merge pull request #1052 from team-lab/change-issue-action-comment-style
Change action-comment styles that follow github.
This commit is contained in:
Naoki Takezoe
@@ -30,10 +30,12 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
@issueOrPullRequest()={ @if(issue.isDefined && issue.get.isPullRequest)( "pull request" )else( "issue" ) }
|
||||||
|
|
||||||
@comments.map {
|
@comments.map {
|
||||||
case comment: gitbucket.core.model.IssueComment => {
|
case comment: gitbucket.core.model.IssueComment => {
|
||||||
@if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){
|
@if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"
|
||||||
|
&& comment.action != "commit" && comment.action != "refer"){
|
||||||
<div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
|
<div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
|
||||||
<div class="panel panel-default issue-comment-box" id="comment-@comment.commentId">
|
<div class="panel panel-default issue-comment-box" id="comment-@comment.commentId">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
@@ -42,7 +44,7 @@
|
|||||||
@if(comment.action == "comment"){
|
@if(comment.action == "comment"){
|
||||||
commented
|
commented
|
||||||
} else {
|
} else {
|
||||||
@if(pullreq.isEmpty){ referenced the issue } else { referenced the pull request }
|
referenced the @issueOrPullRequest()
|
||||||
}
|
}
|
||||||
@helper.html.datetimeago(comment.registeredDate)
|
@helper.html.datetimeago(comment.registeredDate)
|
||||||
</span>
|
</span>
|
||||||
@@ -53,79 +55,114 @@
|
|||||||
<a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-x" aria-label="Remove"></i></a>
|
<a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-x" aria-label="Remove"></i></a>
|
||||||
</span>
|
</span>
|
||||||
}
|
}
|
||||||
@if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){
|
|
||||||
@defining(comment.content.substring(comment.content.length - 40)){ id =>
|
|
||||||
<span class="pull-right"><a href="@path/@repository.owner/@repository.name/commit/@id" class="monospace">@id.substring(0, 7)</a></span>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body issue-content markdown-body" id="commentContent-@comment.commentId">
|
<div class="panel-body issue-content markdown-body" id="commentContent-@comment.commentId">
|
||||||
@if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){
|
@markdown(
|
||||||
@markdown(
|
markdown = comment.content,
|
||||||
markdown = comment.content.substring(0, comment.content.length - 41),
|
repository = repository,
|
||||||
repository = repository,
|
enableWikiLink = false,
|
||||||
enableWikiLink = false,
|
enableRefsLink = true,
|
||||||
enableRefsLink = true,
|
enableLineBreaks = true,
|
||||||
enableLineBreaks = true,
|
enableTaskList = true,
|
||||||
enableTaskList = true,
|
hasWritePermission = hasWritePermission
|
||||||
hasWritePermission = hasWritePermission
|
)
|
||||||
)
|
</div>
|
||||||
} else {
|
</div>
|
||||||
@if(comment.action == "refer"){
|
}
|
||||||
@defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
|
@if(comment.action == "commit"){
|
||||||
<strong>@issueLink(repository, issueId.toInt): @rest.mkString(":")</strong>
|
@defining({
|
||||||
}
|
val (content, id) = " ([a-f0-9]{40})$".r.findFirstMatchIn(comment.content)
|
||||||
} else {
|
.map(m => (m.before.toString -> Some(m.group(1))))
|
||||||
@markdown(
|
.getOrElse(comment.content -> None)
|
||||||
markdown = comment.content,
|
val head = content.take(100).takeWhile(_ != '\n')
|
||||||
repository = repository,
|
(id, head, if(head == content){ None }else{ Some(content.drop(head.length).dropWhile(_ == '\n')) }.filter(_.nonEmpty))
|
||||||
enableWikiLink = false,
|
}){ case (commitId, head, rest) =>
|
||||||
enableRefsLink = true,
|
<div class="discussion-item discussion-item-commit">
|
||||||
enableLineBreaks = true,
|
<div class="discussion-item-header">
|
||||||
enableTaskList = true,
|
<span class="discussion-item-icon"><i class="octicon octicon-bookmark"></i></span>
|
||||||
hasWritePermission = hasWritePermission
|
@avatar(comment.commentedUserName, 16)
|
||||||
)
|
@user(comment.commentedUserName, styleClass="username strong")
|
||||||
|
added a commit that referenced this @issueOrPullRequest()
|
||||||
|
@helper.html.datetimeago(comment.registeredDate)
|
||||||
|
</div>
|
||||||
|
<div style="discussion-item-content">
|
||||||
|
@commitId.map{ id =>
|
||||||
|
<span class="pull-right"><a href="@path/@repository.owner/@repository.name/commit/@id" class="monospace">@id.substring(0, 7)</a></span>
|
||||||
}
|
}
|
||||||
|
<span class="discussion-item-content-head"><i class="octicon octicon-git-commit"></i></span>
|
||||||
|
@link(head, repository)
|
||||||
|
@rest.map{ content =>
|
||||||
|
<a href="javascript:void(0)" class="omit" onclick="$(this.parentNode).find('.discussion-item-content-text').toggle()">...</a>
|
||||||
|
<pre class="reset discussion-item-content-text" style="display:none">@link(content, repository)</pre>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@if(comment.action == "refer"){
|
||||||
|
<div class="discussion-item discussion-item-refer">
|
||||||
|
<div class="discussion-item-header">
|
||||||
|
<span class="discussion-item-icon"><i class="octicon octicon-bookmark"></i></span>
|
||||||
|
@avatar(comment.commentedUserName, 16)
|
||||||
|
@user(comment.commentedUserName, styleClass="username strong")
|
||||||
|
referenced the @issueOrPullRequest()
|
||||||
|
@helper.html.datetimeago(comment.registeredDate)
|
||||||
|
</div>
|
||||||
|
<div style="discussion-item-content">
|
||||||
|
@defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
|
||||||
|
<strong>@issueLink(repository, issueId.toInt): @rest.mkString(":")</strong>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@if(comment.action == "merge"){
|
@if(comment.action == "merge"){
|
||||||
<div class="small" style="margin-top: 10px; margin-bottom: 10px;">
|
<div class="discussion-item discussion-item-merge">
|
||||||
<span class="label label-info">Merged</span>
|
<div class="discussion-item-header">
|
||||||
@avatar(comment.commentedUserName, 20)
|
<span class="discussion-item-icon"><i class="octicon octicon-git-merge"></i></span>
|
||||||
@user(comment.commentedUserName, styleClass="username strong") merged commit <code>@pullreq.map(_.commitIdTo.substring(0, 7))</code> into
|
@avatar(comment.commentedUserName, 16)
|
||||||
@if(pullreq.get.requestUserName == repository.owner){
|
@user(comment.commentedUserName, styleClass="username strong")
|
||||||
<span class="label label-info monospace">@pullreq.map(_.branch)</span> from <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span>
|
merged commit
|
||||||
} else {
|
<code>@pullreq.map(_.commitIdTo.substring(0, 7))</code> into
|
||||||
<span class="label label-info monospace">@pullreq.map(_.userName):@pullreq.map(_.branch)</span> from <span class="label label-info monospace">@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</span>
|
@if(pullreq.get.requestUserName == repository.owner){
|
||||||
}
|
<code>@pullreq.map(_.branch)</code> from <code>@pullreq.map(_.requestBranch)</code>
|
||||||
@helper.html.datetimeago(comment.registeredDate)
|
} else {
|
||||||
|
<code>@pullreq.map(_.userName):@pullreq.map(_.branch)</code> from <code>@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</code>
|
||||||
|
}
|
||||||
|
@helper.html.datetimeago(comment.registeredDate)
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@if(comment.action == "close" || comment.action == "close_comment"){
|
@if(comment.action == "close" || comment.action == "close_comment"){
|
||||||
<div class="issue-comment-action">
|
<div class="discussion-item discussion-item-close">
|
||||||
<i class="octicon octicon-circle-slash danger"></i>
|
<div class="discussion-item-header">
|
||||||
@avatar(comment.commentedUserName, 20)
|
<span class="discussion-item-icon"><i class="octicon octicon-circle-slash"></i></span>
|
||||||
@if(issue.isDefined && issue.get.isPullRequest){
|
@avatar(comment.commentedUserName, 16)
|
||||||
@user(comment.commentedUserName, styleClass="username strong") closed the pull request @helper.html.datetimeago(comment.registeredDate)
|
@user(comment.commentedUserName, styleClass="username strong")
|
||||||
} else {
|
close @issueOrPullRequest()
|
||||||
@user(comment.commentedUserName, styleClass="username strong") closed the issue @helper.html.datetimeago(comment.registeredDate)
|
@helper.html.datetimeago(comment.registeredDate)
|
||||||
}
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@if(comment.action == "reopen" || comment.action == "reopen_comment"){
|
@if(comment.action == "reopen" || comment.action == "reopen_comment"){
|
||||||
<div class="issue-comment-action issue-reopened">
|
<div class="discussion-item discussion-item-reopen">
|
||||||
<i class="octicon octicon-primitive-dot"></i>
|
<div class="discussion-item-header">
|
||||||
@avatar(comment.commentedUserName, 20)
|
<span class="discussion-item-icon"><i class="octicon octicon-primitive-dot"></i></span>
|
||||||
@user(comment.commentedUserName, styleClass="username strong") reopened the issue @helper.html.datetimeago(comment.registeredDate)
|
@avatar(comment.commentedUserName, 16)
|
||||||
|
@user(comment.commentedUserName, styleClass="username strong")
|
||||||
|
reopened the @issueOrPullRequest()
|
||||||
|
@helper.html.datetimeago(comment.registeredDate)
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@if(comment.action == "delete_branch"){
|
@if(comment.action == "delete_branch"){
|
||||||
<div class="issue-comment-action">
|
<div class="discussion-item discussion-item-delete_branch">
|
||||||
<span class="label">Deleted</span>
|
<div class="discussion-item-header">
|
||||||
@avatar(comment.commentedUserName, 20)
|
<span class="discussion-item-icon"><i class="octicon octicon-git-branch"></i></span>
|
||||||
@user(comment.commentedUserName, styleClass="username strong") deleted the <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span> branch @helper.html.datetimeago(comment.registeredDate)
|
@avatar(comment.commentedUserName, 16)
|
||||||
|
@user(comment.commentedUserName, styleClass="username strong")
|
||||||
|
deleted the <code>@pullreq.map(_.requestBranch)</code> branch
|
||||||
|
@helper.html.datetimeago(comment.registeredDate)
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -146,6 +146,24 @@ hr {
|
|||||||
margin-bottom: 4px;
|
margin-bottom: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pre.reset {
|
||||||
|
/* defaults */
|
||||||
|
display: block;
|
||||||
|
font-family: monospace;
|
||||||
|
white-space: pre;
|
||||||
|
margin: 1em 0px;
|
||||||
|
/* bootstrap overrides */
|
||||||
|
padding: initial;
|
||||||
|
line-height: initial;
|
||||||
|
color: initial;
|
||||||
|
background-color: initial;
|
||||||
|
border: initial;
|
||||||
|
overflow: initial;
|
||||||
|
word-break: initial;
|
||||||
|
word-wrap: initial;
|
||||||
|
border-radius: initial;
|
||||||
|
}
|
||||||
|
|
||||||
/* ======================================================================== */
|
/* ======================================================================== */
|
||||||
/* Global Header */
|
/* Global Header */
|
||||||
/* ======================================================================== */
|
/* ======================================================================== */
|
||||||
@@ -1318,6 +1336,74 @@ li.task-list-item input.task-list-item-checkbox {
|
|||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.discussion-item {
|
||||||
|
position: relative;
|
||||||
|
margin: 15px 0 15px 79px;
|
||||||
|
padding-left: 25px;
|
||||||
|
}
|
||||||
|
.discussion-item-header {
|
||||||
|
min-height: 30px;
|
||||||
|
padding-top: 5px;
|
||||||
|
padding-bottom: 5px;
|
||||||
|
color: #767676;
|
||||||
|
line-height: 20px;
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
||||||
|
.discussion-item-icon {
|
||||||
|
float: left;
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
margin-top: -7px;
|
||||||
|
margin-left: -40px;
|
||||||
|
line-height: 28px;
|
||||||
|
color: #767676;
|
||||||
|
text-align: center;
|
||||||
|
background-color: #f3f3f3;
|
||||||
|
border: 2px solid #fff;
|
||||||
|
border-radius: 50%;
|
||||||
|
}
|
||||||
|
.discussion-item-content {
|
||||||
|
margin-left:36px;
|
||||||
|
}
|
||||||
|
.discussion-item-content-head{
|
||||||
|
padding-right:20px;
|
||||||
|
background-color: white;
|
||||||
|
float:left
|
||||||
|
}
|
||||||
|
pre.reset.discussion-item-content-text{
|
||||||
|
border-left: 1px solid rgb(238, 238, 238);
|
||||||
|
margin: 0 0 0 5px;
|
||||||
|
padding-left: 25px;
|
||||||
|
}
|
||||||
|
.discussion-item-commit .discussion-item-content {
|
||||||
|
font-size:12px;
|
||||||
|
}
|
||||||
|
.discussion-item-icon .octicon {
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
.discussion-item-merge .discussion-item-icon {
|
||||||
|
background-color: #6e5494;
|
||||||
|
color: white;
|
||||||
|
padding-top: 1px;
|
||||||
|
padding-left: 3px;
|
||||||
|
}
|
||||||
|
.discussion-item-close .discussion-item-icon {
|
||||||
|
background-color: #bd2c00;
|
||||||
|
color: white;
|
||||||
|
padding-top: 1px;
|
||||||
|
}
|
||||||
|
.discussion-item-delete_branch .discussion-item-icon {
|
||||||
|
padding-left: 2px;
|
||||||
|
padding-top: 1px;
|
||||||
|
background-color: #767676;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
.discussion-item-reopen .discussion-item-icon {
|
||||||
|
background-color: #6cc644;
|
||||||
|
padding-top: 1px;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* Pull Request */
|
/* Pull Request */
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|||||||
Reference in New Issue
Block a user