From af4476a985cd71a47e0ab00717b84944f8bcbb06 Mon Sep 17 00:00:00 2001 From: life Date: Thu, 8 May 2014 15:44:45 +0800 Subject: [PATCH] active email error --- app/routes/routes.go | 388 +++++++++++++++---------------- app/tmp/main.go | 342 +++++++++++++-------------- app/views/User/active_email.html | 25 +- app/views/User/update_email.html | 27 +-- public/js/app/page.js | 2 +- 5 files changed, 388 insertions(+), 396 deletions(-) diff --git a/app/routes/routes.go b/app/routes/routes.go index df5d044..7308adf 100644 --- a/app/routes/routes.go +++ b/app/routes/routes.go @@ -16,35 +16,6 @@ func (_ tBaseController) E404( } -type tStatic struct {} -var Static tStatic - - -func (_ tStatic) Serve( - prefix string, - filepath string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "prefix", prefix) - revel.Unbind(args, "filepath", filepath) - return revel.MainRouter.Reverse("Static.Serve", args).Url -} - -func (_ tStatic) ServeModule( - moduleName string, - prefix string, - filepath string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "moduleName", moduleName) - revel.Unbind(args, "prefix", prefix) - revel.Unbind(args, "filepath", filepath) - return revel.MainRouter.Reverse("Static.ServeModule", args).Url -} - - type tTestRunner struct {} var TestRunner tTestRunner @@ -75,6 +46,35 @@ func (_ tTestRunner) List( } +type tStatic struct {} +var Static tStatic + + +func (_ tStatic) Serve( + prefix string, + filepath string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "prefix", prefix) + revel.Unbind(args, "filepath", filepath) + return revel.MainRouter.Reverse("Static.Serve", args).Url +} + +func (_ tStatic) ServeModule( + moduleName string, + prefix string, + filepath string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "moduleName", moduleName) + revel.Unbind(args, "prefix", prefix) + revel.Unbind(args, "filepath", filepath) + return revel.MainRouter.Reverse("Static.ServeModule", args).Url +} + + type tAuth struct {} var Auth tAuth @@ -198,113 +198,108 @@ func (_ tFile) UploadImageJson( } -type tUser struct {} -var User tUser +type tIndex struct {} +var Index tIndex -func (_ tUser) UpdateUsername( - username string, +func (_ tIndex) Index( ) string { args := make(map[string]string) - revel.Unbind(args, "username", username) - return revel.MainRouter.Reverse("User.UpdateUsername", args).Url + return revel.MainRouter.Reverse("Index.Index", args).Url } -func (_ tUser) UpdatePwd( - oldPwd string, - pwd string, +func (_ tIndex) Suggestion( + addr string, + suggestion string, ) string { args := make(map[string]string) - revel.Unbind(args, "oldPwd", oldPwd) - revel.Unbind(args, "pwd", pwd) - return revel.MainRouter.Reverse("User.UpdatePwd", args).Url + revel.Unbind(args, "addr", addr) + revel.Unbind(args, "suggestion", suggestion) + return revel.MainRouter.Reverse("Index.Suggestion", args).Url } -func (_ tUser) UpdateTheme( - theme string, + +type tMobile struct {} +var Mobile tMobile + + +func (_ tMobile) Index( ) string { args := make(map[string]string) - revel.Unbind(args, "theme", theme) - return revel.MainRouter.Reverse("User.UpdateTheme", args).Url + return revel.MainRouter.Reverse("Mobile.Index", args).Url } -func (_ tUser) SendRegisterEmail( - content string, - toEmail string, +func (_ tMobile) Logout( ) string { args := make(map[string]string) - revel.Unbind(args, "content", content) - revel.Unbind(args, "toEmail", toEmail) - return revel.MainRouter.Reverse("User.SendRegisterEmail", args).Url + return revel.MainRouter.Reverse("Mobile.Logout", args).Url } -func (_ tUser) ReSendActiveEmail( + +type tNotebook struct {} +var Notebook tNotebook + + +func (_ tNotebook) Index( + notebook interface{}, + i int, + name string, ) string { args := make(map[string]string) - return revel.MainRouter.Reverse("User.ReSendActiveEmail", args).Url + revel.Unbind(args, "notebook", notebook) + revel.Unbind(args, "i", i) + revel.Unbind(args, "name", name) + return revel.MainRouter.Reverse("Notebook.Index", args).Url } -func (_ tUser) UpdateEmailSendActiveEmail( - email string, +func (_ tNotebook) DeleteNotebook( + notebookId string, ) string { args := make(map[string]string) - revel.Unbind(args, "email", email) - return revel.MainRouter.Reverse("User.UpdateEmailSendActiveEmail", args).Url + revel.Unbind(args, "notebookId", notebookId) + return revel.MainRouter.Reverse("Notebook.DeleteNotebook", args).Url } -func (_ tUser) UpdateEmail( - token string, +func (_ tNotebook) AddNotebook( + notebookId string, + title string, ) string { args := make(map[string]string) - revel.Unbind(args, "token", token) - return revel.MainRouter.Reverse("User.UpdateEmail", args).Url + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "title", title) + return revel.MainRouter.Reverse("Notebook.AddNotebook", args).Url } -func (_ tUser) ActiveEmail( - token string, +func (_ tNotebook) UpdateNotebookTitle( + notebookId string, + title string, ) string { args := make(map[string]string) - revel.Unbind(args, "token", token) - return revel.MainRouter.Reverse("User.ActiveEmail", args).Url + revel.Unbind(args, "notebookId", notebookId) + revel.Unbind(args, "title", title) + return revel.MainRouter.Reverse("Notebook.UpdateNotebookTitle", args).Url } -func (_ tUser) AddAccount( - email string, - pwd string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "email", email) - revel.Unbind(args, "pwd", pwd) - return revel.MainRouter.Reverse("User.AddAccount", args).Url -} -func (_ tUser) UpdateColumnWidth( - notebookWidth int, - noteListWidth int, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookWidth", notebookWidth) - revel.Unbind(args, "noteListWidth", noteListWidth) - return revel.MainRouter.Reverse("User.UpdateColumnWidth", args).Url -} +type tNoteContentHistory struct {} +var NoteContentHistory tNoteContentHistory -func (_ tUser) UpdateLeftIsMin( - leftIsMin bool, + +func (_ tNoteContentHistory) ListHistories( + noteId string, ) string { args := make(map[string]string) - revel.Unbind(args, "leftIsMin", leftIsMin) - return revel.MainRouter.Reverse("User.UpdateLeftIsMin", args).Url + revel.Unbind(args, "noteId", noteId) + return revel.MainRouter.Reverse("NoteContentHistory.ListHistories", args).Url } @@ -411,111 +406,6 @@ func (_ tBlog) AboutMe( } -type tIndex struct {} -var Index tIndex - - -func (_ tIndex) Index( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Index.Index", args).Url -} - -func (_ tIndex) Suggestion( - addr string, - suggestion string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "addr", addr) - revel.Unbind(args, "suggestion", suggestion) - return revel.MainRouter.Reverse("Index.Suggestion", args).Url -} - - -type tMobile struct {} -var Mobile tMobile - - -func (_ tMobile) Index( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Mobile.Index", args).Url -} - -func (_ tMobile) Logout( - ) string { - args := make(map[string]string) - - return revel.MainRouter.Reverse("Mobile.Logout", args).Url -} - - -type tNotebook struct {} -var Notebook tNotebook - - -func (_ tNotebook) Index( - notebook interface{}, - i int, - name string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebook", notebook) - revel.Unbind(args, "i", i) - revel.Unbind(args, "name", name) - return revel.MainRouter.Reverse("Notebook.Index", args).Url -} - -func (_ tNotebook) DeleteNotebook( - notebookId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - return revel.MainRouter.Reverse("Notebook.DeleteNotebook", args).Url -} - -func (_ tNotebook) AddNotebook( - notebookId string, - title string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "title", title) - return revel.MainRouter.Reverse("Notebook.AddNotebook", args).Url -} - -func (_ tNotebook) UpdateNotebookTitle( - notebookId string, - title string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "notebookId", notebookId) - revel.Unbind(args, "title", title) - return revel.MainRouter.Reverse("Notebook.UpdateNotebookTitle", args).Url -} - - -type tNoteContentHistory struct {} -var NoteContentHistory tNoteContentHistory - - -func (_ tNoteContentHistory) ListHistories( - noteId string, - ) string { - args := make(map[string]string) - - revel.Unbind(args, "noteId", noteId) - return revel.MainRouter.Reverse("NoteContentHistory.ListHistories", args).Url -} - - type tNote struct {} var Note tNote @@ -810,3 +700,113 @@ func (_ tShare) DeleteUserShareNoteAndNotebook( } +type tUser struct {} +var User tUser + + +func (_ tUser) UpdateUsername( + username string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "username", username) + return revel.MainRouter.Reverse("User.UpdateUsername", args).Url +} + +func (_ tUser) UpdatePwd( + oldPwd string, + pwd string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "oldPwd", oldPwd) + revel.Unbind(args, "pwd", pwd) + return revel.MainRouter.Reverse("User.UpdatePwd", args).Url +} + +func (_ tUser) UpdateTheme( + theme string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "theme", theme) + return revel.MainRouter.Reverse("User.UpdateTheme", args).Url +} + +func (_ tUser) SendRegisterEmail( + content string, + toEmail string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "content", content) + revel.Unbind(args, "toEmail", toEmail) + return revel.MainRouter.Reverse("User.SendRegisterEmail", args).Url +} + +func (_ tUser) ReSendActiveEmail( + ) string { + args := make(map[string]string) + + return revel.MainRouter.Reverse("User.ReSendActiveEmail", args).Url +} + +func (_ tUser) UpdateEmailSendActiveEmail( + email string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "email", email) + return revel.MainRouter.Reverse("User.UpdateEmailSendActiveEmail", args).Url +} + +func (_ tUser) UpdateEmail( + token string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "token", token) + return revel.MainRouter.Reverse("User.UpdateEmail", args).Url +} + +func (_ tUser) ActiveEmail( + token string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "token", token) + return revel.MainRouter.Reverse("User.ActiveEmail", args).Url +} + +func (_ tUser) AddAccount( + email string, + pwd string, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "email", email) + revel.Unbind(args, "pwd", pwd) + return revel.MainRouter.Reverse("User.AddAccount", args).Url +} + +func (_ tUser) UpdateColumnWidth( + notebookWidth int, + noteListWidth int, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "notebookWidth", notebookWidth) + revel.Unbind(args, "noteListWidth", noteListWidth) + return revel.MainRouter.Reverse("User.UpdateColumnWidth", args).Url +} + +func (_ tUser) UpdateLeftIsMin( + leftIsMin bool, + ) string { + args := make(map[string]string) + + revel.Unbind(args, "leftIsMin", leftIsMin) + return revel.MainRouter.Reverse("User.UpdateLeftIsMin", args).Url +} + + diff --git a/app/tmp/main.go b/app/tmp/main.go index 03298fb..5720f23 100644 --- a/app/tmp/main.go +++ b/app/tmp/main.go @@ -12,9 +12,9 @@ import ( _ "github.com/leanote/leanote/app/lea/binder" _ "github.com/leanote/leanote/app/lea/memcache" _ "github.com/leanote/leanote/app/service" - controllers0 "github.com/revel/revel/modules/static/app/controllers" + controllers1 "github.com/revel/revel/modules/static/app/controllers" _ "github.com/revel/revel/modules/testrunner/app" - controllers1 "github.com/revel/revel/modules/testrunner/app/controllers" + controllers0 "github.com/revel/revel/modules/testrunner/app/controllers" ) var ( @@ -44,31 +44,7 @@ func main() { }) - revel.RegisterController((*controllers0.Static)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "Serve", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "prefix", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "filepath", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "ServeModule", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "moduleName", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "prefix", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "filepath", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - - revel.RegisterController((*controllers1.TestRunner)(nil), + revel.RegisterController((*controllers0.TestRunner)(nil), []*revel.MethodType{ &revel.MethodType{ Name: "Index", @@ -102,6 +78,30 @@ func main() { }) + revel.RegisterController((*controllers1.Static)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "Serve", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "prefix", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "filepath", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "ServeModule", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "moduleName", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "prefix", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "filepath", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + revel.RegisterController((*controllers.Auth)(nil), []*revel.MethodType{ &revel.MethodType{ @@ -214,95 +214,93 @@ func main() { }) - revel.RegisterController((*controllers.User)(nil), + revel.RegisterController((*controllers.Index)(nil), []*revel.MethodType{ &revel.MethodType{ - Name: "UpdateUsername", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "username", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "UpdatePwd", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "oldPwd", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "UpdateTheme", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "theme", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "SendRegisterEmail", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "content", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "toEmail", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "ReSendActiveEmail", + Name: "Index", Args: []*revel.MethodArg{ }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpdateEmailSendActiveEmail", + Name: "Suggestion", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "addr", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "suggestion", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + + revel.RegisterController((*controllers.Mobile)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "Index", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpdateEmail", + Name: "Logout", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + + revel.RegisterController((*controllers.Notebook)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "Index", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebook", Type: reflect.TypeOf((*info.Notebook)(nil)) }, + &revel.MethodArg{Name: "i", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "ActiveEmail", + Name: "DeleteNotebook", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "AddAccount", + Name: "AddNotebook", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, &revel.MethodType{ - Name: "UpdateColumnWidth", + Name: "UpdateNotebookTitle", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookWidth", Type: reflect.TypeOf((*int)(nil)) }, - &revel.MethodArg{Name: "noteListWidth", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, }, + + }) + + revel.RegisterController((*controllers.NoteContentHistory)(nil), + []*revel.MethodType{ &revel.MethodType{ - Name: "UpdateLeftIsMin", + Name: "ListHistories", Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "leftIsMin", Type: reflect.TypeOf((*bool)(nil)) }, + &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, }, RenderArgNames: map[int][]string{ }, @@ -399,100 +397,6 @@ func main() { }) - revel.RegisterController((*controllers.Index)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "Index", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Suggestion", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "addr", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "suggestion", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - - revel.RegisterController((*controllers.Mobile)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "Index", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "Logout", - Args: []*revel.MethodArg{ - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - - revel.RegisterController((*controllers.Notebook)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "Index", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebook", Type: reflect.TypeOf((*info.Notebook)(nil)) }, - &revel.MethodArg{Name: "i", Type: reflect.TypeOf((*int)(nil)) }, - &revel.MethodArg{Name: "name", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "DeleteNotebook", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "AddNotebook", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - &revel.MethodType{ - Name: "UpdateNotebookTitle", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "notebookId", Type: reflect.TypeOf((*string)(nil)) }, - &revel.MethodArg{Name: "title", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - - revel.RegisterController((*controllers.NoteContentHistory)(nil), - []*revel.MethodType{ - &revel.MethodType{ - Name: "ListHistories", - Args: []*revel.MethodArg{ - &revel.MethodArg{Name: "noteId", Type: reflect.TypeOf((*string)(nil)) }, - }, - RenderArgNames: map[int][]string{ - }, - }, - - }) - revel.RegisterController((*controllers.Note)(nil), []*revel.MethodType{ &revel.MethodType{ @@ -742,6 +646,102 @@ func main() { }) + revel.RegisterController((*controllers.User)(nil), + []*revel.MethodType{ + &revel.MethodType{ + Name: "UpdateUsername", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "username", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpdatePwd", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "oldPwd", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpdateTheme", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "theme", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "SendRegisterEmail", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "content", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "toEmail", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "ReSendActiveEmail", + Args: []*revel.MethodArg{ + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpdateEmailSendActiveEmail", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpdateEmail", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "ActiveEmail", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "token", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "AddAccount", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "email", Type: reflect.TypeOf((*string)(nil)) }, + &revel.MethodArg{Name: "pwd", Type: reflect.TypeOf((*string)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpdateColumnWidth", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "notebookWidth", Type: reflect.TypeOf((*int)(nil)) }, + &revel.MethodArg{Name: "noteListWidth", Type: reflect.TypeOf((*int)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + &revel.MethodType{ + Name: "UpdateLeftIsMin", + Args: []*revel.MethodArg{ + &revel.MethodArg{Name: "leftIsMin", Type: reflect.TypeOf((*bool)(nil)) }, + }, + RenderArgNames: map[int][]string{ + }, + }, + + }) + revel.DefaultValidationKeys = map[string]map[int]string{ } revel.TestSuites = []interface{}{ diff --git a/app/views/User/active_email.html b/app/views/User/active_email.html index 093cb57..13506fe 100644 --- a/app/views/User/active_email.html +++ b/app/views/User/active_email.html @@ -1,25 +1,22 @@ -{{template "header.html" .}} -
+{{template "home/header_box.html" .}} +
-
-

- 验证邮箱 - - {{if .ok}}成功{{else}}失败{{end}} -

- +

+ leanote 验证邮箱 - + {{if .ok}}成功{{else}}失败{{end}} +

+ + + 您的邮箱 {{.email}} 验证 {{if .ok}}成功{{else}}失败{{end}} {{if .msg}}
{{.msg}}{{end}}
- 回到我的笔记 + 回到我的笔记
-
- -{{template "footer.html"}} - + \ No newline at end of file diff --git a/app/views/User/update_email.html b/app/views/User/update_email.html index cdade2d..b893955 100644 --- a/app/views/User/update_email.html +++ b/app/views/User/update_email.html @@ -1,13 +1,12 @@ -{{template "header.html" .}} -
-
-
- -

- 验证邮箱 - - {{if .ok}}成功{{else}}失败{{end}} -

- +{{template "home/header_box.html" .}} +
+
+

+ leanote 验证邮箱 - + {{if .ok}}成功{{else}}失败{{end}} +

+ + 您的邮箱 {{.email}} 验证 {{if .ok}}成功{{else}}失败{{end}} {{if .ok}} @@ -18,13 +17,9 @@ {{if .msg}}
{{.msg}}{{end}}
- 回到我的笔记 + 回到我的笔记
-
- -{{template "footer.html"}} - + \ No newline at end of file diff --git a/public/js/app/page.js b/public/js/app/page.js index 4ddb22c..5678b58 100644 --- a/public/js/app/page.js +++ b/public/js/app/page.js @@ -152,7 +152,7 @@ $(function() { if(!e.shiftKey) { // ed.execCommand('Indent'); - + // TODO 如果当前在li, ul, ol下不执行!! // 如果在pre下就加tab var node = ed.selection.getNode(); if(node.nodeName == "PRE") {