diff --git a/app/views/admin/top.html b/app/views/admin/top.html index aaff7da..8948162 100644 --- a/app/views/admin/top.html +++ b/app/views/admin/top.html @@ -84,7 +84,7 @@ </section> <footer class="footer lt hidden-xs b-t b-light" style="min-height: initial; padding: 10px 15px;text-align:center;"> - <a href="http://leanote.com" target="_blank">leanote</a> © 2014 + <a href="http://leanote.com" target="_blank">leanote</a> © 2015 <!-- <a href="#nav" data-toggle="class:nav-xs" class="pull-right btn btn-sm btn-default btn-icon"> <i class="fa fa-angle-left text"> diff --git a/app/views/home/header.html b/app/views/home/header.html index ea2c59f..74fed89 100644 --- a/app/views/home/header.html +++ b/app/views/home/header.html @@ -44,7 +44,6 @@ function log(o) { --> <li><a href="/index#download" target="#download" class="smooth-scroll">{{msg . "download"}}</a> </li> <li><a href="/index#donate" target="#donate" class="smooth-scroll">{{msg . "donate"}}</a> </li> - <li><a id="leanoteBlog" href="{{.leaUrl}}/index" target="_blank" title="lea++, leanote博客平台" class="">lea++</a></li> <li style="position: relative; margin-right: 3px;"> <a href="http://bbs.leanote.com" target="_blank" class="">{{msg . "discussion"}}</a> <div class="red-circle" style=""></div> diff --git a/app/views/member/top.html b/app/views/member/top.html index 864e08c..7911ed9 100644 --- a/app/views/member/top.html +++ b/app/views/member/top.html @@ -27,18 +27,13 @@ </div> <ul class="nav navbar-nav navbar-right m-n hidden-xs nav-user"> - <li class="hidden-xs"> - <a href="http://lea.leanote.com" class="dk" target="_blank"> - lea++ - </a> - </li> <li class="hidden-xs"> <a href="/note" class="dk" target="_blank"> {{msg . "myNote"}} </a> </li> <li class="hidden-xs"> - <a href="http://blog.leanote.com/{{$.session.Username}}" class="dk" target="_blank"> + <a href="/blog/{{$.session.Username}}" class="dk" target="_blank"> {{msg . "myBlog"}} </a> </li> @@ -79,7 +74,7 @@ </section> <footer class="footer lt hidden-xs b-t b-light" style="min-height: initial; padding: 10px 15px;text-align:center;"> - <a href="http://leanote.com" target="_blank">leanote</a> © 2014 + <a href="http://leanote.com" target="_blank">leanote</a> © 2015 <!-- <a href="#nav" data-toggle="class:nav-xs" class="pull-right btn btn-sm btn-default btn-icon"> <i class="fa fa-angle-left text"> diff --git a/conf/app.conf b/conf/app.conf index db05d9c..af245df 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -4,15 +4,15 @@ http.port=9000 -site.url=http://cc.com:9000 +site.url=http://localhost:9000 # mongdb db.host=localhost #db.host=leanote db.port=27017 db.dbname=leanote_beta2 # required -db.username= #root -db.password= #abc123 +db.username= # if not exists, please leave it blank +db.password= # if not exists, please leave it blank # or you can set the mongdb url # mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb # db.url=mongodb://root:root123@localhost:27017/leanote @@ -28,7 +28,7 @@ http.addr= http.ssl=false cookie.httponly=false cookie.prefix=LEANOTE -cookie.domain=cc.com #life, for share cookie with subdomain, 默认为空, 即不设置 不能设置为localhost, 要么就为空 +cookie.domain= # for share cookie with subdomain, 默认为空, 即不设置 不能设置为localhost, 要么就为空 cookie.secure=false format.date=01/02/2006 format.datetime=01/02/2006 15:04 diff --git a/public/blog/themes/elegant/header.html b/public/blog/themes/elegant/header.html index 839564a..2af2ede 100644 --- a/public/blog/themes/elegant/header.html +++ b/public/blog/themes/elegant/header.html @@ -103,10 +103,10 @@ function log(o) { <!-- 归档 --> <li class="{{if $.curIsArchive}}active{{end}}"> - <a href="{{$.archiveUrl}}">归档</a> + <a href="{{$.archiveUrl}}">Archives</a> </li> <li class="{{if $.curIsTags}}active{{end}}"> - <a href="{{$.tagsUrl}}">标签</a> + <a href="{{$.tagsUrl}}">Tags</a> </li> </ul>