resize editor

app/lea/Email.go

@@ -28,8 +28,8 @@ var bodyTpl = `
 					<div style="float:left; height: 40px;">
 						<a href="http://leanote.com" style="font-size: 24px">leanote</a>
 					</div>
-					<div style="float:left; height:40px; line-height:16px;">
+					<div style="float:left; height:40px; line-height:40px;">
-						&nbsp;&nbsp;| &nbsp;<span style="font-size:24px">$title</span>
+						&nbsp;&nbsp;| &nbsp;<span style="font-size:14px">$title</span>
 					</div>
 					<div style="clear:both"></div>
 				</div>
@@ -50,7 +50,7 @@ var bodyTpl = `
 						font-size: 12px;
 					}
 				</style>
-				<a href="http://leanote.com">leanote</a>, your own cloud note
+				<a href="http://leanote.com">leanote</a>, your own cloud note!
 			</div>
 		</div>
 	</body>
@@ -78,6 +78,7 @@ func SendEmail(to, subject, title, body string) bool {
 	err := smtp.SendMail(host+":"+port, auth, username, send_to, msg)
 	
 	if err != nil {
+		Log(err)
 		return false
 	}
 	return true

app/service/UserService.go

@@ -208,11 +208,11 @@ func (this *UserService) UpdateEmailSendActiveEmail(userId, email string) (ok bo
 	}
 	
 	// 发送邮件
-	url := "http://115.28.133.226/user/updateEmail?token=" + token
+	url := "http://leanote.com/user/updateEmail?token=" + token
 	body := "邮箱验证后您的登录邮箱为: <b>" + email + "</b><br />";
 	body += fmt.Sprintf("请点击链接验证邮箱: <a href='%v'>%v</a>. %v小时后过期.", url, url, tokenService.GetOverHours(info.TokenUpdateEmail));
 	if !SendEmail(email, "leanote-验证邮箱", "验证邮箱", body) {
-		msg = "发送失败"
+		msg = "发送失败, 该邮箱存在?"
 		return 
 	}
 	ok = true
@@ -291,4 +291,4 @@ func (this *UserService)UpdateColumnWidth(userId string, notebookWidth, noteList
 // 左侧是否隐藏
 func  (this *UserService)UpdateLeftIsMin(userId string, leftIsMin bool) bool {
 	return db.UpdateByQMap(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)}, bson.M{"LeftIsMin": leftIsMin})
-}
+}

app/views/Blog/set.html

@@ -166,19 +166,17 @@
 $(function() {
 	tinymce.init({
 		selector : "#AboutMe",
-		content_css : [ "/css/bootstrap.css", "/css/editor.css" ],
+		content_css : [ "/css/bootstrap.css", "/css/editor/editor.css" ],
 		skin : "custom",
-		language : "zh_CN",
+		language : "zh",
 		height : 300,
 		width : "100%",
+		skin : "custom",
 		plugins : [
-				"advlist autolink link image lists charmap hr ",
+				"advlist autolink link leanote_image lists charmap hr ",
-				"searchreplace visualblocks visualchars code tabfocus",
+				"searchreplace visualblocks visualchars leanote_code tabfocus",
-				"table contextmenu directionality textcolor paste fullpage textcolor" ],
+				"table contextmenu directionality textcolor paste fullpage textcolor"],
-
+		toolbar1 : "formatselect |fontselect fontsizeselect| forecolor backcolor | bold italic underline strikethrough | bullist numlist |",
-		toolbar1 : "formatselect fontselect fontsizeselect | forecolor backcolor | bold italic underline strikethrough | image |  bullist numlist | alignleft aligncenter alignright alignjustify",
-		toolbar2 : "outdent indent blockquote | link unlink | table | hr removeformat | subscript superscript | visualchars visualblocks | searchreplace | code",
-
 		menubar : false,
 		toolbar_items_size : 'small',
 		statusbar : false,

app/views/Note/note-dev.html

@@ -834,7 +834,7 @@ function log(o) {
 									
 									<tr>
 										<td>
-											<button id="pwdBtn" class="btn btn-success" style="width: 100%">{{msg . "submit"}}</button> 
+											<button id="pwdBtn" class="btn btn-success">{{msg . "submit"}}</button> 
 										</td>
 									</tr>
 								</table>

app/views/Note/note.html

@@ -834,7 +834,7 @@ function log(o) {
 									
 									<tr>
 										<td>
-											<button id="pwdBtn" class="btn btn-success" style="width: 100%">{{msg . "submit"}}</button> 
+											<button id="pwdBtn" class="btn btn-success">{{msg . "submit"}}</button> 
 										</td>
 									</tr>
 								</table>

public/js/app/page.js

@@ -745,6 +745,9 @@ editorMode.prototype.resizeEditor = function() {
 	setTimeout(function() {
 		resizeEditor();
 	}, 20);
+	setTimeout(function() {
+		resizeEditor();
+	}, 500);
 }
 editorMode.prototype.normalMode = function() {
 	/*