Skip to content

Commit bfc3367

Browse files
unknwonachilleas-k
unknwon
authored and
achilleas-k
committedAug 26, 2020
template: improve admin config page
1 parent 8a53028 commit bfc3367

File tree

10 files changed

+307
-242
lines changed

10 files changed

+307
-242
lines changed
 

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ All notable changes to Gogs are documented in this file.
5353
- Configuration option `[repository] PULL_REQUEST_QUEUE_LENGTH`
5454
- Configuration option `[session] ENABLE_SET_COOKIE`
5555
- Configuration option `[release.attachment] PATH`
56+
- Configuration option `[webhook] QUEUE_LENGTH`
5657

5758
---
5859

‎conf/app.ini

-2
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,6 @@ DISABLE_REGULAR_ORG_CREATION = false
337337
[webhook]
338338
; Types are enabled for users to use, can be "gogs", "slack", "discord", "dingtalk"
339339
TYPES = gogs, slack, discord, dingtalk
340-
; Hook task queue length, increase if webhook shooting starts hanging
341-
QUEUE_LENGTH = 1000
342340
; Deliver timeout in seconds
343341
DELIVER_TIMEOUT = 15
344342
; Allow insecure certification

‎conf/locale/locale_en-US.ini

+43-28
Original file line numberDiff line numberDiff line change
@@ -1301,34 +1301,48 @@ config.cache.host = Host
13011301
config.http_config = HTTP configuration
13021302
config.http.access_control_allow_origin = Access control allow origin
13031303
1304-
config.log_file_root_path = Log File Root Path
1305-
1306-
config.webhook_config = Webhook Configuration
1307-
config.queue_length = Queue Length
1308-
config.deliver_timeout = Deliver Timeout
1309-
config.skip_tls_verify = Skip TLS Verify
1310-
1311-
config.oauth_config = OAuth Configuration
1312-
config.oauth_enabled = Enabled
1313-
1314-
config.picture_config = Picture Configuration
1315-
config.picture_service = Picture Service
1316-
config.disable_gravatar = Disable Gravatar
1317-
config.enable_federated_avatar = Enable Federated Avatars
1318-
1319-
config.git_config = Git Configuration
1320-
config.git_disable_diff_highlight = Disable Diff Syntax Highlight
1321-
config.git_max_diff_lines = Max Diff Lines (for a single file)
1322-
config.git_max_diff_line_characters = Max Diff Characters (for a single line)
1323-
config.git_max_diff_files = Max Diff Files (to be shown)
1324-
config.git_gc_args = GC Arguments
1325-
config.git_migrate_timeout = Migration Timeout
1326-
config.git_mirror_timeout = Mirror Update Timeout
1327-
config.git_clone_timeout = Clone Operation Timeout
1328-
config.git_pull_timeout = Pull Operation Timeout
1329-
config.git_gc_timeout = GC Operation Timeout
1330-
1331-
config.log_config = Log Configuration
1304+
config.attachment_config = Attachment configuration
1305+
config.attachment.enabled = Enabled
1306+
config.attachment.path = Path
1307+
config.attachment.allowed_types = Allowed types
1308+
config.attachment.max_size = Size limit
1309+
config.attachment.max_files = Files limit
1310+
1311+
config.release_config = Release configuration
1312+
config.release.attachment.enabled = Attachment enabled
1313+
config.release.attachment.allowed_types = Attachment allowed types
1314+
config.release.attachment.max_size = Attachment size limit
1315+
config.release.attachment.max_files = Attachment files limit
1316+
1317+
config.picture_config = Picture configuration
1318+
config.picture.avatar_upload_path = User avatar upload path
1319+
config.picture.repo_avatar_upload_path = Repository avatar upload path
1320+
config.picture.gravatar_source = Gravatar source
1321+
config.picture.disable_gravatar = Disable Gravatar
1322+
config.picture.enable_federated_avatar = Enable federated avatars
1323+
1324+
config.mirror_config = Mirror configuration
1325+
config.mirror.default_interval = Default interval
1326+
1327+
config.webhook_config = Webhook configuration
1328+
config.webhook.types = Types
1329+
config.webhook.deliver_timeout = Deliver timeout
1330+
config.webhook.skip_tls_verify = Skip TLS verify
1331+
1332+
config.git_config = Git configuration
1333+
config.git.disable_diff_highlight = Disable diff syntax highlight
1334+
config.git.max_diff_lines = Diff lines limit (for a single file)
1335+
config.git.max_diff_line_characters = Diff characters limit (for a single line)
1336+
config.git.max_diff_files = Diff files limit (for a single diff)
1337+
config.git.gc_args = GC arguments
1338+
config.git.migrate_timeout = Migration timeout
1339+
config.git.mirror_timeout = Mirror fetch timeout
1340+
config.git.clone_timeout = Clone timeout
1341+
config.git.pull_timeout = Pull timeout
1342+
config.git.gc_timeout = GC timeout
1343+
1344+
config.log_config = Log configuration
1345+
config.log_file_root_path = Log file root path
13321346
config.log_mode = Mode
13331347
config.log_options = Options
13341348
@@ -1400,6 +1414,7 @@ months = %d months %s
14001414
years = %d years %s
14011415
raw_seconds = seconds
14021416
raw_minutes = minutes
1417+
raw_hours = hours
14031418
14041419
[dropzone]
14051420
default_message = Drop files here or click to upload.

