Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Antoine GIRARD
2015-05-18 15:51:03 +02:00
143 changed files with 11154 additions and 6865 deletions

View File

@@ -35,18 +35,23 @@
@if(repository.commitCount > 0){
<div class="pull-right">
<div class="input-prepend">
@if(loginAccount.isEmpty){
<a title="You must be signed in to fork a repository" href="@path/signin" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
} else {
@if(isNoGroup) {
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-small" style="margin-bottom: 10px;" data-account="@loginAccount.get.userName">Fork</a>
@if(loginAccount.isEmpty){
<a title="You must be signed in to fork a repository" href="@path/signin" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
} else {
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-small" rel="facebox" style="margin-bottom: 10px;">Fork</a>
@if(isNoGroup) {
<a id="fork-link" href="javascript:void(0);" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
} else {
<a href="@path/@repository.owner/@repository.name/fork" class="btn btn-small" rel="facebox" style="margin-bottom: 10px;">Fork</a>
}
}
}
<span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
</div>
</div>
@if(loginAccount.isDefined && isNoGroup){
<form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork">
<input type="hidden" name="account" value="@loginAccount.get.userName"/>
</form>
}
}
<div class="head">
@helper.html.repositoryicon(repository, true)
@@ -151,7 +156,7 @@ $(function(){
$('a[rel*=facebox]').facebox({
'loadingImage': '@assets/vendors/facebox/loading.gif',
'closeImage': '@assets/vendors/facebox/closelabel.png',
'closeImage': '@assets/vendors/facebox/closelabel.png'
});
$(document).on("click", ".js-fork-owner-select-target", function() {
@@ -163,19 +168,9 @@ $(function(){
});
@if(loginAccount.isDefined){
$(document).on("click", "a[data-account]", function(e) {
$(document).on("click", "a#fork-link", function(e) {
e.preventDefault();
var form = $('<form/>', {
action: $(this).attr('href'),
method: "post"
});
var account = $('<input/>', {
type: "hidden",
name: "account",
value: $(this).data('account')
});
form.append(account);
form.submit();
$('#fork-form').submit();
});
}