diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-29 20:02:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 08:02:29 -0400 |
| commit | 241b74f6c536c1d7de3b4e79e552bf1a3264cc6d (patch) | |
| tree | b6e482d056eeb1d00ca48de9161dc1123f6bbaf4 /templates/admin | |
| parent | 5a5ab8ef5ac5fbdb893707933f06ff6bcd8e834a (diff) | |
| download | gitea-241b74f6c536c1d7de3b4e79e552bf1a3264cc6d.tar.gz gitea-241b74f6c536c1d7de3b4e79e552bf1a3264cc6d.zip | |
Improve template helper (#24417)
It seems that we really need the "context function" soon. So we should
clean up the helper functions first.
Major changes:
* Improve StringUtils and add JsonUtils
* Remove one-time-use helper functions like CompareLink
* Move other code (no change) to util_avatar/util_render/util_misc (no
need to propose changes for them)
I have tested the changed templates:
---------
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'templates/admin')
| -rw-r--r-- | templates/admin/auth/edit.tmpl | 2 | ||||
| -rw-r--r-- | templates/admin/config.tmpl | 8 | ||||
| -rw-r--r-- | templates/admin/queue.tmpl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 0aed59ffab..2c8fe724e2 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -334,7 +334,7 @@ <div class="field"> <label for="oauth2_scopes">{{.locale.Tr "admin.auths.oauth2_scopes"}}</label> - <input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{Join $cfg.Scopes ","}}{{end}}"> + <input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{StringUtils.Join $cfg.Scopes ","}}{{end}}"> </div> <div class="field"> <label for="oauth2_required_claim_name">{{.locale.Tr "admin.auths.oauth2_required_claim_name"}}</label> diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index f0d0ad3643..c4f77ec1ae 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -365,7 +365,7 @@ <dt>{{$.locale.Tr "admin.config.log_mode"}}</dt> <dd>{{.Name}} ({{.Provider}})</dd> <dt>{{$.locale.Tr "admin.config.log_config"}}</dt> - <dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd> + <dd><pre>{{JsonUtils.PrettyIndent .Config}}</pre></dd> {{end}} <div class="ui divider"></div> <dt>{{$.locale.Tr "admin.config.router_log_mode"}}</dt> @@ -378,7 +378,7 @@ <dt>{{$.locale.Tr "admin.config.log_mode"}}</dt> <dd>{{.Name}} ({{.Provider}})</dd> <dt>{{$.locale.Tr "admin.config.log_config"}}</dt> - <dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd> + <dd><pre>{{JsonUtils.PrettyIndent .Config}}</pre></dd> {{end}} {{else}} <dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd> @@ -393,7 +393,7 @@ <dt>{{$.locale.Tr "admin.config.log_mode"}}</dt> <dd>{{.Name}} ({{.Provider}})</dd> <dt>{{$.locale.Tr "admin.config.log_config"}}</dt> - <dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd> + <dd><pre>{{JsonUtils.PrettyIndent .Config}}</pre></dd> {{end}} {{else}} <dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd> @@ -412,7 +412,7 @@ <dt>{{$.locale.Tr "admin.config.log_mode"}}</dt> <dd>{{.Name}} ({{.Provider}})</dd> <dt>{{$.locale.Tr "admin.config.log_config"}}</dt> - <dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd> + <dd><pre>{{JsonUtils.PrettyIndent .Config}}</pre></dd> {{end}} {{else}} <dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd> diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index 3de01a32ab..84eb8892ef 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -174,7 +174,7 @@ {{.locale.Tr "admin.monitor.queue.configuration"}} </h4> <div class="ui attached segment"> - <pre>{{.Queue.Configuration | JsonPrettyPrint}}</pre> + <pre>{{JsonUtils.PrettyIndent .Queue.Configuration}}</pre> </div> </div> |