浏览代码

增加cdn路径生成

Minho 8 年之前
父节点
当前提交
701121c85e

+ 19 - 8
controllers/document.go

@@ -650,9 +650,18 @@ func (c *DocumentController) Export() {
 		c.Redirect(beego.URLFor("AccountController.Login"),302)
 		return
 	}
-	book := isReadable(identify,token,c)
-
-	docs, err := models.NewDocument().FindListByBookId(book.BookId)
+	bookResult := models.NewBookResult()
+	if c.Member != nil && c.Member.Role == conf.MemberSuperRole {
+		book,err := models.NewBook().FindByIdentify(identify)
+		if err != nil {
+			beego.Error(err)
+			c.Abort("500")
+		}
+		bookResult = book.ToBookResult()
+	}else {
+		bookResult = isReadable(identify, token, c)
+	}
+	docs, err := models.NewDocument().FindListByBookId(bookResult.BookId)
 
 	if err != nil {
 		beego.Error(err)
@@ -669,18 +678,18 @@ func (c *DocumentController) Export() {
 			c.Data["ErrorCode"] = 50010
 			return
 		}
-		dpath := "cache/" + book.Identify
+		dpath := "cache/" + bookResult.Identify
 
 		os.MkdirAll(dpath, 0766)
 
 		pathList := list.New()
 
-		RecursiveFun(0, "", dpath, c, book, docs, pathList)
+		RecursiveFun(0, "", dpath, c, bookResult, docs, pathList)
 
-		//defer os.RemoveAll(dpath)
+		defer os.RemoveAll(dpath)
 
 		os.MkdirAll("./cache", 0766)
-		pdfpath := "cache/" + identify + ".pdf"
+		pdfpath := "cache/" + identify + "_" + c.CruSession.SessionID() + ".pdf"
 
 		if _,err := os.Stat(pdfpath); os.IsNotExist(err){
 			paths := make([]string, len(docs))
@@ -697,10 +706,12 @@ func (c *DocumentController) Export() {
 
 		c.Ctx.Output.Download(pdfpath, identify + ".pdf")
 
+		defer os.Remove(pdfpath)
+
 		c.StopRun()
 	}
 
-	c.StopRun()
+	c.Abort("404")
 }
 
 //递归生成文档序列数组.

+ 1 - 1
static/css/kancloud.css

@@ -78,6 +78,7 @@ h6 {
 .m-manual.manual-reader .manual-head .slidebar {
     display: none
 }
+
 .m-manual .manual-head {
     min-width: 980px;
     height: 54px;
@@ -859,7 +860,6 @@ h6 {
         min-width: initial
     }
 
-
     .m-manual.manual-reader .manual-head {
         min-width: initial
     }

+ 24 - 1
static/css/main.css

@@ -53,6 +53,9 @@ textarea{
     font-weight: 500;
     color: #563d7c
 }
+.manual-reader .slidebar {
+    margin: 5px 10px 0 0;
+}
 .user-info{
     border: 0;
     background-color: #ffffff;
@@ -108,6 +111,7 @@ textarea{
     background-color: #f5f5f5;
     border-right: 1px solid #eaeaea
 }
+
 .manual-body .page-left .menu {
     padding: 18px 0
 }
@@ -138,8 +142,10 @@ textarea{
 }
 .manual-body .page-right {
     padding: 15px 0 15px 24px;
-    margin-left: 200px
+    margin-left: 200px;
+    min-width: 400px;
 }
+
 .manual-body .page-right .box-head{
     border-bottom: 1px solid #DDDDD9;
 }
@@ -534,6 +540,23 @@ textarea{
 .footer li a:hover {
     color: #2b85ae
 }
+@media screen and (max-width: 840px) {
+    .manual-body .page-left{
+        display: none;
+    }
+    .manual-body .page-right {
+        margin-left: 0;
+    }
+    .manual-body .page-right .box-body .form-right{
+        display: none;
+    }
+    .manual-body .page-right .box-body{
+        padding-right: 0 !important;
+    }
+    .footer .container .row{
+        margin-left: 0;
+    }
+}
 
 
 

+ 8 - 7
views/book/dashboard.tpl

@@ -8,10 +8,10 @@
     <title>概要 - Powered by MinDoc</title>
 
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.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="/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 -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
@@ -83,10 +83,11 @@
                             <span class="title">担任角色:</span>
                             <span class="body">{{.Model.RoleName}}</span>
                         </div>
-                       {{/* <div class="list">
+                       <!-- {{/* <div class="list">
                             <span class="title">评论数量:</span>
                             <span class="body">{{.Model.CommentCount}} 条</span>
                         </div>*/}}
+                        -->
                     <div class="list">
                         <span class="title">文档标签:</span>
                         <span class="body">{{.Model.Label}}</span>
@@ -100,9 +101,9 @@
     </div>
     {{template "widgets/footer.tpl" .}}
 </div>
-<script src="/static/jquery/1.12.4/jquery.min.js"></script>
-<script src="/static/bootstrap/js/bootstrap.min.js"></script>
-<script src="/static/layer/layer.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/layer/layer.js"}}"></script>
 <script src="/static/js/main.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(function () {

+ 3 - 1
views/book/index.tpl

@@ -140,6 +140,7 @@
                     </div>
                     <div class="clearfix"></div>
                 </div>
+                <!--
 				{{/*
                 <div class="form-group">
                     <div class="col-lg-3">
@@ -165,6 +166,7 @@
                     <div class="clearfix"></div>
                 </div>
 				*/}}
+				-->
                 <div class="clearfix"></div>
             </div>
             <div class="modal-footer">
@@ -181,7 +183,7 @@
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}" type="text/javascript"></script>
 <script src="{{cdnjs "/static/vuejs/vue.min.js"}}" type="text/javascript"></script>
 <script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
-<script src="{{cdnjs "/static/js/main.js"}}" type="text/javascript"></script>
+<script src="/static/js/main.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(function () {
         $("#addBookDialogForm").ajaxForm({

+ 11 - 9
views/book/setting.tpl

@@ -8,10 +8,10 @@
     <title>设置 - Powered by MinDoc</title>
 
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-    <link href="/static/webuploader/webuploader.css" rel="stylesheet">
-    <link href="/static/cropper/2.3.4/cropper.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/webuploader/webuploader.css"}}" rel="stylesheet">
+    <link href="{{cdncss "/static/cropper/2.3.4/cropper.min.css"}}" rel="stylesheet">
     <link href="/static/css/main.css" rel="stylesheet">
     <!-- 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:// -->
@@ -83,6 +83,7 @@
                                     </label>
                                 </div>
                             </div>
+                            <!--
                             {{/*
                             <div class="form-group">
                             <label>开启评论</label>
@@ -102,6 +103,7 @@
                     </div>
                 </div>
                 */}}
+                -->
                 {{if eq .Model.PrivatelyOwned 1}}
                 <div class="form-group">
                     <label>访问令牌</label>
@@ -264,11 +266,11 @@
     </div>
 </div>
 
-<script src="/static/jquery/1.12.4/jquery.min.js" type="text/javascript"></script>
-<script src="/static/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-<script src="/static/webuploader/webuploader.min.js" type="text/javascript"></script>
-<script src="/static/cropper/2.3.4/cropper.min.js" type="text/javascript"></script>
-<script src="/static/js/jquery.form.js" type="text/javascript"></script>
+<script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/webuploader/webuploader.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/cropper/2.3.4/cropper.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
 <script src="/static/js/main.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(function () {

+ 6 - 6
views/book/users.tpl

@@ -8,8 +8,8 @@
     <title>成员 - Powered by MinDoc</title>
 
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.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="/static/css/main.css" rel="stylesheet">
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -131,10 +131,10 @@
         </form>
     </div>
 </div><!--END Modal-->
-<script src="/static/jquery/1.12.4/jquery.min.js"></script>
-<script src="/static/bootstrap/js/bootstrap.min.js"></script>
-<script src="/static/vuejs/vue.min.js"></script>
-<script src="/static/js/jquery.form.js" type="text/javascript"></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/vuejs/vue.min.js"}}"></script>
+<script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
 <script src="/static/js/main.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(function () {

+ 12 - 12
views/document/default_read.tpl

@@ -8,17 +8,17 @@
     <title>{{.Model.BookName}} - Powered by MinDoc</title>
 
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-    <link href="/static/jstree/3.3.4/themes/default/style.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/jstree/3.3.4/themes/default/style.min.css"}}" rel="stylesheet">
 
