diff options
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/auth/link_account.tmpl | 40 | ||||
| -rw-r--r-- | templates/user/auth/signin_navbar.tmpl | 32 | ||||
| -rw-r--r-- | templates/user/auth/signup_openid_navbar.tmpl | 16 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/settings/navbar.tmpl | 44 |
5 files changed, 71 insertions, 63 deletions
diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl index b7fa998a0d..8e1509b8ce 100644 --- a/templates/user/auth/link_account.tmpl +++ b/templates/user/auth/link_account.tmpl @@ -2,27 +2,29 @@ <div class="user link-account"> <div class="ui secondary pointing tabular top attached borderless menu new-menu navbar"> - <!-- TODO handle .ShowRegistrationButton once other login bugs are fixed --> - <a class="item {{if not .user_exists}}active{{end}}" - data-tab="auth-link-signup-tab"> - {{.i18n.Tr "auth.oauth_signup_tab"}} - </a> - <a class="item {{if .user_exists}}active{{end}}" - data-tab="auth-link-signin-tab"> - {{.i18n.Tr "auth.oauth_signin_tab"}} - </a> - </div> - - <div class="ui middle very relaxed page grid"> - <div class="column"> - <div class="ui tab {{if not .user_exists}}active{{end}}" + <div class="new-menu-inner"> + <!-- TODO handle .ShowRegistrationButton once other login bugs are fixed --> + <a class="item {{if not .user_exists}}active{{end}}" data-tab="auth-link-signup-tab"> - {{template "user/auth/signup_inner" .}} - </div> - <div class="ui tab {{if .user_exists}}active{{end}}" + {{.i18n.Tr "auth.oauth_signup_tab"}} + </a> + <a class="item {{if .user_exists}}active{{end}}" data-tab="auth-link-signin-tab"> - <div class="ui user signin container icon"> - {{template "user/auth/signin_inner" .}} + {{.i18n.Tr "auth.oauth_signin_tab"}} + </a> + </div> + + <div class="ui middle very relaxed page grid"> + <div class="column"> + <div class="ui tab {{if not .user_exists}}active{{end}}" + data-tab="auth-link-signup-tab"> + {{template "user/auth/signup_inner" .}} + </div> + <div class="ui tab {{if .user_exists}}active{{end}}" + data-tab="auth-link-signin-tab"> + <div class="ui user signin container icon"> + {{template "user/auth/signin_inner" .}} + </div> </div> </div> </div> diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl index 428a3d843a..85ebcd90f8 100644 --- a/templates/user/auth/signin_navbar.tmpl +++ b/templates/user/auth/signin_navbar.tmpl @@ -1,19 +1,21 @@ {{if or .EnableOpenIDSignIn .EnableSSPI}} <div class="ui secondary pointing tabular top attached borderless menu new-menu navbar"> - <a class="{{if .PageIsLogin}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login"> - {{.i18n.Tr "auth.login_userpass"}} - </a> - {{if .EnableOpenIDSignIn}} - <a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid"> - <i class="fa fa-openid"></i> - OpenID - </a> - {{end}} - {{if .EnableSSPI}} - <a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1"> - <i class="fa fa-windows"></i> - SSPI - </a> - {{end}} + <div class="new-menu-inner"> + <a class="{{if .PageIsLogin}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login"> + {{.i18n.Tr "auth.login_userpass"}} + </a> + {{if .EnableOpenIDSignIn}} + <a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid"> + <i class="fa fa-openid"></i> + OpenID + </a> + {{end}} + {{if .EnableSSPI}} + <a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1"> + <i class="fa fa-windows"></i> + SSPI + </a> + {{end}} + </div> </div> {{end}} diff --git a/templates/user/auth/signup_openid_navbar.tmpl b/templates/user/auth/signup_openid_navbar.tmpl index 86f6ee7d81..9ba727548c 100644 --- a/templates/user/auth/signup_openid_navbar.tmpl +++ b/templates/user/auth/signup_openid_navbar.tmpl @@ -1,11 +1,13 @@ <div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> - <a class="{{if .PageIsOpenIDConnect}}active{{end}} item" href="{{AppSubUrl}}/user/openid/connect"> - {{.i18n.Tr "auth.openid_connect_title"}} - </a> - {{if .EnableOpenIDSignUp}} - <a class="{{if .PageIsOpenIDRegister}}active{{end}} item" href="{{AppSubUrl}}/user/openid/register"> - {{.i18n.Tr "auth.openid_register_title"}} + <div class="new-menu-inner"> + <a class="{{if .PageIsOpenIDConnect}}active{{end}} item" href="{{AppSubUrl}}/user/openid/connect"> + {{.i18n.Tr "auth.openid_connect_title"}} </a> - {{end}} + {{if .EnableOpenIDSignUp}} + <a class="{{if .PageIsOpenIDRegister}}active{{end}} item" href="{{AppSubUrl}}/user/openid/register"> + {{.i18n.Tr "auth.openid_register_title"}} + </a> + {{end}} + </div> </div> diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index d6b99b3861..1076efec0b 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -<div class="user profile"> +<div class="user profile mt-5"> <div class="ui container"> <div class="ui stackable grid"> <div class="ui five wide column"> diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 18bd9a4f8d..7255819374 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -1,23 +1,25 @@ <div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> - <a class="{{if .PageIsSettingsProfile}}active{{end}} item" href="{{AppSubUrl}}/user/settings"> - {{.i18n.Tr "settings.profile"}} - </a> - <a class="{{if .PageIsSettingsAccount}}active{{end}} item" href="{{AppSubUrl}}/user/settings/account"> - {{.i18n.Tr "settings.account"}} - </a> - <a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubUrl}}/user/settings/security"> - {{.i18n.Tr "settings.security"}} - </a> - <a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications"> - {{.i18n.Tr "settings.applications"}} - </a> - <a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/keys"> - {{.i18n.Tr "settings.ssh_gpg_keys"}} - </a> - <a class="{{if .PageIsSettingsOrganization}}active{{end}} item" href="{{AppSubUrl}}/user/settings/organization"> - {{.i18n.Tr "settings.organization"}} - </a> - <a class="{{if .PageIsSettingsRepos}}active{{end}} item" href="{{AppSubUrl}}/user/settings/repos"> - {{.i18n.Tr "settings.repos"}} - </a> + <div class="new-menu-inner"> + <a class="{{if .PageIsSettingsProfile}}active{{end}} item" href="{{AppSubUrl}}/user/settings"> + {{.i18n.Tr "settings.profile"}} + </a> + <a class="{{if .PageIsSettingsAccount}}active{{end}} item" href="{{AppSubUrl}}/user/settings/account"> + {{.i18n.Tr "settings.account"}} + </a> + <a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubUrl}}/user/settings/security"> + {{.i18n.Tr "settings.security"}} + </a> + <a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications"> + {{.i18n.Tr "settings.applications"}} + </a> + <a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/keys"> + {{.i18n.Tr "settings.ssh_gpg_keys"}} + </a> + <a class="{{if .PageIsSettingsOrganization}}active{{end}} item" href="{{AppSubUrl}}/user/settings/organization"> + {{.i18n.Tr "settings.organization"}} + </a> + <a class="{{if .PageIsSettingsRepos}}active{{end}} item" href="{{AppSubUrl}}/user/settings/repos"> + {{.i18n.Tr "settings.repos"}} + </a> + </div> </div> |