防止Unzip文件恶意攻击

https://github.com/leanote/leanote/issues/42

.travis.yml

@@ -1,5 +1,5 @@
 language: go
-go: 1.3
+go: 1.4
 
 services:
   - mongodb # 2.4.12

README.md

@@ -5,66 +5,83 @@
 
 ## 1. Introduction
 
-Leanote, Not Just A Notepad!
+Leanote, not just a notepad!
 ![leanote.png](leanote.png "")
 
-**Some Features**
+**Highlighted Features**
 
-* Knowledge: Manage your knowledge in Leanote. Leanote contains the tinymce editor and a markdown editor, just enjoy yourself writing.
+* Note-taking made easy: Leanote incorporates a clean and intuitive interface, the `tinymce` rich-text editor and a dedicated *markdown* editor, making your writing/typing more efficient and enjoyable. For more advanced users, we even offer `Vim` and `Emacs` writing modes to help boost your writing speed to another level. 
-* Share: Share your knowledge with your friends in Leanote. You can invite your friends to join your notepad in the cloud so you can share knowledge.
+* Knowledge management: The flexible and versatile notebook-note-tagging system of Leanote makes it an ideal tool for knowledge management.
-* Cooperation: Collaborate with friends to improve your skills.
+* Sharing: Share your knowledge, thoughts and experiences with friends via Leanote. Invite your friends to join your notepad in the cloud.
-* Blog: Publish your knowledge and make Leanote your blog.
+* Cooperating: Collaborate with colleagues to improve skills, fertilize ideas and brainstorm on the fly.
+* Blogging: Publish your work and make Leanote your personal blog.
 
 **Other Features**
 
-* Support Markdown
+* Markdown syntax support
-* Writting mode
+* Distraction-free writing mode
-* Export note to PDF
+* `Vim` and `Emacs` editing mode
-* Note batch operation
+* Export notes to PDFs
-* Custom theme for blog
+* Batch note operation
+* Customizable themes for blogging
 
