diff options
author | David Schneiderbauer <daviian@users.noreply.github.com> | 2018-05-15 12:07:32 +0200 |
---|---|---|
committer | Lauris BH <lauris@nix.lv> | 2018-05-15 13:07:32 +0300 |
commit | 099372d76c411c598285d637bd85c9b2dbc40948 (patch) | |
tree | bce801f16b8534e2ca0dadcbc24455de95f0501c /templates/user/settings/applications.tmpl | |
parent | 1546458f7df4a4f0e77b7ae5cb65baed6feae394 (diff) | |
download | gitea-099372d76c411c598285d637bd85c9b2dbc40948.tar.gz gitea-099372d76c411c598285d637bd85c9b2dbc40948.zip |
Refactor User Settings (#3900)
* moved avatar to profile page
* combined password change, email and account deletion into account settings page
* combined totp, access tokens, linked accounts and openid into security settings page
* move access tokens to applications settings page
* small change to restart drone build
* fix change avatar url on profile page
* redirect old settings urls to new ones
* enforce only one autofocus attribute on settings pages
* set correct redirect status code
* fmt fix
Diffstat (limited to 'templates/user/settings/applications.tmpl')
-rw-r--r-- | templates/user/settings/applications.tmpl | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 4ad5eaa714..f1a3e48115 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -1,8 +1,7 @@ {{template "base/head" .}} -<div class="user settings"> +<div class="user settings applications"> {{template "user/settings/navbar" .}} <div class="ui container"> - {{template "base/alert" .}} <h4 class="ui top attached header"> {{.i18n.Tr "settings.manage_access_token"}} </h4> @@ -13,26 +12,26 @@ </div> {{range .Tokens}} <div class="item"> - <div class="right floated content"> - <button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> + <div class="right floated content"> + <button class="ui red tiny button delete-button" id="delete-token" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> {{$.i18n.Tr "settings.delete_token"}} </button> - </div> - <i class="big send icon {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.token_state_desc"}}" data-variation="inverted tiny"{{end}}></i> - <div class="content"> - <strong>{{.Name}}</strong> - <div class="activity meta"> - <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> - </div> + </div> + <i class="big send icon {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.token_state_desc"}}" data-variation="inverted tiny"{{end}}></i> + <div class="content"> + <strong>{{.Name}}</strong> + <div class="activity meta"> + <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> </div> + </div> </div> {{end}} </div> </div> - <h4 class="ui top attached header"> - {{.i18n.Tr "settings.generate_new_token"}} - </h4> - <div class="ui attached segment"> + <div class="ui attached bottom segment"> + <h5 class="ui top header"> + {{.i18n.Tr "settings.generate_new_token"}} + </h5> <p>{{.i18n.Tr "settings.new_token_desc"}}</p> <form class="ui form ignore-dirty" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} @@ -48,7 +47,7 @@ </div> </div> -<div class="ui small basic delete modal"> +<div class="ui small basic delete modal" id="delete-token"> <div class="ui icon header"> <i class="trash icon"></i> {{.i18n.Tr "settings.access_token_deletion"}} @@ -67,4 +66,6 @@ </div> </div> </div> + + {{template "base/footer" .}} |