note i18n

app/views/Note/note-dev.html

@@ -98,13 +98,7 @@ function log(o) {
 					<span id="msg" style="display: inline-block;"></span>
 					<img id="loading" style="visibility: hidden" src="/images/loading-a-20.gif" />
 					
-					{{if .openRegister}}					
+					
-						{{if eq .userInfo.Email "demo@leanote.com"}}
-						<span>
-							{{msg . "demoRegister"}}
-						</span>
-						{{end}}
-					{{end}}
 				</div>
 				
 				<!-- 
@@ -159,6 +153,16 @@ function log(o) {
 					</a>
 				</div>
 				
+				{{if eq .userInfo.Email "demo@leanote.com"}}
+				{{if .openRegister}}					
+				<div class="pull-right" style="line-height: 60px; margin-right:10px">
+					<span>
+						{{msg . "demoRegister"}}
+					</span>
+				</div>
+				{{end}}
+				{{end}}
+				
 				<!--
 				<ul id="setting" class="pull-right">
 					<li class="dropdown messages">

app/views/Note/note.html

@@ -98,13 +98,7 @@ function log(o) {
 					<span id="msg" style="display: inline-block;"></span>
 					<img id="loading" style="visibility: hidden" src="/images/loading-a-20.gif" />
 					
-					{{if .openRegister}}					
+					
-						{{if eq .userInfo.Email "demo@leanote.com"}}
-						<span>
-							{{msg . "demoRegister"}}
-						</span>
-						{{end}}
-					{{end}}
 				</div>
 				
 				<!-- 
@@ -159,6 +153,16 @@ function log(o) {
 					</a>
 				</div>
 				
+				{{if eq .userInfo.Email "demo@leanote.com"}}
+				{{if .openRegister}}					
+				<div class="pull-right" style="line-height: 60px; margin-right:10px">
+					<span>
+						{{msg . "demoRegister"}}
+					</span>
+				</div>
+				{{end}}
+				{{end}}
+				
 				<!--
 				<ul id="setting" class="pull-right">
 					<li class="dropdown messages">
@@ -707,7 +711,7 @@ function log(o) {
 					</div>
 			    </div>
 			    
-			    <!-- 长微博 -->
+			    <!-- 激活邮件 -->
 				<div id="reSendActiveEmailDialog">
 				    <div class="modal-body">
 				    	<div style="max-height: 300px; padding: 5px 0; text-align: center; overflow: scroll;" class="weibo">

messages/msg.en

@@ -85,7 +85,7 @@ nav=Note nav
 update=Update
 create=Create
 
-demoRegister=您现在使用的是体验帐号, <a href="/register">立即注册?</a>
+demoRegister=<a href="/register">Sign up</a>
 
 close=Close
 cancel=Cancel

messages/msg.zh

@@ -86,7 +86,7 @@ nav=文档导航
 update=更新
 create=创建
 
-demoRegister=您现在使用的是体验帐号, <a href="/register">立即注册?</a>
+demoRegister=<a href="/register">立即注册</a>
 
 close=关闭
 cancel=取消

public/tinymce/tinymce.dev.js

@@ -210,4 +210,4 @@
 	writeScripts();
 })(this);
 
-// $hash: 056ece81215b9821a9351a1225c16a54
+// $hash: 88485e51dfc8b87256e56ced990207fb

public/tinymce/tinymce.jquery.dev.js

@@ -209,4 +209,4 @@
 	writeScripts();
 })(this);
 
-// $hash: 891cc24736535255c4fa3037a91c4795
+// $hash: 8dd58924203761827d379143aa789af1