-    <link href="/static/nprogress/nprogress.css" rel="stylesheet">
+    <link href="{{cdncss "/static/nprogress/nprogress.css"}}" rel="stylesheet">
     <link href="/static/css/kancloud.css" rel="stylesheet">
     <link href="/static/css/jstree.css" rel="stylesheet">
     {{if eq .Model.Editor "markdown"}}
-    <link href="/static/editor.md/css/editormd.preview.css" rel="stylesheet">
+    <link href="{{cdncss "/static/editor.md/css/editormd.preview.css"}}" rel="stylesheet">
     {{else}}
-    <link href="/static/highlight/styles/zenburn.css" rel="stylesheet">
+    <link href="{{cdncss "/static/highlight/styles/zenburn.css"}}" rel="stylesheet">
     {{end}}
     <!-- 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:// -->
@@ -188,12 +188,12 @@
         </div>
     </div>
 </div>
-<script src="/static/jquery/1.12.4/jquery.min.js"></script>
-<script src="/static/bootstrap/js/bootstrap.min.js"></script>
-<script src="/static/jstree/3.3.4/jstree.min.js" type="text/javascript"></script>
-<script type="text/javascript" src="/static/nprogress/nprogress.js"></script>
-<script type="text/javascript" src="/static/highlight/highlight.js"></script>
-<script type="text/javascript" src="/static/highlight/highlightjs-line-numbers.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/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script>
+<script type="text/javascript" src="{{cdnjs "/static/nprogress/nprogress.js"}}"></script>
+<script type="text/javascript" src="{{cdnjs "/static/highlight/highlight.js"}}"></script>
+<script type="text/javascript" src="{{cdnjs "/static/highlight/highlightjs-line-numbers.min.js"}}"></script>
 <script type="text/javascript">
     var events = $("body");
     var catalog = null;

