diff options
| author | Unknwon <u@gogs.io> | 2016-08-10 11:01:42 -0700 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-08-10 11:01:42 -0700 |
| commit | b85927e488c330aeda261ab9b90cd0f9c41d6b11 (patch) | |
| tree | 16cf956bf7b23e981813613c134398fe63e38d01 /templates | |
| parent | 87b408a2e516bb992ff6a4c19da27fbdbc95ceb9 (diff) | |
| download | gitea-b85927e488c330aeda261ab9b90cd0f9c41d6b11.tar.gz gitea-b85927e488c330aeda261ab9b90cd0f9c41d6b11.zip | |
#3091 show Git configs on admin panel
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/admin/config.tmpl | 42 |
2 files changed, 37 insertions, 7 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 0387f88fd9..9e9f5d12b5 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.71.0808
\ No newline at end of file +0.9.71.0809
\ No newline at end of file diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 93fc404ba1..bfc91a92c5 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -156,7 +156,7 @@ <dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt> <dd>{{.Mailer.Host}}</dd> <dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt> - <dd>{{.Mailer.User}}</dd><br> + <dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br> <form class="ui form" action="{{AppSubUrl}}/admin/config/test_mail" method="post"> {{.CsrfTokenHtml}} <div class="inline field ui left"> @@ -179,8 +179,10 @@ <dd>{{.CacheAdapter}}</dd> <dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt> <dd>{{.CacheInternal}} {{.i18n.Tr "tool.raw_seconds"}}</dd> + {{if .CacheConn}} <dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt> - <dd><pre>{{.CacheConn}}</pre></dd> + <dd><code>{{.CacheConn}}</code></dd> + {{end}} </dl> </div> @@ -192,7 +194,7 @@ <dt>{{.i18n.Tr "admin.config.session_provider"}}</dt> <dd>{{.SessionConfig.Provider}}</dd> <dt>{{.i18n.Tr "admin.config.provider_config"}}</dt> - <dd><pre>{{.SessionConfig.ProviderConfig}}</pre></dd> + <dd><code>{{.SessionConfig.ProviderConfig}}</code></dd> <dt>{{.i18n.Tr "admin.config.cookie_name"}}</dt> <dd>{{.SessionConfig.CookieName}}</dd> <dt>{{.i18n.Tr "admin.config.gc_interval_time"}}</dt> @@ -213,12 +215,40 @@ <dl class="dl-horizontal admin-dl-horizontal"> <dt>{{.i18n.Tr "admin.config.disable_gravatar"}}</dt> <dd><i class="fa fa{{if .DisableGravatar}}-check{{end}}-square-o"></i></dd> + <div class="ui divider"></div> + <dt>{{.i18n.Tr "admin.config.enable_federated_avatar"}}</dt> + <dd><i class="fa fa{{if .EnableFederatedAvatar}}-check{{end}}-square-o"></i></dd> </dl> </div> + + <h4 class="ui top attached header"> + {{.i18n.Tr "admin.config.git_config"}} + </h4> <div class="ui attached table segment"> <dl class="dl-horizontal admin-dl-horizontal"> - <dt>{{.i18n.Tr "admin.config.enable_federated_avatar"}}</dt> - <dd><i class="fa fa{{if .EnableFederatedAvatar}}-check{{end}}-square-o"></i></dd> + <dt>{{.i18n.Tr "admin.config.git_disable_diff_highlight"}}</dt> + <dd><i class="fa fa{{if .Git.DisableDiffHighlight}}-check{{end}}-square-o"></i></dd> + <dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt> + <dd>{{.Git.MaxGitDiffLines}}</dd> + <dt>{{.i18n.Tr "admin.config.git_max_diff_line_characters"}}</dt> + <dd>{{.Git.MaxGitDiffLineCharacters}}</dd> + <dt>{{.i18n.Tr "admin.config.git_max_diff_files"}}</dt> + <dd>{{.Git.MaxGitDiffFiles}}</dd> + <dt>{{.i18n.Tr "admin.config.git_gc_args"}}</dt> + <dd><code>{{.Git.GCArgs}}</code></dd> + <dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt> + <dd>{{.Git.MaxGitDiffLines}}</dd> + <div class="ui divider"></div> + <dt>{{.i18n.Tr "admin.config.git_migrate_timeout"}}</dt> + <dd>{{.Git.Timeout.Migrate}} {{.i18n.Tr "tool.raw_seconds"}}</dd> + <dt>{{.i18n.Tr "admin.config.git_mirror_timeout"}}</dt> + <dd>{{.Git.Timeout.Mirror}} {{.i18n.Tr "tool.raw_seconds"}}</dd> + <dt>{{.i18n.Tr "admin.config.git_clone_timeout"}}</dt> + <dd>{{.Git.Timeout.Clone}} {{.i18n.Tr "tool.raw_seconds"}}</dd> + <dt>{{.i18n.Tr "admin.config.git_pull_timeout"}}</dt> + <dd>{{.Git.Timeout.Pull}} {{.i18n.Tr "tool.raw_seconds"}}</dd> + <dt>{{.i18n.Tr "admin.config.git_gc_timeout"}}</dt> + <dd>{{.Git.Timeout.GC}} {{.i18n.Tr "tool.raw_seconds"}}</dd> </dl> </div> @@ -231,7 +261,7 @@ <dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt> <dd>{{.Mode}}</dd> <dt>{{$.i18n.Tr "admin.config.log_config"}}</dt> - <dd><pre>{{.Config}}</pre></dd> + <dd><code>{{.Config}}</code></dd> {{end}} </dl> </div> |