From 5f00161cc831316b075a53eee2de86ae3e72f731 Mon Sep 17 00:00:00 2001 From: life Date: Thu, 14 Apr 2016 16:10:10 +0800 Subject: [PATCH 1/3] login page remove local account entry --- login.html | 13 ++++++++++--- public/css/index.css | 2 +- public/css/index.less | 3 ++- public/langs/zh-cn.js | 2 ++ public/langs/zh-hk.js | 4 +++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/login.html b/login.html index 36987d53..c57cf42d 100644 --- a/login.html +++ b/login.html @@ -27,8 +27,11 @@ if(process.platform != 'darwin') {
- Self-hosted Service - Create Local Account + Sign up Leanote + + Sign in to Self-hosted Service + + Sign in to Leanote
@@ -40,8 +43,8 @@ if(process.platform != 'darwin') { + Self-hosted Service - Create Local Account
@@ -92,7 +95,9 @@ if(process.platform != 'darwin') {
Forget password? +
@@ -271,11 +276,13 @@ $(function() { hideMsg(); }); + /* $('#localAccount').click(function() { $body.addClass('local-account'); $('#username').focus(); hideMsg(); }); + */ $('#loginWithLeanote').click(function () { $body.removeClass('local-account custom-server'); diff --git a/public/css/index.css b/public/css/index.css index 850ac12d..f5e5bae7 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -734,7 +734,7 @@ form { .local-account #loadingLogo { display: none; } -.local-account #box h1 span.localAccount { +.local-account #box h1 .localAccount { display: block; } .win-tool { diff --git a/public/css/index.less b/public/css/index.less index 92dbdc4a..750bd154 100644 --- a/public/css/index.less +++ b/public/css/index.less @@ -785,6 +785,7 @@ form { display: block; } } + } .custom-server { @@ -817,7 +818,7 @@ form { #loadingLogo { display: none; } - #box h1 span.localAccount { + #box h1 .localAccount { display: block; } } diff --git a/public/langs/zh-cn.js b/public/langs/zh-cn.js index a5929c9e..4def191a 100644 --- a/public/langs/zh-cn.js +++ b/public/langs/zh-cn.js @@ -233,6 +233,7 @@ "Username or Email": "用户名或邮箱", "Password": "密码", "Sign up": "注册", + "Sign up Leanote": "注册Leanote", "Forget password?": "忘记密码?", "Find password": "找回密码", @@ -282,6 +283,7 @@ "Password is required": "请输入密码", "The minimum password length is 6": "密码长度最少6位", + "Sign In to Self-hosted Service": "登录自建服务", "Self-hosted Service": "自建服务", "Create Local Account": "创建本地帐户", "Sign in to Leanote": "登录到Leanote", diff --git a/public/langs/zh-hk.js b/public/langs/zh-hk.js index cfe23f64..1a22fad9 100644 --- a/public/langs/zh-hk.js +++ b/public/langs/zh-hk.js @@ -233,6 +233,7 @@ "Username or Email": "用戶名或郵箱", "Password": "密碼", "Sign up": "註冊", + "Sign up Leanote": "註冊Leanote", "Forget password?": "忘記密碼?", "Find password": "找回密碼", @@ -282,7 +283,8 @@ "Password is required": "請輸入密碼", "The minimum password length is 6": "密碼長度最少6位", - "Self-hosted Service": "自建服務", + "Sign In to Self-hosted Service": "登錄自建服務", + "Self-hosted Service": "登錄自建服務", "Create Local Account": "創建本地帳戶", "Sign in to Leanote": "登錄到Leanote", "Confirm password": "確認密碼", From bd4befdf95795b6ea956330d39e48e049af6ac25 Mon Sep 17 00:00:00 2001 From: life Date: Thu, 14 Apr 2016 16:45:02 +0800 Subject: [PATCH 2/3] local account warning!!! --- note.html | 18 ++++++++++++++++++ public/config.js | 2 +- public/js/app/page.js | 20 ++++++++++++++++++++ public/langs/en-us.js | 2 ++ public/langs/zh-cn.js | 4 ++++ public/langs/zh-hk.js | 4 ++++ 6 files changed, 49 insertions(+), 1 deletion(-) diff --git a/note.html b/note.html index f13c5aa2..9dafe948 100755 --- a/note.html +++ b/note.html @@ -579,6 +579,24 @@ function log(o) { + + +