‎internal/assets/conf/conf_gen.go

+39-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/assets/public/public_gen.go

+84-84
Large diffs are not rendered by default.

‎internal/assets/templates/templates_gen.go

+58-58
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/conf/static.go

-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ var (
300300
// Webhook settings
301301
Webhook struct {
302302
Types []string
303-
QueueLength int
304303
DeliverTimeout int
305304
SkipTLSVerify bool `ini:"SKIP_TLS_VERIFY"`
306305
PagingNum int

‎internal/db/webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/G-Node/gogs/internal/sync"
2828
)
2929

30-
var HookQueue = sync.NewUniqueQueue(conf.Webhook.QueueLength)
30+
var HookQueue = sync.NewUniqueQueue(1000)
3131

3232
type HookContentType int
3333

‎internal/route/admin/admin.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,11 @@ func Config(c *context.Context) {
212212
c.Data["User"] = conf.User
213213
c.Data["Session"] = conf.Session
214214
c.Data["Cache"] = conf.Cache
215-
c.Data["HTTP"] = conf.HTTP
216-
217-
// TODO
218215
c.Data["Attachment"] = conf.Attachment
219216
c.Data["Release"] = conf.Release
220-
c.Data["Time"] = conf.Time
221217
c.Data["Picture"] = conf.Picture
218+
c.Data["HTTP"] = conf.HTTP
222219
c.Data["Mirror"] = conf.Mirror
223-
224-
// ???
225220
c.Data["Webhook"] = conf.Webhook
226221
c.Data["Git"] = conf.Git
227222

‎templates/admin/config.tmpl

+80-23
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,61 @@
351351
</dl>
352352
</div>
353353

354+
{{/* Attachment settings */}}
355+
<h4 class="ui top attached header">
356+
{{.i18n.Tr "admin.config.attachment_config"}}
357+
</h4>
358+
<div class="ui attached table segment">
359+
<dl class="dl-horizontal admin-dl-horizontal">
360+
<dt>{{.i18n.Tr "admin.config.attachment.enabled"}}</dt>
361+
<dd><i class="fa fa{{if .Attachment.Enabled}}-check{{end}}-square-o"></i></dd>
362+
<dt>{{.i18n.Tr "admin.config.attachment.path"}}</dt>
363+
<dd><code>{{.Attachment.Path}}</code></dd>
364+
<dt>{{.i18n.Tr "admin.config.attachment.allowed_types"}}</dt>
365+
<dd><code>{{.Attachment.AllowedTypes}}</code></dd>
366+
<dt>{{.i18n.Tr "admin.config.attachment.max_size"}}</dt>
367+
<dd>{{.Attachment.MaxSize}} MB</dd>
368+
<dt>{{.i18n.Tr "admin.config.attachment.max_files"}}</dt>
369+
<dd>{{.Attachment.MaxFiles}}</dd>
370+
</dl>
371+
</div>
372+
373+
{{/* Release settings */}}
374+
<h4 class="ui top attached header">
375+
{{.i18n.Tr "admin.config.release_config"}}
376+
</h4>
377+
<div class="ui attached table segment">
378+
<dl class="dl-horizontal admin-dl-horizontal">
379+
<dt>{{.i18n.Tr "admin.config.release.attachment.enabled"}}</dt>
380+
<dd><i class="fa fa{{if .Release.Attachment.Enabled}}-check{{end}}-square-o"></i></dd>
381+
<dt>{{.i18n.Tr "admin.config.release.attachment.allowed_types"}}</dt>
382+
<dd><code>{{.Release.Attachment.AllowedTypes}}</code></dd>
383+
<dt>{{.i18n.Tr "admin.config.release.attachment.max_size"}}</dt>
384+
<dd>{{.Release.Attachment.MaxSize}} MB</dd>
385+
<dt>{{.i18n.Tr "admin.config.release.attachment.max_files"}}</dt>
386+
<dd>{{.Release.Attachment.MaxFiles}}</dd>
387+
</dl>
388+
</div>
389+
390+
{{/* Picture settings */}}
391+
<h4 class="ui top attached header">
392+
{{.i18n.Tr "admin.config.picture_config"}}
393+
</h4>
394+
<div class="ui attached table segment">
395+
<dl class="dl-horizontal admin-dl-horizontal">
396+
<dt>{{.i18n.Tr "admin.config.picture.avatar_upload_path"}}</dt>
397+
<dd><code>{{.Picture.AvatarUploadPath}}</code></dd>
398+
<dt>{{.i18n.Tr "admin.config.picture.repo_avatar_upload_path"}}</dt>
399+
<dd><code>{{.Picture.RepositoryAvatarUploadPath}}</code></dd>
400+
<dt>{{.i18n.Tr "admin.config.picture.gravatar_source"}}</dt>
401+
<dd><code>{{.Picture.GravatarSource}}</code></dd>
402+
<dt>{{.i18n.Tr "admin.config.picture.disable_gravatar"}}</dt>
403+
<dd><i class="fa fa{{if .Picture.DisableGravatar}}-check{{end}}-square-o"></i></dd>
404+
<dt>{{.i18n.Tr "admin.config.picture.enable_federated_avatar"}}</dt>
405+
<dd><i class="fa fa{{if .Picture.EnableFederatedAvatar}}-check{{end}}-square-o"></i></dd>
406+
</dl>
407+
</div>
408+
354409
{{/* HTTP settings */}}
355410
<h4 class="ui top attached header">
356411
{{.i18n.Tr "admin.config.http_config"}}
@@ -368,58 +423,60 @@
368423
</dl>
369424
</div>
370425

426+
{{/* Mirror settings */}}
371427
<h4 class="ui top attached header">
372-
{{.i18n.Tr "admin.config.webhook_config"}}
428+
{{.i18n.Tr "admin.config.mirror_config"}}
373429
</h4>
374430
<div class="ui attached table segment">
375431
<dl class="dl-horizontal admin-dl-horizontal">
376-
<dt>{{.i18n.Tr "admin.config.queue_length"}}</dt>
377-
<dd>{{.Webhook.QueueLength}}</dd>
378-
<dt>{{.i18n.Tr "admin.config.deliver_timeout"}}</dt>
379-
<dd>{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
380-
<dt>{{.i18n.Tr "admin.config.skip_tls_verify"}}</dt>
381-
<dd><i class="fa fa{{if .Webhook.SkipTLSVerify}}-check{{end}}-square-o"></i></dd>
432+
<dt>{{.i18n.Tr "admin.config.mirror.default_interval"}}</dt>
433+
<dd>{{.Mirror.DefaultInterval}} {{.i18n.Tr "tool.raw_hours"}}</dd>
382434
</dl>
383435
</div>
384436

437+
{{/* Webhook settings */}}
385438
<h4 class="ui top attached header">
386-
{{.i18n.Tr "admin.config.picture_config"}}
439+
{{.i18n.Tr "admin.config.webhook_config"}}
387440
</h4>
388441
<div class="ui attached table segment">
389442
<dl class="dl-horizontal admin-dl-horizontal">
390-
<dt>{{.i18n.Tr "admin.config.disable_gravatar"}}</dt>
391-
<dd><i class="fa fa{{if .DisableGravatar}}-check{{end}}-square-o"></i></dd>
392-
<div class="ui divider"></div>
393-
<dt>{{.i18n.Tr "admin.config.enable_federated_avatar"}}</dt>
394-
<dd><i class="fa fa{{if .EnableFederatedAvatar}}-check{{end}}-square-o"></i></dd>
443+
<dt>{{.i18n.Tr "admin.config.webhook.types"}}</dt>
444+
<dd><code>{{.Webhook.Types}}</code></dd>
445+
<dt>{{.i18n.Tr "admin.config.webhook.deliver_timeout"}}</dt>
446+
<dd>{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
447+
<dt>{{.i18n.Tr "admin.config.webhook.skip_tls_verify"}}</dt>
448+
<dd><i class="fa fa{{if .Webhook.SkipTLSVerify}}-check{{end}}-square-o"></i></dd>
395449
</dl>
396450
</div>
397451

452+
{{/* Git settings */}}
398453
<h4 class="ui top attached header">
399454
{{.i18n.Tr "admin.config.git_config"}}
400455
</h4>
401456
<div class="ui attached table segment">
402457
<dl class="dl-horizontal admin-dl-horizontal">
403-
<dt>{{.i18n.Tr "admin.config.git_disable_diff_highlight"}}</dt>
458+
<dt>{{.i18n.Tr "admin.config.git.disable_diff_highlight"}}</dt>
404459
<dd><i class="fa fa{{if .Git.DisableDiffHighlight}}-check{{end}}-square-o"></i></dd>
405-
<dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt>
460+
<dt>{{.i18n.Tr "admin.config.git.max_diff_lines"}}</dt>
406461
<dd>{{.Git.MaxGitDiffLines}}</dd>
407-
<dt>{{.i18n.Tr "admin.config.git_max_diff_line_characters"}}</dt>
462+
<dt>{{.i18n.Tr "admin.config.git.max_diff_line_characters"}}</dt>
408463
<dd>{{.Git.MaxGitDiffLineCharacters}}</dd>
409-
<dt>{{.i18n.Tr "admin.config.git_max_diff_files"}}</dt>
464+
<dt>{{.i18n.Tr "admin.config.git.max_diff_files"}}</dt>
410465
<dd>{{.Git.MaxGitDiffFiles}}</dd>
411-
<dt>{{.i18n.Tr "admin.config.git_gc_args"}}</dt>
466+
<dt>{{.i18n.Tr "admin.config.git.gc_args"}}</dt>
412467
<dd><code>{{.Git.GCArgs}}</code></dd>
468+
413469
<div class="ui divider"></div>
414-
<dt>{{.i18n.Tr "admin.config.git_migrate_timeout"}}</dt>
470+
471+
<dt>{{.i18n.Tr "admin.config.git.migrate_timeout"}}</dt>
415472
<dd>{{.Git.Timeout.Migrate}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
416-
<dt>{{.i18n.Tr "admin.config.git_mirror_timeout"}}</dt>
473+
<dt>{{.i18n.Tr "admin.config.git.mirror_timeout"}}</dt>
417474
<dd>{{.Git.Timeout.Mirror}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
418-
<dt>{{.i18n.Tr "admin.config.git_clone_timeout"}}</dt>
475+
<dt>{{.i18n.Tr "admin.config.git.clone_timeout"}}</dt>
419476
<dd>{{.Git.Timeout.Clone}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
420-
<dt>{{.i18n.Tr "admin.config.git_pull_timeout"}}</dt>
477+
<dt>{{.i18n.Tr "admin.config.git.pull_timeout"}}</dt>
421478
<dd>{{.Git.Timeout.Pull}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
422-
<dt>{{.i18n.Tr "admin.config.git_gc_timeout"}}</dt>
479+
<dt>{{.i18n.Tr "admin.config.git.gc_timeout"}}</dt>
423480
<dd>{{.Git.Timeout.GC}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
424481
</dl>
425482
</div>

0 commit comments

Comments
 (0)
Please sign in to comment.