mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-02 00:39:16 +00:00
419003adb2
1. In many cases, the `flex-list` has previous and next `gt-hidden` siblings, so relax the CSS selector to remove all ".segument .flex-list" paddings. 2. Make the "Add key" button can toggle 3. Move help message into the related segment(panel). Otherwise users would misread the message, eg: the SSH help seemed for GPG because they are so near 4. Move modal element into the segment element, otherwise it affects the layout
124 lines
5.6 KiB
Go HTML Template
124 lines
5.6 KiB
Go HTML Template
<h4 class="ui top attached header">
|
|
{{.locale.Tr "settings.manage_gpg_keys"}}
|
|
<div class="ui right">
|
|
<button class="ui primary tiny show-panel toggle button" data-panel="#add-gpg-key-panel">{{.locale.Tr "settings.add_key"}}</button>
|
|
</div>
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<div class="{{if not .HasGPGError}}gt-hidden{{end}} gt-mb-4" id="add-gpg-key-panel">
|
|
<form class="ui form{{if .HasGPGError}} error{{end}}" action="{{.Link}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input type="hidden" name="title" value="none">
|
|
<div class="field {{if .Err_Content}}error{{end}}">
|
|
<label for="content">{{.locale.Tr "settings.key_content"}}</label>
|
|
<textarea id="gpg-key-content" name="content" placeholder="{{.locale.Tr "settings.key_content_gpg_placeholder"}}" required>{{.content}}</textarea>
|
|
</div>
|
|
{{if .Err_Signature}}
|
|
<div class="ui error message">
|
|
<p>{{.locale.Tr "settings.gpg_token_required"}}</p>
|
|
</div>
|
|
<div class="field">
|
|
<label for="token">{{.locale.Tr "settings.gpg_token"}}</label>
|
|
<input readonly="" value="{{.TokenToSign}}">
|
|
<div class="help">
|
|
<p>{{.locale.Tr "settings.gpg_token_help"}}</p>
|
|
<p><code>{{$.locale.Tr "settings.gpg_token_code" .TokenToSign .PaddedKeyID}}</code></p>
|
|
</div>
|
|
</div>
|
|
<div class="field">
|
|
<label for="signature">{{.locale.Tr "settings.gpg_token_signature"}}</label>
|
|
<textarea id="gpg-key-signature" name="signature" placeholder="{{.locale.Tr "settings.key_signature_gpg_placeholder"}}" required>{{.signature}}</textarea>
|
|
</div>
|
|
{{end}}
|
|
<input name="type" type="hidden" value="gpg">
|
|
<button class="ui green button">
|
|
{{.locale.Tr "settings.add_key"}}
|
|
</button>
|
|
<button class="ui hide-panel button" data-panel="#add-gpg-key-panel">
|
|
{{.locale.Tr "cancel"}}
|
|
</button>
|
|
</form>
|
|
</div>
|
|
<div class="flex-list">
|
|
<div class="flex-item">
|
|
<p>
|
|
{{.locale.Tr "settings.gpg_desc"}}<br>
|
|
{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}
|
|
</p>
|
|
</div>
|
|
{{range .GPGKeys}}
|
|
<div class="flex-item">
|
|
<div class="flex-item-leading">
|
|
<span class="text {{if or .ExpiredUnix.IsZero ($.PageStartTime.Before .ExpiredUnix.AsTime)}}green{{end}}">{{svg "octicon-key" 32}}</span>
|
|
</div>
|
|
<div class="flex-item-main">
|
|
{{if .Verified}}
|
|
<span class="flex-text-block" data-tooltip-content="{{$.locale.Tr "settings.gpg_key_verified_long"}}">{{svg "octicon-verified"}} <strong>{{$.locale.Tr "settings.gpg_key_verified"}}</strong></span>
|
|
{{end}}
|
|
{{if gt (len .Emails) 0}}
|
|
<span class="flex-text-block" data-tooltip-content="{{$.locale.Tr "settings.gpg_key_matched_identities_long"}}">{{svg "octicon-mail"}} {{$.locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}<strong>{{.Email}} </strong>{{end}}</span>
|
|
{{end}}
|
|
<div class="flex-item-body">
|
|
<b>{{$.locale.Tr "settings.key_id"}}:</b> {{.PaddedKeyID}}
|
|
<b>{{$.locale.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.PaddedKeyID}} {{end}}
|
|
</div>
|
|
<div class="flex-item-body">
|
|
<i>{{$.locale.Tr "settings.added_on" (DateTime "short" .AddedUnix) | Safe}}</i>
|
|
-
|
|
<i>{{if not .ExpiredUnix.IsZero}}{{$.locale.Tr "settings.valid_until_date" (DateTime "short" .ExpiredUnix) | Safe}}{{else}}{{$.locale.Tr "settings.valid_forever"}}{{end}}</i>
|
|
</div>
|
|
</div>
|
|
<div class="flex-item-trailing">
|
|
<button class="ui red tiny button delete-button" data-modal-id="delete-gpg" data-url="{{$.Link}}/delete?type=gpg" data-id="{{.ID}}">
|
|
{{$.locale.Tr "settings.delete_key"}}
|
|
</button>
|
|
{{if and (not .Verified) (ne $.VerifyingID .KeyID)}}
|
|
<a class="ui primary tiny button" href="{{$.Link}}?verify_gpg={{.KeyID}}">{{$.locale.Tr "settings.gpg_key_verify"}}</a>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{if and (not .Verified) (eq $.VerifyingID .KeyID)}}
|
|
<div class="ui segment">
|
|
<h4>{{$.locale.Tr "settings.gpg_token_required"}}</h4>
|
|
<form class="ui form{{if $.HasGPGVerifyError}} error{{end}}" action="{{$.Link}}" method="post">
|
|
{{$.CsrfTokenHtml}}
|
|
<input type="hidden" name="title" value="none">
|
|
<input type="hidden" name="content" value="{{.KeyID}}">
|
|
<input type="hidden" name="key_id" value="{{.KeyID}}">
|
|
<div class="field">
|
|
<label for="token">{{$.locale.Tr "settings.gpg_token"}}</label>
|
|
<input readonly="" value="{{$.TokenToSign}}">
|
|
<div class="help">
|
|
<p>{{$.locale.Tr "settings.gpg_token_help"}}</p>
|
|
<p><code>{{$.locale.Tr "settings.gpg_token_code" $.TokenToSign .PaddedKeyID}}</code></p>
|
|
</div>
|
|
<br>
|
|
</div>
|
|
<div class="field">
|
|
<label for="signature">{{$.locale.Tr "settings.gpg_token_signature"}}</label>
|
|
<textarea id="gpg-key-signature" name="signature" placeholder="{{$.locale.Tr "settings.key_signature_gpg_placeholder"}}" required>{{$.signature}}</textarea>
|
|
</div>
|
|
<input name="type" type="hidden" value="verify_gpg">
|
|
<button class="ui green button">
|
|
{{$.locale.Tr "settings.gpg_key_verify"}}
|
|
</button>
|
|
<a class="ui red button" href="{{$.Link}}">
|
|
{{$.locale.Tr "settings.cancel"}}
|
|
</a>
|
|
</form>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
<div class="ui g-modal-confirm delete modal" id="delete-gpg">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "settings.gpg_key_deletion"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "settings.gpg_key_deletion_desc"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
</div>
|