From c17f3738377c0939d9f95535990ce05482b2e9d3 Mon Sep 17 00:00:00 2001
From: Minecon724 <minecon724@noreply.git.m724.eu>
Date: Sun, 16 Mar 2025 17:46:43 +0100
Subject: [PATCH] Move user RSS icon (WIP)

Signed-off-by: Minecon724 <minecon724@noreply.git.m724.eu>
---
 templates/shared/user/profile_big_avatar.tmpl |  5 +----
 templates/user/heatmap.tmpl                   |  5 +++++
 web_src/css/features/heatmap.css              |  4 ++++
 web_src/js/components/ActivityHeatmap.vue     | 10 +++++++++-
 web_src/js/features/heatmap.js                |  8 +++++++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl
index d718fa390f..5b4ec0e0c8 100644
--- a/templates/shared/user/profile_big_avatar.tmpl
+++ b/templates/shared/user/profile_big_avatar.tmpl
@@ -22,10 +22,7 @@
 					</a>
 				{{end}}</span>
 		<div class="tw-mt-2">
-			<a class="muted" href="{{.ContextUser.HomeLink}}?tab=followers">{{svg "octicon-people" 18 "tw-mr-1"}}{{ctx.Locale.TrN .NumFollowers "user.followers_one" "user.followers_few" .NumFollowers}}</a> · <a class="muted" href="{{.ContextUser.HomeLink}}?tab=following">{{ctx.Locale.TrN .NumFollowing "user.following_one" "user.following_few" .NumFollowing}}</a>
-			{{if and .EnableFeed (or .IsAdmin (eq .SignedUserID .ContextUser.ID) (not .ContextUser.KeepActivityPrivate))}}
-				<a href="{{.ContextUser.HomeLink}}.rss"><i class="ui text grey tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a>
-			{{end}}
+			<a class="muted" href="{{.ContextUser.HomeLink}}?tab=followers">{{svg "octicon-people" 20 "tw-mr-2"}}{{ctx.Locale.TrN .NumFollowers "user.followers_one" "user.followers_few" .NumFollowers}}</a> · <a class="muted" href="{{.ContextUser.HomeLink}}?tab=following">{{ctx.Locale.TrN .NumFollowing "user.following_one" "user.following_few" .NumFollowing}}</a>
 		</div>
 	</div>
 	<div class="extra content tw-break-anywhere">
diff --git a/templates/user/heatmap.tmpl b/templates/user/heatmap.tmpl
index 05403e34e3..9b1a05fd5a 100644
--- a/templates/user/heatmap.tmpl
+++ b/templates/user/heatmap.tmpl
@@ -8,6 +8,11 @@
 		data-locale-contributions-few="{{ctx.Locale.Tr "heatmap.contributions_few"}}"
 		data-locale-more="{{ctx.Locale.Tr "heatmap.more"}}"
 		data-locale-less="{{ctx.Locale.Tr "heatmap.less"}}"
+		data-locale-rss-feed="{{ctx.Locale.Tr "rss_feed"}}"
+		{{if and .EnableFeed (or .IsAdmin (eq .SignedUserID .ContextUser.ID) (not .ContextUser.KeepActivityPrivate))}}
+			data-rss-target="{{.ContextUser.HomeLink}}.rss"
+		{{end}}
 	></div>
 	<div class="divider"></div>
+	<div id="rss-icon-src" style="display: none;">{{ svg "octicon-rss" 16 }}</div>
 {{end}}
diff --git a/web_src/css/features/heatmap.css b/web_src/css/features/heatmap.css
index c064590c46..d5472bed92 100644
--- a/web_src/css/features/heatmap.css
+++ b/web_src/css/features/heatmap.css
@@ -56,3 +56,7 @@
     bottom: -4px;
   }
 }
+
+.vch__legend-right {
+  margin-right: 1em;
+}
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index be0841e831..dffad7926d 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -12,6 +12,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    extra: {
+      type: Object,
+      default: () => {},
+    },
   },
   data: () => ({
     colorRange: [
@@ -54,7 +58,11 @@ export default {
 };
 </script>
 <template>
-  <div class="total-contributions">
+  <div class="total-contributions tw-ml-2">
+    <a v-if="extra.rss_target" :href="extra.rss_target">
+      <i class="ui text grey tw-mr-1" :data-tooltip-content="locale.rss_feed" v-html="extra.rss_icon"/>
+    </a>
+
     {{ locale.contributions_in_the_last_12_months }}
   </div>
   <calendar-heatmap
diff --git a/web_src/js/features/heatmap.js b/web_src/js/features/heatmap.js
index 688f06c2b2..56762de7f5 100644
--- a/web_src/js/features/heatmap.js
+++ b/web_src/js/features/heatmap.js
@@ -28,9 +28,15 @@ export function initHeatmap() {
       contributions_few: el.getAttribute('data-locale-contributions-few'),
       more: el.getAttribute('data-locale-more'),
       less: el.getAttribute('data-locale-less'),
+      rss_feed: el.getAttribute('data-locale-rss-feed'),
     };
 
-    const View = createApp(ActivityHeatmap, {values, locale});
+    const extra = {
+      rss_target: el.getAttribute('data-rss-target'),
+      rss_icon: document.getElementById('rss-icon-src').innerHTML,
+    };
+
+    const View = createApp(ActivityHeatmap, {values, locale, extra});
     View.mount(el);
     el.classList.remove('is-loading');
   } catch (err) {