Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 23:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix layout

Browse Source
This commit is contained in:
Naoki Takezoe
2016-05-13 17:33:24 -04:00
parent 5161ece63b
commit b4d3573a84
2 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/gitbucket/core/issues/issue.scala.html
View File

@@ -46,7 +46,7 @@
</span> </span>
</div> </div>
<hr> <hr>
<div class="row-fluid" style="margin-top: 15px;"> <div style="margin-top: 15px;">
<div class="col-md-9"> <div class="col-md-9">
@commentlist(Some(issue), comments, hasWritePermission, repository) @commentlist(Some(issue), comments, hasWritePermission, repository)
@commentform(issue, true, hasWritePermission, repository) @commentform(issue, true, hasWritePermission, repository)

65
src/main/twirl/gitbucket/core/pulls/conversation.scala.html
View File

@@ -10,43 +10,40 @@
@import context._ @import context._
@import gitbucket.core.view.helpers._ @import gitbucket.core.view.helpers._
@import gitbucket.core.model._ @import gitbucket.core.model._
<div class="col-md-9">
<div class="row"> <div id="comment-list">
<div class="col-md-9"> @issues.html.commentlist(Some(issue), comments, hasWritePermission, repository, Some(pullreq))
<div id="comment-list"> </div>
@issues.html.commentlist(Some(issue), comments, hasWritePermission, repository, Some(pullreq)) @defining(comments.flatMap {
</div> case comment: gitbucket.core.model.IssueComment => Some(comment)
@defining(comments.flatMap { case other => None
case comment: gitbucket.core.model.IssueComment => Some(comment) }.exists(_.action == "merge")){ merged =>
case other => None @if(!issue.closed){
}.exists(_.action == "merge")){ merged => <div class="check-conflict" style="display: none;">
@if(!issue.closed){ <div class="box issue-comment-box" style="background-color: #fbeed5">
<div class="check-conflict" style="display: none;"> <div class="box-content"class="issue-content" style="border: 1px solid #c09853; padding: 10px;">
<div class="box issue-comment-box" style="background-color: #fbeed5"> <img src="@assets/common/images/indicator.gif"/> Checking...
<div class="box-content"class="issue-content" style="border: 1px solid #c09853; padding: 10px;">
<img src="@assets/common/images/indicator.gif"/> Checking...
</div>
</div> </div>
</div> </div>
} </div>
@if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName && merged &&
pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
<div class="box issue-comment-box" style="background-color: #d0eeff;">
<div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">
<a href="@url(repository)/pull/@issue.issueId/delete/@encodeRefName(pullreq.requestBranch)" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
<div>
<span class="strong">Pull request successfully merged and closed</span>
</div>
<span class="small muted">You're all set-the <span class="label label-info monospace">@pullreq.requestBranch</span> branch can be safely deleted.</span>
</div>
</div>
}
@issues.html.commentform(issue, !merged, hasWritePermission, repository)
} }
</div> @if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName && merged &&
<div class="col-md-3"> pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
@issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository) <div class="box issue-comment-box" style="background-color: #d0eeff;">
</div> <div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">
<a href="@url(repository)/pull/@issue.issueId/delete/@encodeRefName(pullreq.requestBranch)" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
<div>
<span class="strong">Pull request successfully merged and closed</span>
</div>
<span class="small muted">You're all set-the <span class="label label-info monospace">@pullreq.requestBranch</span> branch can be safely deleted.</span>
</div>
</div>
}
@issues.html.commentform(issue, !merged, hasWritePermission, repository)
}
</div>
<div class="col-md-3">
@issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
</div> </div>
<script> <script>
$(function(){ $(function(){