[Notice] Announcing the End of Demo Server [Read me]
File name
Commit message
Commit date
File name
Commit message
Commit date
2013-10-23
2013-10-23
File name
Commit message
Commit date
File name
Commit message
Commit date
2013-10-22
@(title:String, form: Form[PullRequest], project: Project, fromBranches: List[String], toBranches: List[String], mergeResult:models.PullRequestMergeResult, pullRequest:models.PullRequest)
@import utils.TemplateHelper._
@implicitField = @{ helper.FieldConstructor(simpleForm) }
@branchItemType(itemType:String) = @{
if(itemType == "heads"){
"branch"
} else if(itemType == "tags") {
"tag"
} else {
itemType
}
}
@makeBranchItem(branch:String, selectedBranch:String) = {
@defining(branch.split('/')){ names =>
@if(names(0).equals("refs")){
<li data-value="@branch" @if(branch.equals(selectedBranch)) { data-selected="true" }>
<a href="#">
<span class="label @branchItemType(names(1))">@branchItemType(names(1))</span>
@branch.replace("refs/" + names(1) + "/", "")
</a>
</li>
} else {
<li data-value="@branch"><a href="#">@branch</a></li>
}
}
}
@projectLayout(title, project, utils.MenuType.PULL_REQUEST) {
<div class="page">
@projectMenu(project, utils.MenuType.PULL_REQUEST, "main-menu-only")
<div class="content-wrap frm-wrap">
@helper.form(action=routes.PullRequestApp.newPullRequest(project.owner, project.name), 'enctype -> "multipart/form-data", 'class->"nm"){
<legend>
@Messages(title)
<span class="pull-right">
<button id="helpBtn" class="ybtn ybtn-inverse">
<i class="yobicon-question-sign yobicon-large"></i> @Messages("title.help")
</button>
</span>
</legend>
<div class="well" id="helpMessage" style="margin-bottom: 10px; display:none;">
<div class="row-fluid">
<div class="pull-left">
<img class="img-polaroid" src="@routes.Assets.at("images/fork-pull/pull-request.jpg")"><br>
</div>
<div class="pull-left help-messages">
<p class="lead">@Messages("pullRequest.help.message.1")</p>
<p>@Messages("pullRequest.help.message.2")</p>
<p>@Messages("pullRequest.help.message.3")</p>
</div>
</div>
</div>
<div class="pull-request-wrap">
<div class="option request-from">
<div class="option-label">@Messages("pullRequest.from"):
<code>@project.owner/@project.name</code>
</div>
<div class="option-desc mt5">
<div class="btn-group branches" data-name="fromBranch">
<button class="btn dropdown-toggle auto" data-toggle="dropdown">
<span class="d-label">@Messages("pullRequest.select.branch")</span>
<span class="d-caret"><span class="caret"></span></span>
</button>
<ul class="dropdown-menu">
@for(branch <- fromBranches) {
@if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
@makeBranchItem(branch, pullRequest.fromBranch)
}
}
</ul>
</div>
</div>
</div>
<div class="arrow">
<i class="yobicon-right"></i>
</div>
<div class="option request-to">
<div class="option-label">@Messages("pullRequest.to"):
<code>@project.originalProject.owner/@project.originalProject.name</code>
</div>
<div class="option-desc mt5">
<div class="btn-group branches" data-name="toBranch">
<button class="btn dropdown-toggle auto" data-toggle="dropdown">
<span class="d-label">@Messages("pullRequest.select.branch")</span>
<span class="d-caret"><span class="caret"></span></span>
</button>
<ul class="dropdown-menu">
@for(branch <- toBranches) {
@if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
@makeBranchItem(branch, pullRequest.toBranch)
}
}
</ul>
</div>
</div>
</div>
</div>
<div id="frmWrap">
@views.html.git.partial_diff(form, project, mergeResult, pullRequest)
</div>
<div id="compare" class="modal hide compare-wrap" tabindex="-1" role="dialog">
<h4 class="path">
<span></span>
<button type="button" class="ybtn pull-right" data-dismiss="modal" style="margin-right:20px;">@Messages("button.confirm")</button>
</h4>
<div class="row-fluid">
<div class="span6 compare-from"></div>
<div class="span6 compare-to"></div>
</div>
<div id="mergely" class="mergely-wrap"></div>
</div>
}
</div>
</div>
<link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/mergely/codemirror.css")">
<link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/mergely/mergely.css")">
<script type="text/javascript" src="@getJSLink("lib/mergely/codemirror.min")"></script>
<script type="text/javascript" src="@getJSLink("lib/mergely/mergely")"></script>
<script type="text/javascript" src="/assets/javascripts/lib/spin.js"></script>
<script type="text/javascript">
$(document).ready(function() {
$yobi.loadModule("git.Write", {
"sFormURL" : "@routes.PullRequestApp.newPullRequestForm(project.owner, project.name)",
"welFromBranch": $("div[data-name='fromBranch']"),
"welToBranch" : $("div[data-name='toBranch']")
});
});
</script>
}