summaryrefslogtreecommitdiffstats
path: root/templates/webhook
diff options
context:
space:
mode:
authorOtto Richter <git@otto.splvs.net>2024-08-17 20:24:31 +0200
committerOtto Richter <git@otto.splvs.net>2024-08-19 01:14:18 +0200
commitc9e402afdc573a9706fa45a1052c122f34264b89 (patch)
tree2c1ba7355b30c3b0f5b0ca10f9ee1f91747ced17 /templates/webhook
parentMerge pull request '[UI] Fix misalignment of authors for repo acctivity' (#50... (diff)
downloadforgejo-c9e402afdc573a9706fa45a1052c122f34264b89.tar.xz
forgejo-c9e402afdc573a9706fa45a1052c122f34264b89.zip
feat(tmpl): Introduce semantic HTML in forms
Modifies forms: - (new) org team - (new) repo webhook - (new) repo protected branch The forms are not completely rewritten to semantic HTML yet. The focus of this change was on standard elements, some custom solutions were left untouched for now. - swaps the order fo permission radio buttons as per https://codeberg.org/forgejo/forgejo/issues/4983 - uses fieldsets to group related inputs - ensures consistent styling across forms - can be improved later, e.g. using horizontal lines between sections - fixes: previous font size of labels was smaller than the font size of the help text - help text are now part of the label, clicking them now also activates the input - drop unused CSS (no required checkboxes in grouped class remain) - playwright testing: - move login boilerplate to utils - automated form accessibility checking - allow defining the scope, because legacy parts of the forms are not yet accessible - assert some CSS properties that should not be overriden - the Makefile adjustment was necessary, because eslint scanned some internal files in the tests/e2e/reports directory
Diffstat (limited to 'templates/webhook')
-rw-r--r--templates/webhook/shared-settings.tmpl48
1 files changed, 20 insertions, 28 deletions
diff --git a/templates/webhook/shared-settings.tmpl b/templates/webhook/shared-settings.tmpl
index 80caad7279..6639327e46 100644
--- a/templates/webhook/shared-settings.tmpl
+++ b/templates/webhook/shared-settings.tmpl
@@ -1,26 +1,20 @@
{{$isNew:=or .PageIsSettingsHooksNew .PageIsAdminDefaultHooksNew .PageIsAdminSystemHooksNew}}
<div class="field">
- <h4>{{ctx.Locale.Tr "repo.settings.event_desc"}}</h4>
- <div class="grouped event type fields">
- <div class="field">
- <div class="ui radio non-events checkbox">
- <input name="events" type="radio" value="push_only" {{if or $isNew .Webhook.PushOnly}}checked{{end}}>
- <label>{{ctx.Locale.Tr "repo.settings.event_push_only"}}</label>
- </div>
- </div>
- <div class="field">
- <div class="ui radio non-events checkbox">
- <input name="events" type="radio" value="send_everything" {{if .Webhook.SendEverything}}checked{{end}}>
- <label>{{ctx.Locale.Tr "repo.settings.event_send_everything"}}</label>
- </div>
- </div>
- <div class="field">
- <div class="ui radio events checkbox">
- <input name="events" type="radio" value="choose_events" {{if .Webhook.ChooseEvents}}checked{{end}}>
- <label>{{ctx.Locale.Tr "repo.settings.event_choose"}}</label>
- </div>
- </div>
- </div>
+ <fieldset class="event type">
+ <legend>{{ctx.Locale.Tr "repo.settings.event_desc"}}</legend>
+ <label class="non-events">
+ <input name="events" type="radio" value="push_only" {{if or $isNew .Webhook.PushOnly}}checked{{end}}>
+ {{ctx.Locale.Tr "repo.settings.event_push_only"}}
+ </label>
+ <label class="non-events">
+ <input name="events" type="radio" value="send_everything" {{if .Webhook.SendEverything}}checked{{end}}>
+ {{ctx.Locale.Tr "repo.settings.event_send_everything"}}
+ </label>
+ <label class="events">
+ <input name="events" type="radio" value="choose_events" {{if .Webhook.ChooseEvents}}checked{{end}}>
+ {{ctx.Locale.Tr "repo.settings.event_choose"}}
+ </label>
+ </fieldset>
<div class="events fields ui grid {{if not .Webhook.ChooseEvents}}tw-hidden{{end}}">
<!-- Repository Events -->
@@ -270,20 +264,18 @@
<div class="divider"></div>
-<div class="inline field">
- <div class="ui checkbox">
+<fieldset>
+ <label>
<input name="active" type="checkbox" {{if or $isNew .Webhook.IsActive}}checked{{end}}>
- <label>{{ctx.Locale.Tr "repo.settings.active"}}</label>
+ {{ctx.Locale.Tr "repo.settings.active"}}
<span class="help">{{ctx.Locale.Tr "repo.settings.active_helper"}}</span>
- </div>
-</div>
-<div class="field">
+ </label>
{{if $isNew}}
<button class="ui primary button">{{ctx.Locale.Tr "repo.settings.add_webhook"}}</button>
{{else}}
<button class="ui primary button">{{ctx.Locale.Tr "repo.settings.update_webhook"}}</button>
<a class="ui red delete-button button" data-url="{{.BaseLink}}/delete" data-id="{{.Webhook.ID}}">{{ctx.Locale.Tr "repo.settings.delete_webhook"}}</a>
{{end}}
-</div>
+</fieldset>
{{template "repo/settings/webhook/delete_modal" .}}