lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-06-28 15:45:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复二级子目录BUG

Browse Source
This commit is contained in:
Minho 2018-03-25 19:33:37 +08:00
parent 3e3aafa77d
commit 970e77f71c
9 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/enumerate.go
View File

@ -80,7 +80,7 @@ func GetDatabasePrefix() string {
//获取默认头像 //获取默认头像
func GetDefaultAvatar() string { func GetDefaultAvatar() string {
return beego.AppConfig.DefaultString("avatar", "/static/images/headimgurl.jpg") return URLForWithCdnImage(beego.AppConfig.DefaultString("avatar", "/static/images/headimgurl.jpg"))
} }
//获取阅读令牌长度. //获取阅读令牌长度.
@ -90,7 +90,7 @@ func GetTokenSize() int {
//获取默认文档封面. //获取默认文档封面.
func GetDefaultCover() string { func GetDefaultCover() string {
return beego.AppConfig.DefaultString("cover", "/static/images/book.jpg") return URLForWithCdnImage(beego.AppConfig.DefaultString("cover", "/static/images/book.jpg"))
} }
//获取允许的商城文件的类型. //获取允许的商城文件的类型.

4
controllers/ManagerController.go
View File

@ -56,6 +56,10 @@ func (c *ManagerController) Users() {
if totalCount > 0 { if totalCount > 0 {
pager := pagination.NewPagination(c.Ctx.Request, totalCount, conf.PageSize, c.BaseUrl()) pager := pagination.NewPagination(c.Ctx.Request, totalCount, conf.PageSize, c.BaseUrl())
c.Data["PageHtml"] = pager.HtmlPages() c.Data["PageHtml"] = pager.HtmlPages()
for _,item := range members {
item.Avatar = conf.URLForWithCdnImage(item.Avatar)
}
} else { } else {
c.Data["PageHtml"] = "" c.Data["PageHtml"] = ""
} }

2
routers/filter.go
View File

@ -24,7 +24,7 @@ func init() {
ctx.ResponseWriter.Write(returnJSON) ctx.ResponseWriter.Write(returnJSON)
} else { } else {
ctx.Redirect(302, beego.URLFor("AccountController.Login") + "?url=" + url.PathEscape(ctx.Request.URL.RequestURI())) ctx.Redirect(302, conf.URLFor("AccountController.Login") + "?url=" + url.PathEscape(conf.BaseUrl + ctx.Request.URL.RequestURI()))
} }
} }
} }

6
views/account/register.tpl
View File

@ -7,12 +7,12 @@
<meta name="renderer" content="webkit" /> <meta name="renderer" content="webkit" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="author" content="SmartWiki" /> <meta name="author" content="SmartWiki" />
<title>用户登录 - Powered by MinDoc</title> <title>用户注册 - Powered by MinDoc</title>
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet"> <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
<link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet"> <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
<link href="/static/css/main.css" rel="stylesheet"> <link href="{{cdncss "/static/css/main.css"}}" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -26,7 +26,7 @@
<header class="navbar navbar-static-top smart-nav navbar-fixed-top manual-header" role="banner"> <header class="navbar navbar-static-top smart-nav navbar-fixed-top manual-header" role="banner">
<div class="container"> <div class="container">
<div class="navbar-header col-sm-12 col-md-6 col-lg-5"> <div class="navbar-header col-sm-12 col-md-6 col-lg-5">
<a href="/" class="navbar-brand">{{.SITE_NAME}}</a> <a href="{{.BaseUrl}}" class="navbar-brand">{{.SITE_NAME}}</a>
</div> </div>
</div> </div>
</header> </header>

2
views/book/dashboard.tpl
View File

@ -59,7 +59,7 @@
<div class="dashboard"> <div class="dashboard">
<div class="pull-left" style="width: 200px;margin-bottom: 15px;"> <div class="pull-left" style="width: 200px;margin-bottom: 15px;">
<div class="book-image"> <div class="book-image">
<img src="{{.Model.Cover}}" onerror="this.src='{{cdnimg "/static/images/book.jpg"}}'" style="border: 1px solid #666"> <img src="{{cdnimg .Model.Cover}}" onerror="this.src='{{cdnimg "/static/images/book.jpg"}}'" style="border: 1px solid #666">
</div> </div>
</div> </div>

30
views/document/compare.tpl
View File

