mirror of https://github.com/gogits/gogs.git
Browse Source
* Add support for federated avatars Fixes #3105 Removes avatar fetching duplication code Adds an "Enable Federated Avatar" checkbox in user settings (defaults to unchecked) Moves avatar settings all in the same form, making local and remote avatars mutually exclusive Renames UploadAvatarForm to AvatarForm as it's not anymore only for uploading * Run gofmt on all modified files * Move Avatar form in its own page * Add go-libravatar dependency to vendor/ dir Hopefully helps with accepting the contribution. See also #3214 * Revert "Add go-libravatar dependency to vendor/ dir" This reverts commit a8cb93ae640bbb90f7d25012fc257bda9fae9b82. * Make federated avatar setting a global configuration Removes the per-user setting * Move avatar handling back to base tool, disable federated avatar in offline mode * Format, handle error * Properly set fallback host * Use unsupported github.com mirror for importing go-libravatar * Remove comment showing life exists outside of github.com ... pity, but contribution would not be accepted otherwise * Use Combo for Get and Post methods over /avatar * FEDERATED_AVATAR -> ENABLE_FEDERATED_AVATAR * Fix persistance of federated avatar lookup checkbox at install time * Federated Avatars -> Enable Federated Avatars * Use len(string) == 0 instead of string == "" * Move import line where it belong See https://github.com/Unknwon/go-code-convention/blob/master/en-US/import_packages.md Pity the import url is still the unofficial one, but oh well... * Save a line (and waste much more expensive time) * Remove redundant parens * Remove an empty line * Remove empty lines * Reorder lines to make diff smaller * Remove another newline Unknwon review got me start a fight against newlines * Move DISABLE_GRAVATAR and ENABLE_FEDERATED_AVATAR after OFFLINE_MODE On re-reading the diff I figured what Unknwon meant here: https://github.com/gogits/gogs/pull/3320/files#r73741106 * Remove newlines that weren't there before my interventionpull/3403/head
Sandro Santilli
8 years ago
committed by
无闻
16 changed files with 157 additions and 59 deletions
@ -0,0 +1,50 @@
|
||||
{{template "base/head" .}} |
||||
<div class="user settings avatar"> |
||||
<div class="ui container"> |
||||
<div class="ui grid"> |
||||
{{template "user/settings/navbar" .}} |
||||
<div class="twelve wide column content"> |
||||
{{template "base/alert" .}} |
||||
<h4 class="ui top attached header"> |
||||
{{.i18n.Tr "settings.avatar"}} |
||||
</h4> |
||||
<div class="ui attached segment"> |
||||
|
||||
<form class="ui form" action="{{.Link}}" method="post" enctype="multipart/form-data"> |
||||
{{.CsrfTokenHtml}} |
||||
{{if not DisableGravatar}} |
||||
<div class="inline field"> |
||||
<div class="ui radio"> |
||||
<input name="source" value="lookup" type="radio" {{if not .SignedUser.UseCustomAvatar}}checked{{end}}> |
||||
<label>{{.i18n.Tr "settings.lookup_avatar_by_mail"}}</label> |
||||
</div> |
||||
</div> |
||||
<div class="field {{if .Err_Gravatar}}error{{end}}"> |
||||
<label for="gravatar">Avatar {{.i18n.Tr "email"}}</label> |
||||
<input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}" /> |
||||
</div> |
||||
{{end}} |
||||
|
||||
<div class="inline field"> |
||||
<div class="ui radio"> |
||||
<input name="source" value="local" type="radio" {{if .SignedUser.UseCustomAvatar}}checked{{end}}> |
||||
<label>{{.i18n.Tr "settings.enable_custom_avatar"}}</label> |
||||
</div> |
||||
</div> |
||||
|
||||
<div class="inline field"> |
||||
<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label> |
||||
<input name="avatar" type="file" > |
||||
</div> |
||||
|
||||
<div class="field"> |
||||
<button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button> |
||||
<a class="ui red button delete-post" data-request-url="{{.Link}}/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a> |
||||
</div> |
||||
</form> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
{{template "base/footer" .}} |
||||
Loading…
Reference in new issue