分类

TruthHun88 · TruthHun88 · commit 6e2afe0e5057 · 2018-03-27T21:58:24.000+08:00
diff --git a/controllers/BaseController.go b/controllers/BaseController.go
@@ -63,6 +63,7 @@ func (this *BaseController) Prepare() {
 				}
 			}
 		}
+
 	}
 	if this.Member.RoleName == "" {
 		this.Member.ResolveRoleName()
diff --git a/controllers/CateController.go b/controllers/CateController.go
@@ -0,0 +1,11 @@
+package controllers
+
+type CateController struct {
+	BaseController
+}
+
+//&#20998;&#31867;
+func (this *CateController) List() {
+	this.Data["IsCate"] = true
+	this.TplName = "cates/list.html"
+}
diff --git a/routers/router.go b/routers/router.go
@@ -105,6 +105,7 @@ func init() {
 	beego.Router("/tag/:key", &controllers.LabelController{}, "get:Index")
 	beego.Router("/tag", &controllers.LabelController{}, "get:List")
 	beego.Router("/tags", &controllers.LabelController{}, "get:List")
+	beego.Router("/cate", &controllers.CateController{}, "get:List")
 	beego.Router("/sitemap.html", &controllers.BaseController{}, "get:Sitemap")
 	beego.Router("/local-render", &controllers.LocalhostController{}, "get,post:RenderMarkdown")
 	beego.Router("/*", &controllers.BaseController{}, "get:StaticFile")
diff --git a/static/css/bookstack.css b/static/css/bookstack.css
@@ -1182,4 +1182,4 @@ li.L1, li.L3, li.L5, li.L7, li.L9{background-color: transparent;}
 .bookstack-bars li{border-bottom: 1px solid #efefef;}
 .bookstack-bars li:last-child{border-bottom:0px;}
 .bookstack-bars li:hover{background-color: #EFEFEF}
-.bookstack-bars li:hover a{color: #10af88}
+.bookstack-bars li:hover a{color: #10af88}
diff --git a/static/css/main.css b/static/css/main.css
@@ -709,4 +709,12 @@ a{color: #333}
 .category-manager .form-control{border-radius: 4px !important;}
 .category-manager .icon-category-small{cursor: pointer;}
 .category-manager .fa-minus-circle{cursor: pointer;font-size: 20px;}
-.category-manager .fa-plus-circle{cursor: pointer;font-size: 20px;color: #5cb85c;}
+.category-manager .fa-plus-circle{cursor: pointer;font-size: 20px;color: #5cb85c;}
+
+.row-cate{margin-top: 35px;margin-bottom: 15px;border: 1px solid red;height: 40px;overflow:hidden;}
+.row-cate .text-muted{margin-right: 15px;}
+.row-cate a{display: inline-block;padding: 7px 18px;border-radius: 4px;border:1px solid transparent;margin-bottom: 10px;text-decoration: none;}
+.row-cate a:hover,.row-cate a.active{color: #009a61;border:1px solid #efefef;font-weight: 400;}
+
+.row-cate-sub a{display: inline-block;text-align: center;}
+.row-cate-sub a img{width: 60px;height: 60px;border-radius: 4px;}
diff --git a/views/cates/list.html b/views/cates/list.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+&#20998;&#31867;
+</body>
+</html>
diff --git a/views/home/index.html b/views/home/index.html
@@ -6,10 +6,17 @@
 <body>
 <div class="manual-reader manual-container">
     {{template "widgets/header.html" .}}
-    <div class="container manual-body" style="overflow-x: hidden !important;;">
+    <div class="container manual-body">
+        <div class="row mgt-15px">
+            <div class="col-xs-12 mgt-15px">
+                <ul class="nav nav-tabs">
+                    <li class="active"><a href="{{urlfor "HomeController.Index"}}" title="&#31449;&#38271;&#25512;&#33616;">&#31449;&#38271;&#25512;&#33616;</a></li>
+                    <li><a href="{{urlfor "HomeController.Index"}}?tab=popular">&#28909;&#38376;&#20070;&#31821;</a></li>
+                    <li><a href="{{urlfor "HomeController.Index"}}?tab=latest">&#26368;&#26032;&#21457;&#24067;</a></li>
+                </ul>
+            </div>
+        </div>
         <div class="row">
-
-
             <div class="manual-list">
                 {{range $index,$item := .Lists}}
                 {{/*<div class="list-item">*/}}
diff --git a/views/widgets/header.html b/views/widgets/header.html
@@ -1,12 +1,15 @@
 <header class="navbar navbar-static-top navbar-fixed-top manual-header" role="banner">
     <div class="container">
-        <div class="navbar-header col-sm-12 col-md-7 col-lg-6">
+        <div class="navbar-header col-sm-12 col-md-8 col-lg-7">
             <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>
                         <a href="{{urlfor "HomeController.Index"}}" class="visible-xs" title="&#39318;&#39029;"><i class="fa fa-home"></i> &#39318;&#39029;</a>
                     </li>
+                    <li>
+                        <a href="{{urlfor "CateController.List"}}" class="visible-xs" title="&#20998;&#31867;"><i class="fa fa-tags"></i> &#20998;&#31867;</a>
+                    </li>
                     <li>
                         <a href="{{urlfor "LabelController.List"}}" class="visible-xs" title="&#26631;&#31614;"><i class="fa fa-tags"></i> &#26631;&#31614;</a>
                     </li>
@@ -51,6 +54,9 @@
                     <li {{if .IsHome}}class="active"{{end}}>
                         <a href="{{urlfor "HomeController.Index" }}" title="&#39318;&#39029;">&#39318;&#39029;</a>
                     </li>
+                    <li class="{{if .IsCate}}active{{end}}">
+                        <a href="{{urlfor "CateController.List" }}" title="&#26631;&#31614;">&#20998;&#31867;</a>
+                    </li>
                     <li class="{{if .IsLabel}}active{{end}}">
                         <a href="{{urlfor "LabelController.List" }}" title="&#26631;&#31614;">&#26631;&#31614;</a>
                     </li>

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ func (this *BaseController) Prepare() {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
	`66`	`+`
`66`	`67`	`}`
`67`	`68`	`if this.Member.RoleName == "" {`
`68`	`69`	`this.Member.ResolveRoleName()`