Improve custom avatar UI logic

Author: CL-Jeremy

options/locale/locale_en-US.ini

@@ -468,6 +468,7 @@ keep_activity_private_popup = Makes the activity visible only for you and the ad
 lookup_avatar_by_mail = Look Up Avatar by Email Address
 federated_avatar_lookup = Federated Avatar Lookup
 enable_custom_avatar = Use Custom Avatar
+current_avatar = Current avatar
 choose_new_avatar = Choose new avatar
 update_avatar = Update Avatar
 delete_current_avatar = Delete Current Avatar

templates/org/settings/options.tmpl

@@ -90,7 +90,7 @@
 						{{.CsrfTokenHtml}}
 						<div class="df fw ac">
 							<div class="inline field mb-4">
-								<label>{{.i18n.Tr "settings.avatar"}}</label>
+								<label>{{.i18n.Tr "settings.current_avatar"}}</label>
 								{{avatar .Org 28 "mr-5"}}
 							</div>
 							<div class="inline field mb-4">

templates/repo/settings/options.tmpl

@@ -60,7 +60,7 @@
 				{{$avatar := (repoAvatar .Repository 28 "mr-5")}}
 				<div class="df fw ac">
 					<div class="inline field mb-4">
-						<label>{{.i18n.Tr "settings.avatar"}}</label>
+						<label>{{.i18n.Tr "settings.current_avatar"}}</label>
 						{{if $avatar}}
 							{{$avatar}}
 						{{else}}
@@ -75,7 +75,9 @@
 
 				<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}}/avatar/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a>
+					{{if $avatar}}
+						<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a>
+					{{end}}
 				</div>
 			</form>
 

templates/user/settings/profile.tmpl

@@ -101,10 +101,12 @@
 				</div>
 
 				<div class="df fw ac">
-					<div class="inline field mb-4">
-						<label>{{.i18n.Tr "settings.avatar"}}</label>
-						{{avatar .SignedUser 28 "mr-5"}}
-					</div>
+					{{if .SignedUser.UseCustomAvatar}}
+						<div class="inline field mb-4">
+							<label>{{.i18n.Tr "settings.current_avatar"}}</label>
+							{{avatar .SignedUser 28 "mr-5"}}
+						</div>
+					{{end}}
 					<div class="inline field mb-4">
 						<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
 						<input name="avatar" type="file" >
@@ -113,7 +115,9 @@
 
 				<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}}/avatar/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a>
+					{{if .SignedUser.UseCustomAvatar}}
+						<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a>
+					{{end}}
 				</div>
 			</form>
 		</div>