Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main:
  Github style following followers (#19482)
  alpine 3.16 (go-gitea#19797)

Author: zjjhot

Dockerfile

@@ -1,5 +1,5 @@
 #Build stage
-FROM golang:1.18-alpine3.15 AS build-env
+FROM golang:1.18-alpine3.16 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
@@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 # Begin env-to-ini build
 RUN go build contrib/environment-to-ini/environment-to-ini.go
 
-FROM alpine:3.15
+FROM alpine:3.16
 LABEL maintainer="[email protected]"
 
 EXPOSE 22 3000

Dockerfile.rootless

@@ -1,5 +1,5 @@
 #Build stage
-FROM golang:1.18-alpine3.15 AS build-env
+FROM golang:1.18-alpine3.16 AS build-env
 
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
@@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 # Begin env-to-ini build
 RUN go build contrib/environment-to-ini/environment-to-ini.go
 
-FROM alpine:3.15
+FROM alpine:3.16
 LABEL maintainer="[email protected]"
 
 EXPOSE 2222 3000

templates/user/profile.tmpl

@@ -17,6 +17,7 @@
 						{{if .Owner.FullName}}<span class="header text center">{{.Owner.FullName}}</span>{{end}}
 						<span class="username text center">{{.Owner.Name}}</span>
 						<a href="{{.Owner.HomeLink}}.rss"><i class="ui grey icon tooltip ml-3" data-content="{{.i18n.Tr "rss_feed"}}" data-position="bottom center">{{svg "octicon-rss" 18}}</i></a>
+						<a class="muted" href="{{.Owner.HomeLink}}?tab=followers">{{svg "octicon-person" 18 "mr-2"}}{{.Owner.NumFollowers}} {{.i18n.Tr "user.followers"}}</a> · <a class="muted" href="{{.Owner.HomeLink}}?tab=following">{{.Owner.NumFollowing}} {{.i18n.Tr "user.following"}}</a>
 					</div>
 					<div class="extra content word-break">
 						<ul>
@@ -108,18 +109,6 @@
 							{{svg "octicon-eye"}} {{.i18n.Tr "user.watched"}}
 						</a>
 					{{end}}
-					<a class='{{if eq .TabName "following"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=following">
-						{{svg "octicon-person"}} {{.i18n.Tr "user.following"}}
-						{{if .Owner.NumFollowing}}
-							<div class="ui primary label">{{.Owner.NumFollowing}}</div>
-						{{end}}
-					</a>
-					<a class='{{if eq .TabName "followers"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=followers">
-						{{svg "octicon-person"}} {{.i18n.Tr "user.followers"}}
-						{{if .Owner.NumFollowers}}
-							<div class="ui primary label">{{.Owner.NumFollowers}}</div>
-						{{end}}
-					</a>
 				</div>
 
 				{{if eq .TabName "activity"}}