From 3baa31d44c2d423d392e4d5a589d3604913d672d Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Sat, 10 May 2014 16:12:38 +0800
Subject: [PATCH] note i18n

---
 app/views/Note/note-dev.html         | 18 +++++++++++-------
 app/views/Note/note.html             | 20 ++++++++++++--------
 messages/msg.en                      |  2 +-
 messages/msg.zh                      |  2 +-
 public/tinymce/tinymce.dev.js        |  2 +-
 public/tinymce/tinymce.jquery.dev.js |  2 +-
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/app/views/Note/note-dev.html b/app/views/Note/note-dev.html
index b24537c..557aad5 100644
--- a/app/views/Note/note-dev.html
+++ b/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">
diff --git a/app/views/Note/note.html b/app/views/Note/note.html
index cc9587b..b45147a 100755
--- a/app/views/Note/note.html
+++ b/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">
diff --git a/messages/msg.en b/messages/msg.en
index db5f443..1d9d526 100644
--- a/messages/msg.en
+++ b/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
diff --git a/messages/msg.zh b/messages/msg.zh
index 0bd9de8..a790022 100644
--- a/messages/msg.zh
+++ b/messages/msg.zh
@@ -86,7 +86,7 @@ nav=文档导航
 update=更新
 create=创建
 
-demoRegister=您现在使用的是体验帐号, <a href="/register">立即注册?</a>
+demoRegister=<a href="/register">立即注册</a>
 
 close=关闭
 cancel=取消
diff --git a/public/tinymce/tinymce.dev.js b/public/tinymce/tinymce.dev.js
index 73df4b1..b075c56 100644
--- a/public/tinymce/tinymce.dev.js
+++ b/public/tinymce/tinymce.dev.js
@@ -210,4 +210,4 @@
 	writeScripts();
 })(this);
 
-// $hash: 056ece81215b9821a9351a1225c16a54
\ No newline at end of file
+// $hash: 88485e51dfc8b87256e56ced990207fb
\ No newline at end of file
diff --git a/public/tinymce/tinymce.jquery.dev.js b/public/tinymce/tinymce.jquery.dev.js
index 86b6e62..cd9f891 100644
--- a/public/tinymce/tinymce.jquery.dev.js
+++ b/public/tinymce/tinymce.jquery.dev.js
@@ -209,4 +209,4 @@
 	writeScripts();
 })(this);
 
-// $hash: 891cc24736535255c4fa3037a91c4795
\ No newline at end of file
+// $hash: 8dd58924203761827d379143aa789af1
\ No newline at end of file