diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/user/auth/login.tmpl (renamed from templates/user/auth/signin.tmpl) | 0 | ||||
| -rw-r--r-- | templates/user/auth/two_factor.tmpl | 28 | ||||
| -rw-r--r-- | templates/user/auth/two_factor_recovery_code.tmpl | 28 | ||||
| -rw-r--r-- | templates/user/settings/navbar.tmpl | 3 | ||||
| -rw-r--r-- | templates/user/settings/profile.tmpl | 1 | ||||
| -rw-r--r-- | templates/user/settings/security.tmpl | 51 | ||||
| -rw-r--r-- | templates/user/settings/two_factor_enable.tmpl | 28 | ||||
| -rw-r--r-- | templates/user/settings/two_factor_recovery_codes.tmpl | 36 |
9 files changed, 175 insertions, 2 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 7816f131..f9dd6482 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.11.4.0405
\ No newline at end of file +0.11.5.0406
\ No newline at end of file diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/login.tmpl index b928f2bd..b928f2bd 100644 --- a/templates/user/auth/signin.tmpl +++ b/templates/user/auth/login.tmpl diff --git a/templates/user/auth/two_factor.tmpl b/templates/user/auth/two_factor.tmpl new file mode 100644 index 00000000..bbe12abf --- /dev/null +++ b/templates/user/auth/two_factor.tmpl @@ -0,0 +1,28 @@ +{{template "base/head" .}} +<div class="user signin two-factor"> + <div class="ui middle very relaxed page grid"> + <div class="column"> + <form class="ui form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <h3 class="ui top attached center header"> + {{.i18n.Tr "auth.login_two_factor"}} + </h3> + <div class="ui attached segment"> + {{template "base/alert" .}} + <div class="required field"> + <label for="passcode">{{.i18n.Tr "auth.login_two_factor_passcode"}}</label> + <div class="ui fluid input"> + <input id="passcode" name="passcode" autofocus required> + </div> + </div> + + <button class="ui fluid green button">{{.i18n.Tr "settings.two_factor_verify"}}</button> + </div> + <p> + <a href="{{AppSubUrl}}/user/login/two_factor_recovery_code">{{.i18n.Tr "auth.login_two_factor_enter_recovery_code"}}</a> + </p> + </form> + </div> + </div> +</div> +{{template "base/footer" .}} diff --git a/templates/user/auth/two_factor_recovery_code.tmpl b/templates/user/auth/two_factor_recovery_code.tmpl new file mode 100644 index 00000000..a9ed17ee --- /dev/null +++ b/templates/user/auth/two_factor_recovery_code.tmpl @@ -0,0 +1,28 @@ +{{template "base/head" .}} +<div class="user signin two-factor"> + <div class="ui middle very relaxed page grid"> + <div class="column"> + <form class="ui form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <h3 class="ui top attached center header"> + {{.i18n.Tr "auth.login_two_factor_recovery"}} + </h3> + <div class="ui attached segment"> + {{template "base/alert" .}} + <div class="required field"> + <label for="recovery_code">{{.i18n.Tr "auth.login_two_factor_recovery_code"}}</label> + <div class="ui fluid input"> + <input id="recovery_code" name="recovery_code" autofocus required> + </div> + </div> + + <button class="ui fluid green button">{{.i18n.Tr "settings.two_factor_verify"}}</button> + </div> + <p> + <a href="{{AppSubUrl}}/user/login/two_factor">{{.i18n.Tr "auth.login_two_factor_enter_passcode"}}</a> + </p> + </form> + </div> + </div> +</div> +{{template "base/footer" .}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 2d4ff8dd..3092bedc 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -16,6 +16,9 @@ <a class="{{if .PageIsSettingsSSHKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/ssh"> {{.i18n.Tr "settings.ssh_keys"}} </a> + <a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubUrl}}/user/settings/security"> + {{.i18n.Tr "settings.security"}} + </a> <a class="{{if .PageIsSettingsRepositories}}active{{end}} item" href="{{AppSubUrl}}/user/settings/repositories"> {{.i18n.Tr "settings.repos"}} </a> diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index aab54a82..85c02cca 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -40,7 +40,6 @@ <button class="ui green button">{{$.i18n.Tr "settings.update_profile"}}</button> </div> </form> - </div> </div> </div> diff --git a/templates/user/settings/security.tmpl b/templates/user/settings/security.tmpl new file mode 100644 index 00000000..eb39feba --- /dev/null +++ b/templates/user/settings/security.tmpl @@ -0,0 +1,51 @@ +{{template "base/head" .}} +<div class="user settings security"> + <div class="ui container"> + <div class="ui grid"> + {{template "user/settings/navbar" .}} + <div class="twelve wide column content"> + {{template "base/alert" .}} + <h4 class="ui top attached header"> + {{.i18n.Tr "settings.two_factor"}} + </h4> + <div class="ui attached segment two-factor"> + <p class="text bold"> + {{.i18n.Tr "settings.two_factor_status"}} + {{if .TwoFactor}} + <span class="text green">{{.i18n.Tr "settings.two_factor_on"}} <i class="octicon octicon-check"></i></span> + <button class="ui right mini red toggle button delete-button" data-url="{{$.Link}}/two_factor_disable">{{.i18n.Tr "settings.two_factor_disable"}}</button> + {{else}} + <span class="text red">{{.i18n.Tr "settings.two_factor_off"}} <i class="octicon octicon-x"></i></span> + <a class="ui right mini green toggle button" href="{{AppSubUrl}}/user/settings/security/two_factor_enable">{{.i18n.Tr "settings.two_factor_enable"}}</a> + {{end}} + </p> + </div> + {{if .TwoFactor}} + <br> + <p>{{.i18n.Tr "settings.two_factor_view_recovery_codes" AppSubUrl "/user/settings/security/two_factor_recovery_codes" | Safe}}</p> + {{end}} + </div> + </div> + </div> +</div> + +<div class="ui small basic delete modal"> + <div class="ui icon header"> + <i class="trash icon"></i> + {{.i18n.Tr "settings.two_factor_disable_title"}} + </div> + <div class="content"> + <p>{{.i18n.Tr "settings.two_factor_disable_desc"}}</p> + </div> + <div class="actions"> + <div class="ui red basic inverted cancel button"> + <i class="remove icon"></i> + {{.i18n.Tr "modal.no"}} + </div> + <div class="ui green basic inverted ok button"> + <i class="checkmark icon"></i> + {{.i18n.Tr "modal.yes"}} + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/settings/two_factor_enable.tmpl b/templates/user/settings/two_factor_enable.tmpl new file mode 100644 index 00000000..1b981445 --- /dev/null +++ b/templates/user/settings/two_factor_enable.tmpl @@ -0,0 +1,28 @@ +{{template "base/head" .}} +<div class="user settings security two-factor"> + <div class="ui container"> + <div class="ui grid"> + {{template "user/settings/navbar" .}} + <div class="twelve wide column content"> + {{template "base/alert" .}} + <h4 class="ui top attached header"> + {{.i18n.Tr "settings.two_factor_enable_title"}} + </h4> + <div class="ui attached segment"> + <div>{{.i18n.Tr "settings.two_factor_scan_qr"}}</div> + <img src="{{.QRCode}}" alt="{{.TwoFactorSecret}}"> + <p>{{.i18n.Tr "settings.two_factor_or_enter_secret"}} <b>{{.TwoFactorSecret}}</b></p> + <form class="ui form" method="post"> + {{.CsrfTokenHtml}} + <div class="required inline field"> + <span>{{.i18n.Tr "settings.two_factor_then_enter_passcode"}}</span> + <input class="ui input" name="passcode" autocomplete="off" autofocus required> + </div> + <button class="ui green button">{{.i18n.Tr "settings.two_factor_verify"}}</button> + </form> + </div> + </div> + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/settings/two_factor_recovery_codes.tmpl b/templates/user/settings/two_factor_recovery_codes.tmpl new file mode 100644 index 00000000..3f555b4f --- /dev/null +++ b/templates/user/settings/two_factor_recovery_codes.tmpl @@ -0,0 +1,36 @@ +{{template "base/head" .}} +<div class="user settings security two-factor"> + <div class="ui container"> + <div class="ui grid"> + {{template "user/settings/navbar" .}} + <div class="twelve wide column content"> + {{template "base/alert" .}} + <h4 class="ui top attached header"> + {{.i18n.Tr "settings.two_factor_recovery_codes_title"}} + </h4> + <div class="ui attached segment"> + <p>{{.i18n.Tr "settings.two_factor_recovery_codes_desc" | Safe}}</p> + <ul class="ui list"> + {{range .RecoveryCodes}} + <li class="item"> + <code> + {{if .IsUsed}} + <del>{{.Code}}</del> + {{else}} + {{.Code}} + {{end}} + </code> + </li> + {{end}} + </ul> + + <form class="ui form" method="post"> + {{.CsrfTokenHtml}} + <button class="ui blue button">{{.i18n.Tr "settings.two_factor_regenerate_recovery_codes"}}</button> + </form> + </div> + </div> + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file |