diff --git a/README.md b/README.md index a181dd5..f36cf89 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## 1. Introduction -Leanote, your own cloud note. +Leanote, note just a notebook! **Some Features** @@ -109,7 +109,7 @@ Please fork this repository and contribute back using [pull requests](https://gi ## 1. 介绍 -Leanote, 你的私人云笔记! +Leanote, 不只是笔记! **特性** @@ -214,6 +214,6 @@ $> sudo sh run.sh leanote还有很多问题, 如果你喜欢它, 欢迎加入我们一起完善leanote. ## 讨论 -* [leanote bbs](http://bbs.leanote.com) -* [leanote google group](https://groups.google.com/forum/#!forum/leanote) +* [leanote 社区](http://bbs.leanote.com) * QQ群158716820 +* [leanote google group](https://groups.google.com/forum/#!forum/leanote) diff --git a/app/controllers/LeaController.go b/app/controllers/LeaController.go deleted file mode 100644 index 386b120..0000000 --- a/app/controllers/LeaController.go +++ /dev/null @@ -1,52 +0,0 @@ -package controllers - -import ( - "github.com/revel/revel" -// "encoding/json" - . "github.com/leanote/leanote/app/lea" -// "github.com/leanote/leanote/app/types" -// "io/ioutil" -// "math" -// "os" -// "path" -) - -// lea++博客平台 -type Lea struct { - BaseController -} - -// 进入某个用户的博客 -func (c Lea) Index(tag, keywords string) revel.Result { - c.RenderArgs["nav"] = "recommend" - return c.p(tag, keywords, true) -} - -func (c Lea) Latest(tag, keywords string) revel.Result { - c.RenderArgs["nav"] = "latest" - return c.p(tag, keywords, false); -} - -func (c Lea) p(tag, keywords string, recommend bool) revel.Result { - var tags = []string{} - if recommend { - tags = configService.GetGlobalArrayConfig("recommendTags") - } else { - tags = configService.GetGlobalArrayConfig("newTags") - } - // 如果不在所在的tag就不能搜索 - if !InArray(tags, tag) { - tag = "" - } - c.RenderArgs["tag"] = tag - - page := c.GetPage() - pageInfo, blogs := blogService.ListAllBlogs(tag, keywords, recommend, page, 10, "UpdatedTime", false) - - c.RenderArgs["pageInfo"] = pageInfo - c.RenderArgs["blogs"] = blogs - c.RenderArgs["tags"] = tags - c.RenderArgs["keywords"] = keywords - - return c.RenderTemplate("lea/index.html"); -} \ No newline at end of file diff --git a/app/lea/session/session.go b/app/lea/session/session.go index 8f57e38..a5990a1 100644 --- a/app/lea/session/session.go +++ b/app/lea/session/session.go @@ -2,7 +2,7 @@ package session import ( "github.com/robfig/revel" - "leanote/app/lea/memcache" + "github.com/leanote/leanote/app/lea/memcache" // . "leanote/app/lea" ) diff --git a/app/views/Admin/header.html b/app/views/Admin/header.html index 3aa95c7..acb71fe 100644 --- a/app/views/Admin/header.html +++ b/app/views/Admin/header.html @@ -5,7 +5,7 @@ - + {{.title}} diff --git a/app/views/Blog/header.html b/app/views/Blog/header.html index d33314c..44552cd 100644 --- a/app/views/Blog/header.html +++ b/app/views/Blog/header.html @@ -5,7 +5,7 @@ - + {{.title}} diff --git a/app/views/Blog/set.html b/app/views/Blog/set.html index 9f3308f..6111643 100644 --- a/app/views/Blog/set.html +++ b/app/views/Blog/set.html @@ -126,7 +126,7 @@
+ placeholder="eg: leanote, {{msg $ "moto"}}">
diff --git a/app/views/Home/header.html b/app/views/Home/header.html index f5c17ee..b4cf595 100644 --- a/app/views/Home/header.html +++ b/app/views/Home/header.html @@ -5,7 +5,7 @@ - + {{.title}} @@ -27,7 +27,7 @@ function log(o) {

- +

diff --git a/app/views/Home/header_box.html b/app/views/Home/header_box.html index 0a4698c..c879821 100644 --- a/app/views/Home/header_box.html +++ b/app/views/Home/header_box.html @@ -5,7 +5,7 @@ - + {{.title}} diff --git a/app/views/Lea/footer.html b/app/views/Lea/footer.html deleted file mode 100644 index f5cbae9..0000000 --- a/app/views/Lea/footer.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/views/Lea/header.html b/app/views/Lea/header.html deleted file mode 100644 index 21befea..0000000 --- a/app/views/Lea/header.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - -lea++, leanote博客平台 - - - - - \ No newline at end of file diff --git a/app/views/Lea/index.html b/app/views/Lea/index.html deleted file mode 100644 index dd37a1a..0000000 --- a/app/views/Lea/index.html +++ /dev/null @@ -1,95 +0,0 @@ -{{template "lea/header.html" .}} -{{if eq .nav "recommend"}} - {{set $ "baseUrl" "/lea/index" }} -{{else}} - {{set $ "baseUrl" "/lea/latest" }} -{{end}} -
- - - - - - -
- - - - - - -{{template "lea/footer.html" .}} \ No newline at end of file diff --git a/app/views/Lea/page.html b/app/views/Lea/page.html deleted file mode 100644 index 68b46b8..0000000 --- a/app/views/Lea/page.html +++ /dev/null @@ -1,33 +0,0 @@ -{{if gt .pageInfo.TotalPage 1}} - -{{end}} \ No newline at end of file diff --git a/app/views/Note/note-dev.html b/app/views/Note/note-dev.html index c2a8082..013a465 100644 --- a/app/views/Note/note-dev.html +++ b/app/views/Note/note-dev.html @@ -5,8 +5,8 @@ - -leanote, your own cloud note + +leanote, {{msg $ "moto"}} @@ -164,10 +164,6 @@ function log(o) { -
- lea++ -
-
{{msg . "myBlog"}} diff --git a/app/views/Note/note.html b/app/views/Note/note.html index b464886..33affa7 100755 --- a/app/views/Note/note.html +++ b/app/views/Note/note.html @@ -5,8 +5,8 @@ - -leanote, your own cloud note + +leanote, {{msg $ "moto"}} diff --git a/messages/msg.en b/messages/msg.en index d013452..d339b40 100644 --- a/messages/msg.en +++ b/messages/msg.en @@ -1,5 +1,5 @@ # leanote -moto=your own cloud note! +moto=Not Just A Notebook! moto2=Knowledge, Sharing, Cooperation, Blog... all in leanote moto3=Brief But Not Simple fork github=Fork leanote on Github diff --git a/messages/msg.zh b/messages/msg.zh index 52cf557..f18d45c 100644 --- a/messages/msg.zh +++ b/messages/msg.zh @@ -1,5 +1,5 @@ # leanote -moto=你的私人云笔记! +moto=不只是笔记! moto2=知识管理, 博客, 分享, 协作... 尽在leanote moto3=简约而不简单 fork github=Github 源码