core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#633 dix suburl

This commit is contained in:
Unknwon 2015-09-06 06:57:25 -04:00
parent 705224353b
commit 24658fcbdd
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/config.codekit
View File

@ -606,8 +606,8 @@
}, },
"\/ng\/js\/gogs.js": { "\/ng\/js\/gogs.js": {
"fileType": 64, "fileType": 64,
"ignore": 0, "ignore": 1,
"ignoreWasSetByUser": 0, "ignoreWasSetByUser": 1,
"inputAbbreviatedPath": "\/ng\/js\/gogs.js", "inputAbbreviatedPath": "\/ng\/js\/gogs.js",
"outputAbbreviatedPath": "\/ng\/js\/min\/gogs-min.js", "outputAbbreviatedPath": "\/ng\/js\/min\/gogs-min.js",
"outputPathIsOutsideProject": 0, "outputPathIsOutsideProject": 0,
@ -670,17 +670,6 @@
"outputStyle": 1, "outputStyle": 1,
"syntaxCheckerStyle": 1 "syntaxCheckerStyle": 1
}, },
"\/ng\/js\/min\/gogs-min.js": {
"fileType": 64,
"ignore": 1,
"ignoreWasSetByUser": 0,
"inputAbbreviatedPath": "\/ng\/js\/min\/gogs-min.js",
"outputAbbreviatedPath": "\/ng\/js\/min\/min\/gogs-min-min.js",
"outputPathIsOutsideProject": 0,
"outputPathIsSetByUser": 0,
"outputStyle": 1,
"syntaxCheckerStyle": 1
},
"\/ng\/js\/utils\/preview.js": { "\/ng\/js\/utils\/preview.js": {
"fileType": 64, "fileType": 64,
"ignore": 1, "ignore": 1,

6
public/js/gogs.js
View File

@ -1,6 +1,7 @@
'use strict'; 'use strict';
var csrf; var csrf;
var suburl;
function initCommentPreviewTab($form) { function initCommentPreviewTab($form) {
var $tab_menu = $form.find('.tabular.menu'); var $tab_menu = $form.find('.tabular.menu');
@ -407,6 +408,7 @@ function initWebhook() {
$(document).ready(function () { $(document).ready(function () {
csrf = $('meta[name=_csrf]').attr("content"); csrf = $('meta[name=_csrf]').attr("content");
suburl = $('meta[name=_suburl]').attr("content");
// Show exact time // Show exact time
$('.time-since').each(function () { $('.time-since').each(function () {
@ -485,9 +487,9 @@ $(document).ready(function () {
// Emojify // Emojify
emojify.setConfig({ emojify.setConfig({
img_dir:'/img/emoji' img_dir: suburl + '/img/emoji'
}); });
$('.markdown').each(function(){ $('.emojify').each(function () {
emojify.run($(this)[0]); emojify.run($(this)[0]);
}); });

2
public/ng/js/gogs.js
View File

@ -937,7 +937,7 @@ $(document).ready(function () {
homepage(); homepage();
emojify.setConfig({ emojify.setConfig({
img_dir:'/img/emoji' img_dir: Gogs.AppSubUrl + '/img/emoji'
}); });
emojify.run(); emojify.run();

1
templates/base/head.tmpl
View File

@ -8,6 +8,7 @@
<meta name="keywords" content="go, git, self-hosted, gogs"> <meta name="keywords" content="go, git, self-hosted, gogs">
<meta name="referrer" content="no-referrer" /> <meta name="referrer" content="no-referrer" />
<meta name="_csrf" content="{{.CsrfToken}}" /> <meta name="_csrf" content="{{.CsrfToken}}" />
<meta name="_suburl" content="{{AppSubUrl}}" />
{{if .GoGetImport}} {{if .GoGetImport}}
<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}"> <meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">
{{end}} {{end}}

6
templates/repo/issue/view_content.tmpl
View File

@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="ui attached segment"> <div class="ui attached segment">
<div class="render-content markdown"> <div class="render-content markdown emojify">
{{if .Issue.RenderedContent}} {{if .Issue.RenderedContent}}
{{.Issue.RenderedContent|Str2html}} {{.Issue.RenderedContent|Str2html}}
{{else}} {{else}}
@ -77,7 +77,7 @@
</div> </div>
</div> </div>
<div class="ui attached segment"> <div class="ui attached segment">
<div class="render-content markdown"> <div class="render-content markdown emojify">
{{if .RenderedContent}} {{if .RenderedContent}}
{{.RenderedContent|Str2html}} {{.RenderedContent|Str2html}}
{{else}} {{else}}
@ -317,7 +317,7 @@
<div class="ui bottom attached active write tab segment"> <div class="ui bottom attached active write tab segment">
<textarea id="content" name="content"></textarea> <textarea id="content" name="content"></textarea>
</div> </div>
<div class="ui bottom attached tab preview segment markdown"> <div class="ui bottom attached tab preview segment markdown emojify">
{{$.i18n.Tr "repo.release.loading"}} {{$.i18n.Tr "repo.release.loading"}}
</div> </div>
<div class="text right edit buttons"> <div class="text right edit buttons">