From efbb895ebe33327630195ac52f10bd3d85bbae00 Mon Sep 17 00:00:00 2001 From: Patrick G Date: Wed, 15 Mar 2017 22:39:38 +0000 Subject: [PATCH] Cleaner ui for admin, repo settings, and user settings page (#1269) (#1270) --- public/css/index.css | 8 + public/less/_base.less | 9 + templates/admin/auth/edit.tmpl | 380 ++++++++------- templates/admin/auth/list.tmpl | 72 ++- templates/admin/auth/new.tmpl | 384 ++++++++-------- templates/admin/config.tmpl | 508 ++++++++++----------- templates/admin/dashboard.tmpl | 230 +++++----- templates/admin/monitor.tmpl | 110 +++-- templates/admin/navbar.tmpl | 55 ++- templates/admin/notice.tmpl | 172 ++++--- templates/admin/org/list.tmpl | 78 ++-- templates/admin/repo/list.tmpl | 86 ++-- templates/admin/user/edit.tmpl | 222 +++++---- templates/admin/user/list.tmpl | 98 ++-- templates/admin/user/new.tmpl | 110 +++-- templates/repo/header.tmpl | 2 +- templates/repo/settings/branches.tmpl | 140 +++--- templates/repo/settings/collaboration.tmpl | 88 ++-- templates/repo/settings/deploy_keys.tmpl | 120 +++-- templates/repo/settings/githook_edit.tmpl | 50 +- templates/repo/settings/githooks.tmpl | 36 +- templates/repo/settings/hook_list.tmpl | 70 ++- templates/repo/settings/hook_new.tmpl | 36 +- templates/repo/settings/hooks.tmpl | 6 +- templates/repo/settings/navbar.tmpl | 45 +- templates/repo/settings/options.tmpl | 456 +++++++++--------- templates/user/settings/account_link.tmpl | 52 +-- templates/user/settings/applications.tmpl | 102 ++--- templates/user/settings/avatar.tmpl | 78 ++-- templates/user/settings/delete.tmpl | 48 +- templates/user/settings/email.tmpl | 94 ++-- templates/user/settings/navbar.tmpl | 61 ++- templates/user/settings/password.tmpl | 68 ++- templates/user/settings/profile.tmpl | 90 ++-- templates/user/settings/sshkeys.tmpl | 114 +++-- templates/user/settings/twofa.tmpl | 52 +-- templates/user/settings/twofa_enroll.tmpl | 44 +- 37 files changed, 2131 insertions(+), 2243 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index e0b22687a0..e61daddcba 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -420,6 +420,14 @@ footer .ui.language .menu { background: inherit !important; padding: 0 !important; } +.ui.menu.new-menu { + justify-content: center !important; + padding-top: 15px !important; + margin-top: -15px !important; + margin-bottom: 15px !important; + background-color: #FAFAFA !important; + border-width: 1px !important; +} .markdown:not(code) { overflow: hidden; font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; diff --git a/public/less/_base.less b/public/less/_base.less index e938f42a51..7008b5c918 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -411,3 +411,12 @@ footer { background: inherit !important; padding: 0 !important; } + +.ui.menu.new-menu { + justify-content: center !important; + padding-top: 15px !important; + margin-top: -15px !important; + margin-bottom: 15px !important; + background-color: #FAFAFA !important; + border-width: 1px !important; +} diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 84b62f6e87..ea5104b79f 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -1,199 +1,195 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.auths.edit"}} -

-
-
- {{.CsrfTokenHtml}} - -
- - - {{.Source.TypeName}} -
-
- - -
- - - {{if or .Source.IsLDAP .Source.IsDLDAP}} - {{ $cfg:=.Source.LDAP }} -
- -
- -
{{$cfg.SecurityProtocolName}}
- -
- {{range .SecurityProtocols}} -
{{.Name}}
- {{end}} -
-
-
-
- - -
-
- - -
- {{if .Source.IsLDAP}} -
- - -
- -
- - -

{{.i18n.Tr "admin.auths.bind_password_helper"}}

-
-
- - -
- {{end}} - {{if .Source.IsDLDAP}} -
- - -
- {{end}} -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- {{if .Source.IsLDAP}} -
-
- - -
-
- {{end}} - {{end}} - - - {{if .Source.IsSMTP}} - {{ $cfg:=.Source.SMTP }} -
- -
- -
{{$cfg.Auth}}
- -
- {{range .SMTPAuths}} -
{{.}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- - -

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

-
- {{end}} - - - {{if .Source.IsPAM}} - {{ $cfg:=.Source.PAM }} -
- - -
- {{end}} - - - {{if .Source.IsOAuth2}} - {{ $cfg:=.Source.OAuth2 }} -
- -
- -
{{.CurrentOAuth2Provider.DisplayName}}
- -
- {{range $key, $value := .OAuth2Providers}} -
{{$value.DisplayName}}
- {{end}} -
-
-
-
- - -
-
- - -
- {{end}} - -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- -
- -
{{.i18n.Tr "admin.auths.delete"}}
-
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.auths.edit"}} +

+
+
+ {{.CsrfTokenHtml}} + +
+ + + {{.Source.TypeName}}
-
+
+ + +
+ + + {{if or .Source.IsLDAP .Source.IsDLDAP}} + {{ $cfg:=.Source.LDAP }} +
+ +
+ +
{{$cfg.SecurityProtocolName}}
+ +
+ {{range .SecurityProtocols}} +
{{.Name}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+ {{if .Source.IsLDAP}} +
+ + +
+ +
+ + +

{{.i18n.Tr "admin.auths.bind_password_helper"}}

+
+
+ + +
+ {{end}} + {{if .Source.IsDLDAP}} +
+ + +
+ {{end}} +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ {{if .Source.IsLDAP}} +
+
+ + +
+
+ {{end}} + {{end}} + + + {{if .Source.IsSMTP}} + {{ $cfg:=.Source.SMTP }} +
+ +
+ +
{{$cfg.Auth}}
+ +
+ {{range .SMTPAuths}} +
{{.}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ + +

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

+
+ {{end}} + + + {{if .Source.IsPAM}} + {{ $cfg:=.Source.PAM }} +
+ + +
+ {{end}} + + + {{if .Source.IsOAuth2}} + {{ $cfg:=.Source.OAuth2 }} +
+ +
+ +
{{.CurrentOAuth2Provider.DisplayName}}
+ +
+ {{range $key, $value := .OAuth2Providers}} +
{{$value.DisplayName}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+ {{end}} + +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ +
+ +
{{.i18n.Tr "admin.auths.delete"}}
+
+
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index 58bdc66b2c..4e8fb1ea82 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -1,45 +1,41 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.auths.auth_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) -
- {{.i18n.Tr "admin.auths.new"}} -
-

-
- - - - - - - - - - - - - - {{range .Sources}} - - - - - - - - - - {{end}} - -
ID{{.i18n.Tr "admin.auths.name"}}{{.i18n.Tr "admin.auths.type"}}{{.i18n.Tr "admin.auths.enabled"}}{{.i18n.Tr "admin.auths.updated"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.edit"}}
{{.ID}}{{.Name}}{{.TypeName}}{{DateFmtShort .Updated}}{{DateFmtShort .Created}}
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.auths.auth_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) +
+ {{.i18n.Tr "admin.auths.new"}}
+

+
+ + + + + + + + + + + + + + {{range .Sources}} + + + + + + + + + + {{end}} + +
ID{{.i18n.Tr "admin.auths.name"}}{{.i18n.Tr "admin.auths.type"}}{{.i18n.Tr "admin.auths.enabled"}}{{.i18n.Tr "admin.auths.updated"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.edit"}}
{{.ID}}{{.Name}}{{.TypeName}}{{DateFmtShort .Updated}}{{DateFmtShort .Created}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 24257a1b65..59990fc37e 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -1,204 +1,200 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.auths.new"}} -

-
-
- {{.CsrfTokenHtml}} - -
- -
- -
{{.CurrentTypeName}}
- -
- {{range .AuthSources}} -
{{.Name}}
- {{end}} -
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.auths.new"}} +

+
+ + {{.CsrfTokenHtml}} + +
+ +
+ +
{{.CurrentTypeName}}
+ +
+ {{range .AuthSources}} +
{{.Name}}
+ {{end}}
-
- - -
- - -
-
- -
- -
{{.CurrentSecurityProtocol}}
- -
- {{range .SecurityProtocols}} -
{{.Name}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- - -
- -
- - -

{{.i18n.Tr "admin.auths.bind_password_helper"}}

-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
- -
{{.smtp_auth}}
- -
- {{range .SMTPAuths}} -
{{.}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- - -

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

-
-
- - -
- - -
- - -
-
- -
- -
{{.oauth2_provider}}
- -
- {{range $key, $value := .OAuth2Providers}} -
{{$value.DisplayName}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- -
- -
- +
+
+
+ +
-

- {{.i18n.Tr "admin.auths.tips"}} -

-
-
GMail Settings:
-

Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true

-
OAuth GitHub:
-

{{.i18n.Tr "admin.auths.tip.github"}}

+ +
+
+ +
+ +
{{.CurrentSecurityProtocol}}
+ +
+ {{range .SecurityProtocols}} +
{{.Name}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +

{{.i18n.Tr "admin.auths.bind_password_helper"}}

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
+ + +
+
+ +
+ +
{{.smtp_auth}}
+ +
+ {{range .SMTPAuths}} +
{{.}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ + +

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

+
+
+ + +
+ + +
+ + +
+
+ +
+ +
{{.oauth2_provider}}
+ +
+ {{range $key, $value := .OAuth2Providers}} +
{{$value.DisplayName}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ +
+ +
+ +
+ +

+ {{.i18n.Tr "admin.auths.tips"}} +

+
+
GMail Settings:
+

Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true

+
OAuth GitHub:
+

{{.i18n.Tr "admin.auths.tip.github"}}

diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index d9403f4145..225c23b97b 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -1,280 +1,276 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.config.server_config"}} -

-
-
-
{{.i18n.Tr "admin.config.app_name"}}
-
{{AppName}}
-
{{.i18n.Tr "admin.config.app_ver"}}
-
{{AppVer}}{{AppBuiltWith}}
-
{{.i18n.Tr "admin.config.app_url"}}
-
{{.AppUrl}}
-
{{.i18n.Tr "admin.config.domain"}}
-
{{.Domain}}
-
{{.i18n.Tr "admin.config.offline_mode"}}
-
-
{{.i18n.Tr "admin.config.disable_router_log"}}
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.config.server_config"}} +

+
+
+
{{.i18n.Tr "admin.config.app_name"}}
+
{{AppName}}
+
{{.i18n.Tr "admin.config.app_ver"}}
+
{{AppVer}}{{AppBuiltWith}}
+
{{.i18n.Tr "admin.config.app_url"}}
+
{{.AppUrl}}
+
{{.i18n.Tr "admin.config.domain"}}
+
{{.Domain}}
+
{{.i18n.Tr "admin.config.offline_mode"}}
+
+
{{.i18n.Tr "admin.config.disable_router_log"}}
+
-
+
-
{{.i18n.Tr "admin.config.run_user"}}
-
{{.RunUser}}
-
{{.i18n.Tr "admin.config.run_mode"}}
-
{{.RunMode}}
+
{{.i18n.Tr "admin.config.run_user"}}
+
{{.RunUser}}
+
{{.i18n.Tr "admin.config.run_mode"}}
+
{{.RunMode}}
-
+
-
{{.i18n.Tr "admin.config.git_version"}}
-
{{.GitVersion}}
+
{{.i18n.Tr "admin.config.git_version"}}
+
{{.GitVersion}}
-
+
-
{{.i18n.Tr "admin.config.repo_root_path"}}
-
{{.RepoRootPath}}
-
{{.i18n.Tr "admin.config.static_file_root_path"}}
-
{{.StaticRootPath}}
-
{{.i18n.Tr "admin.config.log_file_root_path"}}
-
{{.LogRootPath}}
-
{{.i18n.Tr "admin.config.script_type"}}
-
{{.ScriptType}}
-
{{.i18n.Tr "admin.config.reverse_auth_user"}}
-
{{.ReverseProxyAuthUser}}
-
-
+
{{.i18n.Tr "admin.config.repo_root_path"}}
+
{{.RepoRootPath}}
+
{{.i18n.Tr "admin.config.static_file_root_path"}}
+
{{.StaticRootPath}}
+
{{.i18n.Tr "admin.config.log_file_root_path"}}
+
{{.LogRootPath}}
+
{{.i18n.Tr "admin.config.script_type"}}
+
{{.ScriptType}}
+
{{.i18n.Tr "admin.config.reverse_auth_user"}}
+
{{.ReverseProxyAuthUser}}
+
+
-

- {{.i18n.Tr "admin.config.ssh_config"}} -

-
-
-
{{.i18n.Tr "admin.config.ssh_enabled"}}
-
- {{if not .SSH.Disabled}} -
{{.i18n.Tr "admin.config.ssh_start_builtin_server"}}
-
-
{{.i18n.Tr "admin.config.ssh_domain"}}
-
{{.SSH.Domain}}
-
{{.i18n.Tr "admin.config.ssh_port"}}
-
{{.SSH.Port}}
-
{{.i18n.Tr "admin.config.ssh_listen_port"}}
-
{{.SSH.ListenPort}}
+

+ {{.i18n.Tr "admin.config.ssh_config"}} +

+
+
+
{{.i18n.Tr "admin.config.ssh_enabled"}}
+
+ {{if not .SSH.Disabled}} +
{{.i18n.Tr "admin.config.ssh_start_builtin_server"}}
+
+
{{.i18n.Tr "admin.config.ssh_domain"}}
+
{{.SSH.Domain}}
+
{{.i18n.Tr "admin.config.ssh_port"}}
+
{{.SSH.Port}}
+
{{.i18n.Tr "admin.config.ssh_listen_port"}}
+
{{.SSH.ListenPort}}
- {{if not .SSH.StartBuiltinServer}} -
{{.i18n.Tr "admin.config.ssh_root_path"}}
-
{{.SSH.RootPath}}
-
{{.i18n.Tr "admin.config.ssh_key_test_path"}}
-
{{.SSH.KeyTestPath}}
-
{{.i18n.Tr "admin.config.ssh_keygen_path"}}
-
{{.SSH.KeygenPath}}
-
{{.i18n.Tr "admin.config.ssh_minimum_key_size_check"}}
-
- {{if .SSH.MinimumKeySizeCheck}} -
{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}
-
{{.SSH.MinimumKeySizes}}
- {{end}} - {{end}} + {{if not .SSH.StartBuiltinServer}} +
{{.i18n.Tr "admin.config.ssh_root_path"}}
+
{{.SSH.RootPath}}
+
{{.i18n.Tr "admin.config.ssh_key_test_path"}}
+
{{.SSH.KeyTestPath}}
+
{{.i18n.Tr "admin.config.ssh_keygen_path"}}
+
{{.SSH.KeygenPath}}
+
{{.i18n.Tr "admin.config.ssh_minimum_key_size_check"}}
+
+ {{if .SSH.MinimumKeySizeCheck}} +
{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}
+
{{.SSH.MinimumKeySizes}}
{{end}} -
-
+ {{end}} + {{end}} +
+
-

- {{.i18n.Tr "admin.config.db_config"}} -

-
-
-
{{.i18n.Tr "admin.config.db_type"}}
-
{{.DbCfg.Type}}
-
{{.i18n.Tr "admin.config.db_host"}}
-
{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}
-
{{.i18n.Tr "admin.config.db_name"}}
-
{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}
-
{{.i18n.Tr "admin.config.db_user"}}
-
{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}
-
{{.i18n.Tr "admin.config.db_ssl_mode"}}
-
{{.i18n.Tr "admin.config.db_ssl_mode_helper"}}
-
{{.i18n.Tr "admin.config.db_path"}}
-
{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}} {{.i18n.Tr "admin.config.db_path_helper"}}
-
-
+

+ {{.i18n.Tr "admin.config.db_config"}} +

+
+
+
{{.i18n.Tr "admin.config.db_type"}}
+
{{.DbCfg.Type}}
+
{{.i18n.Tr "admin.config.db_host"}}
+
{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}
+
{{.i18n.Tr "admin.config.db_name"}}
+
{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}
+
{{.i18n.Tr "admin.config.db_user"}}
+
{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}
+
{{.i18n.Tr "admin.config.db_ssl_mode"}}
+
{{.i18n.Tr "admin.config.db_ssl_mode_helper"}}
+
{{.i18n.Tr "admin.config.db_path"}}
+
{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}} {{.i18n.Tr "admin.config.db_path_helper"}}
+
+
-

- {{.i18n.Tr "admin.config.service_config"}} -

-
-
-
{{.i18n.Tr "admin.config.register_email_confirm"}}
-
-
{{.i18n.Tr "admin.config.disable_register"}}
-
-
{{.i18n.Tr "admin.config.show_registration_button"}}
-
-
{{.i18n.Tr "admin.config.require_sign_in_view"}}
-
-
{{.i18n.Tr "admin.config.mail_notify"}}
-
- {{/*
{{.i18n.Tr "admin.config.disable_key_size_check"}}
-
*/}} -
{{.i18n.Tr "admin.config.enable_captcha"}}
-
-
{{.i18n.Tr "admin.config.default_keep_email_private"}}
-
-
{{.i18n.Tr "admin.config.no_reply_address"}}
-
{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}
-
-
{{.i18n.Tr "admin.config.active_code_lives"}}
-
{{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
-
{{.i18n.Tr "admin.config.reset_password_code_lives"}}
-
{{.Service.ResetPwdCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
-
-
+

+ {{.i18n.Tr "admin.config.service_config"}} +

+
+
+
{{.i18n.Tr "admin.config.register_email_confirm"}}
+
+
{{.i18n.Tr "admin.config.disable_register"}}
+
+
{{.i18n.Tr "admin.config.show_registration_button"}}
+
+
{{.i18n.Tr "admin.config.require_sign_in_view"}}
+
+
{{.i18n.Tr "admin.config.mail_notify"}}
+
+ {{/*
{{.i18n.Tr "admin.config.disable_key_size_check"}}
+
*/}} +
{{.i18n.Tr "admin.config.enable_captcha"}}
+
+
{{.i18n.Tr "admin.config.default_keep_email_private"}}
+
+
{{.i18n.Tr "admin.config.no_reply_address"}}
+
{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}
+
+
{{.i18n.Tr "admin.config.active_code_lives"}}
+
{{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
+
{{.i18n.Tr "admin.config.reset_password_code_lives"}}
+
{{.Service.ResetPwdCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
+
+
-

- {{.i18n.Tr "admin.config.webhook_config"}} -

-
-
-
{{.i18n.Tr "admin.config.queue_length"}}
-
{{.Webhook.QueueLength}}
-
{{.i18n.Tr "admin.config.deliver_timeout"}}
-
{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.skip_tls_verify"}}
-
-
-
+

+ {{.i18n.Tr "admin.config.webhook_config"}} +

+
+
+
{{.i18n.Tr "admin.config.queue_length"}}
+
{{.Webhook.QueueLength}}
+
{{.i18n.Tr "admin.config.deliver_timeout"}}
+
{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.skip_tls_verify"}}
+
+
+
-

- {{.i18n.Tr "admin.config.mailer_config"}} -

-
-
-
{{.i18n.Tr "admin.config.mailer_enabled"}}
-
- {{if .MailerEnabled}} -
{{.i18n.Tr "admin.config.mailer_name"}}
-
{{.Mailer.Name}}
-
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
-
-
{{.i18n.Tr "admin.config.mailer_host"}}
-
{{.Mailer.Host}}
-
{{.i18n.Tr "admin.config.mailer_user"}}
-
{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}

-
- {{.CsrfTokenHtml}} -
-
- -
-
- -
- {{end}} -
-
+

+ {{.i18n.Tr "admin.config.mailer_config"}} +

+
+
+
{{.i18n.Tr "admin.config.mailer_enabled"}}
+
+ {{if .MailerEnabled}} +
{{.i18n.Tr "admin.config.mailer_name"}}
+
{{.Mailer.Name}}
+
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
+
+
{{.i18n.Tr "admin.config.mailer_host"}}
+
{{.Mailer.Host}}
+
{{.i18n.Tr "admin.config.mailer_user"}}
+
{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}

+
+ {{.CsrfTokenHtml}} +
+
+ +
+
+ +
+ {{end}} +
+
-

- {{.i18n.Tr "admin.config.cache_config"}} -

-
-
-
{{.i18n.Tr "admin.config.cache_adapter"}}
-
{{.CacheAdapter}}
-
{{.i18n.Tr "admin.config.cache_interval"}}
-
{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}
- {{if .CacheConn}} -
{{.i18n.Tr "admin.config.cache_conn"}}
-
{{.CacheConn}}
- {{end}} -
-
+

+ {{.i18n.Tr "admin.config.cache_config"}} +

+
+
+
{{.i18n.Tr "admin.config.cache_adapter"}}
+
{{.CacheAdapter}}
+
{{.i18n.Tr "admin.config.cache_interval"}}
+
{{.CacheInterval}} {{.i18n.Tr "tool.raw_seconds"}}
+ {{if .CacheConn}} +
{{.i18n.Tr "admin.config.cache_conn"}}
+
{{.CacheConn}}
+ {{end}} +
+
-

- {{.i18n.Tr "admin.config.session_config"}} -

-
-
-
{{.i18n.Tr "admin.config.session_provider"}}
-
{{.SessionConfig.Provider}}
-
{{.i18n.Tr "admin.config.provider_config"}}
-
{{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig}}{{else}}-{{end}}
-
{{.i18n.Tr "admin.config.cookie_name"}}
-
{{.SessionConfig.CookieName}}
-
{{.i18n.Tr "admin.config.gc_interval_time"}}
-
{{.SessionConfig.Gclifetime}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.session_life_time"}}
-
{{.SessionConfig.Maxlifetime}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.https_only"}}
-
-
{{.i18n.Tr "admin.config.cookie_life_time"}}
-
{{.SessionConfig.CookieLifeTime}} {{.i18n.Tr "tool.raw_seconds"}}
-
-
+

+ {{.i18n.Tr "admin.config.session_config"}} +

+
+
+
{{.i18n.Tr "admin.config.session_provider"}}
+
{{.SessionConfig.Provider}}
+
{{.i18n.Tr "admin.config.provider_config"}}
+
{{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig}}{{else}}-{{end}}
+
{{.i18n.Tr "admin.config.cookie_name"}}
+
{{.SessionConfig.CookieName}}
+
{{.i18n.Tr "admin.config.gc_interval_time"}}
+
{{.SessionConfig.Gclifetime}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.session_life_time"}}
+
{{.SessionConfig.Maxlifetime}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.https_only"}}
+
+
{{.i18n.Tr "admin.config.cookie_life_time"}}
+
{{.SessionConfig.CookieLifeTime}} {{.i18n.Tr "tool.raw_seconds"}}
+
+
-

- {{.i18n.Tr "admin.config.picture_config"}} -

-
-
-
{{.i18n.Tr "admin.config.disable_gravatar"}}
-
-
-
{{.i18n.Tr "admin.config.enable_federated_avatar"}}
-
-
-
+

+ {{.i18n.Tr "admin.config.picture_config"}} +

+
+
+
{{.i18n.Tr "admin.config.disable_gravatar"}}
+
+
+
{{.i18n.Tr "admin.config.enable_federated_avatar"}}
+
+
+
-

- {{.i18n.Tr "admin.config.git_config"}} -

-
-
-
{{.i18n.Tr "admin.config.git_disable_diff_highlight"}}
-
-
{{.i18n.Tr "admin.config.git_max_diff_lines"}}
-
{{.Git.MaxGitDiffLines}}
-
{{.i18n.Tr "admin.config.git_max_diff_line_characters"}}
-
{{.Git.MaxGitDiffLineCharacters}}
-
{{.i18n.Tr "admin.config.git_max_diff_files"}}
-
{{.Git.MaxGitDiffFiles}}
-
{{.i18n.Tr "admin.config.git_gc_args"}}
-
{{.Git.GCArgs}}
-
{{.i18n.Tr "admin.config.git_max_diff_lines"}}
-
{{.Git.MaxGitDiffLines}}
-
-
{{.i18n.Tr "admin.config.git_migrate_timeout"}}
-
{{.Git.Timeout.Migrate}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.git_mirror_timeout"}}
-
{{.Git.Timeout.Mirror}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.git_clone_timeout"}}
-
{{.Git.Timeout.Clone}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.git_pull_timeout"}}
-
{{.Git.Timeout.Pull}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.git_gc_timeout"}}
-
{{.Git.Timeout.GC}} {{.i18n.Tr "tool.raw_seconds"}}
-
-
+

+ {{.i18n.Tr "admin.config.git_config"}} +

+
+
+
{{.i18n.Tr "admin.config.git_disable_diff_highlight"}}
+
+
{{.i18n.Tr "admin.config.git_max_diff_lines"}}
+
{{.Git.MaxGitDiffLines}}
+
{{.i18n.Tr "admin.config.git_max_diff_line_characters"}}
+
{{.Git.MaxGitDiffLineCharacters}}
+
{{.i18n.Tr "admin.config.git_max_diff_files"}}
+
{{.Git.MaxGitDiffFiles}}
+
{{.i18n.Tr "admin.config.git_gc_args"}}
+
{{.Git.GCArgs}}
+
{{.i18n.Tr "admin.config.git_max_diff_lines"}}
+
{{.Git.MaxGitDiffLines}}
+
+
{{.i18n.Tr "admin.config.git_migrate_timeout"}}
+
{{.Git.Timeout.Migrate}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.git_mirror_timeout"}}
+
{{.Git.Timeout.Mirror}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.git_clone_timeout"}}
+
{{.Git.Timeout.Clone}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.git_pull_timeout"}}
+
{{.Git.Timeout.Pull}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.git_gc_timeout"}}
+
{{.Git.Timeout.GC}} {{.i18n.Tr "tool.raw_seconds"}}
+
+
-

- {{.i18n.Tr "admin.config.log_config"}} -

-
-
- {{range .Loggers}} -
{{$.i18n.Tr "admin.config.log_mode"}}
-
{{.Mode}}
-
{{$.i18n.Tr "admin.config.log_config"}}
- 
{{.Config | JsonPrettyPrint}}
- {{end}} -
-
-
+

+ {{.i18n.Tr "admin.config.log_config"}} +

+
+
+ {{range .Loggers}} +
{{$.i18n.Tr "admin.config.log_mode"}}
+
{{.Mode}}
+
{{$.i18n.Tr "admin.config.log_config"}}
+ 
{{.Config | JsonPrettyPrint}}
+ {{end}} +
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index acffdc4314..229cd305b9 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -1,124 +1,120 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.dashboard.statistic"}} -

-
-

- {{.i18n.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.LoginSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}} -

-
-

- {{.i18n.Tr "admin.dashboard.operations"}} -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.delete_repo_archives"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.delete_missing_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.git_gc_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.resync_all_hooks"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.reinit_missing_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.dashboard.statistic"}} +

+
+

+ {{.i18n.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.LoginSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}} +

+
+

+ {{.i18n.Tr "admin.dashboard.operations"}} +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.delete_repo_archives"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.delete_missing_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.git_gc_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.resync_all_hooks"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.reinit_missing_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
+
-

- {{.i18n.Tr "admin.dashboard.system_status"}} -

-
-
-
{{.i18n.Tr "admin.dashboard.server_uptime"}}
-
{{.SysStatus.Uptime}}
-
{{.i18n.Tr "admin.dashboard.current_goroutine"}}
-
{{.SysStatus.NumGoroutine}}
-
-
{{.i18n.Tr "admin.dashboard.current_memory_usage"}}
-
{{.SysStatus.MemAllocated}}
-
{{.i18n.Tr "admin.dashboard.total_memory_allocated"}}
-
{{.SysStatus.MemTotal}}
-
{{.i18n.Tr "admin.dashboard.memory_obtained"}}
-
{{.SysStatus.MemSys}}
-
{{.i18n.Tr "admin.dashboard.pointer_lookup_times"}}
-
{{.SysStatus.Lookups}}
-
{{.i18n.Tr "admin.dashboard.memory_allocate_times"}}
-
{{.SysStatus.MemMallocs}}
-
{{.i18n.Tr "admin.dashboard.memory_free_times"}}
-
{{.SysStatus.MemFrees}}
-
-
{{.i18n.Tr "admin.dashboard.current_heap_usage"}}
-
{{.SysStatus.HeapAlloc}}
-
{{.i18n.Tr "admin.dashboard.heap_memory_obtained"}}
-
{{.SysStatus.HeapSys}}
-
{{.i18n.Tr "admin.dashboard.heap_memory_idle"}}
-
{{.SysStatus.HeapIdle}}
-
{{.i18n.Tr "admin.dashboard.heap_memory_in_use"}}
-
{{.SysStatus.HeapInuse}}
-
{{.i18n.Tr "admin.dashboard.heap_memory_released"}}
-
{{.SysStatus.HeapReleased}}
-
{{.i18n.Tr "admin.dashboard.heap_objects"}}
-
{{.SysStatus.HeapObjects}}
-
-
{{.i18n.Tr "admin.dashboard.bootstrap_stack_usage"}}
-
{{.SysStatus.StackInuse}}
-
{{.i18n.Tr "admin.dashboard.stack_memory_obtained"}}
-
{{.SysStatus.StackSys}}
-
{{.i18n.Tr "admin.dashboard.mspan_structures_usage"}}
-
{{.SysStatus.MSpanInuse}}
-
{{.i18n.Tr "admin.dashboard.mspan_structures_obtained"}}
-
{{.SysStatus.HeapSys}}
-
{{.i18n.Tr "admin.dashboard.mcache_structures_usage"}}
-
{{.SysStatus.MCacheInuse}}
-
{{.i18n.Tr "admin.dashboard.mcache_structures_obtained"}}
-
{{.SysStatus.MCacheSys}}
-
{{.i18n.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}
-
{{.SysStatus.BuckHashSys}}
-
{{.i18n.Tr "admin.dashboard.gc_metadata_obtained"}}
-
{{.SysStatus.GCSys}}
-
{{.i18n.Tr "admin.dashboard.other_system_allocation_obtained"}}
-
{{.SysStatus.OtherSys}}
-
-
{{.i18n.Tr "admin.dashboard.next_gc_recycle"}}
-
{{.SysStatus.NextGC}}
-
{{.i18n.Tr "admin.dashboard.last_gc_time"}}
-
{{.SysStatus.LastGC}}
-
{{.i18n.Tr "admin.dashboard.total_gc_pause"}}
-
{{.SysStatus.PauseTotalNs}}
-
{{.i18n.Tr "admin.dashboard.last_gc_pause"}}
-
{{.SysStatus.PauseNs}}
-
{{.i18n.Tr "admin.dashboard.gc_times"}}
-
{{.SysStatus.NumGC}}
-
-
-
+

+ {{.i18n.Tr "admin.dashboard.system_status"}} +

+
+
+
{{.i18n.Tr "admin.dashboard.server_uptime"}}
+
{{.SysStatus.Uptime}}
+
{{.i18n.Tr "admin.dashboard.current_goroutine"}}
+
{{.SysStatus.NumGoroutine}}
+
+
{{.i18n.Tr "admin.dashboard.current_memory_usage"}}
+
{{.SysStatus.MemAllocated}}
+
{{.i18n.Tr "admin.dashboard.total_memory_allocated"}}
+
{{.SysStatus.MemTotal}}
+
{{.i18n.Tr "admin.dashboard.memory_obtained"}}
+
{{.SysStatus.MemSys}}
+
{{.i18n.Tr "admin.dashboard.pointer_lookup_times"}}
+
{{.SysStatus.Lookups}}
+
{{.i18n.Tr "admin.dashboard.memory_allocate_times"}}
+
{{.SysStatus.MemMallocs}}
+
{{.i18n.Tr "admin.dashboard.memory_free_times"}}
+
{{.SysStatus.MemFrees}}
+
+
{{.i18n.Tr "admin.dashboard.current_heap_usage"}}
+
{{.SysStatus.HeapAlloc}}
+
{{.i18n.Tr "admin.dashboard.heap_memory_obtained"}}
+
{{.SysStatus.HeapSys}}
+
{{.i18n.Tr "admin.dashboard.heap_memory_idle"}}
+
{{.SysStatus.HeapIdle}}
+
{{.i18n.Tr "admin.dashboard.heap_memory_in_use"}}
+
{{.SysStatus.HeapInuse}}
+
{{.i18n.Tr "admin.dashboard.heap_memory_released"}}
+
{{.SysStatus.HeapReleased}}
+
{{.i18n.Tr "admin.dashboard.heap_objects"}}
+
{{.SysStatus.HeapObjects}}
+
+
{{.i18n.Tr "admin.dashboard.bootstrap_stack_usage"}}
+
{{.SysStatus.StackInuse}}
+
{{.i18n.Tr "admin.dashboard.stack_memory_obtained"}}
+
{{.SysStatus.StackSys}}
+
{{.i18n.Tr "admin.dashboard.mspan_structures_usage"}}
+
{{.SysStatus.MSpanInuse}}
+
{{.i18n.Tr "admin.dashboard.mspan_structures_obtained"}}
+
{{.SysStatus.HeapSys}}
+
{{.i18n.Tr "admin.dashboard.mcache_structures_usage"}}
+
{{.SysStatus.MCacheInuse}}
+
{{.i18n.Tr "admin.dashboard.mcache_structures_obtained"}}
+
{{.SysStatus.MCacheSys}}
+
{{.i18n.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}
+
{{.SysStatus.BuckHashSys}}
+
{{.i18n.Tr "admin.dashboard.gc_metadata_obtained"}}
+
{{.SysStatus.GCSys}}
+
{{.i18n.Tr "admin.dashboard.other_system_allocation_obtained"}}
+
{{.SysStatus.OtherSys}}
+
+
{{.i18n.Tr "admin.dashboard.next_gc_recycle"}}
+
{{.SysStatus.NextGC}}
+
{{.i18n.Tr "admin.dashboard.last_gc_time"}}
+
{{.SysStatus.LastGC}}
+
{{.i18n.Tr "admin.dashboard.total_gc_pause"}}
+
{{.SysStatus.PauseTotalNs}}
+
{{.i18n.Tr "admin.dashboard.last_gc_pause"}}
+
{{.SysStatus.PauseNs}}
+
{{.i18n.Tr "admin.dashboard.gc_times"}}
+
{{.SysStatus.NumGC}}
+
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl index d74c885e9e..6cc927d68f 100644 --- a/templates/admin/monitor.tmpl +++ b/templates/admin/monitor.tmpl @@ -1,64 +1,60 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.monitor.cron"}} -

-
- - - - - - - - - - - - {{range .Entries}} - - - - - - - - {{end}} - -
{{.i18n.Tr "admin.monitor.name"}}{{.i18n.Tr "admin.monitor.schedule"}}{{.i18n.Tr "admin.monitor.next"}}{{.i18n.Tr "admin.monitor.previous"}}{{.i18n.Tr "admin.monitor.execute_times"}}
{{.Description}}{{.Spec}}{{DateFmtLong .Next}}{{if gt .Prev.Year 1 }}{{DateFmtLong .Prev}}{{else}}N/A{{end}}{{.ExecTimes}}
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.monitor.cron"}} +

+
+ + + + + + + + + + + + {{range .Entries}} + + + + + + + + {{end}} + +
{{.i18n.Tr "admin.monitor.name"}}{{.i18n.Tr "admin.monitor.schedule"}}{{.i18n.Tr "admin.monitor.next"}}{{.i18n.Tr "admin.monitor.previous"}}{{.i18n.Tr "admin.monitor.execute_times"}}
{{.Description}}{{.Spec}}{{DateFmtLong .Next}}{{if gt .Prev.Year 1 }}{{DateFmtLong .Prev}}{{else}}N/A{{end}}{{.ExecTimes}}
+
-

- {{.i18n.Tr "admin.monitor.process"}} -

-
- - - - - - - - - - - {{range .Processes}} - - - - - - - {{end}} - -
Pid{{.i18n.Tr "admin.monitor.desc"}}{{.i18n.Tr "admin.monitor.start"}}{{.i18n.Tr "admin.monitor.execute_time"}}
{{.PID}}{{.Description}}{{DateFmtLong .Start}}{{TimeSince .Start $.Lang}}
-
-
+

+ {{.i18n.Tr "admin.monitor.process"}} +

+
+ + + + + + + + + + + {{range .Processes}} + + + + + + + {{end}} + +
Pid{{.i18n.Tr "admin.monitor.desc"}}{{.i18n.Tr "admin.monitor.start"}}{{.i18n.Tr "admin.monitor.execute_time"}}
{{.PID}}{{.Description}}{{DateFmtLong .Start}}{{TimeSince .Start $.Lang}}
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 9fa1721e46..c5ad124157 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -1,29 +1,26 @@ -
-
-
{{.i18n.Tr "admin_panel"}}
- - {{.i18n.Tr "admin.dashboard"}} - - - {{.i18n.Tr "admin.users"}} - - - {{.i18n.Tr "admin.organizations"}} - - - {{.i18n.Tr "admin.repositories"}} - - - {{.i18n.Tr "admin.authentication"}} - - - {{.i18n.Tr "admin.config"}} - - - {{.i18n.Tr "admin.notices"}} - - - {{.i18n.Tr "admin.monitor"}} - -
-
+
+ + {{.i18n.Tr "admin.dashboard"}} + + + {{.i18n.Tr "admin.users"}} + + + {{.i18n.Tr "admin.organizations"}} + + + {{.i18n.Tr "admin.repositories"}} + + + {{.i18n.Tr "admin.authentication"}} + + + {{.i18n.Tr "admin.config"}} + + + {{.i18n.Tr "admin.notices"}} + + + {{.i18n.Tr "admin.monitor"}} + +
\ No newline at end of file diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 0af7713d30..49e760d2b7 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -1,96 +1,92 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.notices.system_notice_list"}} ({{.i18n.Tr "admin.total" .Total}}) -

-
- - - - - - - - - - - - - {{range .Notices}} - - - - - - - - - {{end}} - - - - - - - -
ID{{.i18n.Tr "admin.notices.type"}}{{.i18n.Tr "admin.notices.desc"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.notices.op"}}
-
- -
- 		{{.ID}}{{$.i18n.Tr .TrStr}}{{SubStr .Description 0 120}}...{{DateFmtShort .Created}}
-
- {{.i18n.Tr "admin.notices.delete_all"}} -
-
- {{.i18n.Tr "admin.notices.actions"}} -
-
- {{.i18n.Tr "admin.notices.select_all"}} -
-
- {{.i18n.Tr "admin.notices.deselect_all"}} -
-
- {{.i18n.Tr "admin.notices.inverse_selection"}} -
-
-
-
- {{.i18n.Tr "admin.notices.delete_selected"}} -
-
-
- - {{with .Page}} - {{if gt .TotalPages 1}} -
- -
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.notices.system_notice_list"}} ({{.i18n.Tr "admin.total" .Total}}) +

+
+ + + + + + + + + + + + + {{range .Notices}} + + + + + + + + {{end}} - {{end}} - + + + + + + + +
ID{{.i18n.Tr "admin.notices.type"}}{{.i18n.Tr "admin.notices.desc"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.notices.op"}}
+
+ +
+ 		{{.ID}}{{$.i18n.Tr .TrStr}}{{SubStr .Description 0 120}}...{{DateFmtShort .Created}}
+
+ {{.i18n.Tr "admin.notices.delete_all"}} +
+
+ {{.i18n.Tr "admin.notices.actions"}} +
+
+ {{.i18n.Tr "admin.notices.select_all"}} +
+
+ {{.i18n.Tr "admin.notices.deselect_all"}} +
+
+ {{.i18n.Tr "admin.notices.inverse_selection"}} +
+
+
+
+ {{.i18n.Tr "admin.notices.delete_selected"}} +
+
+ + {{with .Page}} + {{if gt .TotalPages 1}} +
+ +
+ {{end}} + {{end}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 244f915c97..f2e258355d 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -1,48 +1,44 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) -

-
- {{template "admin/base/search" .}} -
-
- - - - - - - - - - - - - - {{range .Users}} - - - - - - - - - - {{end}} - -
ID{{.i18n.Tr "admin.orgs.name"}}{{.i18n.Tr "admin.orgs.teams"}}{{.i18n.Tr "admin.orgs.members"}}{{.i18n.Tr "admin.users.repos"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.edit"}}
{{.ID}}{{.Name}}{{.NumTeams}}{{.NumMembers}}{{.NumRepos}}{{DateFmtShort .Created}}
-
- - {{template "base/paginate" .}} -
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) +

+
+ {{template "admin/base/search" .}}
+
+ + + + + + + + + + + + + + {{range .Users}} + + + + + + + + + + {{end}} + +
ID{{.i18n.Tr "admin.orgs.name"}}{{.i18n.Tr "admin.orgs.teams"}}{{.i18n.Tr "admin.orgs.members"}}{{.i18n.Tr "admin.users.repos"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.edit"}}
{{.ID}}{{.Name}}{{.NumTeams}}{{.NumMembers}}{{.NumRepos}}{{DateFmtShort .Created}}
+
+ + {{template "base/paginate" .}}
{{template "base/footer" .}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index ccc958fe93..ffdbd5bfb8 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -1,52 +1,48 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) -

-
- {{template "admin/base/search" .}} -
-
- - - - - - - - - - - - - - - - {{range .Repos}} - - - - - - - - - - - - {{end}} - -
ID{{.i18n.Tr "admin.repos.owner"}}{{.i18n.Tr "admin.repos.name"}}{{.i18n.Tr "admin.repos.private"}}{{.i18n.Tr "admin.repos.watches"}}{{.i18n.Tr "admin.repos.stars"}}{{.i18n.Tr "admin.repos.issues"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.notices.op"}}
{{.ID}}{{.Owner.Name}}{{.Name}}{{.NumWatches}}{{.NumStars}}{{.NumIssues}}{{DateFmtShort .Created}}
-
- - {{template "base/paginate" .}} -
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) +

+
+ {{template "admin/base/search" .}}
+
+ + + + + + + + + + + + + + + + {{range .Repos}} + + + + + + + + + + + + {{end}} + +
ID{{.i18n.Tr "admin.repos.owner"}}{{.i18n.Tr "admin.repos.name"}}{{.i18n.Tr "admin.repos.private"}}{{.i18n.Tr "admin.repos.watches"}}{{.i18n.Tr "admin.repos.stars"}}{{.i18n.Tr "admin.repos.issues"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.notices.op"}}
{{.ID}}{{.Owner.Name}}{{.Name}}{{.NumWatches}}{{.NumStars}}{{.NumIssues}}{{DateFmtShort .Created}}
+
+ + {{template "base/paginate" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 7c97198d53..4feeef302a 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -1,120 +1,116 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.users.edit_account"}} -

-
-
- {{.CsrfTokenHtml}} -
- - {{.User.Name}} -
- -
- -
- -
{{.i18n.Tr "admin.users.local"}}
- -
-
{{.i18n.Tr "admin.users.local"}}
- {{range .Sources}} -
{{.Name}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- - -
- -
- - -

{{.i18n.Tr "admin.users.password_helper"}}

-
-
- - -
-
- - -
- -
- -
- - -

{{.i18n.Tr "admin.users.max_repo_creation_desc"}}

-
- -
- -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- {{if not .DisableRegularOrgCreation}} -
-
- - -
-
- {{end}} - -
- -
- -
{{.i18n.Tr "admin.users.delete_account"}}
-
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.users.edit_account"}} +

+
+
+ {{.CsrfTokenHtml}} +
+ + {{.User.Name}}
-
+ +
+ +
+ +
{{.i18n.Tr "admin.users.local"}}
+ +
+
{{.i18n.Tr "admin.users.local"}}
+ {{range .Sources}} +
{{.Name}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +

{{.i18n.Tr "admin.users.password_helper"}}

+
+
+ + +
+
+ + +
+ +
+ +
+ + +

{{.i18n.Tr "admin.users.max_repo_creation_desc"}}

+
+ +
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ {{if not .DisableRegularOrgCreation}} +
+
+ + +
+
+ {{end}} + +
+ +
+ +
{{.i18n.Tr "admin.users.delete_account"}}
+
+
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index de361a2030..7e06417013 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -1,59 +1,55 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) -
- {{.i18n.Tr "admin.users.new_account"}} -
-

-
- {{template "admin/base/search" .}} -
-
- - - - - - - - - - - - - - - - {{range .Users}} - - - - - - - - - {{if .LastLoginUnix}} - - {{else}} - - {{end}} - - - {{end}} - -
ID{{.i18n.Tr "admin.users.name"}}{{.i18n.Tr "email"}}{{.i18n.Tr "admin.users.activated"}}{{.i18n.Tr "admin.users.admin"}}{{.i18n.Tr "admin.users.repos"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.last_login"}}{{.i18n.Tr "admin.users.edit"}}
{{.ID}}{{.Name}}{{.NumRepos}}{{DateFmtShort .Created }}{{DateFmtShort .LastLogin }}{{$.i18n.Tr "admin.users.never_login"}}
-
- - {{template "base/paginate" .}} + {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) +
+ {{.i18n.Tr "admin.users.new_account"}}
+

+
+ {{template "admin/base/search" .}}
+
+ + + + + + + + + + + + + + + + {{range .Users}} + + + + + + + + + {{if .LastLoginUnix}} + + {{else}} + + {{end}} + + + {{end}} + +
ID{{.i18n.Tr "admin.users.name"}}{{.i18n.Tr "email"}}{{.i18n.Tr "admin.users.activated"}}{{.i18n.Tr "admin.users.admin"}}{{.i18n.Tr "admin.users.repos"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.last_login"}}{{.i18n.Tr "admin.users.edit"}}
{{.ID}}{{.Name}}{{.NumRepos}}{{DateFmtShort .Created }}{{DateFmtShort .LastLogin }}{{$.i18n.Tr "admin.users.never_login"}}
+
+ + {{template "base/paginate" .}}
{{template "base/footer" .}} diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 9352eaaced..14e1d74292 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -1,65 +1,61 @@ {{template "base/head" .}}
+ {{template "admin/navbar" .}}
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.users.new_account"}} -

-
-
- {{.CsrfTokenHtml}} - -
- -
- -
{{.i18n.Tr "admin.users.local"}}
- -
-
{{.i18n.Tr "admin.users.local"}}
- {{range .Sources}} -
{{.Name}}
- {{end}} -
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.users.new_account"}} +

+
+ + {{.CsrfTokenHtml}} + +
+ +
+ +
{{.i18n.Tr "admin.users.local"}}
+ +
+
{{.i18n.Tr "admin.users.local"}}
+ {{range .Sources}} +
{{.Name}}
+ {{end}}
-
- - -
-
- - -
-
- - -
- -
- - -
- - - {{if .CanSendEmail}} -
-
- - -
-
- {{end}} - -
- -
- +
-
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+ + + {{if .CanSendEmail}} +
+
+ + +
+
+ {{end}} + +
+ +
+
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 24ddb46d08..16a2be4aa1 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -48,7 +48,7 @@ {{end}} {{if not (or .IsBareRepo .IsDiffCompare)}}
-
+
{{if .Repository.EnableUnit $.UnitTypeCode}} {{.i18n.Tr "repo.code"}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 2a55691efc..d9d19845a5 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -1,88 +1,84 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/settings/navbar" .}}
-
- {{template "repo/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "repo.default_branch"}} -

-
-
- {{.CsrfTokenHtml}} - -
- {{.i18n.Tr "repo.settings.default_branch_desc"}} -
- {{if not .Repository.IsBare}} -
-
-
- -
{{.Repository.DefaultBranch}}
- -
-
-
- {{end}} -
- -
-
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.default_branch"}} +

+
+
+ {{.CsrfTokenHtml}} + +
+ {{.i18n.Tr "repo.settings.default_branch_desc"}}
- -

- {{.i18n.Tr "repo.settings.protected_branch"}} -

-
-
-
-
- -
{{.i18n.Tr "repo.settings.choose_branch"}}
- + {{if not .Repository.IsBare}} +
+
+
+ +
{{.Repository.DefaultBranch}}
+
+
+ {{end}} +
+ +
+ +
-
-
- - - {{range .ProtectedBranches}} - - - - - {{else}} - - {{end}} - -
{{.BranchName}}
{{.i18n.Tr "repo.settings.no_protected_branch"}}
+

+ {{.i18n.Tr "repo.settings.protected_branch"}} +

+
+
+
+
+ +
{{.i18n.Tr "repo.settings.choose_branch"}}
+
+ +
+
+ + + {{range .ProtectedBranches}} + + + + + {{else}} + + {{end}} + +
{{.BranchName}}
{{.i18n.Tr "repo.settings.no_protected_branch"}}
+
+
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index edf269b471..e732b3c9d3 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -1,58 +1,54 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/settings/navbar" .}}
-
- {{template "repo/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "repo.settings.collaboration"}} -

-
- {{range .Collaborators}} -
-
- - - {{.DisplayName}} - -
-
- -
-
{{$.i18n.Tr .Collaboration.ModeI18nKey}}
- -
-
{{$.i18n.Tr "repo.settings.collaboration.admin"}}
-
{{$.i18n.Tr "repo.settings.collaboration.write"}}
-
{{$.i18n.Tr "repo.settings.collaboration.read"}}
-
-
-
-
- + {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.settings.collaboration"}} +

+
+ {{range .Collaborators}} +
+
+ + + {{.DisplayName}} + +
+
+ +
+
{{$.i18n.Tr .Collaboration.ModeI18nKey}}
+ +
+
{{$.i18n.Tr "repo.settings.collaboration.admin"}}
+
{{$.i18n.Tr "repo.settings.collaboration.write"}}
+
{{$.i18n.Tr "repo.settings.collaboration.read"}}
- {{end}} +
+
+ +
-
-
- {{.CsrfTokenHtml}} -
-
-
- -
-
-
+ {{end}} +
+
+ + {{.CsrfTokenHtml}} +
+
+
+
- - +
+
-
+ +
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 6f419c894a..cd9dea1dda 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -1,74 +1,70 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/settings/navbar" .}}
-
- {{template "repo/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "repo.settings.deploy_keys"}} -
-
{{.i18n.Tr "repo.settings.add_deploy_key"}}
-
-

-
- {{if .Deploykeys}} -
- {{range .Deploykeys}} -
-
- -
-
- -
-
- {{.Name}} -
- {{.Fingerprint}} -
-
- {{$.i18n.Tr "settings.add_on"}} {{DateFmtShort .Created}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} -
-
-
- -
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.settings.deploy_keys"}} +
+
{{.i18n.Tr "repo.settings.add_deploy_key"}}
+
+

+
+ {{if .Deploykeys}} +
+ {{range .Deploykeys}} +
+
+ +
+
+ +
+
+ {{.Name}} +
+ {{.Fingerprint}}
- {{end}} +
+ {{$.i18n.Tr "settings.add_on"}} {{DateFmtShort .Created}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} +
+
+
+ +
- {{else}} - {{.i18n.Tr "repo.settings.no_deploy_keys"}} {{end}}
-
-
-

- {{.i18n.Tr "repo.settings.add_deploy_key"}} -

-
-
- {{.CsrfTokenHtml}} -
- {{.i18n.Tr "repo.settings.deploy_key_desc"}} -
-
- - -
-
- - -
- -
+ {{else}} + {{.i18n.Tr "repo.settings.no_deploy_keys"}} + {{end}} +
+
+
+

+ {{.i18n.Tr "repo.settings.add_deploy_key"}} +

+
+
+ {{.CsrfTokenHtml}} +
+ {{.i18n.Tr "repo.settings.deploy_key_desc"}}
-
+
+ + +
+
+ + +
+ +
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl index d139fd3f3e..04833cfc58 100644 --- a/templates/repo/settings/githook_edit.tmpl +++ b/templates/repo/settings/githook_edit.tmpl @@ -1,35 +1,31 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/settings/navbar" .}}
-
- {{template "repo/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "repo.settings.githooks"}} -

-
-

{{.i18n.Tr "repo.settings.githook_edit_desc"}}

-
- {{.CsrfTokenHtml}} - {{with .Hook}} -
- - {{.Name}} -
-
- - -
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.settings.githooks"}} +

+
+

{{.i18n.Tr "repo.settings.githook_edit_desc"}}

+ + {{.CsrfTokenHtml}} + {{with .Hook}} +
+ + {{.Name}} +
+
+ + +
-
- -
- {{end}} - -
-
+
+ +
+ {{end}} +
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl index 8d8923b475..8014a7fe14 100644 --- a/templates/repo/settings/githooks.tmpl +++ b/templates/repo/settings/githooks.tmpl @@ -1,28 +1,24 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/settings/navbar" .}}
-
- {{template "repo/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "repo.settings.githooks"}} -

-
-
-
- {{.i18n.Tr "repo.settings.githooks_desc" | Str2html}} -
- {{range .Hooks}} -
- - {{.Name}} - -
- {{end}} -
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.settings.githooks"}} +

+
+
+
+ {{.i18n.Tr "repo.settings.githooks_desc" | Str2html}}
+ {{range .Hooks}} +
+ + {{.Name}} + +
+ {{end}}
diff --git a/templates/repo/settings/hook_list.tmpl b/templates/repo/settings/hook_list.tmpl index 061893bc0a..94f1d1310a 100644 --- a/templates/repo/settings/hook_list.tmpl +++ b/templates/repo/settings/hook_list.tmpl @@ -1,43 +1,41 @@ -
- {{template "base/alert" .}} -

- {{.i18n.Tr "repo.settings.hooks"}} -
-
-
{{.i18n.Tr "repo.settings.add_webhook"}}
-
- - Gitea - - - Slack - -
+{{template "base/alert" .}} +

+ {{.i18n.Tr "repo.settings.hooks"}} +
+
+
{{.i18n.Tr "repo.settings.add_webhook"}}
+
+ + Gitea + + + Slack +
-

-
-
+
+

+
+
+
+ {{.Description | Str2html}} +
+ {{range .Webhooks}}
- {{.Description | Str2html}} -
- {{range .Webhooks}} -
- {{if eq .LastStatus 1}} - - {{else if eq .LastStatus 2}} - - {{else}} - - {{end}} - {{.URL}} -
- - -
+ {{if eq .LastStatus 1}} + + {{else if eq .LastStatus 2}} + + {{else}} + + {{end}} + {{.URL}} +
+ +
- {{end}} -
+
+ {{end}}
diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl index 96123525bb..8f7f0026f2 100644 --- a/templates/repo/settings/hook_new.tmpl +++ b/templates/repo/settings/hook_new.tmpl @@ -1,29 +1,25 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/settings/navbar" .}}
-
- {{template "repo/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} -
- {{if eq .HookType "gogs"}} - - {{else if eq .HookType "slack"}} - - {{end}} -
-

-
- {{template "repo/settings/hook_gogs" .}} - {{template "repo/settings/hook_slack" .}} -
- - {{template "repo/settings/hook_history" .}} + {{template "base/alert" .}} +

+ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} +
+ {{if eq .HookType "gogs"}} + + {{else if eq .HookType "slack"}} + + {{end}}
+

+
+ {{template "repo/settings/hook_gogs" .}} + {{template "repo/settings/hook_slack" .}}
+ + {{template "repo/settings/hook_history" .}}
{{template "base/footer" .}} diff --git a/templates/repo/settings/hooks.tmpl b/templates/repo/settings/hooks.tmpl index a405b44698..34c5cfbb6c 100644 --- a/templates/repo/settings/hooks.tmpl +++ b/templates/repo/settings/hooks.tmpl @@ -1,11 +1,9 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/settings/navbar" .}}
-
- {{template "repo/settings/navbar" .}} - {{template "repo/settings/hook_list" .}} -
+ {{template "repo/settings/hook_list" .}}
{{template "base/footer" .}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 2c71557426..3d9d7d15a7 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -1,27 +1,24 @@ -
-
-
{{.i18n.Tr "repo.settings"}}
- - {{.i18n.Tr "repo.settings.options"}} +
+ + {{.i18n.Tr "repo.settings.options"}} + + + {{.i18n.Tr "repo.settings.collaboration"}} + + {{if not .Repository.IsBare}} + + {{.i18n.Tr "repo.settings.branches"}} - - {{.i18n.Tr "repo.settings.collaboration"}} + {{end}} + + {{.i18n.Tr "repo.settings.hooks"}} + + {{if .SignedUser.CanEditGitHook}} + + {{.i18n.Tr "repo.settings.githooks"}} - {{if not .Repository.IsBare}} - - {{.i18n.Tr "repo.settings.branches"}} - - {{end}} - - {{.i18n.Tr "repo.settings.hooks"}} - - {{if .SignedUser.CanEditGitHook}} - - {{.i18n.Tr "repo.settings.githooks"}} - - {{end}} - - {{.i18n.Tr "repo.settings.deploy_keys"}} - -
+ {{end}} + + {{.i18n.Tr "repo.settings.deploy_keys"}} +
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 091828bc00..cd7d2c304b 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -1,256 +1,252 @@ {{template "base/head" .}}
{{template "repo/header" .}} + {{template "repo/settings/navbar" .}}
-
- {{template "repo/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "repo.settings.basic_settings"}} -

-
-
- {{.CsrfTokenHtml}} - -
- - + {{template "base/alert" .}} +

+ {{.i18n.Tr "repo.settings.basic_settings"}} +

+
+ + {{.CsrfTokenHtml}} + +
+ + +
+ {{if not .Repository.IsFork}} +
+ +
+ +
- {{if not .Repository.IsFork}} -
- -
- - -
-
- {{end}} -
- - -
-
- - -
- -
- -
- +
+ {{end}} +
+ + +
+
+ +
- {{if .Repository.IsMirror}} -

- {{.i18n.Tr "repo.settings.mirror_settings"}} -

-
-
- {{.CsrfTokenHtml}} - -
- -
- - +
+ +
+ +
+ + {{if .Repository.IsMirror}} +

+ {{.i18n.Tr "repo.settings.mirror_settings"}} +

+
+
+ {{.CsrfTokenHtml}} + +
+ +
+ + +
+
+
+ + +
+
+ + +

{{.i18n.Tr "repo.mirror_address_desc"}}

+
+ +
+ +
+
+ +
+ +
+ {{.CsrfTokenHtml}} + +
+ + {{.Mirror.Updated}} +
+
+ +
+
+
+ {{end}} + +

+ {{.i18n.Tr "repo.settings.advanced_settings"}} +

+
+
+ {{.CsrfTokenHtml}} + + +
+ +
+ + +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+ + +

{{.i18n.Tr "repo.settings.external_wiki_url_desc"}}

+
+
+ +
+ +
+ +
+ + +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +

{{.i18n.Tr "repo.settings.external_tracker_url_desc"}}

+
+
+ + +

{{.i18n.Tr "repo.settings.tracker_url_format_desc" | Str2html}}

+
+
+ +
+
+ {{$externalTracker := (.Repository.MustGetUnit $.UnitTypeExternalTracker)}} + {{$externalTrackerStyle := $externalTracker.ExternalTrackerConfig.ExternalTrackerStyle}} + +
-
- - -
- - -

{{.i18n.Tr "repo.mirror_address_desc"}}

+
+ + +
+
+
+
-
- -
-
+ {{if .Repository.CanEnablePulls}} +
-
- -
- {{.CsrfTokenHtml}} - -
- - {{.Mirror.Updated}} -
-
- -
-
+
+ +
+ + +
{{end}} -

- {{.i18n.Tr "repo.settings.advanced_settings"}} -

-
-
- {{.CsrfTokenHtml}} - - -
- -
- - -
-
-
-
-
- - -
-
-
-
- - -
-
-
- - -

{{.i18n.Tr "repo.settings.external_wiki_url_desc"}}

-
-
- -
- -
- -
- - -
-
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -

{{.i18n.Tr "repo.settings.external_tracker_url_desc"}}

-
-
- - -

{{.i18n.Tr "repo.settings.tracker_url_format_desc" | Str2html}}

-
-
- -
-
- {{$externalTracker := (.Repository.MustGetUnit $.UnitTypeExternalTracker)}} - {{$externalTrackerStyle := $externalTracker.ExternalTrackerConfig.ExternalTrackerStyle}} - - -
-
-
-
- - -
-
-
-
-
- - {{if .Repository.CanEnablePulls}} -
- -
- -
- - -
-
- {{end}} - -
-
- -
-
+
+
+
+ +
- {{if .IsRepositoryOwner}} -

- {{.i18n.Tr "repo.settings.danger_zone"}} -

-
- {{if .Repository.IsMirror}} -
-
- -
-
-
{{.i18n.Tr "repo.settings.convert"}}
-

{{.i18n.Tr "repo.settings.convert_desc"}}

-
+ {{if .IsRepositoryOwner}} +

+ {{.i18n.Tr "repo.settings.danger_zone"}} +

+
+ {{if .Repository.IsMirror}} +
+
+ +
+
+
{{.i18n.Tr "repo.settings.convert"}}
+

{{.i18n.Tr "repo.settings.convert_desc"}}

+
+
+ +
+ {{end}} +
+
+ +
+
+
{{.i18n.Tr "repo.settings.transfer"}}
+

{{.i18n.Tr "repo.settings.transfer_desc"}}

+
+
+ + {{if .Repository.EnableUnit $.UnitTypeWiki}} +
+ +
+
+
- -
- {{end}} -
-
- -
-
-
{{.i18n.Tr "repo.settings.transfer"}}
-

{{.i18n.Tr "repo.settings.transfer_desc"}}

-
-
- - {{if .Repository.EnableUnit $.UnitTypeWiki}} -
- -
-
- -
-
-
{{.i18n.Tr "repo.settings.wiki_delete"}}
-

{{.i18n.Tr "repo.settings.wiki_delete_desc"}}

-
-
- {{end}} - -
- -
-
- -
-
-
{{.i18n.Tr "repo.settings.delete"}}
-

{{.i18n.Tr "repo.settings.delete_desc"}}

-
+
+
{{.i18n.Tr "repo.settings.wiki_delete"}}
+

{{.i18n.Tr "repo.settings.wiki_delete_desc"}}

- {{end}} + {{end}} + +
+ +
+
+ +
+
+
{{.i18n.Tr "repo.settings.delete"}}
+

{{.i18n.Tr "repo.settings.delete_desc"}}

+
+ {{end}}
diff --git a/templates/user/settings/account_link.tmpl b/templates/user/settings/account_link.tmpl index fa14cb525b..4b19bea75c 100644 --- a/templates/user/settings/account_link.tmpl +++ b/templates/user/settings/account_link.tmpl @@ -1,35 +1,31 @@ {{template "base/head" .}}