Show current avatar next to avatar file picker

Author: CL-Jeremy

templates/org/settings/options.tmpl

@@ -88,9 +88,15 @@
 
 					<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
 						{{.CsrfTokenHtml}}
-						<div class="inline field">
-							<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
-							<input name="avatar" type="file" >
+						<div class="df fw ac">
+							<div class="inline field mb-4">
+								<label>{{.i18n.Tr "settings.avatar"}}</label>
+								{{avatar .Org 28 "mr-5"}}
+							</div>
+							<div class="inline field mb-4">
+								<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
+								<input name="avatar" type="file" >
+							</div>
 						</div>
 
 						<div class="field">

templates/repo/settings/options.tmpl

@@ -57,9 +57,20 @@
 
 			<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
 				{{.CsrfTokenHtml}}
-				<div class="inline field">
-					<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
-					<input name="avatar" type="file" >
+				{{$avatar := (repoAvatar .Repository 28 "mr-5")}}
+				<div class="df fw ac">
+					<div class="inline field mb-4">
+						<label>{{.i18n.Tr "settings.avatar"}}</label>
+						{{if $avatar}}
+							{{$avatar}}
+						{{else}}
+							<div class="ui basic label repo-icon none mr-5">{{svg "octicon-circle-slash" 16}}</div>
+						{{end}}
+					</div>
+					<div class="inline field mb-4">
+						<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
+						<input name="avatar" type="file" >
+					</div>
 				</div>
 
 				<div class="field">

templates/user/settings/profile.tmpl

@@ -100,9 +100,15 @@
 					</div>
 				</div>
 
-				<div class="inline field">
-					<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
-					<input name="avatar" type="file" >
+				<div class="df fw ac">
+					<div class="inline field mb-4">
+						<label>{{.i18n.Tr "settings.avatar"}}</label>
+						{{avatar .SignedUser 28 "mr-5"}}
+					</div>
+					<div class="inline field mb-4">
+						<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
+						<input name="avatar" type="file" >
+					</div>
 				</div>
 
 				<div class="field">

web_src/less/_repository.less

@@ -2895,8 +2895,20 @@ tbody.commit-list {
   }
 }
 
-.repo-icon .svg {
-  vertical-align: middle;
+.repo-icon {
+  &.none {
+    height: 28px;
+    width: 28px;
+    padding: 5px !important;
+
+    .svg {
+      color: var(--color-light-border);
+    }
+  }
+
+  .svg {
+    vertical-align: middle;
+  }
 }
 
 .repo-buttons,