diff options
Diffstat (limited to 'templates/user/settings')
| -rw-r--r-- | templates/user/settings/account.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/settings/applications.tmpl | 15 | ||||
| -rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/settings/keys_principal.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/settings/keys_ssh.tmpl | 6 | ||||
| -rw-r--r-- | templates/user/settings/repos.tmpl | 22 | ||||
| -rw-r--r-- | templates/user/settings/security/twofa.tmpl | 2 |
7 files changed, 19 insertions, 36 deletions
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 9a57bd5722..53f7d021e0 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -151,9 +151,9 @@ <input id="password-confirmation" name="password" type="password" autocomplete="off" required> </div> <div class="field"> - <div class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form"> + <button class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form"> {{.locale.Tr "settings.confirm_delete_account"}} - </div> + </button> <a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a> </div> </form> diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index b0cd37d44c..18132c4a75 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -276,15 +276,16 @@ <div class="content"> <p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p> </div> - <div class="actions"> - <div class="ui cancel button"> - <i class="remove icon"></i> + + <div class="actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl */}} + <button class="ui green basic inverted cancel button"> + {{svg "octicon-x"}} {{.locale.Tr "settings.access_token_deletion_cancel_action"}} - </div> - <div class="ui red basic inverted ok button"> - <i class="checkmark icon"></i> + </button> + <button class="ui red basic inverted ok button"> + {{svg "octicon-check"}} {{.locale.Tr "settings.access_token_deletion_confirm_action"}} - </div> + </button> </div> </div> diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index c80890940a..93ca12a088 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -1,7 +1,7 @@ <h4 class="ui top attached header"> {{.locale.Tr "settings.manage_gpg_keys"}} <div class="ui right"> - <div class="ui primary tiny show-panel button" data-panel="#add-gpg-key-panel">{{.locale.Tr "settings.add_key"}}</div> + <button class="ui primary tiny show-panel button" data-panel="#add-gpg-key-panel">{{.locale.Tr "settings.add_key"}}</button> </div> </h4> <div class="ui attached segment"> diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index cc1152b739..8012b874cd 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -3,9 +3,9 @@ {{.locale.Tr "settings.manage_ssh_principals"}} <div class="ui right"> {{if not .DisableSSH}} - <div class="ui primary tiny show-panel button" data-panel="#add-ssh-principal-panel">{{.locale.Tr "settings.add_new_principal"}}</div> + <button class="ui primary tiny show-panel button" data-panel="#add-ssh-principal-panel">{{.locale.Tr "settings.add_new_principal"}}</button> {{else}} - <div class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</div> + <button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button> {{end}} </div> </h4> diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 891959d351..1ff4dab34e 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -2,11 +2,11 @@ {{.locale.Tr "settings.manage_ssh_keys"}} <div class="ui right"> {{if not .DisableSSH}} - <div id="add-ssh-button" class="ui primary tiny show-panel button" data-panel="#add-ssh-key-panel"> + <button id="add-ssh-button" class="ui primary tiny show-panel button" data-panel="#add-ssh-key-panel"> {{.locale.Tr "settings.add_key"}} - </div> + </button> {{else}} - <div class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</div> + <button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button> {{end}} </div> </h4> diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 902b3fb2f3..2e107ca7fa 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -50,16 +50,7 @@ {{$.CsrfTokenHtml}} <input type="hidden" name="id" value="{{$dir}}"> <input type="hidden" name="action" value="adopt"> - <div class="actions"> - <div class="ui red basic inverted cancel button"> - <i class="remove icon"></i> - {{$.locale.Tr "modal.no"}} - </div> - <button class="ui green basic inverted ok button"> - <i class="checkmark icon"></i> - {{$.locale.Tr "modal.yes"}} - </button> - </div> + {{template "base/delete_modal_actions" .}} </form> </div> {{end}} @@ -77,16 +68,7 @@ {{$.CsrfTokenHtml}} <input type="hidden" name="id" value="{{$dir}}"> <input type="hidden" name="action" value="delete"> - <div class="actions"> - <div class="ui red basic inverted cancel button"> - <i class="remove icon"></i> - {{$.locale.Tr "modal.no"}} - </div> - <button class="ui green basic inverted ok button"> - <i class="checkmark icon"></i> - {{$.locale.Tr "modal.yes"}} - </button> - </div> + {{template "base/delete_modal_actions" .}} </form> </div> {{end}} diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl index a4da947628..1a0a8a6432 100644 --- a/templates/user/settings/security/twofa.tmpl +++ b/templates/user/settings/security/twofa.tmpl @@ -13,7 +13,7 @@ <form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form"> {{.CsrfTokenHtml}} <p>{{.locale.Tr "settings.twofa_disable_note"}}</p> - <div class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{$.locale.Tr "settings.twofa_disable"}}</div> + <button class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{$.locale.Tr "settings.twofa_disable"}}</button> </form> {{else}} <p>{{.locale.Tr "settings.twofa_not_enrolled"}}</p> |