@ -5,22 +5,22 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>文档比较 - Powered by MinDoc</title> <title>文档比较 - Powered by MinDoc</title>
<link rel="shortcut icon" href="{{cdnimg "/favicon.ico"}}" /> <link rel="shortcut icon" href="{{cdnimg "/favicon.ico"}}" />
<link href="/static/fonts/notosans.css" rel='stylesheet' type='text/css' /> <link href="{{cdncss "/static/fonts/notosans.css"}}" rel='stylesheet' type='text/css' />
<script type="text/javascript" src="/static/jquery/1.12.4/jquery.min.js"></script> <link type='text/css' rel='stylesheet' href="{{cdncss "/static/mergely/editor/lib/wicked-ui.css"}}" />
<link type='text/css' rel='stylesheet' href='/static/mergely/editor/lib/wicked-ui.css' /> <link type='text/css' rel='stylesheet' href="{{cdncss "/static/mergely/editor/lib/tipsy/tipsy.css"}}" />
<script type="text/javascript" src="/static/mergely/editor/lib/wicked-ui.js"></script> <link type="text/css" rel="stylesheet" href="{{cdncss "/static/mergely/editor/lib/farbtastic/farbtastic.css"}}" />
<link type="text/css" rel="stylesheet" href="{{cdncss "/static/mergely/lib/codemirror.css"}}" />
<link type="text/css" rel="stylesheet" href="{{cdncss "/static/mergely/lib/mergely.css"}}" />
<link type='text/css' rel='stylesheet' href="{{cdncss "/static/mergely/editor/editor.css"}}" />
<link type='text/css' rel='stylesheet' href='/static/mergely/editor/lib/tipsy/tipsy.css' /> <script type="text/javascript" src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
<script type="text/javascript" src="/static/mergely/editor/lib/tipsy/jquery.tipsy.js"></script> <script type="text/javascript" src="{{cdnjs "/static/mergely/editor/lib/wicked-ui.js"}}"></script>
<script type="text/javascript" src="/static/mergely/editor/lib/farbtastic/farbtastic.js"></script> <script type="text/javascript" src="{{cdnjs "/static/mergely/editor/lib/tipsy/jquery.tipsy.js"}}"></script>
<link type="text/css" rel="stylesheet" href="/static/mergely/editor/lib/farbtastic/farbtastic.css" /> <script type="text/javascript" src="{{cdnjs "/static/mergely/editor/lib/farbtastic/farbtastic.js"}}"></script>
<script type="text/javascript" src="/static/mergely/lib/codemirror.min.js"></script> <script type="text/javascript" src="{{cdnjs "/static/mergely/lib/codemirror.min.js"}}"></script>
<script type="text/javascript" src="/static/mergely/lib/mergely.min.js"></script> <script type="text/javascript" src="{{cdnjs "/static/mergely/lib/mergely.min.js"}}"></script>
<script type="text/javascript" src="/static/mergely/editor/editor.js"></script> <script type="text/javascript" src="{{cdnjs "/static/mergely/editor/editor.js"}}"></script>
<link type="text/css" rel="stylesheet" href="/static/mergely/lib/codemirror.css" /> <script type="text/javascript" src="{{cdnjs "/static/mergely/lib/searchcursor.js"}}"></script>
<link type="text/css" rel="stylesheet" href="/static/mergely/lib/mergely.css" />
<link type='text/css' rel='stylesheet' href='/static/mergely/editor/editor.css' />
<script type="text/javascript" src="/static/mergely/lib/searchcursor.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var key = ''; var key = '';
// var isSample = key === 'usaindep'; // var isSample = key === 'usaindep';

2
views/document/kancloud_read_template.tpl
View File

@ -172,7 +172,7 @@
<script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script> <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script> <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
<script src="{{cdnjs "/static/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script> <script src="{{cdnjs "/static/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script>
<script src="/static/jquery/plugins/imgbox/jquery.imgbox.pack.js"></script> <script src="{{cdnjs "/static/jquery/plugins/imgbox/jquery.imgbox.pack.js"}}"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$("#sidebar").jstree({ $("#sidebar").jstree({

16
views/manager/users.tpl
View File

@ -8,10 +8,10 @@
<title>用户管理 - Powered by MinDoc</title> <title>用户管理 - Powered by MinDoc</title>
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="{{cdncss "/static/bootstrap/css/bootstrap.min.css"}}" rel="stylesheet">
<link href="/static/font-awesome/css/font-awesome.min.css" rel="stylesheet"> <link href="{{cdncss "/static/font-awesome/css/font-awesome.min.css"}}" rel="stylesheet">
<link href="/static/css/main.css" rel="stylesheet"> <link href="{{cdncss "/static/css/main.css"}}" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -205,11 +205,11 @@
</form> </form>
</div> </div>
</div><!--END Modal--> </div><!--END Modal-->
<script src="{{cdncss "/static/jquery/1.12.4/jquery.min.js"}}"></script> <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
<script src="{{cdncss "/static/bootstrap/js/bootstrap.min.js"}}"></script> <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
<script src="{{cdncss "/static/vuejs/vue.min.js"}}"></script> <script src="{{cdnjs "/static/vuejs/vue.min.js"}}"></script>
<script src="{{cdncss "/static/js/jquery.form.js"}}" type="text/javascript"></script> <script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
<script src="{{cdncss "/static/js/main.js"}}" type="text/javascript"></script> <script src="{{cdnjs "/static/js/main.js"}}" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
$("#addMemberDialogModal").on("show.bs.modal",function () { $("#addMemberDialogModal").on("show.bs.modal",function () {

4
views/template.tpl
View File

@ -78,7 +78,7 @@
</div> </div>
</div> </div>
</div> </div>
<script src="/static/jquery/1.12.4/jquery.min.js"></script> <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
<script src="/static/bootstrap/js/bootstrap.min.js"></script> <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
</body> </body>
</html> </html>