mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-10 20:59:31 +01:00
Merge branch 'master' of github.com:gogits/gogs
This commit is contained in:
commit
d9991603e6
4 changed files with 28 additions and 25 deletions
|
@ -79,5 +79,6 @@ func RepoAssignment(redirect bool) martini.Handler {
|
|||
ctx.Data["CloneLink"] = ctx.Repo.CloneLink
|
||||
ctx.Data["RepositoryLink"] = ctx.Data["Title"]
|
||||
ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner
|
||||
ctx.Data["IsRepositoryWatching"] = ctx.Repo.IsWatching
|
||||
}
|
||||
}
|
||||
|
|
|
@ -72,16 +72,16 @@ var Gogits = {
|
|||
prettyPrint();
|
||||
|
||||
var $lineNums = $pre.parent().siblings('.lines-num');
|
||||
if($lineNums.length > 0){
|
||||
if ($lineNums.length > 0) {
|
||||
var nums = $pre.find('ol.linenums > li').length;
|
||||
for(var i=0;i < nums;i++){
|
||||
$lineNums.append('<span id="L'+i+'" rel=".L'+i+'">'+(i+1)+'</span>');
|
||||
for (var i = 0; i < nums; i++) {
|
||||
$lineNums.append('<span id="L' + i + '" rel=".L' + i + '">' + (i + 1) + '</span>');
|
||||
}
|
||||
|
||||
var last;
|
||||
$(document).on('click', '.lines-num span', function(){
|
||||
$(document).on('click', '.lines-num span', function () {
|
||||
var $e = $(this);
|
||||
if(last){
|
||||
if (last) {
|
||||
last.removeClass('active');
|
||||
}
|
||||
last = $e.parent().siblings('.lines-code').find('ol.linenums > ' + $e.attr('rel'));
|
||||
|
@ -96,12 +96,12 @@ var Gogits = {
|
|||
var node = $(this);
|
||||
var val = encodeURIComponent(node.text().toLowerCase().replace(/[^\w\- ]/g, '').replace(/[ ]/g, '-'));
|
||||
var name = val;
|
||||
if(headers[val] > 0){
|
||||
if (headers[val] > 0) {
|
||||
name = val + '-' + headers[val];
|
||||
}
|
||||
if(headers[val] == undefined){
|
||||
if (headers[val] == undefined) {
|
||||
headers[val] = 1;
|
||||
}else{
|
||||
} else {
|
||||
headers[val] += 1;
|
||||
}
|
||||
node = node.wrap('<div id="' + name + '" class="anchor-wrap" ></div>');
|
||||
|
@ -181,20 +181,22 @@ function initUserSetting() {
|
|||
}
|
||||
|
||||
function initRepository() {
|
||||
var $guide = $('.guide-box');
|
||||
if ($guide.length) {
|
||||
var $url = $('#guide-clone-url');
|
||||
$guide.find('button[data-url]').on("click",function () {
|
||||
var $this = $(this);
|
||||
if (!$this.hasClass('btn-primary')) {
|
||||
$guide.find('.btn-primary').removeClass('btn-primary').addClass("btn-default");
|
||||
$(this).addClass('btn-primary').removeClass('btn-default');
|
||||
$url.val($this.data("url"));
|
||||
$guide.find('span.clone-url').text($this.data('url'));
|
||||
}
|
||||
}).eq(0).trigger("click");
|
||||
// todo copy to clipboard
|
||||
}
|
||||
(function () {
|
||||
var $guide = $('.guide-box');
|
||||
if ($guide.length) {
|
||||
var $url = $('#guide-clone-url');
|
||||
$guide.find('button[data-link]').on("click",function () {
|
||||
var $this = $(this);
|
||||
if (!$this.hasClass('btn-primary')) {
|
||||
$guide.find('.btn-primary').removeClass('btn-primary').addClass("btn-default");
|
||||
$(this).addClass('btn-primary').removeClass('btn-default');
|
||||
$url.val($this.data("link"));
|
||||
$guide.find('span.clone-url').text($this.data('link'));
|
||||
}
|
||||
}).eq(0).trigger("click");
|
||||
// todo copy to clipboard
|
||||
}
|
||||
})();
|
||||
}
|
||||
|
||||
(function ($) {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<span class="caret"></span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="btn-group" id="gogs-repo-watching">
|
||||
<div class="btn-group {{if .IsRepositoryWatching}}watching{{end}}" id="gogs-repo-watching">
|
||||
<button type="button" class="btn btn-default"><i class="fa fa-eye fa-lg fa-m"></i></button>
|
||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
|
||||
<span class="caret"></span>
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
<h3>Clone this repository</h3>
|
||||
<div class="input-group col-md-8 col-md-offset-2 guide-buttons">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default" data-url="{{.CloneLink.SSH}}" type="button">SSH</button>
|
||||
<button class="btn btn-default" data-url="{{.CloneLink.HTTPS}}" type="button">HTTPS</button>
|
||||
<button class="btn btn-default" data-link="{{.CloneLink.SSH}}" type="button">SSH</button>
|
||||
<button class="btn btn-default" data-link="{{.CloneLink.HTTPS}}" type="button">HTTPS</button>
|
||||
</span>
|
||||
<input type="text" class="form-control" id="guide-clone-url" value="" readonly/>
|
||||
<span class="input-group-btn">
|
||||
|
|
Loading…
Reference in a new issue