+ 9 - 9
views/document/html_edit_template.tpl

@@ -121,15 +121,15 @@
         </form>
     </div>
 </div>
-<script src="/static/jquery/1.12.4/jquery.min.js"></script>
-<script src="/static/bootstrap/js/bootstrap.min.js"></script>
-<script src="/static/jstree/3.3.4/jstree.min.js" type="text/javascript"></script>
-<script src="/static/wangEditor/js/wangEditor.min.js" type="text/javascript"></script>
-<script src="/static/wangEditor/plugins/save-menu.js" type="text/javascript"></script>
-<script src="/static/wangEditor/plugins/release-menu.js" type="text/javascript"></script>
-<script type="text/javascript" src="/static/layer/layer.js"></script>
-<script src="/static/to-markdown/dist/to-markdown.js" type="text/javascript"></script>
-<script src="/static/js/jquery.form.js" type="text/javascript"></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/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/wangEditor/js/wangEditor.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/wangEditor/plugins/save-menu.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/wangEditor/plugins/release-menu.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/layer/layer.js"}}" type="text/javascript" ></script>
+<script src="{{cdnjs "/static/to-markdown/dist/to-markdown.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
 <script src="/static/js/editor.js" type="text/javascript"></script>
 <script src="/static/js/html-editor.js" type="text/javascript"></script>
 </body>