-## 2. Why we created Leanote
+## 2. Why we create Leanote
-To be honest, our inspiration comes from Evernote. We use Evernote to manage our knowledge everyday. But we find that:
+
-* Evernote's editor can't meet our needs, it does not have document navigation, it does not render code properly (as a programmer, syntax highlighted code rendering is a basic need), it cannot resize images and so forth
+We have been using the popular note-taking software/service `Evernote` as our knowledge management tool on a daily basis. Benefited from and inspired by `Evernote`, we decided to create a brand-new tool that provides everything `Evernote` has to offer, plus a bunch of new features that `Evernote` failed to deliver, such as:
-* We like markdown, but Evernote does not support it.
+
-* We want to share our knowledge, so all of us have our blogs (e.g. on Wordpress) and our Evernote accounts, but why can not those two be one!
+* A more powerful editor: `Evernote`'s editor lacks the functionalities of **document navigation**, **syntax based code rendering** (as a programmer, syntax highlighted code rendering is a necessity), **image resizing** and so forth.
+* Everybody loves *markdown*, however `Evernote` simply wouldn't add it despite of years' of requests from users. So we will do the favor and bring a *markdown* enabled editor to you, guess what, it is also rendered in real-time!
+* If you a developer and miss the `Vim` or `Emacs` ways of writing, we offer you the choice of `Vim` and `Emacs` editting modes. Equipped   with *markdown* syntax for text formatting, you will never need to touch your mouse while writing.
+* We love managing knowledge and thoughts as much as sharing them, so everybody has their own note account (`Evernote`, `Onenote`, `Google doc`, `Wiz note` etc.) and social media account (`Facebook`, `Wordpress`, blogs, etc.). But why can’t those two be one? Leanote makes this first step to bridge the private note-taking and public knowledge sharing seamlessly.
+* A complete and all-platform (sorry Windows phone) covering software suite: that includes Leanote Web & Server (this repository), [Desktop app](https://github.com/leanote/desktop-app), [iOS](https://github.com/leanote/leanote-ios), [Android](https://github.com/leanote/leanote-android). And they are all open source!
 * ......
 
-## 3. How to install Leanote
+## 3. How to get Leanote
 
-Leanote contains: Leanote Web & Server (this repository), [Desktop app](https://github.com/leanote/desktop-app), [iOS](https://github.com/leanote/leanote-ios), [Android](https://github.com/leanote/leanote-android). And all the products are open source!
+The Leanote software suite contains: Leanote Web & Server (this repository), [Desktop app](https://github.com/leanote/desktop-app), [iOS](https://github.com/leanote/leanote-ios), [Android](https://github.com/leanote/leanote-android). 
 
-You can install Leanote on your server, and use Leanote App (Desktop, iOs, Android) to sync notes with your self-hosted server.
+Interested in our product and want to try it out from your web browser? Welcome to sign up on https://leanote.com. 
 
-Welcome to sign up on https://leanote.com, Leanote team provide a stable and reliable service for you.
+Feeling suspicious about how those note-taking companies treat your personal data? You can install Leanote on your server, and use Leanote App (Desktop, iOS, Android) to sync notes with your self-hosted server.
 
 More information about how to install Leanote please see:
 
-* [Leanote binary installation tutorial](https://github.com/leanote/leanote/wiki/leanote-binary-distribution-installation-tutorial)
+* Leanote binary installation tutorial:
-* [Leanote source installation tutorial](https://github.com/leanote/leanote/wiki/leanote-source-installation-tutorial)
+    * [Windows](https://github.com/leanote/leanote/wiki/leanote-source-installation-on-Windows-(En))
+    * [Mac and Linux](https://github.com/leanote/leanote/wiki/leanote-binary-installation-on-Mac-and-Linux-(En))
+* Leanote source installation tutorial:
+    * [Windows](https://github.com/leanote/leanote/wiki/leanote-source-installation-on-Windows-(En))
+    * [Mac and Linux](https://github.com/leanote/leanote/wiki/Leanote-source-installation-on-Mac-and-Linux-(En))
 
-## 4. How to develop Leanote
+## 4. Documentation
 
-Please see [How-to-develop-leanote](https://github.com/leanote/leanote/wiki/How-to-develop-leanote-%E5%A6%82%E4%BD%95%E5%BC%80%E5%8F%91leanote)
+Please see [wiki](https://github.com/leanote/leanote/wiki) for detailed instruction on how to install Leanote on various platforms, trouble shooting and configuration explanations.
 
-## 5. Docs
 
-Please see [wiki](https://github.com/leanote/leanote/wiki).
+## 5. How to develop Leanote
 
-## 6. Contributors
+If you are a developer yourself and feel like to build on top of Leanote, please refer to [How-to-develop-leanote](https://github.com/leanote/leanote/wiki/How-to-develop-leanote-%E5%A6%82%E4%BD%95%E5%BC%80%E5%8F%91leanote).
-Thank you to all the [contributors](https://github.com/leanote/leanote/graphs/contributors) on
-this project. Your help is much appreciated.
 
-## 7.Join us
 
-Please fork this repository and contribute back using [pull requests](https://github.com/leanote/leanote/pulls).
+## 6. Contributions
 
-If you find some problems or has some good ideas, please submit [issues](https://github.com/leanote/leanote/issues).
+Like or dislike Leanote, please leave your comments and suggestions to help us improve it.
+If you encounter any issue, we suggest you first do a search in the issues section to see whether a solution already exists, or open up a new one otherwise.
+
+We’d like to acknowledge the contributions made by our [developers and contributors](https://github.com/leanote/leanote/graphs/contributors) to
+this project. Leanote won’t exist without your hard work. Your help is much appreciated.
+
+## 7. Join us
+
+Please feel free to fork this repository and contribute back using [pull requests](https://github.com/leanote/leanote/pulls).
+
+If you find any problems or have any good ideas, feature requests, please submit here [issues](https://github.com/leanote/leanote/issues).
 
-You are always welcomed!
 
 ## 8. Donation
-Support us, [donate us](http://leanote.org/#donate). And thanks [donators](http://leanote.leanote.com/post/leanote-donation-list).
+
+If you like our product, consider supporting us via [donate us](http://leanote.org/#donate).
+We acknowledge the donations make by all the [donators](http://leanote.leanote.com/post/leanote-donation-list).
 
 ## 9. Related projects
 
@@ -74,12 +91,12 @@ Support us, [donate us](http://leanote.org/#donate). And thanks [donators](http:
 
 You are welcome to join us.
 
-## 9. Support & Join us
+## 10. Contacts
 
 * Email: leanote@leanote.com
 * [Leanote BBS](http://bbs.leanote.com)
 * [Leanote Google Group](https://groups.google.com/forum/#!forum/leanote)
-* QQ Group: 326073529, 256076853, 158716820
+* QQ Groups: 326073529, 256076853, 158716820
 
 -----------------------------------------------------------------------
 
@@ -91,64 +108,71 @@ Leanote, 不只是笔记!
 
 **特性**
 
-* 知识管理: 通过Leanote来管理知识, Leanote有易操作的界面, 包含两款编辑器富文本编辑器和Markdown编辑器. 在Leanote, 你可以尽情享受写作.
+* 高效笔记：Leanote 有易操作的界面, 包含一款富文本编辑器和Markdown编辑器，让您的笔记记录更轻松和高效。对高阶用户，我们还提供`Vim` 和`Emacs` 编辑模式，助推你的写作速度更上层楼。
-* 博客: Leanote也可以作为你的博客, 将知识公开成博客, 让Leanote把你的知识传播的更远!
+* 知识管理:  Leanote 灵活而强大的“笔记本-笔记-标签”系统，让它成为你个人知识管理的利器。
-* 分享: 你也可以通过分享知识给好友, 让好友拥有你的知识.
+* 分享: 你可以通过Leanote同好友分享知识、想法和经历, 邀请好友加入你的笔记簿，通过云端交流信息。
-* 协作: 在分享的同时也可以与好友一起协作知识.
+* 协作: Leanote协助你与同事之间相互协作，激荡新思路，随时随地头脑风暴。
+* 博客: Leanote也可以作为你的个人博客, 把你的知识传播的更远!
 
-**一些其它特性**
+**其它特性**
 
 * 支持Markdown编辑
 * 写作模式
+* `Vim` 及 `Emacs` 编辑模式
 * 支持PDF导出
 * 支持批量操作
 * 博客自定义主题, 实现高度定制化
 
 ## 2. 为什么我们要创建Leanote?
-说实话, 我们曾是evernote的忠实粉丝, 但是我们也发现evernote的不足:
+我们都曾是`Evernote`的忠实粉丝, 一直以来`Evernote`都是我们日常知识管理的有效工具。于是我们决定重新创造一款工具，提供`Evernote`所能提供的功能，同时弥补`Evernote`的不足，比如：
-* evernote的编辑器不能满足我们的需求, 不能贴代码(格式会乱掉, 作为程序员, 代码是我们的基本需求啊), 图片不能缩放.
+* 功能更强的文本编辑器：`Evernote`的编辑器不能满足我们的需求, 不能实现文档导航、不能贴代码(格式会乱掉, 作为程序员, 代码是我们的基本需求啊), 图片不能缩放等。
-* 我们是markdown的爱好者, 可是evernote竟然没有.
+* `Evernote` 不支持所有人都喜爱的markdown语法，于是我们为Leanote配备了一款可以实时渲染的markdown编辑器。
-* 我们也想将知识公开, 所以我们有自己的博客, 如wordpress, 但为什么这两者不能合二为一呢?
+* 如果你是一名开发者，觉得手指怀念`Vim` 或 `Emacs` 了，那么我们还提供给你`Vim` 和 `Emacs` 写作模式，配合*markdown*的格式编辑，写作的时候再也不用去碰鼠标了。
+* 知识积累和知识分享同样重要，因此大家都有自己的笔记账号和社交账号。但为什么这两者不能合二为一呢? Leanote 做到了将二者无缝衔接。
+* 一套完整的、全平台覆盖的软件套装，包括了web、桌面、安卓、IOS设备，而且全部开源！
 * 还有...
 
-## 3.安装Leanote
+## 3. 获取Leanote
 
-Leanote云笔记产品包括: Leanote Web & Server(即本仓库), 桌面客户端, ios, android. 4端全部开源! 你可以下载它安装在自己的服务器上, Leanote的客户端可以连接自建的服务.
+Leanote云笔记产品包括: Leanote Web & Server(即本仓库), 桌面客户端, IOS, android. 4端全部开源! 
 
-欢迎在 https://leanote.com 上注册, Leanote团队为你提供稳定可靠的服务.
+如果想试用我们的产品，欢迎在 https://leanote.com 上注册, Leanote团队为你提供稳定可靠的服务。
+担心服务厂商如何处理你的个人数据吗？你可以下载Leanote安装在自己的服务器上, 通过Leanote客户端连接与自建服务同步数据。
 
 这里详细整理了Leanote二进版和Leanote开发版的安装教程, 请移步至:
 
-* [Leanote二进制详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+* Leanote二进制详细安装教程:
-* [Leanote源码详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E5%BC%80%E5%8F%91%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+    * [Windows](https://github.com/leanote/leanote/wiki/Leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B---Windows)
+    * [Mac, Linux](https://github.com/leanote/leanote/wiki/leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
+* Leanote源码详细安装教程:
+    * [Windows](https://github.com/leanote/leanote/wiki/Leanote-%E6%BA%90%E7%A0%81%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B----Windows)
+    * [Mac, Linux](https://github.com/leanote/leanote/wiki/leanote%E5%BC%80%E5%8F%91%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
 
-## 4. 如何对Leanote进行二次开发
+## 4. 相关文档
 
-请查看 [How-to-develop-Leanote](https://github.com/leanote/leanote/wiki/How-to-develop-leanote-%E5%A6%82%E4%BD%95%E5%BC%80%E5%8F%91leanote)
+更多详细的安装说明、问题处理和配置说明文档，请查看 [wiki](https://github.com/leanote/leanote/wiki)。
 
-## 5 相关文档
+## 5. 如何对Leanote进行二次开发
-* [Leanote二进制版详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E4%BA%8C%E8%BF%9B%E5%88%B6%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
-* [Leanote源码详细安装教程](https://github.com/leanote/leanote/wiki/leanote%E5%BC%80%E5%8F%91%E7%89%88%E8%AF%A6%E7%BB%86%E5%AE%89%E8%A3%85%E6%95%99%E7%A8%8B)
-* [Leanote source Leanote源码导读](https://github.com/leanote/leanote/wiki/Leanote-source-leanote源码导读)
-* [Leanote blog theme api(中文版)](https://github.com/leanote/leanote/wiki/leanote-blog-theme-api)
-* [How to develop leanote 如何开发Leanote](https://github.com/leanote/leanote/wiki/How-to-develop-leanote-如何开发leanote)
 
-更多文档请查看 [wiki](https://github.com/leanote/leanote/wiki).
+如果您有兴趣基于Leanote二次开发，请查看 [How-to-develop-Leanote](https://github.com/leanote/leanote/wiki/How-to-develop-leanote-%E5%A6%82%E4%BD%95%E5%BC%80%E5%8F%91leanote)。
 
 ## 6. 贡献者
 
-谢谢 [贡献者](https://github.com/leanote/leanote/graphs/contributors) 的贡献, Leanote因有你们而更完美!
+在此对向Leanote贡献力量的[贡献者们](https://github.com/leanote/leanote/graphs/contributors) 表示感谢。Leanote因有你们而更完美!
 
 ## 7. 加入我们
 
-欢迎提交[pull requests](https://github.com/leanote/leanote/pulls) 到Leanote.
+欢迎提交[pull requests](https://github.com/leanote/leanote/pulls) 到Leanote。
 
-有任何问题或建议, 欢迎提交[issue](https://github.com/leanote/leanote/issues).
+有任何问题或建议, 请先搜索[issue](https://github.com/leanote/leanote/issues)区是否已经有解决方法。如果没有，欢迎提交新issue。
 
-Leanote还有很多问题, 如果你喜欢它, 欢迎加入我们一起完善Leanote.
+Leanote还有很多问题, 如果你喜欢它, 欢迎加入我们一起完善Leanote。
 
 ## 8. 捐赠
-支持我们, [捐赠Leanote](http://leanote.org/#donate). 感谢[捐赠者](http://leanote.leanote.com/post/leanote-donation-list), 谢谢你们的鼓励, Leanote会一直坚持!
+
+如果您喜欢我们的产品，请考虑支持我们, [捐赠Leanote](http://leanote.org/#donate)。
+
+感谢[这些捐赠者](http://leanote.leanote.com/post/leanote-donation-list), 谢谢你们的鼓励, Leanote会一直坚持!
 
 ## 9. 其它相关项目
 * [Leanote Desktop App](https://github.com/leanote/desktop-app), [下载地址](http://app.leanote.com)

app/controllers/BlogController.go

@@ -113,8 +113,8 @@ func (c Blog) setPreviewUrl() {
 	themeId := c.Session["themeId"]
 	theme := themeService.GetTheme(userId, themeId)
 
-	siteUrl := configService.GetSiteUrl()
+	// siteUrl := configService.GetSiteUrl()
-	blogUrl := siteUrl + "/preview" // blog.leanote.com
+	blogUrl := "/preview" // blog.leanote.com
 
 	indexUrl = blogUrl + "/" + userIdOrEmail
 	cateUrl = blogUrl + "/cate/" + userIdOrEmail // /notebookId
@@ -143,8 +143,8 @@ func (c Blog) setPreviewUrl() {
 // 各种地址设置
 func (c Blog) setUrl(userBlog info.UserBlog, userInfo info.User) {
 	// 主页 http://leanote.com/blog/life or http://blog.leanote.com/life or http:// xxxx.leanote.com or aa.com
-	host := c.Request.Request.Host
+	// host := c.Request.Request.Host
-	var staticUrl = configService.GetUserUrl(strings.Split(host, ":")[0])
+	// var staticUrl = configService.GetUserUrl(strings.Split(host, ":")[0])
 	// staticUrl == host, 为保证同源!!! 只有host, http://leanote.com, http://blog/leanote.com
 	// life.leanote.com, lealife.com
 	siteUrl := configService.GetSiteUrl()
@@ -168,20 +168,20 @@ func (c Blog) setUrl(userBlog info.UserBlog, userInfo info.User) {
 	c.RenderArgs["themeBaseUrl"] = "/" + userBlog.ThemePath
 
 	// 其它static js
-	c.RenderArgs["jQueryUrl"] = siteUrl + "/js/jquery-1.9.0.min.js"
+	c.RenderArgs["jQueryUrl"] = "/js/jquery-1.9.0.min.js"
 
-	c.RenderArgs["prettifyJsUrl"] = siteUrl + "/js/google-code-prettify/prettify.js"
+	c.RenderArgs["prettifyJsUrl"] = "/js/google-code-prettify/prettify.js"
-	c.RenderArgs["prettifyCssUrl"] = siteUrl + "/js/google-code-prettify/prettify.css"
+	c.RenderArgs["prettifyCssUrl"] = "/js/google-code-prettify/prettify.css"
 
-	c.RenderArgs["blogCommonJsUrl"] = siteUrl + "/public/blog/js/common.js"
+	c.RenderArgs["blogCommonJsUrl"] = "/public/blog/js/common.js"
 
-	c.RenderArgs["shareCommentCssUrl"] = siteUrl + "/public/blog/css/share_comment.css"
+	c.RenderArgs["shareCommentCssUrl"] = "/public/blog/css/share_comment.css"
-	c.RenderArgs["shareCommentJsUrl"] = siteUrl + "/public/blog/js/share_comment.js"
+	c.RenderArgs["shareCommentJsUrl"] = "/public/blog/js/share_comment.js"
 
-	c.RenderArgs["fontAwesomeUrl"] = staticUrl + "/css/font-awesome-4.2.0/css/font-awesome.css"
+	c.RenderArgs["fontAwesomeUrl"] = "/css/font-awesome-4.2.0/css/font-awesome.css"
 
-	c.RenderArgs["bootstrapCssUrl"] = siteUrl + "/css/bootstrap.css"
+	c.RenderArgs["bootstrapCssUrl"] = "/css/bootstrap.css"
-	c.RenderArgs["bootstrapJsUrl"] = siteUrl + "/js/bootstrap-min.js"
+	c.RenderArgs["bootstrapJsUrl"] = "/js/bootstrap-min.js"
 }
 
 // 笔记本分类

app/controllers/admin/AdminSettingController.go

@@ -79,6 +79,12 @@ func (c AdminSetting) ExportPdf(path string) revel.Result {
 	return c.RenderJson(re)
 }
 
+func (c AdminSetting) DoSiteUrl(siteUrl string) revel.Result {
+	re := info.NewRe()
+	re.Ok = configService.UpdateGlobalStringConfig(c.GetUserId(), "siteUrl", siteUrl)
+	return c.RenderJson(re)
+}
+
 // SubDomain
 func (c AdminSetting) SubDomain() revel.Result {
 	c.RenderArgs["str"] = configService.GlobalStringConfigs

app/lea/Debug.go

@@ -1,26 +1,34 @@
 package lea
 
 import (
-	"encoding/json"
+    "encoding/json"
-	"fmt"
+    "fmt"
-	"github.com/revel/revel"
+    "github.com/revel/revel"
 )
 
-func Log(i interface{}) {
+func Log(i ...interface{}) {
-	revel.INFO.Println(i)
+    revel.INFO.Println(i...)
+}
+
+func LogW(i ...interface{}) {
+    revel.WARN.Println(i...)
+}
+
+func Log1(key, i interface{}) {
+    revel.INFO.Println(key, i)
 }
 
 func LogJ(i interface{}) {
-	b, _ := json.MarshalIndent(i, "", "	")
+    b, _ := json.MarshalIndent(i, "", " ")
-	revel.INFO.Println(string(b))
+    revel.INFO.Println(string(b))
 }
 
 // 为test用
 func L(i interface{}) {
-	fmt.Println(i)
+    fmt.Println(i)
 }
 
 func LJ(i interface{}) {
-	b, _ := json.MarshalIndent(i, "", "	")
+    b, _ := json.MarshalIndent(i, "", " ")
-	fmt.Println(string(b))
+    fmt.Println(string(b))
 }

app/lea/archive/zip.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path"
 	"strings"
+	"github.com/leanote/leanote/app/lea"
 )
 
 // main functions shows how to TarGz a directory/file and
@@ -144,12 +145,18 @@ func Unzip(srcFilePath string, destDirPath string) (ok bool, msg string) {
 	}
 	defer r.Close()
 	for _, f := range r.File {
-		//		fmt.Println("FileName : ", f.Name); // j/aaa.zip
+		// fmt.Println("FileName : ", f.Name); // j/aaa.zip
 		rc, err := f.Open()
 		if err != nil {
 			panic(err)
 		}
 
+		// 包含恶意目录
+		if strings.Contains(f.Name, "../") {
+			lea.LogW("恶意文件", f.Name);
+			continue
+		}
+
 		// 把首文件夹去掉, 即j去掉, 分离出文件夹和文件名
 		paths := strings.Split(f.Name, "/")
 		prePath := ""

app/service/BlogService.go

@@ -518,7 +518,7 @@ func (this *BlogService) fixUserBlog(userBlog *info.UserBlog) {
 	// Logo路径问题, 有些有http: 有些没有
 	if userBlog.Logo != "" && !strings.HasPrefix(userBlog.Logo, "http") {
 		userBlog.Logo = strings.Trim(userBlog.Logo, "/")
-		userBlog.Logo = configService.GetSiteUrl() + "/" + userBlog.Logo
+		userBlog.Logo = "/" + userBlog.Logo
 	}
 
 	if userBlog.SortField == "" {
@@ -1108,6 +1108,7 @@ func (this *BlogService) SortSingles(userId string, singleIds []string) (ok bool
 
 // 得到用户的博客url
 func (this *BlogService) GetUserBlogUrl(userBlog *info.UserBlog, username string) string {
+	/*
 	if userBlog != nil {
 		if userBlog.Domain != "" && configService.AllowCustomDomain() {
 			return configService.GetUserUrl(userBlog.Domain)
@@ -1118,12 +1119,15 @@ func (this *BlogService) GetUserBlogUrl(userBlog *info.UserBlog, username string
 			username = userBlog.UserId.Hex()
 		}
 	}
+	*/
 	return configService.GetBlogUrl() + "/" + username
 }
 
 // 得到所有url
 func (this *BlogService) GetBlogUrls(userBlog *info.UserBlog, userInfo *info.User) info.BlogUrls {
 	var indexUrl, postUrl, searchUrl, cateUrl, singleUrl, tagsUrl, archiveUrl, tagPostsUrl string
+	
+	/*
 	if userBlog.Domain != "" && configService.AllowCustomDomain() { // http://demo.com
 		// ok
 		indexUrl = configService.GetUserUrl(userBlog.Domain)
@@ -1144,6 +1148,7 @@ func (this *BlogService) GetBlogUrls(userBlog *info.UserBlog, userInfo *info.Use
 		tagsUrl = indexUrl + "/tags"
 		tagPostsUrl = indexUrl + "/tag"
 	} else {
+		*/
 		// ok
 		blogUrl := configService.GetBlogUrl() // blog.leanote.com
 		userIdOrEmail := ""
@@ -1162,7 +1167,7 @@ func (this *BlogService) GetBlogUrls(userBlog *info.UserBlog, userInfo *info.Use
 		archiveUrl = blogUrl + "/archives/" + userIdOrEmail // blog.leanote.com/archive/username
 		tagsUrl = blogUrl + "/tags/" + userIdOrEmail
 		tagPostsUrl = blogUrl + "/tag/" + userIdOrEmail // blog.leanote.com/archive/username
-	}
+	// }
 
 	return info.BlogUrls{
 		IndexUrl:    indexUrl,

app/service/ConfigService.go

@@ -67,10 +67,20 @@ func (this *ConfigService) InitGlobalConfigs() bool {
 		}
 	}
 
+	// site URL
+	if s, ok := this.GlobalStringConfigs["siteUrl"]; !ok || s != "" {
+		this.GlobalStringConfigs["siteUrl"] = this.siteUrl
+	}
+
 	return true
 }
 
 func (this *ConfigService) GetSiteUrl() string {
+	s := this.GetGlobalStringConfig("siteUrl")
+	if s != "" {
+		return s
+	}
+
 	return this.siteUrl
 }
 func (this *ConfigService) GetAdminUsername() string {
@@ -498,42 +508,25 @@ func (this *ConfigService) GetDefaultDomain() string {
 	return defaultDomain
 }
 
-// 包含http://
-func (this *ConfigService) GetDefaultUrl() string {
-	return schema + defaultDomain
-}
-
 // note
 func (this *ConfigService) GetNoteDomain() string {
-	subDomain := this.GetGlobalStringConfig("noteSubDomain")
+	return "/note"
-	if subDomain != "" {
-		return subDomain + port
-	}
-	return this.GetDefaultDomain() + "/note"
 }
 func (this *ConfigService) GetNoteUrl() string {
-	return schema + this.GetNoteDomain()
+	return this.GetNoteDomain()
 }
 
 // blog
 func (this *ConfigService) GetBlogDomain() string {
-	subDomain := this.GetGlobalStringConfig("blogSubDomain")
+	return "/blog"
-	if subDomain != "" {
-		return subDomain + port
-	}
-	return this.GetDefaultDomain() + "/blog"
 }
 func (this *ConfigService) GetBlogUrl() string {
-	return schema + this.GetBlogDomain()
+	return this.GetBlogDomain()
 }
 
 // lea
 func (this *ConfigService) GetLeaDomain() string {
-	subDomain := this.GetGlobalStringConfig("leaSubDomain")
+	return "/lea"
-	if subDomain != "" {
-		return subDomain + port
-	}
-	return this.GetDefaultDomain() + "/lea"
 }
 func (this *ConfigService) GetLeaUrl() string {
 	return schema + this.GetLeaDomain()
@@ -611,5 +604,5 @@ func (this *ConfigService) HomePageIsAdminsBlog() bool {
 }
 
 func (this *ConfigService) GetVersion() string {
-	return "1.4.2"
+	return "2.0"
 }

app/service/ThemeService.go

@@ -264,8 +264,22 @@ func (this *ThemeService) GetDefaultThemes() (themes []info.Theme) {
 	return
 }
 
+
+func validateFilename(filename string) bool {
+	// 防止用"../../来获取其它文件"
+	if (strings.Contains(filename, "..")) {
+		return false
+	}
+	return true
+}
+
+
 // 得到模板内容
 func (this *ThemeService) GetTplContent(userId, themeId, filename string) string {
+	if (!validateFilename(filename)) {
+		return ""
+	}
+	
 	path := this.GetThemeAbsolutePath(userId, themeId) + "/" + filename
 	return GetFileStrContent(path)
 }
@@ -290,6 +304,10 @@ func (this *ThemeService) GetThemePath(userId, themeId string) string {
 
 // 更新模板内容
 func (this *ThemeService) UpdateTplContent(userId, themeId, filename, content string) (ok bool, msg string) {
+	if (!validateFilename(filename)) {
+		return 
+	}
+
 	basePath := this.GetThemeAbsolutePath(userId, themeId)
 	path := basePath + "/" + filename
 	if strings.Contains(filename, ".html") {
@@ -326,6 +344,10 @@ func (this *ThemeService) UpdateTplContent(userId, themeId, filename, content st
 }
 
 func (this *ThemeService) DeleteTpl(userId, themeId, filename string) (ok bool) {
+	if (!validateFilename(filename)) {
+		return
+	}
+
 	path := this.GetThemeAbsolutePath(userId, themeId) + "/" + filename
 	ok = DeleteFile(path)
 	return

app/service/UserService.go

@@ -110,7 +110,7 @@ func (this *UserService) setUserLogo(user *info.User) {
 	}
 	if user.Logo != "" && !strings.HasPrefix(user.Logo, "http") {
 		user.Logo = strings.Trim(user.Logo, "/")
-		user.Logo = configService.GetSiteUrl() + "/" + user.Logo
+		user.Logo = "/" + user.Logo
 	}
 }
 

app/views/admin/nav.html

@@ -131,6 +131,15 @@
 				</span>
 			</a>
 			<ul class="nav lt">
+
+				<li>
+					<a href="/admin/t?t=setting/site_url">
+						<span>
+							Site's URL
+						</span>
+					</a>
+				</li>
+
 				<li>
 					<a href="/admin/t?t=setting/home_page">
 						<span>

app/views/admin/setting/site_url.html

@@ -0,0 +1,51 @@
+{{template "admin/top.html" .}}
+<div class="m-b-md"> <h3 class="m-b-none">Site's URL</h3></div>
+
+<div class="row">
+
+<div class="col-sm-6">
+    <form id="add_user_form">
+        <section class="panel panel-default">
+            <div class="panel-body">
+                <div class="form-group">
+                    <label>Site's URL</label>
+                    <input type="text" class="form-control" name="siteUrl" value="{{.str.siteUrl}}" placeholder="http://localhost:9000">
+                    Please note that if the value isn't blank, it will override the "siteUrl" configuration on app.conf.
+                    <br>
+                    Site's URL will be used to upload images, find password, and send email...
+                </div>
+            </div>
+            
+            <footer class="panel-footer text-right bg-light lter">
+                <button type="submit" id="submit" class="btn btn-success btn-s-xs">Submit</button>
+            </footer>
+        </section>
+    </form>
+</div>
+
+</div>
+
+{{template "admin/footer.html" .}}
+<script src="/public/admin/js/jquery-validation-1.13.0/jquery.validate.js"></script>
+<script>
+$(function() {
+    init_validator("#add_user_form");
+    $("#submit").click(function(e){
+        e.preventDefault();
+        var t = this;
+        if($("#add_user_form").valid()) {
+            $(t).button('loading');
+            ajaxPost("/adminSetting/doSiteUrl", getFormJsonData("add_user_form"), function(ret){
+                $(t).button('reset');
+                if(!ret.Ok) {
+                    art.alert(ret.Msg);
+                } else {
+                    art.tips("Success");
+                }
+            });
+        }
+    });
+});
+</script>
+
+{{template "admin/end.html" .}}

app/views/blog/about_me.html

@@ -1,19 +0,0 @@
-{{template "blog/header.html" .}}
-
-<div id="postsContainer">
-	<div id="posts">
-		<div class="each-post">
-			<div class="title">
-				{{msg . "aboutMe"}}
-			</div>
-			<div class="created-time">
-			</div>
-			<div class="desc">
-				{{.userBlog.AboutMe | raw}}
-				
-			</div>
-		</div>
-	</div>
-</div>
-
-{{template "blog/footer.html" .}}

app/views/blog/comment.html

@@ -1,204 +0,0 @@
-<!-- 赞 -->
-<div class="entry-controls clearfix">
-	<div class="vote-section-wrapper clearfix">
-		<button class="btn btn-default btn-zan" id="likeBtn"><i class="fa fa-thumbs-o-up"></i> <span id="likeNum">{{.blog.LikeNum}}</span> {{msg . "like"}}</button>
-		<span class="control-item read-counts"><i class="fa fa-eye"></i> {{if .blog.ReadNum}}{{.blog.ReadNum}}{{else}}1{{end}} {{msg . "viewers"}}</span>
-	</div>
-	<div class="right-section">
-		<div id="weixinQRCode"></div>
-		<!-- google+
-		<g:plusone size=”medium”></g:plusone>
-		-->
-		<button class="btn btn-share btn-default btn-weibo"><i class="fa fa-weibo"></i> {{msg . "sinaWeibo"}}</button>
-		<button class="btn btn-share btn-default btn-weixin"><i class="fa fa-wechat"></i> {{msg . "weixin"}}</button>
-		<div class="dropdown" style="display: inline-block; cursor: pointer; padding: 5px 10px;">
-			<!-- open -->
-			<div class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown">
-				<i class="fa fa-share-square-o"></i>
-			{{msg . "moreShare"}}
-			</div>
-			<ul class="dropdown-menu" role="menu">
-				<li><a href="#" class="btn-share tencent-weibo"><i class="fa fa-tencent-weibo"></i> {{msg . "tencentWeibo"}}</a></li>
-				<li><a href="#" class="btn-share qq"><i class="fa fa-qq"></i> {{msg . "qqZone"}}</a></li>
-				<li><a href="#" class="btn-share renren"><i class="fa fa-renren"></i> {{msg . "renren"}}</a></li>
-			</ul>
-		</div>
-		<!-- 举报 -->
-		{{if eq .locale "zh"}}
-		<div style="display: inline-block">
-			<a id="reportBtn"><i class="fa fa-flag-o"></i> {{msg . "report"}}</a>
-		</div>
-		{{end}}
-	</div>
-	<div class="voters clearfix" id="likers">
-	</div>
-</div>
-
-<script type="text/x-jsrender" id="tLikers">
-[[for users]]
-	<a id="liker_[[:UserId]]" href="[[:~root.blogUrl]]/[[:Username]]" target="_blank" class="voter">
-		[[if Logo]]
-			<img alt="avatar" class="avatar-small" src="[[:Logo]]">
-		[[else]]
-			<img alt="avatar" class="avatar-small" src="/images/blog/default_avatar.png">
-		[[/if]]
-	</a>
-[[/for]]
-</script>
-{{if and .userBlog.CanComment (not (eq .userBlog.CommentType "disqus"))}}
-
-<script type="text/x-jsrender" id="tComments">
-[[for comments]]
-	<li class="comment-item">
-		<!-- 头像 -->
-		<a ui-hovercard="" target="_blank" class="avatar-link" title="[[:UserInfo.Username]]" href="[[:~root.blogUrl]]/[[:UserInfo.Username]]">
-			<img class="avatar" src="[[:UserInfo.Logo]]">
-		</a>
-		<!-- 评论 -->
-		<div class="comment-body">
-			<div class="comment-hd">
-				<a href="[[:~root.blogUrl]]/[[:UserInfo.Username]]" target="_blank" >[[:UserInfo.Username]]</a>
-				[[if IsAuthorComment]]
-				<span>({{msg . "author"}})</span>
-				[[/if]]
-				
-				<!-- 回复其它人 -->
-				[[if ToUserInfo]]
-					<span class="in-reply-to">
-			        {{rawMsg . "reply"}}
-			        <a href="[[:~root.blogUrl]]/[[:ToUserInfo.Username]]">[[:ToUserInfo.Username]]</a>
-					</span>
-					[[if ToUserIsAuthor]]
-					<span>({{msg . "author"}})</span>
-					[[/if]]
-				[[/if]]
-			</div>
-			<div class="comment-content ng-binding" ng-bind-html="comment.content">
-				[[html:Content]]
-			</div>
-			<div class="comment-ft clearfix" data-comment-id="[[:CommentId]]" >
-				<span title="" ui-time="" class="date">[[:PublishDate]] </span>
-				<span class="like-num [[if !LikeNum]]hide[[/if]]" title="[[:LikeNum]] {{rawMsg . "like"}}"><span class="like-num-i">[[:LikeNum]]</span> {{rawMsg . "like"}}</span></span>
-				
-				[[if ~root.visitUserInfo.UserId]]
-					[[if IsMyNote && !IsMyComment]]
-						<a href="javascript:;" class="comment-trash op-link "><i class="fa fa-trash"></i> {{rawMsg . "delete"}}</a>
-					[[/if]]
-					[[if !IsMyComment]]
-					<a href="javascript:;" class="comment-reply op-link ">
-						<i class="fa fa-reply"></i>
-						{{rawMsg . "reply"}} 
-					</a>
-					<a href="javascript:;" class="comment-like op-link"><i class="fa fa-thumbs-o-up"></i> <span class="like-text">[[if IsILikeIt]]{{rawMsg . "unlike"}}[[else]]{{rawMsg . "like"}}[[/if]]</span></a>
-					{{if eq .locale "zh"}}
-					<a href="javascript:;" class="comment-report op-link "><i class="fa fa-flag-o"></i> {{rawMsg . "report"}}</a>
-					{{end}}
-					[[else]]
-					<a href="javascript:;" class="comment-trash op-link "><i class="fa fa-trash"></i> {{rawMsg . "delete"}}</a>
-					[[/if]]
-				[[/if]]
-			</div>
-			
-			<!-- 回复该评论 -->
-			[[if ~root.visitUserInfo.UserId]]
-			<form class="comment-form comment-box-ft">
-				<div class="clearfix">
-					<div class="avatar-wrap">
-						<img class="avatar" src="[[:~root.visitUserInfo.Logo]]">
-					</div>
-					<div class="editor-wrap">
-						<textarea class="editable" id="commentContent" name="commentContent" placeholder="{{rawMsg . "reply"}}"></textarea>
-					</div>
-				</div>
-				
-				<div class="command clearfix" style="display: block;">
-					<button class="reply-comment-btn save btn btn-primary" data-comment-id="[[:CommentId]]">{{rawMsg . "comment"}}</button>
-					<a class="cancel reply-cancel btn-link">{{rawMsg . "cancel"}}</a>
-				</div>
-			</form>
-			[[/if]]
-		</div>
-	</li>
-[[/for]]
-</script>
-
-<!-- 评论 -->
-<div class="comment-box hide">
-    {{if .visitUserInfo.UserId}}
-	<form class="comment-form comment-box-ft" id="commentForm">
-		<div class="clearfix">
-			<div class="avatar-wrap">
-				<img class="avatar" src="{{.visitUserInfo.Logo}}">
-			</div>
-			<div class="editor-wrap">
-				<textarea class="editable" id="commentContent" name="commentContent" placeholder="{{msg . "comment"}}" style="height: 100px;"></textarea>
-			</div>
-		</div>
-		<div class="command clearfix" style="display: block;">
-			<button id="commentBtn" class="reply-comment-btn save btn btn-primary">{{msg . "comment"}}</button>
-		</div>
-	</form>
-	{{else}}
-	<div class="needLogin">
-		<a onclick="goLogin()">{{msg . "signIn"}}</a>, {{msg . "submitComment"}}.
-		<br />
-		没有帐号? <a onclick="goRegister()">{{msg . "signUp"}}</a>
-	</div>
-	{{end}}
-	<div class="box-header">
-	    <span class="counter">
-	      <i class="icon icon-comment"></i><span id="commentNum">{{.blog.CommentNum}}</span> {{msg . "comments"}}
-	    </span>
-    </div>
-	<ul id="comments">
-	</ul>
-</div>
-
-<div id="moreComments">
-	<div class="hide comments-more">
-		<a>More...</a>
-	</div>
-	<div class="comments-loading">
-		<img src="/images/loading-32.gif" />
-	</div>
-</div>
-
-{{if eq .locale "zh"}}
-<div id="reportMsg" class="hide">
-    <form class="report-form" name="reportForm">
-      <ul class="options clearfix">
-        <li><label><input required="" value="{{msg . "reportReason1"}}" name="reason" type="radio">{{msg . "reportReason1"}}</label></li>
-        <li><label><input required="" value="{{msg . "reportReason2"}}" name="reason" type="radio">{{msg . "reportReason2"}}</label></li>
-        <li><label><input required="" value="{{msg . "reportReason3"}}" name="reason" type="radio">{{msg . "reportReason3"}}</label></li>
-        <li><label><input required="" value="{{msg . "reportReason4"}}" name="reason" type="radio">{{msg . "reportReason4"}}</label></li>
-        <li><label><input required="" value="" name="reason" type="radio">{{msg . "other"}}</label></li>
-      </ul>
-      <p class="input-container" style="display: none">
-		<input placeholder="{{msg . "reportReason"}}" type="text" name="detail" class="form-control reason-text basic-input" />
-      </p>
-      <p class="footnote"></p>
-    </form>
-</div>
-{{end}}
-
-{{end}}
-
-{{if and .userBlog.CanComment (eq .userBlog.CommentType "disqus")}}
-
-<div id="disqus_thread"></div>
-<!-- comment -->
-<script type="text/javascript">
-    /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-    var disqus_shortname = '{{.userBlog.DisqusId}}'; // required: replace example with your forum shortname
-    var disqus_identifier = '{{.userBlog.UserId.Hex}}/{{.blog.NoteId.Hex}}/{{.blog.Title}}'; // 博客链接
-
-    /* * * DON'T EDIT BELOW THIS LINE * * */
-    (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-    })();
-</script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
-{{end}}	

app/views/blog/footer.html

@@ -1,56 +0,0 @@
-<div id="footerContainer">
-	{{$userId := .userBlog.UserId.Hex}}
-	<div class="container" id="footer">
-        <div class="col-md-4">
-          <h3>{{msg . "blogNavs"}}</h3>
-          <ul>
-          	<li><a href="{{$.blogUrl}}/{{$.userInfo.Username}}">{{msg . "home"}}</a></li>
-          	{{range .notebooks}}
-			<li>
-				<a href="{{$.cateUrl}}/{{.NotebookId.Hex}}">{{.Title}}</a>
-			</li>
-			{{end}}
-          	<li><a href="{{$.aboutMeUrl}}">{{msg . "aboutMe"}}</a></li>
-          </ul>
-        </div>
-        <div class="col-md-4">
-          <h3>{{msg . "latestPosts"}}</h3>
-          <ul>
-          	{{range .recentBlogs}}
-          	<li title="{{.Title}}"><a href="{{$.blogUrl}}/view/{{.NoteId.Hex}}/">{{.Title}}</a></li>
-          	{{end}}
-          </ul>
-       </div>
-        <div class="col-md-4">
-          <h3>{{msg . "quickLinks"}}</h3>
-          <ul>
-			<li><a href="{{$.noteUrl}}">{{msg . "myNote"}}</a></li>
-			<li><a href="{{$.siteUrl}}/login">leanote {{msg . "login"}}</a></li>
-			<li><a href="http://leanote.com" target="_blank">leanote {{msg . "home"}}</a></li>
-			<li><a href="http://lea.leanote.com" target="_blank">lea++</a></li>
-			<li><a href="http://bbs.leanote.com" target="_blank">leanote {{msg . "community"}}</a></li>
-			<li><a href="https://github.com/leanote/leanote" target="_blank">leanote github</a></li>
-		 </ul>
-        </div>
-    </div>
-</div>
-<script src="{{$.siteUrl}}/js/jquery-1.9.0.min.js"></script>
-<script src="{{$.siteUrl}}/js/bootstrap-min.js"></script>
-<script src="{{$.siteUrl}}/js/bootstrap-hover-dropdown.js"></script>
-<script src="{{$.siteUrl}}/js/i18n/blog.{{.locale}}.js"></script>
-{{if not .isMe}}
-<script src="{{$.siteUrl}}/blog/isMe.js?userId={{.userBlog.UserId.Hex}}"></script>
-{{end}}
-<script>
-// 搜索
-function search(e) {
-	var key = $("#searchInput").val();
-	if(!key) {
-		location.href = "{{$.searchUrl}}";
-	} else {
-		var tpl = '<form action="{{$.searchUrl}}" method="get">';
-		tpl += '<input name="key" value="' + key + '" />';
-		tpl += "</form";
-		$(tpl).submit();
-	}
-}␍</script>

app/views/blog/header.html

@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="keywords" content="leanote,leanote.com">
-<meta name="description" content="leanote, {{msg $ "moto"}}">
-<meta name="author" content="leanote">
-
-<title>{{.title}}</title>
-<!-- Bootstrap core CSS -->
-<link href="{{.siteUrl}}/css/bootstrap.css" rel="stylesheet">
-<!-- 字体必须同一域 -->
-{{if .set}}
-<link href="{{.siteUrl}}/css/font-awesome-4.2.0/css/font-awesome.css" rel="stylesheet">
-{{else}}
-<link href="{{$.staticUrl}}/css/font-awesome-4.2.0/css/font-awesome.css" rel="stylesheet">
-{{end}}
-<link id="styleLink" href="{{.siteUrl}}/css/blog/{{if .userBlog.Style}}{{.userBlog.Style}}{{else}}blog_default{{end}}.css" rel="stylesheet">
-<link href="{{.siteUrl}}/css/blog/comment.css" rel="stylesheet">
-<script>
-function log(o) {
-}
-</script>
-<style>
-
-</style>
-</head>
-<body>
-<div id="headerAndNav" >
-	<div id="headerContainer" class="container">
-		<!-- 头部可放博客名, 导航 -->
-		<div id="header">
-			{{$userId := .userBlog.UserId.Hex}} <!-- 可不要了 -->
-			{{$username := .userInfo.Username}}
-			<h1>
-				<a href="{{.indexUrl}}" id="logo">
-				{{if .userBlog.Logo}}
-				<img src="{{.userBlog.Logo}}" title="{{.userBlog.Title}}"/>
-				{{else}}
-					{{.userBlog.Title | raw}}
-				{{end}}
-				</a>
-			</h1>
-			<div id="blogDesc">
-				{{.userBlog.SubTitle | raw}}
-			</div>
-		</div>
-	</div>
-	
-	<!-- Static navbar -->
-	<div class="navbar navbar-default">
-	  <div class="container">
-	    <div class="navbar-header">
-	      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-	        <span class="sr-only">Toggle navigation</span>
-	        <span class="icon-bar"></span>
-	        <span class="icon-bar"></span>
-	        <span class="icon-bar"></span>
-	      </button>
-	      <a class="navbar-brand" href="{{.indexUrl}}">
-	      	{{if .userBlog.Logo}}
-			<img src="{{.userBlog.Logo}}" title="{{.userBlog.Title}}"/>
-			{{else}}
-				{{.userBlog.Title | raw}}
-			{{end}}
-	      </a>
-	    </div>
-	    <div class="navbar-collapse collapse">
-	      <ul class="nav navbar-nav">
-	      	{{$navNotebookId := .notebookId}}
-				<li class="{{if .index}}active{{end}}"><a href="{{.indexUrl}}">{{msg . "home"}}</a></li>
-			{{range .notebooks}}
-				{{$notebookId := .NotebookId.Hex}}
-				<li class="{{if $navNotebookId}}{{if eq $navNotebookId $notebookId}}active{{else}}{{end}}{{end}}">
-					<a href="{{$.cateUrl}}/{{$notebookId}}" 
-					>{{.Title}}</a>
-				</li>
-			{{end}}
-				<li class="{{if .aboutMe}}active{{end}}"><a href="{{.aboutMeUrl}}">{{msg . "aboutMe"}}</a></li>
-				<!-- 同源上传logo -->
-				<li class="is-me {{if .set}}active{{end}} {{if not .isMe}}hide{{end}}" ><a href="{{$.siteUrl}}/blog/set/">{{msg . "blogSet"}}</a></li>
-				<li><a href="{{$.noteUrl}}" class="is-me {{if not .isMe}}hide{{end}}">{{msg . "myNote"}}</a></li>
-	      </ul>
-	      <form class="navbar-form navbar-right" id="search" onsubmit="search(event);return false;">
-	      	<div class="input-group">
-			  	<span class="input-group-addon" id="searchIcon" onclick="search(event);"><i class="fa fa-search"></i></span>
-		        <input type="text" placeholder="search" id="searchInput" class="form-control" value="{{.key}}">
-		  	</div>
-	      </form>
-	    </div><!--/.nav-collapse -->
-	  </div>
-	</div>
-</div>
-
-<script>
-var UserInfo = {UserId: "{{$userId}}", Email: "{{.userInfo.Email}}", Username: "{{.userInfo.Username}}"};
-var UserBlogInfo={CanComment: {{.userBlog.CanComment}}, CommentType: "{{.userBlog.CommentType}}"};
-var indexUrl = "{{$.indexUrl}}";
-var viewUrl = "{{$.viewUrl}}";
-var blogUrl = "{{$.blogUrl}}";
-var staticUrl = "{{$.staticUrl}}"; // blog.leanote.com, life.leanote.com, aaa.com
-</script>

app/views/blog/highlight.html

@@ -1,73 +0,0 @@
-<!-- This file is Depreciated -->
-
-<link href="/public/mdeditor/editor/google-code-prettify/prettify.css" type="text/css" rel="stylesheet">
-<script src="/public/mdeditor/editor/google-code-prettify/prettify.js"></script>
-
-<script>
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-</script>
-
-<!--
-<script type="text/javascript" src="/js/syntaxhighlighter/scripts/shCore.js"></script>
-<link href="/js/syntaxhighlighter/styles/shCore.css" rel="stylesheet" type="text/css" />
-<link href="/js/syntaxhighlighter/styles/shThemeDefault.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript">
-    $(function () {
-		var pathPrefix = "/js/syntaxhighlighter/scripts/";
-        var map = {
-			"brush: jscript": "shBrushJScript.js",
-        	"brush: c#": "shBrushCSharp.js",
-	        "brush: css": "shBrushCss.js",
-	        "brush: cpp": "shBrushCpp.js",
-	        "brush: java": "shBrushJava.js",
-	        "brush: xml": "shBrushXml.js",
-	        "brush: php": "shBrushPhp.js",
-	        "brush: perl": "shBrushPerl.js",
-	        "brush: python": "shBrushPython.js",
-	        "brush: ruby": "shBrushRuby.js",
-	        "brush: sql": "shBrushSql.js"}
-        var needLoadCount = 0;
-        var alreadyLoadCount = 0;
-		$('pre[class]').each(function() {
-			var brush = $(this).attr("class");
-			var js = map[brush]
-			if (js) {
-                needLoadCount++;
-				map[brush] = null; // 不要重复加载
-				loadJS(pathPrefix + js, function () {
-                    alreadyLoadCount++;
-                    if (alreadyLoadCount == needLoadCount) {
-						//setTimeout(function() {
-	                        SyntaxHighlighter.highlight();
-						//}, 500);
-                    }
-                });
-			}
-		});
-    });
-
-	function loadJS(url, callback) {
-		$.getScript(url, function() {
-			callback();
-		});
-	}
-	 
-	/*
-	function loadJS(url, callback, charset) {
-	    var script = document.createElement('script');
-	    script.onload = script.onreadystatechange = function () {
-	        if (script && script.readyState && /^(?!(?:loaded|complete)$)/.test(script.readyState)) return;
-	        script.onload = script.onreadystatechange = null;
-	        script.src = '';
-	        script.parentNode.removeChild(script);
-	        script = null;
-	        if (callback) callback();
-	    };
-	    script.charset = charset || document.charset || document.characterSet;
-	    script.src = url;
-	    try { document.getElementsByTagName("head")[0].appendChild(script); } catch (e) { }
-	}
-	*/
-</script>
--->

app/views/blog/index.html

@@ -1,50 +0,0 @@
-{{template "blog/header.html" .}}
-
-<div id="postsContainer">
-	<div class="container">
-		{{if .notebookId}}
-		<h2>{{msg . "blogClass"}} - {{.notebook.Title}}</h2>
-		{{end}}
-	</div>
-	<div id="posts">
-		{{$G := .}}
-		{{range .blogs}}
-		<div class="each-post">
-			<div class="title">
-				<a href="{{$.viewUrl}}/{{.NoteId.Hex}}" title="{{msg $ "fullBlog"}}">
-					{{.Title}}
-				</a>
-			</div>
-			<div class="created-time">
-				<i class="fa fa-bookmark-o"></i>
-				{{if .Tags}} 
-					{{blogTags $ .Tags}}
-				{{else}}
-					{{msg $ "noTag"}}
-				{{end}}
-				|
-				<i class="fa fa-calendar"></i> {{msg $ "updatedTime"}} {{.UpdatedTime | datetime}} | 
-				<i class="fa fa-calendar"></i> {{msg $ "createdTime"}} {{.CreatedTime | datetime}}
-			</div>
-			<div class="desc">
-				{{.Content | raw}}
-			</div>
-			<a class="more" href="{{$.viewUrl}}/{{.NoteId.Hex}}" title="{{msg $ "fullBlog"}}">{{msg $ "more"}}.</a>
-		</div>
-		{{end}}
-		<!-- 分页 -->
-		<ul class="pager">
-			{{if .notebookId}}
-				{{set $ "pageUrl" (concatStr $.cateUrl "/" .notebookId)}}
-			{{else}}
-				{{set $ "pageUrl" $.indexUrl}}
-			{{end}}
-			{{page $.pageUrl .page .pageSize .count}}
-		</ul>
-	</div>
-</div>
-
-{{template "blog/footer.html" .}}
-{{template "blog/highlight.html"}}
-</body>
-</html>

app/views/blog/search.html

@@ -1,45 +0,0 @@
-{{template "blog/header.html" .}}
-
-<div id="postsContainer">
-	<div class="container">
-		<h2>{{msg . "search"}} - {{.key}} </h2>
-	</div>
-
-	<div id="posts">
-		{{range .blogs}}
-		<div class="each-post">
-			<div class="title">
-				<a href="{{$.viewUrl}}/{{.NoteId.Hex}}" title="{{msg $ "fullBlog"}}">
-					{{.Title}}
-				</a>
-			</div>
-			<div class="created-time">
-				<i class="fa fa-bookmark-o"></i>
-				{{if .Tags}} 
-					{{blogTags $ .Tags}}
-				{{else}}
-					{{msg $ "noTag"}}
-				{{end}}
-				|
-				<i class="fa fa-calendar"></i> {{msg $ "updatedTime"}} {{.UpdatedTime | datetime}} | 
-				<i class="fa fa-calendar"></i> {{msg $ "createdTime"}}  {{.CreatedTime | datetime}}
-			</div>
-			<div class="desc">
-				{{.Content | raw}}
-			</div>
-			<a class="more" href="{{$.viewUrl}}/{{.NoteId.Hex}}" title="{{msg $ "fullBlog"}}">{{msg $ "more"}}</a>
-		</div>
-		{{end}}
-		
-		{{if not .blogs }}
-			<div class="each-post">
-				{{msg . "none"}}
-			</div>
-		{{end}}
-	</div>
-</div>
-
-{{template "blog/footer.html" .}}
-{{template "blog/highlight.html"}}
-</body>
-</html>

app/views/blog/set.html

@@ -1,323 +0,0 @@
-{{template "blog/header.html" .}}
-
-<!-- set页面不是自定义域名和二级域名页  -->
-<link rel="stylesheet" href="{{.siteUrl}}/tinymce/skins/custom/skin.min.css" type="text/css">
-<style>
-.tab-pane {
-	padding-top: 10px;
-}
-
-</style>
-<div id="postsContainer">
-	<div id="posts">
-		<ul id="myTab" class="nav nav-tabs">
-			<li class="active"><a href="#baseInfo" data-toggle="tab">{{msg . "baseInfoSet"}}</a></li>
-			<li class=""><a href="#commentInfo" data-toggle="tab">{{msg . "commentSet"}}</a></li>
-			<li class=""><a href="#styleInfo" data-toggle="tab">{{msg . "themeSet"}}</a></li>
-		</ul>
-
-		<!-- Tab panes -->
-		<div class="tab-content">
-			<div class="tab-pane" id="styleInfo">
-				<form class="form-horizontal" role="form">
-					<div class="form-group">
-						<label class="col-sm-2 control-label"></label>
-						<div class="col-sm-10">
-							<div class="alert alert-success" id="styleMsg" style="display: none; margin-bottom: 3px;"></div>
-						</div>
-					</div>
-					
-					<div class="form-group">
-						<label for="Style" class="col-sm-2 control-label">{{msg . "theme"}}</label>
-						<div class="col-sm-10" style="margin-top: 6px;" id="themeList">
-							<label>
-							<img class="preview" src="{{$.siteUrl}}/images/blog/theme/default.png" />
-							<input type="radio" name="Style"
-								value="blog_default" 
-								{{if not .userBlog.Style}}
-									checked="checked"
-								{{else}} 
-									{{if eq .userBlog.Style "blog_default"}}
-										checked="checked"
-									{{end}}
-								{{end}}>
-								{{msg . "default"}} 
-								</label> 
-								<label>
-								<img class="preview" src="{{$.siteUrl}}/images/blog/theme/elegent.png" />
-								<input type="radio" name="Style"
-								value="blog_daqi" 
-								{{if eq .userBlog.Style "blog_daqi"}}checked="checked"{{end}}>
-								{{msg . "elegant"}}
-								</label>
-								<label>
-								<img class="preview"  src="{{$.siteUrl}}/images/blog/theme/left_nav_fix.png" />
-								<input type="radio" name="Style"
-								value="blog_left_fixed" 
-								{{if eq .userBlog.Style "blog_left_fixed"}}checked="checked"{{end}}>
-								{{msg . "navFixed"}}
-								</label>
-						</div>
-					</div>
-						<div class="form-group">
-							<div class="col-sm-offset-2 col-sm-10">
-								<button class="btn btn-success">{{msg . "save"}}</button>
-								<span class="msg"></span>
-							</div>
-						</div>
-				</form>
-			</div>
-			<div class="tab-pane" id="commentInfo">
-				<form class="form-horizontal" role="form">
-					<div class="form-group">
-						<label class="col-sm-2 control-label"></label>
-						<div class="col-sm-10">
-							<div class="alert alert-success" id="commentMsg" style="display: none; margin-bottom: 3px;"></div>
-						</div>
-					</div>
-					<div class="form-group">
-						<label for="subTitle" class="col-sm-2 control-label">{{msg . "chooseComment"}}</label>
-						<div class="col-sm-10">
-							<label>
-								<input type="checkbox" id="CanComment" name="CanComment"
-									{{if .userBlog.CanComment}}checked="checked"{{end}} > {{msg . "openComment"}}
-							</label>
-							
-							<br />
-							
-							<div id="commentSet" {{if not .userBlog.CanComment}}style="display: none"{{end}}>
-								<label>
-									<input type="radio"
-										name="commentType"
-										value="default"
-										{{if or (not .userBlog.CommentType) (eq .userBlog.CommentType "default")}}checked="checked"{{end}} > Default
-								</label>
-									
-								<label>
-									<input type="radio" name="commentType" id="disqus"
-										value="disqus"
-										{{if eq .userBlog.CommentType "disqus"}}checked="checked"{{end}} > Disqus
-								</label>
-					
-								<div id="disqusSet" {{if not (eq .userBlog.CommentType "disqus")}}style="display: none"{{end}}>
-									<label for="DisqusId">Disqus Id</label> <input type="text"
-										class="form-control" style="display: inline; width: 50%"
-										id="DisqusId" name="DisqusId"
-										value="{{if .userBlog.DisqusId}}{{.userBlog.DisqusId}}{{else}}leanote{{end}}">
-									<br /> 
-									{{msg . "disqusHelp"}}
-									<a target="_blank" href="http://leanote.com/blog/view/52db8463e01c530ef8000001">{{msg . "needHelp"}}</a>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
-							<button class="btn btn-success">{{msg . "save"}}</button>
-							<span class="msg"></span>
-						</div>
-					</div>
-				</form>
-			</div>
-			
-			<div class="tab-pane active" id="baseInfo">
-				<div class="form-horizontal" role="form" id="userBlogForm">
-					<div class="form-group">
-						<label class="col-sm-2 control-label"></label>
-						<div class="col-sm-10">
-							<div class="alert alert-success" id="msg"
-								style="display: none; margin-bottom: 3px;"></div>
-						</div>
-					</div>
-					<div class="form-group">
-						<label for="title" class="col-sm-2 control-label">{{msg . "blogName"}}</label>
-						<div class="col-sm-10">
-							<input type="text" class="form-control" id="Title" name="Title"
-								placeholder="eg: leanote's blog"
-								value="{{if .userBlog.Title}}{{.userBlog.Title}}{{else}}{{.userInfo.Email}} 's blog{{end}}">
-						</div>
-					</div>
-
-					<div class="form-group">
-						<label for="logo" class="col-sm-2 control-label">{{msg . "blogLogo"}}</label>
-						<div class="col-sm-10">
-							<input type="hidden" name="Logo" id="Logo"
-								value="{{.userBlog.Logo}}" />
-							<form id="formLogo" action="{{$.siteUrl}}/file/uploadBlogLogo" method="post"
-								enctype="multipart/form-data" target="logoTarget"
-								onsubmit="inProgress()">
-								<input type="file" class="form-control" id="logo2" name="file"
-									onChange='$("#formLogo").submit();' /> 
-									{{msg . "blogLogoTips"}}
-								<div id="logoImg"
-									{{if .userBlog.Logo }}	
-						{{else}}
-						style="display: none"{{end}}
-						>
-									<img src="{{.userBlog.Logo}}" style="height: 40px" /> <a
-										href="#" id="deleteLogo">{{msg . "delete"}}</a>
-								</div>
-							</form>
-							<iframe id="logoTarget" name="logoTarget" src="#"
-								style="display: none"></iframe>
-						</div>
-					</div>
-
-					<div class="form-group">
-						<label for="subTitle" class="col-sm-2 control-label">{{msg . "blogDesc"}}</label>
-						<div class="col-sm-10">
-							<input type="text" class="form-control" id="SubTitle"
-								name="SubTitle" value="{{.userBlog.SubTitle}}"
-								placeholder="eg: leanote, Not Just A Notebook">
-						</div>
-					</div>
-
-					<div class="form-group">
-						<label for="aboutMe" class="col-sm-2 control-label"></label>
-						<div class="col-sm-10">
-							<div id="popularToolbar"></div>
-						</div>
-					</div>
-
-					<div class="form-group">
-						<label for="aboutMe" class="col-sm-2 control-label">{{msg . "aboutMe"}}</label>
-						<div class="col-sm-10">
-							<textarea id="AboutMe" name="AboutMe">{{.userBlog.AboutMe}}</textarea>
-						</div>
-					</div>
-
-					<div class="form-group">
-						<div class="col-sm-offset-2 col-sm-10">
-							<button class="btn btn-success">{{msg . "save"}}</button>
-							<span class="msg"></span>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-
-	</div>
-
-	{{template "blog/footer.html" .}}
-	
-	<script src="{{.siteUrl}}/js/common-min.js"></script>
-	<script type="text/javascript" src="{{.siteUrl}}/tinymce/tinymce.min.js"></script>
-
-<script>
-var urlPrefix = "{{.siteUrl}}";
-$(function() {
-	tinymce.init({
-		selector : "#AboutMe",
-		content_css : [ "/css/bootstrap.css", "/css/editor/editor.css" ],
-		skin : "custom",
-		language : "{{.locale}}",
-		height : 300,
-		width : "100%",
-		skin : "custom",
-		plugins : [
-				"advlist autolink link leanote_image lists charmap hr ",
-				"searchreplace visualblocks visualchars leanote_code tabfocus",
-				"table contextmenu directionality textcolor paste fullpage textcolor"],
-		toolbar1 : "formatselect |fontselect fontsizeselect| forecolor backcolor | bold italic underline strikethrough | bullist numlist |",
-		menubar : false,
-		toolbar_items_size : 'small',
-		statusbar : false,
-		font_formats : "Arial=arial,helvetica,sans-serif;"
-				+ "Arial Black=arial black,avant garde;"
-				+ "Times New Roman=times new roman,times;"
-				+ "Courier New=courier new,courier;"
-				+ "Tahoma=tahoma,arial,helvetica,sans-serif;"
-				+ "Verdana=verdana,geneva;" + "宋体=SimSun;"
-				+ "新宋体=NSimSun;" + "黑体=SimHei;"
-				+ "微软雅黑=Microsoft YaHei",
-		block_formats : "Header 1=h1;Header 2=h2;Header 3=h3; Header 4=h4;Pre=pre;Paragraph=p"
-	});
-	$("#deleteLogo").click(function() {
-		$("#Logo").val("");
-		$("#logoImg").hide();
-	});
-
-	$("#CanComment").click(function() {
-		if ($(this).is(":checked")) {
-			$("#commentSet").show();
-		} else {
-			$("#commentSet").hide();
-		}
-	});
-	
-	$("input[name='commentType']").click(function() {
-		if ($("input[name='commentType']:checked").val() == "disqus") {
-			$("#disqusSet").show();
-		} else {
-			$("#disqusSet").hide();
-		}
-	});
-	
-	
-	// 基本设置
-	$("#baseInfo .btn-success").click(function() {
-		var data = {
-			Title : $("#Title").val(),
-			SubTitle : $("#SubTitle").val(),
-			Logo : $("#Logo").val(),
-			AboutMe : getEditorContent()
-		}
-		
-		post("/blog/setUserBlogBase", data, function(ret) {
-			showMsg2($("#baseInfo .msg"), "{{msg . "saveSuccess"}}", 2000);
-			$("#blogDesc").html(data.SubTitle);
-			$("#logo").html(data.Title);
-			if(data.Logo) {
-				$("#logo").html(t('<img src="?" />', urlPrefix + "/" + data.Logo));
-			}
-		}, this);
-	});
-	// 评论
-	$("#commentInfo .btn-success").click(function(e) {
-		e.preventDefault();
-		var data = {
-			CanComment : $("#CanComment").is(":checked"),
-			CommentType: $("input[name='commentType']:checked").val(),
-			DisqusId : $("#DisqusId").val(),
-		}	
-		post("/blog/setUserBlogComment", data, function(ret) {
-			showMsg2($("#commentInfo .msg"), "{{msg . "saveSuccess"}}", 2000);
-		}, this);
-	});
-	
-	// 主题
-	$("#styleInfo .btn-success").click(function(e) {
-		e.preventDefault();
-		var data = {
-			Style : $("input[name='Style']:checked").val()
-		}
-		post("/blog/setUserBlogStyle", data, function(ret) {
-			showMsg2($("#styleInfo .msg"), "{{msg . "saveSuccess"}}", 2000);
-		}, this);
-	});
-	$("input[name='Style']").click(function() {
-		$("#styleLink").attr("href", "/css/blog/" + $(this).val() + ".css");
-	});
-});
-
-function inProgress() {
-}
-
-// filename, result, resultCode
-function uploadFinish(ret) {
-	if (ret) {
-		if (ret.resultCode == '1') {
-			$("#logoImg img").attr("src", urlPrefix + "/" + ret.filename).parent().show();
-			$("#Logo").val(ret.filename);
-			return;
-		}
-		alert(ret.result);
-		return;
-	}
-	// 上传出错
-	alert("上传出错");
-}
-</script>
-</div>
-</body>
-</html>

app/views/blog/view.html

@@ -1,125 +0,0 @@
-{{template "blog/header.html" .}}
-
-<div id="postsContainer">
-	<div id="posts">
-		<div class="each-post">
-			<div class="title">
-				{{.blog.Title}}
-			</div>
-			<div class="created-time">
-				<i class="fa fa-bookmark-o"></i>
-				{{if .blog.Tags}} 
-					{{blogTags $ .blog.Tags}}
-				{{else}}
-					{{msg . "noTag"}}
-				{{end}}
-				|
-				<i class="fa fa-calendar"></i> {{msg . "updatedTime"}} {{.blog.UpdatedTime | datetime}} | 
-				<i class="fa fa-calendar"></i> {{msg . "createdTime"}} {{.blog.CreatedTime | datetime}}
-			</div>
-			
-			<div class="mobile-created-time">
-			{{ if .userInfo.Logo}}
-				<img src="{{.userInfo.Logo}}" id="userLogo">
-			{{else}}
-				<img src="{{$.siteUrl}}/images/blog/default_avatar.png" id="userLogo">
-			{{end}}
-			{{.userInfo.Username}}
-	
-			{{if .blog.Tags}}
-				&nbsp;
-				<i class="fa fa-bookmark-o" style="color: #666"></i>
-				{{blogTags $ .blog.Tags}}
-			{{end}}
-			</div>
-			
-			<div class="desc" id="content">
-				{{if .blog.IsMarkdown }}
-					<div id="markdownContent" style="display: none">
-						<!-- 用textarea装html, 防止得到的值失真 -->
-						<textarea>
-						{{.blog.Content | raw}}
-						</textarea>
-					</div>
-					<div style="padding: 20px; text-align: center">
-						<img src="/images/loading-32.gif" />
-					</div>
-				{{else}}
-						{{.blog.Content | raw}}
-				{{end}}
-				
-				<div id="desc" class="hide">{{.blog.Desc}}</div>
-			</div>
-			
-			<!-- comment -->
-			{{template "blog/comment.html" .}}
-		</div>
-	</div>
-</div>
-{{template "blog/footer.html" .}}
-{{template "blog/highlight.html"}}
-<div id="blogNav">
-	<div id="blogNavNav">
-		<i class="fa fa-align-justify" title="文档导航"></i>
-		<span>{{msg . "blogNav"}}</span>
-	</div>
-	<div id="blogNavContent">
-	</div>
-</div>
-
-<script>
-var visitUserInfo = eval("(" + {{.visitUserInfoJson}} + ")");
-var urlPrefix = "{{.siteUrl}}";
-var noteId = "{{.blog.NoteId.Hex}}";
-var preLikeNum = +"{{.blog.LikeNum}}";
-var commentNum = +"{{.blog.CommentNum}}";
-</script>
-<script src="/js/app/blog/common.js"></script>
-<script src="/js/jsrender.js"></script>
-<script src="/js/jquery-cookie-min.js"></script>
-<script src="/js/bootstrap-dialog.min.js"></script>
-<script src="/js/jquery.qrcode.min.js"></script>
-<script src="/js/app/blog/view.js"></script>
-
-{{if .blog.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="/public/mdeditor/editor/Markdown.Extra.js"></script>
-
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="/public/mdeditor/editor/mathJax.js"></script>
-<script src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-<script>
-var content = $.trim($("#markdownContent textarea").val());
-
-// $("#markdownContent").html("");
-var converter = Markdown.getSanitizingConverter();
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-var html = converter.makeHtml(content);
-$("#content").html(html);
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
-</script>
-{{else}}
-<script>
-$(function() {
-	initNav();
-	weixin();
-});
-</script>
-{{end}}
-
-<!--google+
-<script type="text/javascript" src="https://apis.google.com/js/plusone.js"> {lang: 'zh-CN'} </script>
--->
-</body>
-</html>

app/views/file/pdf.html

@@ -50,12 +50,12 @@ table tr:nth-child(2n) {
 		{{ if .userBlog.Logo}}
 			<img src="{{.userBlog.Logo}}" id="logo">
 		{{else}}
-			<img src="{{$.siteUrl}}/images/blog/default_avatar.png" id="logo">
+			<img src="/images/blog/default_avatar.png" id="logo">
 		{{end}}
 		{{.userInfo.Username}}
 	-->
 		{{if .blog.Tags}}
-			<img src="{{$.siteUrl}}/images/blog/tag.png" id="tag">
+			<img src="/images/blog/tag.png" id="tag">
 			{{blogTagsForExport $ .blog.Tags}}
 		{{end}}
 	</div>
@@ -79,7 +79,7 @@ table tr:nth-child(2n) {
 <!--
 <div id="footer">
 	<p class="split"></p>
-	<a href="http://leanote.com"><img src="{{.siteUrl}}/images/logo/leanote_icon_blue.png" id="leanote_logo"/></a>
+	<a href="http://leanote.com"><img src="/images/logo/leanote_icon_blue.png" id="leanote_logo"/></a>
 	<p>
 		<a href="http://leanote.com">Leanote</a>
 		<br />
@@ -88,10 +88,10 @@ table tr:nth-child(2n) {
 </div>
 -->
 
-<script src="{{.siteUrl}}/js/jquery-1.9.0.min.js"></script>
+<script src="/js/jquery-1.9.0.min.js"></script>
 
-<link href="{{.siteUrl}}/public/js/google-code-prettify/prettify.css" type="text/css" rel="stylesheet">
+<link href="/public/js/google-code-prettify/prettify.css" type="text/css" rel="stylesheet">
-<script src="{{.siteUrl}}/public/js/google-code-prettify/prettify.js"></script>
+<script src="/public/js/google-code-prettify/prettify.js"></script>
 
 <script>
 function ok() {

app/views/home/header.html

@@ -37,6 +37,7 @@ function log(o) {
 		<div id="navbar" class="navbar-collapse collapse">
 			<div id="lang">
 				<a data-lang="en-us">English</a>
+				<a data-lang="de-de">Deutsch</a>
 				<a data-lang="fr-fr">Français</a>
 				<a data-lang="zh-cn">简体中文</a>
 				<a data-lang="zh-hk">繁体中文</a>
@@ -111,4 +112,4 @@ function log(o) {
 		</ul>
 	</div>
 </div>
--->
+-->

app/views/member/blog/theme.html

@@ -44,7 +44,7 @@
 					    	<a class="btn btn-default btn-sm btn-export"><span class="fa fa-download"></span> {{msg $ "export"}}</a>
 					    	<!-- 必须是自己的主题 -->
 					    	{{if .activeTheme.ThemeId}}
-						    	<a class="btn btn-default btn-sm" href="{{$.siteUrl}}/preview?themeId={{.activeTheme.ThemeId.Hex}}" target="_blank"><span class="fa fa-eye"></span> {{msg $ "preview"}}</a>
+						    	<a class="btn btn-default btn-sm" href="/preview?themeId={{.activeTheme.ThemeId.Hex}}" target="_blank"><span class="fa fa-eye"></span> {{msg $ "preview"}}</a>
 					    	{{end}}
 					    	<a class="btn btn-primary btn-sm" target="_blank" href="/member/blog/updateTheme?themeId={{if .activeTheme.ThemeId}}{{.activeTheme.ThemeId.Hex}}{{end}}"><span class="fa fa-pencil"></span> {{msg $ "edit"}}</a>
 				    	</div>
@@ -84,7 +84,7 @@
 				    	<div class="btn-group" data-id="{{.ThemeId.Hex}}">
 					    	<a class="btn btn-default btn-sm btn-delete" data-loading-text="..."><span class="fa fa-remove"></span> {{msg $ "delete"}}</a>
 					    	<a class="btn btn-default btn-sm btn-export"><span class="fa fa-download"></span> {{msg $ "export"}}</a>
-					    	<a class="btn btn-default btn-sm" href="{{$.siteUrl}}/preview?themeId={{.ThemeId.Hex}}" target="_blank"><span class="fa fa-eye"></span> {{msg $ "preview"}}</a>
+					    	<a class="btn btn-default btn-sm" href="/preview?themeId={{.ThemeId.Hex}}" target="_blank"><span class="fa fa-eye"></span> {{msg $ "preview"}}</a>
 					    	<a class="btn btn-default btn-sm"  target="_blank" href="/member/blog/updateTheme?themeId={{.ThemeId.Hex}}"><span class="fa fa-pencil"></span> {{msg $ "edit"}}</a>
 					    	<a class="btn btn-primary btn-sm btn-active" data-loading-text="..."><span class="fa fa-check"></span> {{msg $ "use"}}</a>
 					    	{{if $.isAdmin}}

app/views/member/blog/update_theme.html

@@ -8,7 +8,7 @@
 		- 
 		{{.theme.Name}}
 		{{end}}
-		<a class="btn btn-default" href="{{$.siteUrl}}/preview?themeId={{.themeId}}" target="_blank"><span class="fa fa-eye"></span> {{msg . "preview"}}</a>
+		<a class="btn btn-default" href="/preview?themeId={{.themeId}}" target="_blank"><span class="fa fa-eye"></span> {{msg . "preview"}}</a>
 		
 		<small>
 		

bin/release.sh

@@ -9,7 +9,7 @@ SP=$(cd "$(dirname "$0")"; pwd)
 tmp="/Users/life/Desktop/leanote_release"
 
 # version
-V="v1.4.2"
+V="v2.0"
 
 ##=================================
 # 1. 先build 成 3个平台, 2种bit = 6种

conf/app.conf

@@ -21,7 +21,7 @@ db.password= # if not exists, please leave it blank
 # db.urlEnv=${MONGODB_URL} # set url from env. eg. mongodb://root:root123@localhost:27017/leanote
 
 # You Must Change It !! About Security!!
-app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y 
+app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y #
 
 #--------------------------------
 # revel config

messages/de-de/album.conf

@@ -0,0 +1,31 @@
+
+# album image
+Images=Bilder
+Upload=Upload
+Image URL=Bild URL
+Albums=Alben
+Default=Standard
+File title search=Dateinamensuche
+Go to upload images=Gehe zu Bildupload
+Rename=Umbenennen
+Add=Hinzufügen
+Add Album=Album hinzufügen
+Add Image=Bild hinzufügen
+Can't load this url=Diese URL kann nicht geladen werden
+No Images=Keine Bilder
+Click to upload images Or Drop images to here=Hier Klicken und Bilder hochzuladen oder per Drag'n'Drop Bilder hier ablegen
+
+Cannot delete default album=Standard Album kann nicht gelöscht werden
+Cannot rename default album=Standard Album kann nicht umbenannt werden
+This album has images, please delete it's images at first.=Dieses Album enthält Bilder, bitte diese zuerst löschen.
+
+Rename Album=Album umbenennen
+Add Success!=Hinzufügen erfolgreich!
+Rename Success!=Umbenennen erfolgreich!
+Delete Success!=Löschen erfolgreich!
+Are you sure to delete this image ?=Soll dieses Bild wirklich gelöscht werden ?
+click to remove this image=Klicken um dieses Bild zu löschen
+error=Fehler
+Error=Fehler
+Prev=Vorheriges
+Next=Nächstes

messages/de-de/blog.conf

@@ -0,0 +1,91 @@
+# blog
+
+blogNavs=Navigation
+quickLinks=Quick Links
+latestPosts=Neuste Posts
+
+noBlog=Kein Blog
+noTag=Keine Tags
+blogClass=Kategorie
+updatedTime=Aktualisert am
+createdTime=Erstellt am
+fullBlog=Vollstädiger Blog
+blogNav=Blog Navigation
+more=Mehr...
+previous=Vorherige
+next=Nächste
+
+#
+# set blog
+#
+blogSet=Blog Konfiguration
+baseInfoSet=Grundeinstellungen
+commentSet=Kommentar
+themeSet=Theme
+theme=Theme
+blogName=Titel
+blogLogo=Logo
+blogDesc=Beschreibung
+aboutMe=Über mich
+
+#domain
+domainSet=Domain
+subDomain=Sub-Domain
+domain=Eigene Domain
+
+# theme
+elegant=Elegant
+navFixed=Navigation fest am linken Rand
+
+openComment=Offen für Kommentare?
+chooseComment=Kommentar System
+disqusHelp=Bitte Disqus Id eingeben
+needHelp=Brauche Sie Hilfe?
+blogLogoTips=Bild Hochladen für den Blogtitel
+saveSuccess=Speichern erfolgreich
+
+community=Community
+home=Home
+none=Keine
+moreShare=Mehr
+sinaWeibo=Weibo
+weixin=Weichat
+tencentWeibo=Tencent Weibo
+qqZone=QQ Zone
+renren=Renren
+report=Report
+like=Gefällt mir
+unlike=Gefällt mir nicht mehr
+viewers=Betrachter
+author=Autor
+delete=Löschen
+reply=Antworten
+comment=Kommentar
+comments=Kommentare
+cancel=Abbrechen
+confirm=Bestätigen
+signIn=Anmelden
+signUp=Registrieren
+submitComment=Absenden
+reportReason1=不友善内容
+reportReason2=广告等垃圾信息
+reportReason3=违法违规内容
+reportReason4=不宜公开讨论的政治内容
+other=Anderes
+reportReason=Grund
+chooseReason=请选择举报理由
+reportSuccess=举报成功, 我们处理后会通知作者, 感谢您的监督
+error=Error
+reportComment?=举报该评论?
+reportBlog?=举报该博客?
+confirmDeleteComment=Sind Sie sicher?
+scanQRCode=Öffnen Sie weichat und scannen den QR Code
+justNow=Jetz
+minutesAgo=Minuten
+hoursAgo=Stunden
+daysAgo=Tage
+weeksAgo=Wochen
+monthsAgo=Monate
+
+
+a=a

messages/de-de/markdown.conf

@@ -0,0 +1,35 @@
+
+# markdown editor
+
+Hyperlink=Hyperlink
+Please provide the link URL and an optional title=Bitte Link URL und einen optionalen Titel angeben
+optional title=Optionaler Titel
+Ok=Ok
+Cancel=Abbrechen
+Strong=Fett
+strong text=Text in Fettschrift
+Emphasis=Kursiv
+emphasized text=Kursiver Text
+Blockquote=Blockzitat
+Code Sample=Code-Schnipsel
+enter code here=Code hier eingeben
+Image=Bild
+Heading=Überschrift
+Numbered List=Nummerierte Liste
+Bulleted List=Aufzählungsliste
+List item=Listenelement
+Horizontal Rule=Horizontale Trennlinie
+Markdown syntax=Markdown Syntax
+Undo=Rückgängig
+Redo=Wiederholen
+enter image description here=Beschreibung des Bildes hier eingeben
+enter link description here=Beschreibung des Links hier eingeben
+Edit mode=Bearbeiten Modus
+Vim mode=Vim Modus
+Emacs mode=Emacs Modus
+Normal mode=Normaler Modus
+Normal=Normal
+Light=Light
+Light editor=Light Editor
+
+Insert Image=Bild einfügen

messages/de-de/member.conf

@@ -0,0 +1,135 @@
+####################
+# Member Center
+####################
+
+memberCenter=Mitgliederbereich
+userNotExists=Der Benutzer ist nicht vorhanden
+hasUsers=Der Benutzer existiert bereits
+Leanote Blog Theme Api=Leanote Blog Theme Schnittstelle
+My Group=Meine Gruppe
+
+# post abstract
+
+Abstract=Zusammenfassung
+Description=Beschreibungn
+Once the abstract has been updated, it will not set the abstract automatically other than you cancel it.=Wenn die Zusammenfassung einmal definiert wurde, wird sie nicht automatisch aktulisiert werden, wenn Sie sie löschen.
+Main Image=Haupt-Bild
+Get next image as main image from content=Das Bild als Haupt-Bild von folgendem Inhalt definieren
+Raw Content=Rohdaten
+
+#memeber
+welcomeToLeanote=Willkommen
+accountInfo=Konto Information
+accountType=Konto Typ
+premiumAccountType=Premium
+normalAccountType=Normal
+imageSize=Bild Kapazität
+attachSize=Anhang Kapazität
+totalTraffic=Web Traffic
+upgrade=Konto Upgraden
+leanoteEvents=Leanote News
+addLeanoteAccount=Neues Leanote Konto
+defaultComment=Standard Leanote Kommentar System
+upgradeAccountTips=Ich möchte eine eigene Domain für meinen Blog verwenden, <a class="btn btn-default" href="/service">Konto Upgrade</a>
+cateIsPublicNotebook=Kategorie der veröffentlichten Notizen
+dragAndSort=Ziehen zum Sortieren
+permanentLink=Permanent Link
+cate=Kategorie
+noCates=Keine Kategorie
+single=Einfache Seite
+singleTips=Es können viele einzelne Seiten angelegt werden
+addSingle=Neue einfache Seite
+updateSingle=Einfache Seite aktualisieren
+inputSingleTitle=Titel für einfache Seite erforderlich
+saveSort=Reihenfolge speichern
+pagingAndSort=Paging und Sortiereinstellungen
+perPageSize=Anzahl Posts pro Seite
+sortField=Sortierfeld
+sortType=Sortiertyp
+publicTime=Veröffentlicht am
+createdTime=Erstellt am
+updatedTime=Geändert am
+desc=Absteigend
+asc=Aufsteigend
+postList=Veröffentlichungsliste
+hasSelfDefined=ist definiert
+noSelfDefined=ist nicht definiert
+setAbstract=Einstellungen der Zusammenfassung
+title=Titel
+content=Inhalt
+
+addTheme=Neues Theme
+importTheme=Import Theme
+exportTheme=Export Theme
+export=Export
+preview=Vorschau
+edit=Bearbeiten
+use=Benutzen
+install=Installieren
+currentTheme=Aktuelles Theme
+myOtherThemes=Meine anderen Themes
+leanoteThemeMarket=Leanote Theme Market
+updateTheme=Theme aktualisieren
+tplStyleScript=template, style, script
+newFile=Neue Datei
+image=Bild
+currentFile=Aktuelle Datei
+tpl=Template
+style=Style
+script=Script
+header=Header
+footer=Footer
+index=Home
+cate=Kategorie
+search=Suchen
+single=Einfache Seite
+archive=Archiv
+post=Post
+tags=Tags
+tag_posts=Tag's posts
+share_comment=Kommentare
+themeJson=Theme Einstellungen
+paging=Paging
+highlight=Code highlight
+
+# member title
+Leanote Member Center=Leanote Mitgliederbereich
+Username=Benutzername
+Email=E-Mail
+Password=Passwort
+Avatar=Avatar
+Add Account=Konto hinzufügen
+Update Post Abstract=Zusammenfassung aktualisieren
+Blog Base Info=Blog Grundeinstellungen
+Comment=Kommentare
+Posts=Posts
+Domain=Domain
+Paging=Paging
+Category=Kategorien
+Add Single=Einfache Seite hinzufügen
+Update Single=Einfache Seite aktualiseren
+Single=Einfache Seiten
+Theme=Theme
+Upate Theme=Theme Aktualisieren
+
+group=Gruppe
+newGroup=Neue Gruppe
+deleteGroup=Gruppe löschen
+addMemberTips=Benutzername oder E-Mail angeben um Benutzer hinzuzufügen
+deleteMember=Mitglied entfernen
+forbiddenNotMyGroup=Sie haben keine Zugriffsrechte, da Sie nicht Besitzer der Gruppe sind
+userExistsInGroup=Dieser Benutzer ist bereits Mitglied in der Gruppe
+notMyGroup=Sie sind nicht Besitzer der Gruppe
+
+# view js
+Are you sure ?=Sind Sie sicher ?
+Are you sure to install it ?=Soll das wirklich installiert werden ?
+Are you sure to delete=Wirklich löschen
+Success=Erfolgreich
+Error=Fehler
+File exists=Datei bereits vorhanden
+Delete file=Datei löschen
+No images=Keine Bilder
+Filename=Dateiname
+Group Title=Gruppenname
+

messages/de-de/msg.conf

@@ -0,0 +1,286 @@
+# leanote
+app=Leanote
+moto=Nicht nur ein Notizzettel!
+moto2=Wissen teilen, Blog, Zusammenarbeit ... Alles in Leanote
+moto3=Einfach, aber nicht leicht
+fork github=Fork Leanote auf Github
+
+# Anfang
+openSource=leanote.org
+forgetPassword = Passwort vergessen?
+or=oder
+try=Ausprobieren
+3th=Externe Konten
+usernameOrEmail=Nutzername oder E-Mail
+password=Passwort
+home=Home
+desktopApp=App
+aboutLeanote=Über Leanote
+suggestions=Vorschläge
+yourSuggestions=Vorschläge
+leanoteBlog=Blog
+knowledge=Wissen
+knowledgeInfo=Nutze Leanote als Notizzettel und verwalte dein Wissen in Leanote.
+share=Teilen
+shareInfo=Teile dein Wissen mit Anderen in Leanote.
+cooperation=Zusammenarbeit
+cooperationInfo=Arbeite mit Anderen zusammen und verbessere dein Wissen.
+blog=Blog
+blogInfo=Veröffentliche dein Wissen, und Leanote ist dein Blog!
+suggestionsInfo=Hilf uns, unseren Service zu verbessern.
+yourContact=Dein Kontakt
+emailOrOthers=E-Mail oder andere Kontaktmöglichkeiten
+captcha=Sicherheitswort
+reloadCaptcha=Sicherheitswort neu laden
+captchaError=Sicherheitswort stimmt nicht überein
+inputCaptcha=Sicherheitswort ist notwendig
+noTag=Keine Tags
+
+hi=Hallo
+welcomeUseLeanote=Willkommen!
+myNote=Meine Notizen
+curUser=E-Mail
+
+# form
+submit=Übertragen
+Submit=Übertragen
+register=Registrieren
+login=Einloggen
+Password=Passwort
+password2=Bestätige dein Passwort
+email=E-Mail
+inputUsername=Nutzername(E-Mail) ist erforderlich
+inputEmail=E-Mail ist erforderlich
+wrongEmail=Falsche E-Mail
+wrongUsernameOrPassword=Falscher Nutzername oder Passwort
+inputPassword=Passwort ist erforderlich
+wrongPassword=Falsches Passwort
+logining=Einloggen
+loginSuccess=Einloggen erfolgreich
+ing=Bearbeiten
+use = Nutzen
+hadAcount = Du hast schon ein Konto?
+hasAcount = Du hast noch kein Konto?
+signInWithThird=Mit anderem Konto anmelden
+
+# Registrierung
+registerSuccessAndRdirectToNote=Registrierung erfolgreich, Weiterleitung ...
+userHasBeenRegistered=%s ist registriert
+
+# Passwort vergessen
+passwordTips=Passwortlänge mindestens 6 Zeichen
+findPassword=Finde Passwort
+findPasswordSendEmailOver=Wir haben dir bereits den Passwortlink geschickt, bitte überprüfe deine E-Mail.
+checkEmai=Überprüfe deine E-Mail
+findPasswordTimeout=Unterbrechung
+reFindPassword=Suche Passwort noch mal
+updatePassword=Aktualisiere Passwort
+updatePasswordSuccessRedirectToLogin=Aktualisierung des Passworts war erfolgreich, Weiterleitung zur Login-Seite ...
+inputPassword2=Bitte gib dein Passwort erneut ein
+confirmPassword=Bitte bestätige dein Passwort
+notGoodPassword=Kein sicheres Passwort, die Länge sollte zumindest 6 Zeichen betragen
+
+# Notizen Start
+myBlog=Blog
+Explore=Erkunden
+history=Verlauf
+save=Speichern
+editorTips=Tipps
+editorTipsInfo=<h4>1. Kurzbefehle</h4>ctrl+shift+c Ansicht ändern<h4>2. shift+enter Den aktuellen Block verlassen</h4> eg. <img src="/images/outofcode.png" style="width: 90px"/> in dieser Situation nutze shift+enter um den derzeitigen Block zu verlassen.
+newNote=Neue Notiz
+newMarkdownNote=Neue Markdown Notiz
+noNoteNewNoteTips=Diese Notizbuch ist leer, warum erstellst du keine neuen Notizen ...
+canntNewNoteTips=Entschuldigung, du kannst hier keine neue Notiz hinzufügen, bitte wähle zuerst ein Notizbuch.
+new=Neu
+newMarkdown=Neue Markup Notiz
+clickAddTag=Klicke hier, um Tags hinzuzufügen
+notebook=Notizbücher
+note=Notiz
+myNotebook=Meine Notizen
+addNotebook=Füge Notiz hinzu
+search=Suchen
+clearSearch=Lösche Suche
+all=Neueste
+trash=Papierkorb
+delete=Löschen
+unTitled=Ohne Titel
+defaultShare=Standard Freigabe
+leftHidden=Verstecke Seitenleiste
+leftShow=Zeige Seitenleiste
+nav=Notiznavigation
+writingMode=Schreibmodus
+normalMode=Normaler Modus
+saving=Speichern
+saveSuccess=Speichern erfolgreich
+SearchNote=Notizen suchen
+SearchNotebook=Notizbuch suchen
+Choose File=Datei auswählen
+Download All=Alle herunterladen
+Information=Information
+
+Toggle Modify with Readonly=Bearbeiten/Ansehen
+
+update=Aktualisierung
+create=Erzeugen
+
+demoRegister=<a href="/register">Registrieren</a>
+
+close=Schliessen
+cancel=Abbrechen
+send=Absenden
+
+# Etikett
+tag=Tags
+myTag=Meine Tags
+red=Rot
+yellow=Gelb
+blue=Blau
+green=Grün
+
+# Einrichtung
+accountSetting=Konto
+themeSetting=Darstellung
+setAvatar=Avatar
+logout=Abmelden
+basicInfo=Grundlagen
+basicInfoSet=Blog Grundeinstellugen
+updateEmail=Aktualisiere E-Mail
+usernameSetting=Aktualisiere Nutzernamen
+username=Nutzername
+avatar=Avatar
+chooseImage=Wähle Bild
+oldPassword=Altes Passwort
+newPassword=Neues Passwort
+admin=Admin
+
+default=Voreinstellung
+simple=Einfach
+
+# tinymce
+uploadImage=Bild hochladen
+
+# blog
+aboutMe=Über mich
+blogSet=Blog Einstellungen
+
+# index
+discussion=Forum
+download=Herunterladen
+howToInstallLeanote=Wie installiere ich Leanote?
+
+# 
+attachments = Anhang
+donate = Spenden
+
+# Kontextmenü
+shareToFriends=Teile mit Anderen
+publicAsBlog=Veröffentlichen als Blog
+cancelPublic=Veröffentlichung zurückziehen
+move=Verschieben
+copy=Kopieren
+rename=Umbenennen
+exportPdf=Export als PDF
+addChildNotebook=Erstelle Unter-Notizbuch
+deleteAllShared=Lösche gemeinsame Nutzer
+deleteSharedNotebook=Lösche gemeinsame Notiz
+copyToMyNotebook=Kopiere zu meinen Notizen
+
+####note-dev
+emailInSending=E-Mail in Zustellung 
+checkEmail=Überprüfe E-Mail
+setUsername=Lege Nutzernamen fest
+setUsernameTips=Deine aktuelle E-Mail ist: <code>%s</code>.Du kannst einen einzigartigen Nutzernamen anlegen. <br />Nutzername' mindestens 4 Zeichen und keinen Sonderzeichen.
+currentEmail=Deine aktuelle E-Mail Adresse lautet: <code>%s</code> 
+updateEmail=Aktualisiere E-Mail
+updateEmailTips=Bitte bestätige deine E-Mail nach dem Aktualisieren. Die verifizierte E-Mail ist dein neues Konto.
+sendVerifiedEmail=Schicke Bestätigungsmail
+verified=Bestätigt
+unVerified=Unbestätigt
+verifiedNow=Bestätige jetzt
+resendVerifiedEmail=Versende Bestätigungsmail noch einmal
+
+# Teilen
+defaulthhare=Voreinstellung
+addShare=Füge Freund hinzu
+friendEmail=E-Mail des Freundes
+permission=Erlaubnis
+readOnly=Nur lesen
+writable=Schreibrechte
+inputFriendEmail=E-Mail-Adresse deines Freundes wird benötigt
+clickToChangePermission=Klicke, um Erlaubniss zu ändern
+sendInviteEmailToYourFriend=Schicke deinem Freund eine E-Mail-Benachrichtigung
+copySuccess=Kopieren erfolgreich
+copyFailed=Fehler beim Kopieren
+friendNotExits=Dein Freund besitzt kein %s's Konto, Einladungs-Benachrichtigung verschicken: %s
+emailBodyRequired=E-Mail-Inhalt ist notwendig
+clickToCopy=Klicke zum Kopieren
+sendSuccess=Erfolgreich
+inviteEmailBody=Hallo, ich bin %s, %s ist grossartig, schau es dir an!
+
+# Verlauf
+historiesNum=Wir haben deine letzten <b>10</b> Einträge gespeichert.
+noHistories=Kein Verlauf
+fold=Einklappen
+unfold=Ausklappen
+datetime=Datum und Zeit
+restoreFromThisVersion=Wiederherstellen von dieser Version
+confirmBackup=Bist du sicher, dass du von dieser Version wiederherstellen willst? Wir werden die aktuelle Version speichern.
+createAccount=Erstelle Konto
+createAccountSuccess=Konto-Erstellung erfolgreich
+createAccountFailed=Fehler beim Erstellen des Kontos
+thirdCreateAcountTips=Du nutzt das  %(app)s Konto um dich einzuloggen, du kannst %(app)s Konto erstellen. <br /> Nachdem du das %(app)s Konto erstellt hast, kannst du dich %(app)s einloggen.
+
+## Gültige Nachricht
+inputUsername=Füge Nutzernamen ein
+updateUsernameSuccess=Aktualisierung des Nutzernamens war erfolgreich
+usernameIsExisted=Nutzername existiert bereits
+noSpecialChars=Nutzername darf keine Sonderzeichen enthalten
+minLength=Die Länge muss mindestens %s Zeichen betragen
+errorEmail=Bitte füge die richtige E-Mail ein
+verifiedEmaiHasSent=Die Verifizierungs-E-Mail wurde verschickt, bitte checke deine E-Mail.
+emailSendFailed=E-Mail-Verifizierung fehlgeschlagen
+inputPassword=Passwort ist erforderlich
+inputNewPassword=Neues Passwort ist erforderlich
+inputPassword2=Bitte füge dein neues Passwort ein
+errorPassword=Die länge des Passwortes sollte mindestenns 6 Zeichen und so komplex wie möglich sein
+oldPasswordError=Das alte Passwort stimmt nicht überein
+confirmPassword=Passwort stimmt nicht überein
+updatePasswordSuccess=Aktualiseren des Passwortes erfolgreich
+errorDomain=Die personalisierte Webseitenaddresse stimmt nicht, z.B. www.myblog.com
+domainExisted=Personalisierte Webseitenadresse existiert bereits
+errorSubDomain=Bitte füge eine gültige Subdomain mit mindestens 4 Zeichen und ohne Sonderzeichen ein.
+subDomainExisted=Subdomain existiert bereits
+domainNotPointToLeanote=Die Benutzerdefinierte Domain zeigt nicht auf d.leanote.com
+errorPerPageSize=Seitengrössenfehler
+errorSortField=Suchfeldfehler
+themeValidHasRoundInclude=WARNING: Layout hat unterschiedliche Verweise!
+
+# share
+tokenExpired=Token abgelaufen
+Share=Teilen
+hasSharedThisNote=hat diese Notiz geteilt
+inputSharePwd=Bitte Passwort eingeben
+shareToGroup=Mit Gruppe teilen
+shareByPwd=Mit Passwort teilen
+groupName=Gruppen Name
+operation=Operation
+groupAndMemberManage=Gruppenmitglieder verwalten
+shareToGroupTips=Wenn eine Notiz mit einer Gruppe geteilt wird, bekommen alle Mitglieder ger Gruppe Zugriff
+shared=geteilt
+notShared=nicht geteilt
+shareLink=Geteilt Link
+sharePwd=Zugriffs-Passwort
+cancelShare=Abbrechen
+getShareLinkAndPwd=Link und Passwort kopieren
+
+# Common
+created=erstellt
+updated=geändert
+modify=Ändern
+Search=Suchen
+Save Success=erfolgreich gespeichert
+Please save note firstly!=Bitte die Notiz zuerst speichen!
+Please sign in firstly!=Bitte zuerst anmelden!
+
+# Fehler 
+notFound=Diese Seite kann nicht gefunden werden.

messages/de-de/tinymce_editor.conf

@@ -0,0 +1,179 @@
+Cut=Cut
+Header 2=Header 2
+Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.=Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.
+Div=Div
+Paste=Paste
+Close=Close
+Font Family=Schriftart
+Pre=Pre
+Align right=Align right
+New document=New document
+Blockquote=Blockquote
+Numbered list=Numbered list
+Increase indent=Increase indent
+Formats=Formats
+Headers=Headers
+Select all=Select all
+Header 3=Header 3
+Blocks=Blocks
+Undo=Undo
+Strikethrough=Strike-through
+Bullet list=Bullet list
+Header 1=Header 1
+Superscript=Superscript
+Clear formatting=Clear formatting
+Font Sizes=Font Sizes
+Subscript=Subscript
+Header 6=Header 6
+Redo=Redo
+Paragraph=Paragraph
+Ok=Ok
+Bold=Bold
+Code=Code
+Italic=Italic
+Align center=Align centre
+Header 5=Header 5
+Decrease indent=Decrease indent
+Header 4=Header 4
+Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.=Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.
+Underline=Underline
+Cancel=Cancel
+Justify=Justify
+Inline=Inline
+Copy=Copy
+Align left=Align left
+Visual aids=Visual aids
+Lower Greek=Lower Greek
+Square=Square
+Default=Default
+Lower Alpha=Lower Alpha
+Circle=Circle
+Disc=Disc
+Upper Alpha=Upper Alpha
+Upper Roman=Upper Roman
+Lower Roman=Lower Roman
+Name=Name
+Anchor=Anchor
+You have unsaved changes are you sure you want to navigate away?=You have unsaved changes are you sure you want to navigate away?
+Restore last draft=Restore last draft
+Special character=Special character
+Source code=Source code
+Right to left=Right to left
+Left to right=Left to right
+Emoticons=Emoticons
+Robots=Robots
+Document properties=Document properties
+Title=Title
+Keywords=Keywords
+Encoding=Encoding
+Description=Description
+Author=Author
+Language=Language
+`ctrl/cmd+shift+c` toggle code=`ctrl/cmd+shift+c` toggle code
+Fullscreen=Full-screen
+Horizontal line=Horizontal line
+Horizontal space=Horizontal space
+Insert\/edit image=Insert\/edit image
+General=General
+Advanced=Advanced
+Source=Source
+Border=Border
+Constrain proportions=Constrain proportions
+Vertical space=Vertical space
+Image description=Image description
+Style=Style
+Dimensions=Dimensions
+Insert image=Insert image
+Insert date\/time=Insert date\/time
+Remove link=Remove link
+Url=URL
+Text to display=Text to display
+Anchors=Anchors
+Insert link=Insert link
+New window=New window
+None=None
+The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?=The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?
+Target=Target
+The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?=The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?
+Insert\/edit link=Insert\/edit link
+Insert\/edit video=Insert\/edit video
+Poster=Poster
+Alternative source=Alternative source
+Paste your embed code below:=Paste your embed code below:
+Insert video=Insert video
+Embed=Embed
+Nonbreaking space=Non-breaking space
+Page break=Page break
+Paste as text=Paste as text
+Preview=Preview
+Print=Print
+Save=Save
+Could not find the specified string.=Could not find the specified string.
+Replace=Replace
+Next=Next
+Whole words=Whole words
+Find and replace=Find and replace
+Replace with=Replace with
+Find=Find
+Replace all=Replace all
+Match case=Match case
+Prev=Prev
+Spellcheck=Spell-check
+Finish=Finish
+Ignore all=Ignore all
+Ignore=Ignore
+Insert row before=Insert row before
+Rows=Rows
+Height=Height
+Paste row after=Paste row after
+Alignment=Alignment
+Column group=Column group
+Row=Row
+Insert column before=Insert column before
+Split cell=Split cell
+Cell padding=Cell padding
+Cell spacing=Cell spacing
+Row type=Row type
+Insert table=Insert table
+Body=Body
+Caption=Caption
+Footer=Footer
+Delete row=Delete row
+Paste row before=Paste row before
+Scope=Scope
+Delete table=Delete table
+Header cell=Header cell
+Column=Column
+Cell=Cell
+Header=Header
+Cell type=Cell type
+Copy row=Copy row
+Row properties=Row properties
+Table properties=Table properties
+Row group=Row group
+Right=Right
+Insert column after=Insert column after
+Cols=Cols
+Insert row after=Insert row after
+Width=Width
+Cell properties=Cell properties
+Left=Left
+Cut row=Cut row
+Delete column=Delete column
+Center=Centre
+Merge cells=Merge cells
+Insert template=Insert template
+Templates=Templates
+Background color=Background colour
+Text color=Text colour
+Show blocks=Show blocks
+Show invisible characters=Show invisible characters
+Words: {0}=Words: {0}
+Insert=Insert
+File=File
+Edit=Edit
+Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help=Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help
+Tools=Tools
+View=View
+Table=Table
+Format=Format

messages/en-us/blog.conf

@@ -67,17 +67,17 @@ confirm=Confirm
 signIn=Sign In
 signUp=Sign Up
 submitComment=Submit
-reportReason1=不友善内容
+reportReason1=Unfriendly content
-reportReason2=广告等垃圾信息
+reportReason2=Advertising and other spam
-reportReason3=违法违规内容
+reportReason3=Illegal content
-reportReason4=不宜公开讨论的政治内容
+reportReason4=Public discussion of political content
 other=Other
 reportReason=Reason
-chooseReason=请选择举报理由
+chooseReason=Select report reason
-reportSuccess=举报成功, 我们处理后会通知作者, 感谢您的监督
+reportSuccess=Reporting success, we will notify the author, thank you for your monitor
 error=Error
-reportComment?=举报该评论?
+reportComment?=Report this comment?
-reportBlog?=举报该博客?
+reportBlog?=Report this blog?
 confirmDeleteComment=Are you sure?
 scanQRCode=Open weichat and scan the QR code
 justNow=Just now
@@ -88,4 +88,4 @@ weeksAgo=weeks ago
 monthsAgo=months ago
 
 
-a=a
+a=a

messages/en-us/msg.conf

@@ -91,7 +91,7 @@ editorTipsInfo=<h4>1. Short cuts</h4>ctrl+shift+c Toggle code<h4>2. shift+enter
 newNote=New note
 newMarkdownNote=New Markdown Note
 noNoteNewNoteTips=The notebook is empty, why not...
-canntNewNoteTips=Sorry, cannot new note in here, please choose a notebook at first.
+canntNewNoteTips=Sorry, you can't add notes here, please choose a notebook first.
 new=New
 newMarkdown=New markdown note
 clickAddTag=Click to add Tag

messages/fr-fr/album.conf

@@ -1,31 +1,31 @@
 
 # album image
 Images=Images
-Upload=Upload
+Upload=Téléverser
-Image URL=Image URL
+Image URL=URL de l'image
 Albums=Albums
-Default=Default
+Default=Par défaut
-File title search=File title search
+File title search=Recherche par nom de fichier
-Go to upload images=Go to upload images
+Go to upload images=Aller au téléversement d'images
-Rename=Rename
+Rename=Renommer
-Add=Add
+Add=Ajouter
-Add Album=Add Album
+Add Album=Ajouter un album
-Add Image=Add Image
+Add Image=Ajouter une image
-Can't load this url=Can't load this url
+Can't load this url=Chargement de l'URL impossible
-No Images=No Images
+No Images=Aucune image
-Click to upload images Or Drop images to here=Click to upload images Or Drop images to here
+Click to upload images Or Drop images to here=Cliquez pour téléverser des images ou glisser des images ici
 
-Cannot delete default album=Cannot delete default album
+Cannot delete default album=Album par défaut impossible à effacer
-Cannot rename default album=Cannot rename default album
+Cannot rename default album=Album par défaut impossible à renommer
-This album has images, please delete it's images at first.=This album has images, please delete it's images at first.
+This album has images, please delete it's images at first.=Cet album contient des images, veuillez les effacer en premier.
 
-Rename Album=Rename Album
+Rename Album=Renommer un album
-Add Success!=Add Success!
+Add Success!=Ajout effectué avec succès!
-Rename Success!=Rename Success!
+Rename Success!=Renommage effectué avec succès!
-Delete Success!=Delete Success!
+Delete Success!=Effaçage effectué avec succès!
-Are you sure to delete this image ?=Are you sure to delete this image ?
+Are you sure to delete this image ?=Voulez-vous vraiment effacer cette image ?
-click to remove this image=click to remove this image
+click to remove this image=cliquez pour supprimer cette image
-error=error
+error=erreur
-Error=Error
+Error=Erreur
-Prev=Prev
+Prev=Préc
-Next=Next
+Next=Suiv

messages/fr-fr/markdown.conf

@@ -1,35 +1,35 @@
 
 # markdown editor
 
-Hyperlink=Hyperlink
+Hyperlink=Hyperlien
-Please provide the link URL and an optional title=Please provide the link URL and an optional title
+Please provide the link URL and an optional title=Veuillez fournir le lien hypertexte et un titre facultatif
-optional title=optional title
+optional title=titre facultatif
 Ok=Ok
-Cancel=Cancel
+Cancel=Annuler
-Strong=Strong
+Strong=Fort
-strong text=strong text
+strong text=Texte fort
-Emphasis=Emphasis
+Emphasis=Emphase
-emphasized text=emphasized text
+emphasized text=Texte avec emphase
-Blockquote=Blockquote
+Blockquote=Bloc de citation
-Code Sample=Code Sample
+Code Sample=Extrait de code
-enter code here=enter code here
+enter code here=entrer le code ici
 Image=Image
-Heading=Heading
+Heading=Titre
-Numbered List=Numbered List
+Numbered List=Liste ordonnée
-Bulleted List=Bulleted List
+Bulleted List=Liste non ordonnée
-List item=List item
+List item=Element de liste
-Horizontal Rule=Horizontal Rule
+Horizontal Rule=Ligne horizontale
-Markdown syntax=Markdown syntax
+Markdown syntax=Syntaxe markdown
-Undo=Undo
+Undo=Annuler
-Redo=Redo
+Redo=Reproduire
-enter image description here=enter image description here
+enter image description here=entrer la description de l'image ici
-enter link description here=enter link description here
+enter link description here=entrer la description du lien ici
-Edit mode=Edit mode
+Edit mode=Mode édition
-Vim mode=Vim mode
+Vim mode=Mode Vim
-Emacs mode=Emacs mode
+Emacs mode=Mode Emacs
-Normal mode=Normal mode
+Normal mode=Mode Normal
 Normal=Normal
-Light=Light
+Light=Léger
-Light editor=Light editor
+Light editor=Editeur léger
 
-Insert Image=Insert Image
+Insert Image=Inserérer une image

messages/fr-fr/member.conf

@@ -7,37 +7,37 @@
 memberCenter=Espace Membre
 userNotExists=L'utilisateur n'existe pas
 hasUsers=L'utilisateur existe déjà
-My Group=My Group
+My Group=Mon Groupe
 
 
 # post abstract
 
-Abstract=Abstract
+Abstract=Résumé
 Description=Description
-Once the abstract has been updated, it will not set the abstract automatically other than you cancel it.=Once the abstract has been updated, it will not set the abstract automatically other than you cancel it.
+Once the abstract has been updated, it will not set the abstract automatically other than you cancel it.=Une fois que le résumé a été mis à jour, celui-ci ne sera pas automatiquement appliqué, à moins que vous ne l'annuliez.
-Main Image=Main Image
+Main Image=Image principale
-Get next image as main image from content=Get next image as main image from content
+Get next image as main image from content=Faire de cette image l'image principale depuis le contenu
-Raw Content=Raw Content
+Raw Content=Contenu brut
 
 # member title
-Leanote Member Center=Leanote Member Center
+Leanote Member Center=Centre de Membre Leanote
-Username=Username
+Username=Nom d'utilisateur
-Email=Email
+Email=Courriel
-Password=Password
+Password=Mot de passe
 Avatar=Avatar
-Add Account=Add Account
+Add Account=Ajouter compte
-Update Post Abstract=Update Post Abstract
+Update Post Abstract=Mise à jour après résumé
-Blog Base Info=Blog Base Info
+Blog Base Info=Info de base du blog
-Comment=Comment
+Comment=Commentaire
 Posts=Posts
-Domain=Domain
+Domain=Domaine
-Paging=Paging
+Paging=Pagination
-Category=Category
+Category=Catégorie
-Add Single=Add Single
+Add Single=Ajout unique
-Update Single=Update Single
+Update Single=Mise à jour unique
-Single=Single
+Single=Unique
-Theme=Theme
+Theme=Thème
-Upate Theme=Upate Theme
+Upate Theme=Mise à jour du thème
 
 
 group=Groupe
@@ -45,9 +45,9 @@ newGroup=Nouveau groupe
 deleteGroup=Effacer groupe
 addMemberTips=Rentrer le nom d'utilisateur et le courriel pour ajouter un membre
 deleteMember=Effacer membre
-forbiddenNotMyGroup=You have no authority to access, cause you are not the group owner
+forbiddenNotMyGroup=Vous n'avez aucun droit d'accès, car vous n'êtes pas le propriétaire du groupe.
-userExistsInGroup=The member is already exists in this group
+userExistsInGroup=Le membre existe déjà dans le groupe.
-notMyGroup=You are not the group owner
+notMyGroup=Vous n'êtes pas le propriétaire du groupe.
 
 #memeber
 welcomeToLeanote=Bienvenue
@@ -126,13 +126,13 @@ highlight=Surlignage du code
 
 
 # view js
-Are you sure ?=Are you sure ?
+Are you sure ?=Êtes-vous sûr ?
-Are you sure to install it ?=Are you sure to install it ?
+Are you sure to install it ?=Voulez-vous vraiment l'installer ?
-Are you sure to delete=Are you sure to delete
+Are you sure to delete=Voulez-vous vraiment l'effacer?
-Success=Success
+Success=Succès
-Error=Error
+Error=Erreur
-File exists=File exists
+File exists=Le fichier exite
-Delete file=Delete file
+Delete file=Effacer le fichier
-No images=No images
+No images=Pas d'images
-Filename=Filename
+Filename=Nom de fichier
-Group Title=Group Title
+Group Title=Titre du groupe

messages/fr-fr/msg.conf

@@ -49,7 +49,7 @@ password2=Confirmer votre mot de passe
 email=Adresse de courriel
 inputUsername=Le nom d'utilisateur(adresse courriel) est requis
 inputEmail=L'adresse courriel est requis
-wrongEmail=Wrong email
+wrongEmail=Adresse courriel incorrecte
 wrongUsernameOrPassword=Mauvais nom d'utilisateur ou mot de passe
 inputPassword=Le mot de passe est requis
 wrongPassword=Mauvais mot de passe
@@ -80,7 +80,7 @@ notGoodPassword=Le mot de passe est incorrect, il doit comporter au moins 6 cara
 
 # note
 myBlog=Blog
-Explore=Explore
+Explore=Explorer
 history=Historique
 save=Sauvegarder
 editorTips=Astuces
@@ -156,7 +156,7 @@ blogSet=Réglages du blog
 # index
 discussion=Discussion
 download=Téléchargement
-howToInstallLeanote=Comment installer leanote
+howToInstallLeanote=Comment installer Leanote
 
 # 
 attachments = Pièces-jointes
@@ -195,7 +195,7 @@ friendEmail=Courriel de l'ami
 permission=Autorisation
 readOnly=Lecture seule
 writable=Editable
-inputFriendEmail=Le courriel de votre ami est requis/
+inputFriendEmail=Le courriel de votre ami est requis
 clickToChangePermission=Cliquez pour changer l'autorisation.
 sendInviteEmailToYourFriend=Envoyer un courriel d'invitation à votre ami.
 copySuccess=Copie réussie
@@ -245,7 +245,7 @@ errorSortField=Erreur dans le tri du champs
 themeValidHasRoundInclude=WARNING: Les modèles ont des références circulaires!
 
 # share
-tokenExpired=Token Expired
+tokenExpired=Session expirée
 Share=Partager
 hasSharedThisNote=a partagé cette note
 inputSharePwd=Veuillez entrer le mot de passe

messages/fr-fr/tinymce_editor.conf

@@ -1,179 +1,179 @@
-Cut=Cut
+Cut=Couper
-Header 2=Header 2
+Header 2=Titre 2
-Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.=Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.
+Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.=Votre navigateur ne supporte pas l'accès direct au presse-papier. Veuillez utiliser les raccourcis Ctrl+X\/C\/V à la place.
 Div=Div
-Paste=Paste
+Paste=Coller
-Close=Close
+Close=Fermer
-Font Family=Font Family
+Font Family=Famille de police
 Pre=Pre
-Align right=Align right
+Align right=Aligné à droite
-New document=New document
+New document=Nouveau document
-Blockquote=Blockquote
+Blockquote=Bloc de citation
-Numbered list=Numbered list
+Numbered list=Liste ordonnée
-Increase indent=Increase indent
+Increase indent=Augmenter l'indentation
-Formats=Formats
+Formats=Format
-Headers=Headers
+Headers=En-tête
-Select all=Select all
+Select all=Sélectionner tout
-Header 3=Header 3
+Header 3=En-tête 3
-Blocks=Blocks
+Blocks=Blocs
-Undo=Undo
+Undo=Annuler
-Strikethrough=Strike-through
+Strikethrough=Barrer
-Bullet list=Bullet list
+Bullet list=Liste à puces
-Header 1=Header 1
+Header 1=En-tête 1
-Superscript=Superscript
+Superscript=Exposant
-Clear formatting=Clear formatting
+Clear formatting=Nettoyer le formatage
-Font Sizes=Font Sizes
+Font Sizes=Taille des Polices
-Subscript=Subscript
+Subscript=Indice
-Header 6=Header 6
+Header 6=En-tête 6
-Redo=Redo
+Redo=Reproduire
-Paragraph=Paragraph
+Paragraph=Paragraphe
 Ok=Ok
-Bold=Bold
+Bold=Gras
 Code=Code
-Italic=Italic
+Italic=Italique
-Align center=Align centre
+Align center=Aligner au centre
-Header 5=Header 5
+Header 5=En-tête 5
-Decrease indent=Decrease indent
+Decrease indent=Diminuer l'indentation
-Header 4=Header 4
+Header 4=En-tête 4
-Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.=Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.
+Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.=Coller est en mode texte clair. Les contenus seront collés désormais en clair jusqu'à ce que vous ne désactiviez cette option.
-Underline=Underline
+Underline=Souligner
-Cancel=Cancel
+Cancel=Annuler
-Justify=Justify
+Justify=Justifier
-Inline=Inline
+Inline=En ligne
-Copy=Copy
+Copy=Copier
-Align left=Align left
+Align left=Aligner à gauche
-Visual aids=Visual aids
+Visual aids=Aides visuelles
-Lower Greek=Lower Greek
+Lower Greek=Grec minuscule
-Square=Square
+Square=Carré
-Default=Default
+Default=Par défaut
-Lower Alpha=Lower Alpha
+Lower Alpha=Alpha minuscule
-Circle=Circle
+Circle=Cercle
-Disc=Disc
+Disc=Disque
-Upper Alpha=Upper Alpha
+Upper Alpha=Alpha majuscule
-Upper Roman=Upper Roman
+Upper Roman=Roman majuscule
-Lower Roman=Lower Roman
+Lower Roman=Roman minuscule
-Name=Name
+Name=Nom
-Anchor=Anchor
+Anchor=Ancre
-You have unsaved changes are you sure you want to navigate away?=You have unsaved changes are you sure you want to navigate away?
+You have unsaved changes are you sure you want to navigate away?=Des changements n'ont pas été enregistrés, voulez-vous vraiment sortir?
-Restore last draft=Restore last draft
+Restore last draft=Restaurer dernier brouillon
-Special character=Special character
+Special character=Caractère spécial
-Source code=Source code
+Source code=Code Source
-Right to left=Right to left
+Right to left=De droite à gauche
-Left to right=Left to right
+Left to right=De gauche à droite
-Emoticons=Emoticons
+Emoticons=Emoticones
 Robots=Robots
-Document properties=Document properties
+Document properties=Propriétés du document
-Title=Title
+Title=Titre
-Keywords=Keywords
+Keywords=Mots-clés
-Encoding=Encoding
+Encoding=Encodage
 Description=Description
-Author=Author
+Author=Auteur
-Language=Language
+Language=Langue
-`ctrl/cmd+shift+c` toggle code=`ctrl/cmd+shift+c` toggle code
+`ctrl/cmd+shift+c` toggle code=inverser le code `ctrl/cmd+shift+c` 
-Fullscreen=Full-screen
+Fullscreen=Plein écran
-Horizontal line=Horizontal line
+Horizontal line=Ligne horizontal
-Horizontal space=Horizontal space
+Horizontal space=Espace horizontal
-Insert\/edit image=Insert\/edit image
+Insert\/edit image=Insérer\/éditer image
-General=General
+General=Général
-Advanced=Advanced
+Advanced=Avancé
 Source=Source
-Border=Border
+Border=Bordure
-Constrain proportions=Constrain proportions
+Constrain proportions=Conserver proportions
-Vertical space=Vertical space
+Vertical space=Espace vertical
-Image description=Image description
+Image description=Description de l'image
 Style=Style
 Dimensions=Dimensions
-Insert image=Insert image
+Insert image=Insérer image
-Insert date\/time=Insert date\/time
+Insert date\/time=Insérer date\/heure
-Remove link=Remove link
+Remove link=Enlever le lien
 Url=URL
-Text to display=Text to display
+Text to display=Texte à afficher
-Anchors=Anchors
+Anchors=Ancres
-Insert link=Insert link
+Insert link=Insérer liens
-New window=New window
+New window=Nouvelle fenêtre
-None=None
+None=Aucune
-The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?=The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?
+The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?=L'URL que vous avez entré semble être un lien externe. Voulez-vous ajouter le préfixe http:\/\/ requis?
-Target=Target
+Target=Cible
-The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?=The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?
+The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?=L'URL que vous avez entré semble être une adresse de courriel. Voulez-vous ajouter le préfixe mailto: requis?
-Insert\/edit link=Insert\/edit link
+Insert\/edit link=Insérer\/éditer le lien
-Insert\/edit video=Insert\/edit video
+Insert\/edit video=Insérer\/éditer la vidéo
 Poster=Poster
-Alternative source=Alternative source
+Alternative source=Source alternative
-Paste your embed code below:=Paste your embed code below:
+Paste your embed code below:=Coller le code intégré ci-dessous:
-Insert video=Insert video
+Insert video=Insérer video
-Embed=Embed
+Embed=Intégrer
-Nonbreaking space=Non-breaking space
+Nonbreaking space=Espaces insécables
-Page break=Page break
+Page break=Saut de page
-Paste as text=Paste as text
+Paste as text=Coller en tant que texte
-Preview=Preview
+Preview=Aperçu
-Print=Print
+Print=Imprimer
-Save=Save
+Save=Enregistrer
-Could not find the specified string.=Could not find the specified string.
+Could not find the specified string.=Impossible de trouver la chaîne spécifiée.
-Replace=Replace
+Replace=Remplacer
-Next=Next
+Next=Suivant
-Whole words=Whole words
+Whole words=Mots entiers
-Find and replace=Find and replace
+Find and replace=Trouver et remplacer
-Replace with=Replace with
+Replace with=Remplacer par
-Find=Find
+Find=Trouver
-Replace all=Replace all
+Replace all=Tout remplacer
-Match case=Match case
+Match case=Correspondance de la casse
-Prev=Prev
+Prev=Précédent
-Spellcheck=Spell-check
+Spellcheck=Correcteur d'orthographe
-Finish=Finish
+Finish=Terminer
-Ignore all=Ignore all
+Ignore all=Ignorer tout
-Ignore=Ignore
+Ignore=Ignorer
-Insert row before=Insert row before
+Insert row before=Insérer une ligne avant
-Rows=Rows
+Rows=Lignes
-Height=Height
+Height=Hauteur
-Paste row after=Paste row after
+Paste row after=Coller une ligne après
-Alignment=Alignment
+Alignment=Alignement
-Column group=Column group
+Column group=Groupe de colonnes
-Row=Row
+Row=Ligne
-Insert column before=Insert column before
+Insert column before=Insérer une colonne avant
-Split cell=Split cell
+Split cell=Diviser la cellule
-Cell padding=Cell padding
+Cell padding=Marge intérieure de cellule
-Cell spacing=Cell spacing
+Cell spacing=Marge extérieure de cellule
-Row type=Row type
+Row type=Type de ligne
-Insert table=Insert table
+Insert table=Insérer tableau
-Body=Body
+Body=Corps
-Caption=Caption
+Caption=Légende
-Footer=Footer
+Footer=Pied de page
-Delete row=Delete row
+Delete row=Effacer la ligne
-Paste row before=Paste row before
+Paste row before=Coller une ligne avant
-Scope=Scope
+Scope=Cadre
-Delete table=Delete table
+Delete table=Effacer le tableau
-Header cell=Header cell
+Header cell=En-tête de cellule
-Column=Column
+Column=Colonne
-Cell=Cell
+Cell=Cellule
-Header=Header
+Header=En-tête
-Cell type=Cell type
+Cell type=Type de cellule
-Copy row=Copy row
+Copy row=Copier la ligne
-Row properties=Row properties
+Row properties=Propriétés de la ligne
-Table properties=Table properties
+Table properties=Propriétés du tableau
-Row group=Row group
+Row group=Groupe de ligne
-Right=Right
+Right=Droit
-Insert column after=Insert column after
+Insert column after=Insérer une colonne après
-Cols=Cols
+Cols=Colonnes
-Insert row after=Insert row after
+Insert row after=Insérer une ligne après
-Width=Width
+Width=Largeur
-Cell properties=Cell properties
+Cell properties=Propriétés de la cellule
-Left=Left
+Left=Gauche
-Cut row=Cut row
+Cut row=Couper la ligne
-Delete column=Delete column
+Delete column=Effacer la colonne
-Center=Centre
+Center=Centrer
-Merge cells=Merge cells
+Merge cells=Fusionner les cellules
-Insert template=Insert template
+Insert template=Insérer un modèle
-Templates=Templates
+Templates=Modèles
-Background color=Background colour
+Background color=Couleur de fond
-Text color=Text colour
+Text color=Couleur de texte
-Show blocks=Show blocks
+Show blocks=Montrer les blocs
-Show invisible characters=Show invisible characters
+Show invisible characters=Montrer les caractères invisibles
-Words: {0}=Words: {0}
+Words: {0}=Mots: {0}
-Insert=Insert
+Insert=Insérer
-File=File
+File=Fichier
-Edit=Edit
+Edit=Editer
-Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help=Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help
+Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help=Zone de texte riche. Appuyer sur ALT-F9 pour afficher le menu. Sur ALT-F10 pour la barre d'outils. Sur ALT-0 for l'aide.
-Tools=Tools
+Tools=Outils
-View=View
+View=Vue
-Table=Table
+Table=Tableau
 Format=Format

public/admin/css/admin.css

@@ -86,6 +86,9 @@ h2,
 h3 {
   font-family: 'Open Sans', '微软雅黑', Arial, Tahoma, sans-serif;
 }
+.navbar-brand {
+  height: 45px;
+}
 .logo-ctn {
   display: block;
 }

public/admin/css/admin.less

@@ -56,7 +56,9 @@ html,body {
 h1, h2, h3 {
   font-family: @fontFamily;
 }
-
+.navbar-brand {
+	height: 45px;
+}
 .logo-ctn {
 	display: block;
 	#logo {

public/js/i18n/blog.de-de.js

@@ -0,0 +1 @@
+var MSG={"noTag":"Keine Tags","saveSuccess":"Speichern erfolgreich","none":"Keine","like":"Gefällt mir","unlike":"Gefällt mir nicht mehr","delete":"Löschen","cancel":"Abbrechen","confirm":"Bestätigen","chooseReason":"Grund angeben","reportSuccess":"Erfolg","error":"Fehler","reportComment?":"Kommentar?","reportBlog?":"Blog?","confirmDeleteComment":"Wirklich löschen?","scanQRCode":"weichat öffnen und QR Code scannen","justNow":"Jetzt","minutesAgo":"Minuten","hoursAgo":"Stunden","daysAgo":"Tage","weeksAgo":"Wochen","monthsAgo":"Monate"};function getMsg(key, data) {var msg = MSG[key];if(msg) {if(data) {if(!isArray(data)) {data = [data];}for(var i = 0; i < data.length; ++i) {msg = msg.replace("%s", data[i]);}}return msg;}return key;}

public/js/i18n/msg.de-de.js

@@ -0,0 +1 @@
+var MSG={"app":"Leanote","share":"Teilen","noTag":"Keine Tags","inputUsername":"Benutzernamen eingeben","inputEmail":"E-Mail ist erforderlich","inputPassword":"Passwort ist erforderlich","inputPassword2":"Bitte Passwort erneut eingeben","confirmPassword":"Bitte Passwort bestätigen","history":"Verlauf","editorTips":"Tips","editorTipsInfo":"<h4>1. Kurzbefehle</h4>ctrl+shift+c Ansicht ändern<h4>2. shift+enter Den aktuellen Block verlassen</h4> Beispiel: <img src=\"/images/outofcode.png\" style=\"width: 90px\"/> in dieser Situation nutze shift+enter um den derzeitigen Block zu verlassen.","all":"Neuste","trash":"Papierkorb","delete":"Löschen","unTitled":"Ohne Titel","defaultShare":"Standard Freigabe","writingMode":"Schreibmodus","normalMode":"Normaler Modus","saving":"Speichern","saveSuccess":"Speichern erfolgreich","update":"Aktualisieren","close":"Schliessen","cancel":"Abbrechen","send":"Senden","shareToFriends":"Mit Anderen teilen","publicAsBlog":"Blog veröffentlichen","cancelPublic":"Blog zurückziehen","move":"Verschieben","copy":"Kopieren","rename":"Umbenennen","exportPdf":"Export als PDF","addChildNotebook":"Neue Unter-Notizbuch","deleteAllShared":"Lösche gemeinsame Nutzer","deleteSharedNotebook":"Entfernen des freigegebenen Notizbuchs","copyToMyNotebook":"Zu meinen Notizbüchern kopieren","checkEmail":"E-Mail abrufen","sendVerifiedEmail":"Schicke Bestätigungsmail","defaulthhare":"Voreinstellung","friendEmail":"Friend E-Mail","readOnly":"Nur-Lesen","writable":"Schreibrechte","inputFriendEmail":"Bitte geben Sie Ihre Freunde E-Mail ein","clickToChangePermission":"Klicken Sie auf Berechtigungen ändern","sendInviteEmailToYourFriend":"Senden Sie die Einladung per E-Mail an Freunde","friendNotExits":"Der Benutzer hat %s's nicht registriert, Einladungs-Link:%s","emailBodyRequired":"E-Mail kann nicht leer sein","sendSuccess":"erfolgreich","inviteEmailBody":"Hallo, ich bin %s, %s ist grossartig, schau es dir an!","historiesNum":"Wir haben deine letzten <b>10</b> Einträge gespeichert.","noHistories":"Kein Verlauf","datetime":"Datum und Zeit","restoreFromThisVersion":"Wiederherstellen von dieser Version","confirmBackup":"Sind Sie sicher das die ausgewählte Version wiederhergestellt werden soll? Die aktuelle Notiz wird zuvor gesichert.","createAccountSuccess":"Konto-Erstellung erfolgreich","createAccountFailed":"Fehler beim Erstellen des Kontos","updateUsernameSuccess":"Aktualisierung des Nutzernamens war erfolgreich","usernameIsExisted":"Nutzername existiert bereits","noSpecialChars":"Nutzername darf keine Sonderzeichen enthalten","minLength":"Die Länge muss mindestens %s Zeichen betragen","errorEmail":"Bitte füge die richtige E-Mail ein","verifiedEmaiHasSent":"Die Verifizierungs-E-Mail wurde verschickt, bitte checke deine E-Mail.","emailSendFailed":"E-Mail-Verifizierung fehlgeschlagen","inputNewPassword":"Neues Passwort ist erforderlich","errorPassword":"Die länge des Passwortes sollte mindestenns 6 Zeichen und so komplex wie möglich sein","updatePasswordSuccess":"Aktualiseren des Passwortes erfolgreich","Please save note firstly!":"Bitte die Notiz zuerst speichen!","Please sign in firstly!":"Bitte zuerst anmelden!","Are you sure ?":"Sind Sie sicher ?","Are you sure to install it ?":"Wollen Sie das wirklich installieren ?","Are you sure to delete":"Wirklich Löschen","Success":"Erfolgreich","Error":"Fehler","File exists":"Datei existiert bereits","Delete file":"Datei löschen","No images":"Keine Bilder","Filename":"Dateiname","Group Title":"Gruppenname","Hyperlink":"Hyperlink","Please provide the link URL and an optional title":"Bitte URL und einen optionalen Titel angeben","optional title":"Optionaler Titel","Cancel":"Abbrechen","Strong":"Fett","strong text":"Text in Fettschrift","Emphasis":"Kursiv","emphasized text":"Kursiver Text","Blockquote":"Blockzitat","Code Sample":"Code Schnipsel","enter code here":"Code hier eingeben","Image":"Bild","Heading":"Überschrift","Numbered List":"Nummerierte Liste","Bulleted List":"Aufzählungsliste","List item":"Listenelement","Horizontal Rule":"Horizontaler Trennstrich","Markdown syntax":"Markdown Syntax","Undo":"Rückgängig","Redo":"Wiederholen","enter image description here":"Bildbeschreibung hier eingeben","enter link description here":"Link Beschreibung hier eingeben","Edit mode":"Bearbeiten Modus","Vim mode":"Vim Modus","Emacs mode":"Emacs Modus","Normal mode":"Normaler Modus","Normal":"Normal","Light":"Light","Light editor":"Light Editor","Add Album":"Album hinzufügen","Cannot delete default album":"Das Standard Album kann nicht gelöscht werden","Cannot rename default album":"Das Standard Album kann nicht umbenannt werden","Rename Album":"Album umbenennen","Add Success!":"Hinzufügen erfolgreich!","Rename Success!":"Umbenennen erfolgreich!","Delete Success!":"Löschen erfolgreich!","Are you sure to delete this image ?":"Soll dieses Bild wirklich gelöscht werden ?","click to remove this image":"Klicken um dieses Bild zu löschen","error":"Fehler","PrevLine truncated

public/libs/ace/ace-old.js

@@ -0,0 +1,20 @@
+(function(){function s(r){var i=function(e,t){return n("",e,t)},s=e;r&&(e[r]||(e[r]={}),s=e[r]);if(!s.define||!s.define.packaged)t.original=s.define,s.define=t,s.define.packaged=!0;if(!s.require||!s.require.packaged)n.original=s.require,s.require=i,s.require.packaged=!0}var ACE_NAMESPACE = "ace",e=function(){return this}();if(!ACE_NAMESPACE&&typeof requirejs!="undefined")return;var t=function(e,n,r){if(typeof e!="string"){t.original?t.original.apply(window,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(r=n),t.modules||(t.modules={},t.payloads={}),t.payloads[e]=r,t.modules[e]=null},n=function(e,t,r){if(Object.prototype.toString.call(t)==="[object Array]"){var s=[];for(var o=0,u=t.length;o<u;++o){var a=i(e,t[o]);if(!a&&n.original)return n.original.apply(window,arguments);s.push(a)}r&&r.apply(null,s)}else{if(typeof t=="string"){var f=i(e,t);return!f&&n.original?n.original.apply(window,arguments):(r&&r(),f)}if(n.original)return n.original.apply(window,arguments)}},r=function(e,t){if(t.indexOf("!")!==-1){var n=t.split("!");return r(e,n[0])+"!"+r(e,n[1])}if(t.charAt(0)=="."){var i=e.split("/").slice(0,-1).join("/");t=i+"/"+t;while(t.indexOf(".")!==-1&&s!=t){var s=t;t=t.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return t},i=function(e,i){i=r(e,i);var s=t.modules[i];if(!s){s=t.payloads[i];if(typeof s=="function"){var o={},u={id:i,uri:"",exports:o,packaged:!0},a=function(e,t){return n(i,e,t)},f=s(a,o,u);o=f||u.exports,t.modules[i]=o,delete t.payloads[i]}s=t.modules[i]=o||s}return s};s(ACE_NAMESPACE)})(),ace.define("ace/lib/regexp",["require","exports","module"],function(e,t,n){"use strict";function o(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}function u(e,t,n){if(Array.prototype.indexOf)return e.indexOf(t,n);for(var r=n||0;r<e.length;r++)if(e[r]===t)return r;return-1}var r={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},i=r.exec.call(/()??/,"")[1]===undefined,s=function(){var e=/^/g;return r.test.call(e,""),!e.lastIndex}();if(s&&i)return;RegExp.prototype.exec=function(e){var t=r.exec.apply(this,arguments),n,a;if(typeof e=="string"&&t){!i&&t.length>1&&u(t,"")>-1&&(a=RegExp(this.source,r.replace.call(o(this),"g","")),r.replace.call(e.slice(t.index),a,function(){for(var e=1;e<arguments.length-2;e++)arguments[e]===undefined&&(t[e]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var f=1;f<t.length;f++)n=this._xregexp.captureNames[f-1],n&&(t[n]=t[f]);!s&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--}return t},s||(RegExp.prototype.test=function(e){var t=r.exec.call(this,e);return t&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--,!!t})}),ace.define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===voiLine truncated
+	if(r) {
+		return i.showInvisibles ? 
+		"<span class='ace_invisible ace_invisible_space ace_invalid'>"+i.SPACE_CHAR+"</span>"
+		: s.stringRepeat("\u00a0", e.length);
+		// return 
+	}
+	else return (t+=1,"<span class='ace_cjk' style='width:"+i.config.characterWidth*2+"px'>"+e+"</span>");
+},a=r.replace(o,u);if(!this.$textToken[n.type]){var f="ace_"+n.type.replace(/\./g," ace_"),l="";n.type=="fold"&&(l=" style='width:"+n.value.length*this.config.characterWidth+"px;' "),e.push("<span class='",f,"'",l,">",a,"</span>")}else e.push(a);return t+r.length},this.renderIndentGuide=function(e,t,n){var r=t.search(this.$indentGuideRe);return r<=0||r>=n?t:t[0]==" "?(r-=r%this.tabSize,e.push(s.stringRepeat(this.$tabStrings[" "],r/this.tabSize)),t.substr(r)):t[0]=="	"?(e.push(s.stringRepeat(this.$tabStrings["	"],r)),t.substr(r)):t},this.$renderWrappedLine=function(e,t,n,r){var i=0,s=0,o=n[0],u=0;for(var a=0;a<t.length;a++){var f=t[a],l=f.value;if(a==0&&this.displayIndentGuides){i=l.length,l=this.renderIndentGuide(e,l,o);if(!l)continue;i-=l.length}if(i+l.length<o)u=this.$renderToken(e,u,f,l),i+=l.length;else{while(i+l.length>=o)u=this.$renderToken(e,u,f,l.substring(0,o-i)),l=l.substring(o-i),i=o,r||e.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px'>"),s++,u=0,o=n[s]||Number.MAX_VALUE;l.length!=0&&(i+=l.length,u=this.$renderToken(e,u,f,l))}}},this.$renderSimpleLine=function(e,t){var n=0,r=t[0],i=r.value;this.displayIndentGuides&&(i=this.renderIndentGuide(e,i)),i&&(n=this.$renderToken(e,n,r,i));for(var s=1;s<t.length;s++)r=t[s],i=r.value,n=this.$renderToken(e,n,r,i)},this.$renderLine=function(e,t,n,r){!r&&r!=0&&(r=this.session.getFoldLine(t));if(r)var i=this.$getFoldLineTokens(t,r);else var i=this.session.getTokens(t);n||e.push("<div class='ace_line' style='height:",this.config.lineHeight*(this.$useLineGroups()?1:this.session.getRowLength(t)),"px'>");if(i.length){var s=this.session.getRowSplitData(t);s&&s.length?this.$renderWrappedLine(e,i,s,n):this.$renderSimpleLine(e,i)}this.showInvisibles&&(r&&(t=r.end.row),e.push("<span class='ace_invisible ace_invisible_eol'>",t==this.session.getLength()-1?this.EOF_CHAR:this.EOL_CHAR,"</span>")),n||e.push("</div>")},this.$getFoldLineTokens=function(e,t){function i(e,t,n){var i=0,s=0;while(s+e[i].value.length<t){s+=e[i].value.length,i++;if(i==e.length)return}if(s!=t){var o=e[i].value.substring(t-s);o.length>n-t&&(o=o.substring(0,n-t)),r.push({type:e[i].type,value:o}),s=t+o.length,i+=1}while(s<n&&i<e.length){var o=e[i].value;o.length+s>n?r.push({type:e[i].type,value:o.substring(0,n-s)}):r.push(e[i]),s+=o.length,i+=1}}var n=this.session,r=[],s=n.getTokens(e);return t.walk(function(e,t,o,u,a){e!=null?r.push({type:"fold",value:e}):(a&&(s=n.getTokens(t)),s.length&&i(s,u,o))},t.end.row,this.session.getLine(t.end.row).length),r},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}}).call(a.prototype),t.Text=a}),ace.define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../lib/dom"),i,s=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_cursor-layer",e.appendChild(this.element),i===undefined&&(i="opacity"in this.element),this.isVisible=!1,this.isBlinking=!0,this.blinkInterval=1e3,this.smoothBlinking=!1,this.cursors=[],this.cursor=this.addCursor(),r.addCssClass(this.element,"ace_hidden-cursors"),this.$updateCursors=this.$updateVisibility.bind(this)};(function(){this.$updateVisibility=function(e){var t=this.cursors;for(var n=t.length;n--;)t[n].style.visibility=e?"":"hidden"},this.$updateOpacity=function(e){var t=this.cursors;for(var n=t.length;n--;)t[n].style.opacity=e?"":"0"},this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setBlinking=function(e){e!=this.isBlinking&&(this.isBlinking=e,this.restartTimer())},this.setBlinkInterval=function(e){e!=this.blinkInterval&&(this.blinkInterval=e,this.restartTimer())},this.setSmoothBlinking=function(e){e!=this.smoothBlinking&&!i&&(this.smoothBlinking=e,r.setCssClass(this.element,"ace_smooth-blinking",e),this.$updateCursors(!0),this.$updateCursors=(e?this.$updateOpacity:this.$updateVisibility).bind(this),this.restartTimer())},this.addCursor=function(){var e=r.createElement("div");return e.className="ace_cursor",this.element.appendChild(e),this.cursors.push(e),e},this.removeCursor=function(){if(this.cursors.length>1){var e=this.cursors.pop();return e.parentNode.removeChild(e),e}},this.hideCursor=function(){this.isVisible=!1,r.addCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.showCursor=function(){this.isVisible=!0,r.removeCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.restartTimer=function(){var e=this.$updateCursors;clearInterval(this.intervalId),clearTimeout(this.timeoutId),this.smoothBlinking&&r.removeCssClass(this.element,"ace_smooth-blinking"),e(!0);if(!this.isBlinking||!this.blinkInterval||!this.isVisible)return;this.smoothBlinking&&setTimeout(function(){r.addCssClass(this.element,"ace_smooth-blinking")}.bind(this));var t=function(Line truncated
+            (function() {
+                ace.require(["ace/ace"], function(a) {
+                    a && a.config.init(true);
+                    if (!window.ace)
+                        window.ace = a;
+                    for (var key in a) if (a.hasOwnProperty(key))
+                        window.ace[key] = a[key];
+                });
+            })();
+// 以下非ace.js文件里的, 只是markdown编辑器要用, mode-ace_mode.js       
+ace.define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/lang"),s=e("./text_highlight_rules").TextHighlightRules,o=t.supportType="animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|pointer-events|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index",u=t.supportFunction="rgb|rgba|url|attr|counter|counters",a=t.supportConstant="absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-blocLine truncated

public/libs/ace/ace.js

@@ -1,12 +1,4 @@
-(function(){function s(r){var i=function(e,t){return n("",e,t)},s=e;r&&(e[r]||(e[r]={}),s=e[r]);if(!s.define||!s.define.packaged)t.original=s.define,s.define=t,s.define.packaged=!0;if(!s.require||!s.require.packaged)n.original=s.require,s.require=i,s.require.packaged=!0}var ACE_NAMESPACE = "ace",e=function(){return this}();if(!ACE_NAMESPACE&&typeof requirejs!="undefined")return;var t=function(e,n,r){if(typeof e!="string"){t.original?t.original.apply(window,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(r=n),t.modules||(t.modules={},t.payloads={}),t.payloads[e]=r,t.modules[e]=null},n=function(e,t,r){if(Object.prototype.toString.call(t)==="[object Array]"){var s=[];for(var o=0,u=t.length;o<u;++o){var a=i(e,t[o]);if(!a&&n.original)return n.original.apply(window,arguments);s.push(a)}r&&r.apply(null,s)}else{if(typeof t=="string"){var f=i(e,t);return!f&&n.original?n.original.apply(window,arguments):(r&&r(),f)}if(n.original)return n.original.apply(window,arguments)}},r=function(e,t){if(t.indexOf("!")!==-1){var n=t.split("!");return r(e,n[0])+"!"+r(e,n[1])}if(t.charAt(0)=="."){var i=e.split("/").slice(0,-1).join("/");t=i+"/"+t;while(t.indexOf(".")!==-1&&s!=t){var s=t;t=t.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return t},i=function(e,i){i=r(e,i);var s=t.modules[i];if(!s){s=t.payloads[i];if(typeof s=="function"){var o={},u={id:i,uri:"",exports:o,packaged:!0},a=function(e,t){return n(i,e,t)},f=s(a,o,u);o=f||u.exports,t.modules[i]=o,delete t.payloads[i]}s=t.modules[i]=o||s}return s};s(ACE_NAMESPACE)})(),ace.define("ace/lib/regexp",["require","exports","module"],function(e,t,n){"use strict";function o(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}function u(e,t,n){if(Array.prototype.indexOf)return e.indexOf(t,n);for(var r=n||0;r<e.length;r++)if(e[r]===t)return r;return-1}var r={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},i=r.exec.call(/()??/,"")[1]===undefined,s=function(){var e=/^/g;return r.test.call(e,""),!e.lastIndex}();if(s&&i)return;RegExp.prototype.exec=function(e){var t=r.exec.apply(this,arguments),n,a;if(typeof e=="string"&&t){!i&&t.length>1&&u(t,"")>-1&&(a=RegExp(this.source,r.replace.call(o(this),"g","")),r.replace.call(e.slice(t.index),a,function(){for(var e=1;e<arguments.length-2;e++)arguments[e]===undefined&&(t[e]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var f=1;f<t.length;f++)n=this._xregexp.captureNames[f-1],n&&(t[n]=t[f]);!s&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--}return t},s||(RegExp.prototype.test=function(e){var t=r.exec.call(this,e);return t&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--,!!t})}),ace.define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===voiLine truncated
+(function(){function o(n){var i=e;n&&(e[n]||(e[n]={}),i=e[n]);if(!i.define||!i.define.packaged)t.original=i.define,i.define=t,i.define.packaged=!0;if(!i.require||!i.require.packaged)r.original=i.require,i.require=r,i.require.packaged=!0}var ACE_NAMESPACE = "ace",e=function(){return this}();!e&&typeof window!="undefined"&&(e=window);if(!ACE_NAMESPACE&&typeof requirejs!="undefined")return;var t=function(e,n,r){if(typeof e!="string"){t.original?t.original.apply(this,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(r=n),t.modules[e]||(t.payloads[e]=r,t.modules[e]=null)};t.modules={},t.payloads={};var n=function(e,t,n){if(typeof t=="string"){var i=s(e,t);if(i!=undefined)return n&&n(),i}else if(Object.prototype.toString.call(t)==="[object Array]"){var o=[];for(var u=0,a=t.length;u<a;++u){var f=s(e,t[u]);if(f==undefined&&r.original)return;o.push(f)}return n&&n.apply(null,o)||!0}},r=function(e,t){var i=n("",e,t);return i==undefined&&r.original?r.original.apply(this,arguments):i},i=function(e,t){if(t.indexOf("!")!==-1){var n=t.split("!");return i(e,n[0])+"!"+i(e,n[1])}if(t.charAt(0)=="."){var r=e.split("/").slice(0,-1).join("/");t=r+"/"+t;while(t.indexOf(".")!==-1&&s!=t){var s=t;t=t.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return t},s=function(e,r){r=i(e,r);var s=t.modules[r];if(!s){s=t.payloads[r];if(typeof s=="function"){var o={},u={id:r,uri:"",exports:o,packaged:!0},a=function(e,t){return n(r,e,t)},f=s(a,o,u);o=f||u.exports,t.modules[r]=o,delete t.payloads[r]}s=t.modules[r]=o||s}return s};o(ACE_NAMESPACE)})(),ace.define("ace/lib/regexp",["require","exports","module"],function(e,t,n){"use strict";function o(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}function u(e,t,n){if(Array.prototype.indexOf)return e.indexOf(t,n);for(var r=n||0;r<e.length;r++)if(e[r]===t)return r;return-1}var r={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},i=r.exec.call(/()??/,"")[1]===undefined,s=function(){var e=/^/g;return r.test.call(e,""),!e.lastIndex}();if(s&&i)return;RegExp.prototype.exec=function(e){var t=r.exec.apply(this,arguments),n,a;if(typeof e=="string"&&t){!i&&t.length>1&&u(t,"")>-1&&(a=RegExp(this.source,r.replace.call(o(this),"g","")),r.replace.call(e.slice(t.index),a,function(){for(var e=1;e<arguments.length-2;e++)arguments[e]===undefined&&(t[e]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var f=1;f<t.length;f++)n=this._xregexp.captureNames[f-1],n&&(t[n]=t[f]);!s&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--}return t},s||(RegExp.prototype.test=function(e){var t=r.exec.call(this,e);return t&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--,!!t})}),ace.define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(thisLine truncated
-	if(r) {
-		return i.showInvisibles ? 
-		"<span class='ace_invisible ace_invisible_space ace_invalid'>"+i.SPACE_CHAR+"</span>"
-		: s.stringRepeat("\u00a0", e.length);
-		// return 
-	}
-	else return (t+=1,"<span class='ace_cjk' style='width:"+i.config.characterWidth*2+"px'>"+e+"</span>");
-},a=r.replace(o,u);if(!this.$textToken[n.type]){var f="ace_"+n.type.replace(/\./g," ace_"),l="";n.type=="fold"&&(l=" style='width:"+n.value.length*this.config.characterWidth+"px;' "),e.push("<span class='",f,"'",l,">",a,"</span>")}else e.push(a);return t+r.length},this.renderIndentGuide=function(e,t,n){var r=t.search(this.$indentGuideRe);return r<=0||r>=n?t:t[0]==" "?(r-=r%this.tabSize,e.push(s.stringRepeat(this.$tabStrings[" "],r/this.tabSize)),t.substr(r)):t[0]=="	"?(e.push(s.stringRepeat(this.$tabStrings["	"],r)),t.substr(r)):t},this.$renderWrappedLine=function(e,t,n,r){var i=0,s=0,o=n[0],u=0;for(var a=0;a<t.length;a++){var f=t[a],l=f.value;if(a==0&&this.displayIndentGuides){i=l.length,l=this.renderIndentGuide(e,l,o);if(!l)continue;i-=l.length}if(i+l.length<o)u=this.$renderToken(e,u,f,l),i+=l.length;else{while(i+l.length>=o)u=this.$renderToken(e,u,f,l.substring(0,o-i)),l=l.substring(o-i),i=o,r||e.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px'>"),s++,u=0,o=n[s]||Number.MAX_VALUE;l.length!=0&&(i+=l.length,u=this.$renderToken(e,u,f,l))}}},this.$renderSimpleLine=function(e,t){var n=0,r=t[0],i=r.value;this.displayIndentGuides&&(i=this.renderIndentGuide(e,i)),i&&(n=this.$renderToken(e,n,r,i));for(var s=1;s<t.length;s++)r=t[s],i=r.value,n=this.$renderToken(e,n,r,i)},this.$renderLine=function(e,t,n,r){!r&&r!=0&&(r=this.session.getFoldLine(t));if(r)var i=this.$getFoldLineTokens(t,r);else var i=this.session.getTokens(t);n||e.push("<div class='ace_line' style='height:",this.config.lineHeight*(this.$useLineGroups()?1:this.session.getRowLength(t)),"px'>");if(i.length){var s=this.session.getRowSplitData(t);s&&s.length?this.$renderWrappedLine(e,i,s,n):this.$renderSimpleLine(e,i)}this.showInvisibles&&(r&&(t=r.end.row),e.push("<span class='ace_invisible ace_invisible_eol'>",t==this.session.getLength()-1?this.EOF_CHAR:this.EOL_CHAR,"</span>")),n||e.push("</div>")},this.$getFoldLineTokens=function(e,t){function i(e,t,n){var i=0,s=0;while(s+e[i].value.length<t){s+=e[i].value.length,i++;if(i==e.length)return}if(s!=t){var o=e[i].value.substring(t-s);o.length>n-t&&(o=o.substring(0,n-t)),r.push({type:e[i].type,value:o}),s=t+o.length,i+=1}while(s<n&&i<e.length){var o=e[i].value;o.length+s>n?r.push({type:e[i].type,value:o.substring(0,n-s)}):r.push(e[i]),s+=o.length,i+=1}}var n=this.session,r=[],s=n.getTokens(e);return t.walk(function(e,t,o,u,a){e!=null?r.push({type:"fold",value:e}):(a&&(s=n.getTokens(t)),s.length&&i(s,u,o))},t.end.row,this.session.getLine(t.end.row).length),r},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}}).call(a.prototype),t.Text=a}),ace.define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../lib/dom"),i,s=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_cursor-layer",e.appendChild(this.element),i===undefined&&(i="opacity"in this.element),this.isVisible=!1,this.isBlinking=!0,this.blinkInterval=1e3,this.smoothBlinking=!1,this.cursors=[],this.cursor=this.addCursor(),r.addCssClass(this.element,"ace_hidden-cursors"),this.$updateCursors=this.$updateVisibility.bind(this)};(function(){this.$updateVisibility=function(e){var t=this.cursors;for(var n=t.length;n--;)t[n].style.visibility=e?"":"hidden"},this.$updateOpacity=function(e){var t=this.cursors;for(var n=t.length;n--;)t[n].style.opacity=e?"":"0"},this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setBlinking=function(e){e!=this.isBlinking&&(this.isBlinking=e,this.restartTimer())},this.setBlinkInterval=function(e){e!=this.blinkInterval&&(this.blinkInterval=e,this.restartTimer())},this.setSmoothBlinking=function(e){e!=this.smoothBlinking&&!i&&(this.smoothBlinking=e,r.setCssClass(this.element,"ace_smooth-blinking",e),this.$updateCursors(!0),this.$updateCursors=(e?this.$updateOpacity:this.$updateVisibility).bind(this),this.restartTimer())},this.addCursor=function(){var e=r.createElement("div");return e.className="ace_cursor",this.element.appendChild(e),this.cursors.push(e),e},this.removeCursor=function(){if(this.cursors.length>1){var e=this.cursors.pop();return e.parentNode.removeChild(e),e}},this.hideCursor=function(){this.isVisible=!1,r.addCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.showCursor=function(){this.isVisible=!0,r.removeCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.restartTimer=function(){var e=this.$updateCursors;clearInterval(this.intervalId),clearTimeout(this.timeoutId),this.smoothBlinking&&r.removeCssClass(this.element,"ace_smooth-blinking"),e(!0);if(!this.isBlinking||!this.blinkInterval||!this.isVisible)return;this.smoothBlinking&&setTimeout(function(){r.addCssClass(this.element,"ace_smooth-blinking")}.bind(this));var t=function(Line truncated
             (function() {
                 ace.require(["ace/ace"], function(a) {
                     a && a.config.init(true);

public/libs/md2html/md2html.js

@@ -291,7 +291,8 @@ listStr=addAnchors(listStr);listStr=listStr.replace(/\n{2,}(?=\\x03)/,"\n");list
 		                styles: "safe",
 		                fontsize: "all"
 		            }
-		        }
+		        },
+		        equationNumbers: { autoNumber: "AMS" }
 		    },
 		    messageStyle: "none"
 		});

public/tinymce/langs/de-de.js

@@ -0,0 +1 @@
+tinymce.addI18n("de",{Cut:"Ausschneiden","Heading 5":"Überschrift 5","Header 2":"Überschrift 2","Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.":"Ihr Browser unterstützt leider keinen direkten Zugriff auf die Zwischenablage. Bitte benutzen Sie die Strg + X / C / V Tastenkombinationen.","Heading 4":"Überschrift 4",Div:"Textblock","Heading 2":"Überschrift 2",Paste:"Einfügen",Close:"Schließen","Font Family":"Schriftart",Pre:"Vorformatierter Text","Align right":"Rechtsbündig ausrichten","New document":"Neues Dokument",Blockquote:"Zitat","Numbered list":"Nummerierte Liste","Heading 1":"Überschrift 1",Headings:"Überschriften","Increase indent":"Einzug vergrößern",Formats:"Formate",Headers:"Überschriften","Select all":"Alles auswählen","Header 3":"Überschrift 3",Blocks:"Absatzformate",Undo:"Rückgängig",Strikethrough:"Durchgestrichen","Bullet list":"Aufzählung","Header 1":"Überschrift 1",Superscript:"Hochgestellt","Clear formatting":"Formatierung entfernen","Font Sizes":"Schriftgröße",Subscript:"Tiefgestellt","Header 6":"Überschrift 6",Redo:"Wiederholen",Paragraph:"Absatz",Ok:"Ok",Bold:"Fett",Code:"Quelltext",Italic:"Kursiv","Align center":"Zentriert ausrichten","Header 5":"Überschrift 5","Heading 6":"Überschrift 6","Heading 3":"Überschrift 3","Decrease indent":"Einzug verkleinern","Header 4":"Überschrift 4","Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.":"Einfügen ist nun im einfachen Textmodus. Inhalte werden ab jetzt als unformatierter Text eingefügt, bis Sie diese Einstellung wieder ausschalten!",Underline:"Unterstrichen",Cancel:"Abbrechen",Justify:"Blocksatz",Inline:"Zeichenformate",Copy:"Kopieren","Align left":"Linksbündig ausrichten","Visual aids":"Visuelle Hilfen","Lower Greek":"Griechische Kleinbuchstaben",Square:"Quadrat",Default:"Standard","Lower Alpha":"Kleinbuchstaben",Circle:"Kreis",Disc:"Punkt","Upper Alpha":"Großbuchstaben","Upper Roman":"Römische Zahlen (Großbuchstaben)","Lower Roman":"Römische Zahlen (Kleinbuchstaben)",Name:"Name",Anchor:"Textmarke","You have unsaved changes are you sure you want to navigate away?":"Die Änderungen wurden noch nicht gespeichert, sind Sie sicher, dass Sie diese Seite verlassen wollen?","Restore last draft":"Letzten Entwurf wiederherstellen","Special character":"Sonderzeichen","Source code":"Quelltext",B:"B",R:"R",G:"G",Color:"Farbe","Right to left":"Von rechts nach links","Left to right":"Von links nach rechts",Emoticons:"Emoticons",Robots:"Robots","Document properties":"Dokumenteigenschaften",Title:"Titel",Keywords:"Schüsselwörter",Encoding:"Zeichenkodierung",Description:"Beschreibung",Author:"Verfasser",Fullscreen:"Vollbild","Horizontal line":"Horizontale Linie","Horizontal space":"Horizontaler Abstand","Insert/edit image":"Bild einfügen/bearbeiten",General:"Allgemein",Advanced:"Erweitert",Source:"Quelle",Border:"Rahmen","Constrain proportions":"Seitenverhältnis beibehalten","Vertical space":"Vertikaler Abstand","Image description":"Bildbeschreibung",Style:"Stil",Dimensions:"Abmessungen","Insert image":"Bild einfügen","Zoom in":"Ansicht vergrößern",Contrast:"Kontrast",Back:"Zurück",Gamma:"Gamma","Flip horizontally":"Horizontal spiegeln",Resize:"Skalieren",Sharpen:"Schärfen","Zoom out":"Ansicht verkleinern","Image options":"Bildeigenschaften",Apply:"Anwenden",Brightness:"Helligkeit","Rotate clockwise":"Im Uhrzeigersinn drehen","Rotate counterclockwise":"Gegen den Uhrzeigersinn drehen","Edit image":"Bild bearbeiten","Color levels":"Farbwerte",Crop:"Bescheiden",Orientation:"Ausrichtung","Flip vertically":"Vertikal spiegeln",Invert:"Invertieren","Insert date/time":"Datum/Uhrzeit einfügen ","Remove link":"Link entfernen",Url:"URL","Text to display":"Anzuzeigender Text",Anchors:"Textmarken","Insert link":"Link einfügen","New window":"Neues Fenster",None:"Keine","The URL you entered seems to be an external link. Do you want to add the required http:// prefix?":'Diese Adresse scheint ein externer Link zu sein. Möchten Sie das dazu benötigte "http://" voranstellen?',Target:"Ziel","The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?":'Diese Adresse scheint eine E-Mail-Adresse zu sein. Möchten Sie das dazu benötigte "mailto:" voranstellen?',"Insert/edit link":"Link einfügen/bearbeiten","Insert/edit video":"Video einfügen/bearbeiten",Poster:"Poster","Alternative source":"Alternative Quelle","Paste your embed code below:":"Fügen Sie Ihren Einbettungscode hier ein:","Insert video":"Video einfügen",Embed:"Einbetten","Nonbreaking space":"Geschütztes Leerzeichen","Page break":"Seitenumbruch","Paste as text":"Als Text einfügen",Preview:"Vorschau",Print:"Drucken",Save:"Speichern","Could not find the specified string.":"Die Zeichenfolge wurde nicht gefunden.",Replace:"Ersetzen",Next:"Weiter","Whole words":"Nur ganze Wörter","Find and replace":"Suchen undLine truncated