v1.0 initial db data

app/views/home/header.html

@@ -41,7 +41,7 @@ function log(o) {
 			<div id="lang">
 				<a data-lang="en-us">English</a>
 				<a data-lang="fr-fr">Français</a>
-				<a data-lang="zh-cn">中文简体</a>
+				<a data-lang="zh-cn">简体中文</a>
 			</div>
 			
 			<ul class="nav navbar-nav navbar-left">

app/views/home/index_en.html

@@ -9,18 +9,17 @@
 		<p>
 		Knowledge, Blog, Sharing, Cooperation... all in leanote
 		</p>
-		
 		<div>
 			<a class="btn btn-primary" href="https://github.com/leanote/leanote">{{msg . "fork github"}}</a> 
 			&nbsp;
 			&nbsp;
 			<a class="btn btn-default" href="/demo">{{msg . "try"}}</a>
+			&nbsp;
+			&nbsp;
+			<a class="btn btn-default" href="/login">{{msg . "login"}}</a>
 			{{if .openRegister}}
 			&nbsp;
 			&nbsp;
-			OR	
-			&nbsp;
-			&nbsp;
 			<a class="btn btn-default" href="/register">{{msg . "register"}}</a> 
 			{{end}}
 		</div>

app/views/home/index_zh.html

@@ -13,12 +13,12 @@
 			 
 			 
 			<a class="btn btn-default" href="/demo">{{msg . "try"}}</a>
+			&nbsp;
+			&nbsp;
+			<a class="btn btn-default" href="/login">{{msg . "login"}}</a>
 			{{if .openRegister}}
 			&nbsp;
 			&nbsp;
-			OR	
-			&nbsp;
-			&nbsp;
 			<a class="btn btn-default" href="/register">{{msg . "register"}}</a> 
 			{{end}}
 		</div>

conf/app.conf

@@ -9,7 +9,7 @@ site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
 # mongdb
 db.host=localhost
 db.port=27017
-db.dbname=leanote8 # required
+db.dbname=leanote # required
 db.username= # if not exists, please leave it blank
 db.password= # if not exists, please leave it blank
 # or you can set the mongdb url for more complex needs the format is:
@@ -17,7 +17,7 @@ db.password= # if not exists, please leave it blank
 # db.url=mongodb://root:root123@localhost:27017/leanote
 
 # You Must Change It !! About Security!!
-app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y 
+app.secret=V85ZzBeTnzpsHyjQX4zukbQaDM55VWxAH9Qop19poekx3xkcDVvrD0y 
 
 #--------------------------------
 # revel config

mongodb_backup/leanote_install_data/albums.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.albums" } ] }

mongodb_backup/leanote_install_data/attachs.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.attachs" } ] }

mongodb_backup/leanote_install_data/blog_comments.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.blog_comments" } ] }

mongodb_backup/leanote_install_data/blog_likes.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.blog_likes" } ] }

mongodb_backup/leanote_install_data/blog_singles.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.blog_singles" } ] }

mongodb_backup/leanote_install_data/configs.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.configs" } ] }

mongodb_backup/leanote_install_data/email_logs.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.email_logs" } ] }

mongodb_backup/leanote_install_data/files.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.files" } ] }

mongodb_backup/leanote_install_data/find_pwds.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.find_pwds" } ] }

mongodb_backup/leanote_install_data/group_users.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.group_users" } ] }

mongodb_backup/leanote_install_data/groups.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.groups" } ] }

mongodb_backup/leanote_install_data/has_share_notes.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote7.has_share_notes" } ] }

mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.leanote.ShareNotes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "name" : "UserId_1_ToUserId_1_NoteId_1", "ns" : "leanote7.leanote.ShareNotes" } ] }

mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.leanote.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote7.leanote.has_share_notes" } ] }

mongodb_backup/leanote_install_data/note_content_histories.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.note_content_histories" } ] }

mongodb_backup/leanote_install_data/note_contents.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.note_contents" } ] }

mongodb_backup/leanote_install_data/note_images.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.note_images" } ] }

mongodb_backup/leanote_install_data/note_tags.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.note_tags" } ] }

mongodb_backup/leanote_install_data/notebooks.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.notebooks" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote7.notebooks" } ] }

mongodb_backup/leanote_install_data/notes.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.notes" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote7.notes" } ] }

mongodb_backup/leanote_install_data/reports.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.reports" } ] }

mongodb_backup/leanote_install_data/sessions.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.sessions" } ] }

mongodb_backup/leanote_install_data/share_notebooks.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.share_notebooks" } ] }

mongodb_backup/leanote_install_data/share_notes.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.share_notes" } ] }

mongodb_backup/leanote_install_data/suggestions.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.suggestions" } ] }

mongodb_backup/leanote_install_data/tag_count.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.tag_count" } ] }

mongodb_backup/leanote_install_data/tags.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.tags" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote7.tags" } ] }

mongodb_backup/leanote_install_data/themes.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.themes" } ] }

mongodb_backup/leanote_install_data/tokens.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.tokens" } ] }

mongodb_backup/leanote_install_data/user_blogs.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.user_blogs" } ] }

mongodb_backup/leanote_install_data/users.metadata.json

@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.users" } ] }

public/blog/themes/default/post.html

@@ -108,34 +108,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 markdown 
 调用markdown来解析得到html
 -->
-
 {{if $.post.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
+<script src="/public/libs/md2html/md2html.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="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
+md2Html(content, $("#content"), function(html) {
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
+    $("pre").addClass("prettyprint linenums");
-var html = converter.makeHtml(content);
+    prettyPrint();
-$("#content").html(html);
+    initNav();
-$("pre").addClass("prettyprint linenums");
+    weixin();
-prettyPrint();
+});
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>

public/blog/themes/default/style.css

@@ -530,3 +530,8 @@ table tr:nth-child(2n) {
 	border-collapse: collapse;
 	padding: 6px 13px;
 }
+
+.desc *, #content * {
+    word-wrap: break-word;
+}
+

public/blog/themes/elegant/post.html

@@ -107,35 +107,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 <!-- 
 markdown 
 调用markdown来解析得到html
--->
+-->{{if $.post.IsMarkdown }}
-
+<script src="/public/libs/md2html/md2html.js"></script>
-{{if $.post.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="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
+md2Html(content, $("#content"), function(html) {
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
+    $("pre").addClass("prettyprint linenums");
-var html = converter.makeHtml(content);
+    prettyPrint();
-$("#content").html(html);
+    initNav();
-$("pre").addClass("prettyprint linenums");
+    weixin();
-prettyPrint();
+});
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>

public/blog/themes/elegant/style.css

@@ -541,3 +541,6 @@ table tr:nth-child(2n) {
 	border-collapse: collapse;
 	padding: 6px 13px;
 }
+.desc *, #content * {
+    word-wrap: break-word;
+}

public/blog/themes/nav_fixed/post.html

@@ -108,34 +108,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 markdown 
 调用markdown来解析得到html
 -->
-
 {{if $.post.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
+<script src="/public/libs/md2html/md2html.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="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
+md2Html(content, $("#content"), function(html) {
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
+    $("pre").addClass("prettyprint linenums");
-var html = converter.makeHtml(content);
+    prettyPrint();
-$("#content").html(html);
+    initNav();
-$("pre").addClass("prettyprint linenums");
+    weixin();
-prettyPrint();
+});
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>

public/blog/themes/nav_fixed/style.css

@@ -580,3 +580,6 @@ table tr:nth-child(2n) {
 	border-collapse: collapse;
 	padding: 6px 13px;
 }
+.desc *, #content * {
+    word-wrap: break-word;
+}