+ 2 - 2
views/document/kancloud_read_template.tpl

@@ -25,7 +25,7 @@
         <div class="container-fluid">
             <div class="navbar-header pull-left manual-title">
                 <span class="slidebar" id="slidebar"><i class="fa fa-align-justify"></i></span>
-                SmartWiki帮助手册
+
                 <span style="font-size: 12px;font-weight: 100;">v 0.1.1</span>
             </div>
             <div class="navbar-header pull-right manual-menu">
@@ -61,7 +61,7 @@
             </div>
             <div class="m-copyright">
                 <p>
-                    本文档使用 <a href="https://doc.iminho.me" target="_blank">MinDoc</a> 发布
+                    本文档使用 <a href="https://www.iminho.me" target="_blank">MinDoc</a> 发布
                 </p>
             </div>
         </div>

+ 8 - 7
views/home/index.tpl

@@ -5,13 +5,14 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>用户中心 - Powered by MinDoc</title>
-
+    <title>网站首页 - Powered by MinDoc</title>
+    <meta name="author" content="Minho" />
+    <meta name="site" content="https://www.iminho.me" />
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.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="/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 -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
@@ -52,7 +53,7 @@
     </div>
     {{template "widgets/footer.tpl" .}}
 </div>
-<script src="/static/jquery/1.12.4/jquery.min.js"></script>
-<script src="/static/bootstrap/js/bootstrap.min.js"></script>
+<script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}" type="text/javascript"></script>
 </body>
 </html>

+ 1 - 1
views/manager/books.tpl

@@ -104,7 +104,7 @@
 <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
 <script src="{{cdnjs "/static/vuejs/vue.min.js"}}" type="text/javascript"></script>
 <script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
-<script src="{{cdnjs "/static/js/main.js"}}" type="text/javascript"></script>
+<script src="/static/js/main.js" type="text/javascript"></script>
 
 </body>
 </html>

+ 9 - 9
views/manager/edit_book.tpl

@@ -8,10 +8,10 @@
     <title>编辑项目 - Powered by MinDoc</title>
 
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-    <link href="/static/webuploader/webuploader.css" rel="stylesheet">
-    <link href="/static/cropper/2.3.4/cropper.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/webuploader/webuploader.css"}}" rel="stylesheet">
+    <link href="{{cdncss "/static/cropper/2.3.4/cropper.min.css"}}" rel="stylesheet">
     <link href="/static/css/main.css" rel="stylesheet">
     <!-- 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:// -->
@@ -213,11 +213,11 @@
         </form>
     </div>
 </div>
-<script src="/static/jquery/1.12.4/jquery.min.js" type="text/javascript"></script>
-<script src="/static/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-<script src="/static/webuploader/webuploader.min.js" type="text/javascript"></script>
-<script src="/static/cropper/2.3.4/cropper.min.js" type="text/javascript"></script>
-<script src="/static/js/jquery.form.js" type="text/javascript"></script>
+<script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/webuploader/webuploader.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/cropper/2.3.4/cropper.min.js"}}" type="text/javascript"></script>
+<script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
 <script src="/static/js/main.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(function () {

+ 6 - 5
views/manager/index.tpl

@@ -8,8 +8,8 @@
     <title>用户中心 - Powered by MinDoc</title>
 
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.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="/static/css/main.css" rel="stylesheet">
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -55,13 +55,14 @@
                         <span class="fa-class">会员数量</span>
                         <span class="fa-class">{{.Model.MemberNumber}}</span>
                     </div>
+                    <!--
                     {{/*
                     <div class="dashboard-item">
                         <span class="fa fa-comments-o" aria-hidden="true"></span>
                         <span class="fa-class">评论数量</span>
                         <span class="fa-class">{{.Model.CommentNumber}}</span>
                     </div>
-                */}}
+                */}}-->
                     <div class="dashboard-item">
                         <span class="fa fa-cloud-download" aria-hidden="true"></span>
                         <span class="fa-class">附件数量</span>
