@(issue: model.Issue, pullreq: model.PullRequest, comments: List[model.IssueComment], collaborators: List[String], milestones: List[(model.Milestone, Int, Int)], hasWritePermission: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ @import view.helpers._ <div class="row-fluid"> <div class="span10"> @issues.html.issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository) @issues.html.commentlist(issue, comments, hasWritePermission, repository, Some(pullreq)) @if(hasWritePermission && !issue.closed){ <div class="box issue-comment-box" style="background-color: #d8f5cd;"> <div class="box-content"class="issue-content" style="border: 1px solid #95c97e; padding: 10px;"> <div id="merge-pull-request"> <div class="check-conflict" style="display: none;"> <img src="@assets/common/images/indicator.gif"/> Checking... </div> </div> <div id="confirm-merge-form" style="display: none;"> <form method="POST" action="@url(repository)/pull/@issue.issueId/merge"> <div class="strong"> Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch} </div> <span id="error-message" class="error"></span> <textarea name="message" style="width: 680px; height: 80px;">@issue.title</textarea> <div> <input type="button" class="btn" value="Cancel" id="cancel-merge-pull-request"/> <input type="submit" class="btn btn-success" value="Confirm merge"/> </div> </form> </div> </div> </div> } @issues.html.commentform(issue, hasWritePermission, repository) </div> <div class="span2"> @if(issue.closed) { @if(comments.exists(_.action == "merge")){ <span class="label label-info issue-status">Merged</span> } else { <span class="label label-important issue-status">Closed</span> } } else { <span class="label label-success issue-status">Open</span> } <div class="small" style="text-align: center;"> <span class="strong">@comments.size</span> @plural(comments.size, "comment") </div> <hr/> </div> </div> <script> $(function(){ $('#cancel-merge-pull-request').click(function(){ $('#confirm-merge-form').hide(); $('#merge-pull-request').show(); }); @if(hasWritePermission){ $('.check-conflict').show(); $.get('@url(repository)/pull/@issue.issueId/mergeguide', function(data){ $('.check-conflict').html(data); }); } }); </script>