Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 22:15:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2)Add tabs to the pull request page.

Browse Source
This commit is contained in:
takezoe
2013-07-14 14:06:48 +09:00
parent 2fb9f83227
commit b68977597b
6 changed files with 215 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/twirl/pulls/pullreq.scala.html
View File

@@ -9,11 +9,13 @@
@import view.helpers._
@html.main("%s - Issue #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
@html.header("issues", repository)
@issues.html.tab("issues", repository)
@tab("discussion", issue.issueId, repository)
@*
<ul class="nav nav-tabs">
<li class="pull-left"><a href="@url(repository)/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
<li class="pull-right">Issue #@issue.issueId</li>
</ul>
*@
<div class="row-fluid">
<div class="span10">
<div class="issue-avatar-image">@avatar(issue.openedUserName, 48)</div>
@@ -140,7 +142,7 @@ git push origin @{pullreq.branch}</pre>
<div>
<strong>Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}</strong>
</div>
<textarea name="content" style="width: 680px; height: 100px;">@issue.title</textarea>
<textarea name="content" 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"/>