@@ -72,7 +73,7 @@
         </div>
     </div>
 </div>
-<script src="/static/jquery/1.12.4/jquery.min.js"></script>
-<script src="/static/bootstrap/js/bootstrap.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>
 </body>
 </html>

+ 4 - 4
views/search/index.tpl

@@ -8,8 +8,8 @@
     <title>搜索 - Powered by MinDoc</title>
 
     <!-- Bootstrap -->
-    <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/static/font-awesome/css/font-awesome.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="/static/css/main.css" rel="stylesheet">
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -56,7 +56,7 @@
     </div>
     {{template "widgets/footer.tpl" .}}
 </div>
-<script src="/static/jquery/1.12.4/jquery.min.js"></script>
-<script src="/static/bootstrap/js/bootstrap.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>
 </body>
 </html>

+ 14 - 9
views/widgets/header.tpl

@@ -16,29 +16,34 @@
                     </button>
                 </form>
             </div>
-            {{/*
+
             <div class="btn-group dropdown-menu-right pull-right slidebar visible-xs-inline-block visible-sm-inline-block">
                 <button class="btn btn-default dropdown-toggle hidden-lg" type="button" data-toggle="dropdown"><i class="fa fa-align-justify"></i></button>
                 <ul class="dropdown-menu" role="menu">
-                    <li class="active"><a href="https://wiki.iminho.me/member/projects" class="item"><i class="fa fa-sitemap"></i> 我的项目</a> </li>
-                    <li><a href="https://wiki.iminho.me/member" class="item"><i class="fa fa-user"></i> 个人资料</a> </li>
-                    <li><a href="https://wiki.iminho.me/member/account" class="item"><i class="fa fa-lock"></i> 修改密码</a> </li>
-                    <li><a href="https://wiki.iminho.me/member/setting" class="item"><i class="fa fa-gear"></i> 开发配置</a> </li>
-                    <li><a href="https://wiki.iminho.me/setting/site" class="item"><i class="fa fa-cogs"></i> 网站设置</a> </li>
-                    <li><a href="https://wiki.iminho.me/member/users" class="item"><i class="fa fa-group"></i> 用户管理</a> </li>
+                    <li>
+                        <a href="{{urlfor "SettingController.Index"}}" title="个人中心"><i class="fa fa-user" aria-hidden="true"></i> 个人中心</a>
+                    </li>
+                    <li>
+                        <a href="{{urlfor "BookController.Index"}}" title="我的项目"><i class="fa fa-book" aria-hidden="true"></i> 我的项目</a>
+                    </li>
+                    {{if eq .Member.Role 0 }}
+                    <li>
+                        <a href="{{urlfor "ManagerController.Index"}}" title="管理后台"><i class="fa fa-university" aria-hidden="true"></i> 管理后台</a>
+                    </li>
+                    {{end}}
                     <li>
                         <a href="{{urlfor "AccountController.Logout"}}" title="退出登录"><i class="fa fa-sign-out"></i> 退出登录</a>
                     </li>
                 </ul>
             </div>
-        */}}
+
         </div>
         <nav class="navbar-collapse hidden-xs hidden-sm" role="navigation">
             <ul class="nav navbar-nav navbar-right">
                 {{if gt .Member.MemberId 0}}
                 <li>
                     <div class="img user-info" data-toggle="dropdown">
-                        <img src="{{.Member.Avatar}}" class="img-circle userbar-avatar">
+                        <img src="{{cdnimg .Member.Avatar}}" class="img-circle userbar-avatar" alt="{{.Member.Account}}">
                         <div class="userbar-content">
                             <span>{{.Member.Account}}</span>
                             <div>{{.Member.RoleName}}</div>