Add 'Show on a map' button to Location in profile, fix layout

custom/conf/app.example.ini

@@ -827,6 +827,17 @@ LEVEL = Info
 ;; Dependencies can be added from any repository where the user is granted access or only from the current repository depending on this setting.
 ;ALLOW_CROSS_REPOSITORY_DEPENDENCIES = true
 ;;
+;; Enable button that redirects users to a map service in Location fields on profiles
+;ENABLE_LOCATION_BUTTON = true
+;;
+;; Default map service. No external API support has been included. A service has to allow
+;; searching using URL parameters. Only relevant if ENABLE_LOCATION_BUTTON is enabled.
+;; Some examples are:
+;; - https://www.google.com/maps/place/
+;; - https://www.mapquest.com/search/
+;; - https://www.bing.com/maps?where1=
+; LOCATION_QUERY_URL = https://www.openstreetmap.org/search?query=
+;;
 ;; Enable heatmap on users profiles.
 ;ENABLE_USER_HEATMAP = true
 ;;

modules/setting/service.go

@@ -73,6 +73,8 @@ var Service = struct {
 	AllowCrossRepositoryDependencies        bool
 	DefaultAllowOnlyContributorsToTrackTime bool
 	NoReplyAddress                          string
+	EnableLocationButton                    bool
+	LocationQueryURL                        string
 	EnableUserHeatmap                       bool
 	AutoWatchNewRepos                       bool
 	AutoWatchOnChanges                      bool
@@ -185,6 +187,8 @@ func loadServiceFrom(rootCfg ConfigProvider) {
 	Service.AllowCrossRepositoryDependencies = sec.Key("ALLOW_CROSS_REPOSITORY_DEPENDENCIES").MustBool(true)
 	Service.DefaultAllowOnlyContributorsToTrackTime = sec.Key("DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME").MustBool(true)
 	Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply." + Domain)
+	Service.EnableLocationButton = sec.Key("ENABLE_OSM_BUTTON").MustBool(true)
+	Service.LocationQueryURL = sec.Key("LOCATION_QUERY_URL").MustString("https://www.openstreetmap.org/search?query=")
 	Service.EnableUserHeatmap = sec.Key("ENABLE_USER_HEATMAP").MustBool(true)
 	Service.AutoWatchNewRepos = sec.Key("AUTO_WATCH_NEW_REPOS").MustBool(true)
 	Service.AutoWatchOnChanges = sec.Key("AUTO_WATCH_ON_CHANGES").MustBool(false)

options/locale/locale_en-US.ini

@@ -601,6 +601,7 @@ user_bio = Biography
 disabled_public_activity = This user has disabled the public visibility of the activity.
 email_visibility.limited = Your email address is visible to all authenticated users
 email_visibility.private = Your email address is only visible to you and administrators
+redirect_to_osm = View on OpenStreetMap
 
 form.name_reserved = The username "%s" is reserved.
 form.name_pattern_not_allowed = The pattern "%s" is not allowed in a username.
@@ -627,6 +628,7 @@ webauthn = Security Keys
 
 public_profile = Public Profile
 biography_placeholder = Tell us a little bit about yourself
+location_placeholder = Share your approximate location with others
 profile_desc = Your email address will be used for notifications and other operations.
 password_username_disabled = Non-local users are not allowed to change their username. Please contact your site administrator for more details.
 full_name = Full Name

routers/web/user/profile.go

@@ -52,6 +52,8 @@ func userProfile(ctx *context.Context) {
 
 	ctx.Data["Title"] = ctx.ContextUser.DisplayName()
 	ctx.Data["PageIsUserProfile"] = true
+	ctx.Data["EnableLocationButton"] = setting.Service.EnableLocationButton
+	ctx.Data["LocationQueryURL"] = setting.Service.LocationQueryURL
 
 	// prepare heatmap data
 	if setting.Service.EnableUserHeatmap {

templates/shared/user/profile_big_avatar.tmpl

@@ -24,7 +24,19 @@
 	<div class="extra content gt-word-break">
 		<ul>
 			{{if .ContextUser.Location}}
-				<li>{{svg "octicon-location"}} {{.ContextUser.Location}}</li>
+				<li>
+					{{svg "octicon-location"}}
+					<span>{{.ContextUser.Location}}</span>
+					{{/* Checking whether .LocationQueryURL is empty is arguably excessive, but makes this functionality foolproof */}}
+					{{if and .EnableLocationButton .LocationQueryURL}}
+						{{/* We presume that the LocationQueryURL is safe, as it is provided by the site administrator. */}}
+						<a href="{{.LocationQueryURL | Safe}}{{.ContextUser.Location}}" rel="nofollow noreferrer">
+							<i class="ui right" data-tooltip-content="{{.locale.Tr "user.redirect_to_osm"}}">
+								{{svg "octicon-link-external"}}
+							</i>
+						</a>
+					{{end}}
+				</li>
 			{{end}}
 			{{if (eq .SignedUserID .ContextUser.ID)}}
 				<li>

templates/user/settings/profile.tmpl

@@ -35,7 +35,7 @@
 				</div>
 				<div class="field">
 					<label for="location">{{.locale.Tr "settings.location"}}</label>
-					<input id="location" name="location"  value="{{.SignedUser.Location}}" maxlength="50">
+					<input id="location" name="location" placeholder="{{.locale.Tr "settings.location_placeholder"}}" value="{{.SignedUser.Location}}" maxlength="50">
 				</div>
 
 				<div class="divider"></div>

tests/integration/user_test.go

@@ -4,6 +4,7 @@
 package integration
 
 import (
+	"fmt"
 	"net/http"
 	"testing"
 
@@ -12,6 +13,7 @@
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/modules/translation"

web_src/css/user.css

@@ -26,9 +26,14 @@
 }
 
 .user.profile .ui.card .extra.content > ul > li:not(:last-child) {
+  display: flex;
   border-bottom: 1px solid var(--color-secondary);
 }
 
+.user.profile .ui.card .extra.content > ul > li:not(:last-child) > :nth-child(2) {
+  flex-grow: 1;
+}
+
 .user.profile .ui.card .extra.content > ul > li .svg {
   margin-left: 1px;
   margin-right: 5px;