diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/mail/auth/activate_email.tmpl | 39 | ||||
| -rw-r--r-- | templates/mail/auth/reset_passwd.tmpl | 40 | ||||
| -rw-r--r-- | templates/user/auth/activate.tmpl | 37 | ||||
| -rw-r--r-- | templates/user/auth/forgot_passwd.tmpl | 60 | ||||
| -rw-r--r-- | templates/user/auth/reset_passwd.tmpl | 48 | ||||
| -rw-r--r-- | templates/user/auth/signin.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/auth/signup.tmpl | 2 |
7 files changed, 104 insertions, 124 deletions
diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index 24bbf89d05..1a918fe223 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -1,30 +1,15 @@ -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>{{.User.Name}}, please activate your e-mail address</title> +<!DOCTYPE html> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>{{.User.Name}}, please verify your e-mail address</title> </head> -<body style="background:#eee;"> -<div style="color:#333; font:12px/1.5 Tahoma,Arial,sans-serif;; text-shadow:1px 1px #fff; padding:0; margin:0;"> - <div style="width:600px;margin:0 auto; padding:40px 0 20px;"> - <div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);"> - <div style="padding: 20px 15px;"> - <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1> - <div style="padding:40px 15px;"> - <div style="font-size:16px; padding-bottom:30px; font-weight:bold;"> - Hi <span style="color: #00BFFF;">{{.User.Name}}</span>, - </div> - <div style="font-size:14px; padding:0 15px;"> - <p style="margin:0;padding:0 0 9px 0;">Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>.</p> - <p style="margin:0;padding:0 0 9px 0;"> - <a href="{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}">{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</a> - </p> - <p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p> - </div> - </div> - </div> - </div> - <div style="color:#aaa;padding:10px;text-align:center;"> - © 2014 <a style="color:#888;text-decoration:none;" target="_blank" href="http://gogits.org">Gogs: Go Git Service</a> - </div> - </div> -</div> + +<body> + <p>Hi <b>{{.User.Name}}</b>,</p> + <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p> + <p><a href="{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}">{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</a></p> + <p>Not working? Try copying and pasting it to your browser.</p> + <p>© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p> </body> </html>
\ No newline at end of file diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index bf0b9cd3ec..92ae9f328d 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -1,33 +1,15 @@ <!DOCTYPE html> -<html> +<html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>{{.User.Name}}, please reset your password</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>{{.User.Name}}, you have requested to reset your password</title> </head> -<body style="background:#eee;"> -<div style="color:#333; font:12px/1.5 Tahoma,Arial,sans-serif;; text-shadow:1px 1px #fff; padding:0; margin:0;"> - <div style="width:600px;margin:0 auto; padding:40px 0 20px;"> - <div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);"> - <div style="padding: 20px 15px;"> - <h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1> - <div style="padding:40px 15px;"> - <div style="font-size:16px; padding-bottom:30px; font-weight:bold;"> - Hi <span style="color: #00BFFF;">{{.User.Name}}</span>, - </div> - <div style="font-size:14px; padding:0 15px;"> - <p style="margin:0;padding:0 0 9px 0;">Please click the following link to reset your password within <b>{{.ActiveCodeLives}} hours</b>.</p> - <p style="margin:0;padding:0 0 9px 0;"> - <a href="{{.AppUrl}}user/reset_password?code={{.Code}}">{{.AppUrl}}user/reset_password?code={{.Code}}</a> - </p> - <p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p> - </div> - </div> - </div> - </div> - <div style="color:#aaa;padding:10px;text-align:center;"> - © 2014 <a style="color:#888;text-decoration:none;" target="_blank" href="http://gogits.org">Gogs: Go Git Service</a> - </div> - </div> -</div> + +<body> + <p>Hi <b>{{.User.Name}}</b>,</p> + <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p> + <p><a href="{{.AppUrl}}user/reset_password?code={{.Code}}">{{.AppUrl}}user/reset_password?code={{.Code}}</a></p> + <p>Not working? Try copying and pasting it to your browser.</p> + <p>© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p> </body> -</html> +</html>
\ No newline at end of file diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index cc318fe3b9..caadc4f82b 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -8,33 +8,34 @@ {{.i18n.Tr "auth.active_your_account"}} </h2> <div class="ui attached segment"> + {{template "base/alert" .}} {{if .IsActivatePage}} {{if .ServiceNotEnabled}} - <p>{{.i18n.Tr "auth.disable_register_mail"}}</p> + <p class="center">{{.i18n.Tr "auth.disable_register_mail"}}</p> {{else if .ResendLimited}} - <p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p> + <p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p> {{else}} - <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p> - <div class="ui divider"></div> - <div class="text right"> - <a class="ui green button" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a> - </div> + <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p> + <div class="ui divider"></div> + <div class="text right"> + <a class="ui green button" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a> + </div> {{end}} {{else}} {{if .IsSendRegisterMail}} - <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p> - <div class="ui divider"></div> - <div class="text right"> - <a class="ui green button" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a> - </div> + <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p> + <div class="ui divider"></div> + <div class="text right"> + <a class="ui green button" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a> + </div> {{else if .IsActivateFailed}} - <p>{{.i18n.Tr "auth.invalid_code"}}</p> + <p>{{.i18n.Tr "auth.invalid_code"}}</p> {{else}} - <p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p> - <div class="ui divider"></div> - <div class="text right"> - <button class="ui blue button" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.resend_mail"}}</button> - </div> + <p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p> + <div class="ui divider"></div> + <div class="text right"> + <button class="ui blue button">{{.i18n.Tr "auth.resend_mail"}}</button> + </div> {{end}} {{end}} </div> diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index 6122dfceba..f8f23318c4 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -1,32 +1,38 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -<div id="sign-wrapper"> - <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/forget_password" method="post"> +{{template "base/head" .}} +<div class="user forgot password"> + <div class="ui middle very relaxed page grid"> + <div class="column"> + <form class="ui form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} - <div class="panel-header"> - <h2>{{.i18n.Tr "auth.forgot_password"}}</h2> - </div> - <div class="panel-content"> - {{template "ng/base/alert" .}} - {{if .IsResetSent}} + <h2 class="ui top attached header"> + {{.i18n.Tr "auth.forgot_password"}} + </h2> + <div class="ui attached segment"> + {{template "base/alert" .}} + {{if .IsResetSent}} <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p> - <hr/> - <label></label> - <a class="btn btn-green btn-large btn-link btn-radius" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_email"}}</a> - {{else if .IsResetRequest}} - <div class="field"> - <label class="req" for="email">{{.i18n.Tr "email"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.email}}"required/> + <div class="ui divider"></div> + <div class="text right"> + <a class="ui green button" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a> + </div> + {{else if .IsResetRequest}} + <div class="required inline field {{if .Err_Email}}error{{end}}"> + <label for="email">{{.i18n.Tr "email"}}</label> + <input id="email" name="email" type="email" value="{{.Email}}" autofocus required> + </div> + <div class="ui divider"></div> + <div class="inline field"> + <label></label> + <button class="ui blue button">{{.i18n.Tr "auth.send_reset_mail"}}</button> </div> - <hr/> - <label></label> - <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.send_reset_mail"}}</button> - {{else if .IsResetDisable}} - <p>{{.i18n.Tr "auth.disable_register_mail"}}</p> - {{else if .ResendLimited}} - <p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p> - {{end}} + {{else if .IsResetDisable}} + <p class="center">{{.i18n.Tr "auth.disable_register_mail"}}</p> + {{else if .ResendLimited}} + <p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p> + {{end}} </div> - </form> + </form> + </div> + </div> </div> -{{template "ng/base/footer" .}} +{{template "base/footer" .}} diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl index d63d7a0f3c..5f06bd6494 100644 --- a/templates/user/auth/reset_passwd.tmpl +++ b/templates/user/auth/reset_passwd.tmpl @@ -1,25 +1,31 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -<div id="sign-wrapper"> - <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/reset_password?code={{.Code}}" method="post"> +{{template "base/head" .}} +<div class="user reset password"> + <div class="ui middle very relaxed page grid"> + <div class="column"> + <form class="ui form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} - <div class="panel-header"> - <h2>{{.i18n.Tr "auth.reset_password"}}</h2> - </div> - <div class="panel-content"> - {{template "ng/base/alert" .}} - {{if .IsResetForm}} - <div class="field"> - <label class="req" for="password">{{.i18n.Tr "password"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" value="{{.password}}" required/> + <input name="code" type="hidden" value="{{.Code}}"> + <h2 class="ui top attached header"> + {{.i18n.Tr "auth.reset_password"}} + </h2> + <div class="ui attached segment"> + {{template "base/alert" .}} + {{if .IsResetForm}} + <div class="required inline field {{if .Err_Password}}error{{end}}"> + <label for="password">{{.i18n.Tr "password"}}</label> + <input id="password" name="password" type="password" value="{{.password}}" autofocus required> + </div> + <div class="ui divider"></div> + <div class="inline field"> + <label></label> + <button class="ui blue button">{{.i18n.Tr "auth.reset_password_helper"}}</button> </div> - <hr/> - <label></label> - <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.reset_password_helper"}}</button> - {{else}} - <p>{{.i18n.Tr "auth.invalid_code"}}</p> - {{end}} + {{else}} + <p class="center">{{.i18n.Tr "auth.invalid_code"}}</p> + {{end}} </div> - </form> + </form> + </div> + </div> </div> -{{template "ng/base/footer" .}} +{{template "base/footer" .}} diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl index b93700361d..259c5f7d8f 100644 --- a/templates/user/auth/signin.tmpl +++ b/templates/user/auth/signin.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -<div class="signin"> +<div class="user signin"> <div class="ui middle very relaxed page grid"> <div class="column"> <form class="ui form" action="{{.Link}}" method="post"> diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl index 8baec58773..c237a20d85 100644 --- a/templates/user/auth/signup.tmpl +++ b/templates/user/auth/signup.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -<div class="signup"> +<div class="user signup"> <div class="ui middle very relaxed page grid"> <div class="column"> <form class="ui form" action="{{.Link}}" method="post"> |