博客菜单

6 years ago · 8e201cbbc0
8 changed files with 41 additions and 25 deletions
--- a/controllers/BlogController.go
+++ b/controllers/BlogController.go
@ -44,3 +44,11 @@ func (this *BlogController) New() {
 func (this *BlogController) Blog1() {
 	this.TplName = "blog1.html"
 }
 func (this *BlogController) BlogsPage() {
 	blogs,_ := service.FindBlogs()
 	this.Data["Blogs"] = blogs
 	this.Data["IsBlog"] = true
 	this.TplName = "blogs.html"
 }
--- a/controllers/IndexController.go
+++ b/controllers/IndexController.go
@ -2,18 +2,13 @@ package controllers
 import (
 	"github.com/astaxie/beego"
 	"fmt"
 	"beeblog/service"
 )
 type IndexController struct {
 	beego.Controller
 }
-func (c *IndexController) Get() {
+func (this *IndexController) Get() {
-	blogs,_ := service.FindBlogs()
+	this.Redirect("blogs",302)
-	fmt.Println(blogs)
+	return
 	c.Data["Blogs"] = blogs
 	c.Data["IsHome"] = true
 	c.TplName = "index.html"
 }
--- a/data/beeblog.db
+++ b/data/beeblog.db
--- a/routers/BlogRouter.go
+++ b/routers/BlogRouter.go
@ -8,6 +8,7 @@ import (
 func init() {
 	beego.Router("/blog/new", &controllers.BlogController{}, "post:Save")
 	beego.Router("/blog/:id([0-9]+)", &controllers.BlogController{}, "get:Get")
 	beego.Router("/blogs", &controllers.BlogController{}, "get:BlogsPage")
 	beego.Router("/blog/new", &controllers.BlogController{}, "get:New")
 	beego.Router("/blog1", &controllers.BlogController{}, "get:Blog1")
 }
--- a/utils/PageUtil.go
+++ b/utils/PageUtil.go
@ -0,0 +1,19 @@
 package utils
 type Page struct {
 	PageNo     int
 	PageSize   int
 	TotalPage  int
 	TotalCount int
 	FirstPage  bool
 	LastPage   bool
 	List       interface{}
 }
 func PageUtil(count int, pageNo int, pageSize int, list interface{}) Page {
 	tp := count / pageSize
 	if count % pageSize > 0 {
 		tp = count / pageSize + 1
 	}
 	return Page{PageNo: pageNo, PageSize: pageSize, TotalPage: tp, TotalCount: count, FirstPage: pageNo == 1, LastPage: pageNo == tp, List: list}
 }
--- a/views/T.nav.tpl
+++ b/views/T.nav.tpl
@ -7,13 +7,16 @@
            </div>
            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                <ul class="nav navbar-nav">
-                    <li class="active">
+                    <li {{if .IsHome}} class="active" {{end}}>
-                        <a href="/" target="_blank">首页 </a>
+                        <a href="/">首页 </a>
                    </li>
                    <li {{if .IsBlog}} class="active" {{end}}>
                        <a href="/blogs" target="_blank">博客 </a>
                    </li>
                    <li>
                        <a href="/note" target="_blank">笔记</a>
                    </li>
-                    <li>
+                    <li {{if .IsMap}} class="active" {{end}}>
                        <a href="/map" target="_blank">地图</a>
                    </li>
                </ul>
--- a/views/blog.html
+++ b/views/blog.html
@ -1,14 +0,0 @@
 {{template "header"}}
 <title>博客 - 个人随笔</title>
 <link type="text/css" rel="styleSheet" href="/static/css/newblog.css"/>
 </head>
 <body>
 <div class="root-container">
 {{template "nav" .}}
    <div class="blog-root">
        <h1>{{.Blog.Title}}</h1>
    </div>
 </div>
 </body>
 </html>
--- a/views/blogs.html
+++ b/views/blogs.html
@ -58,6 +58,10 @@
            <hr style="height:1px;border:none;border-top:1px solid #EEE;"/>
        </div>
        {{end}}
        <div>
        </div>
 </body>
        <script>
            // $(function () {