git724/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Move user RSS icon (WIP)

Browse source 
Signed-off-by: Minecon724 <minecon724@noreply.git.m724.eu>
This commit is contained in:
Minecon724 2025-03-16 17:46:43 +01:00
parent a94e53c017
commit c17f373837
Signed by: Minecon724
GPG key ID: A02E6E67AB961189
5 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
templates/shared/user/profile_big_avatar.tmpl
View file

@ -22,10 +22,7 @@
</a> </a>
{{end}}</span> {{end}}</span>
<div class="tw-mt-2"> <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> <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>
{{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}}
</div> </div>
</div> </div>
<div class="extra content tw-break-anywhere"> <div class="extra content tw-break-anywhere">

5
templates/user/heatmap.tmpl
View file

@ -8,6 +8,11 @@
data-locale-contributions-few="{{ctx.Locale.Tr "heatmap.contributions_few"}}" data-locale-contributions-few="{{ctx.Locale.Tr "heatmap.contributions_few"}}"
data-locale-more="{{ctx.Locale.Tr "heatmap.more"}}" data-locale-more="{{ctx.Locale.Tr "heatmap.more"}}"
data-locale-less="{{ctx.Locale.Tr "heatmap.less"}}" 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>
<div class="divider"></div> <div class="divider"></div>
<div id="rss-icon-src" style="display: none;">{{ svg "octicon-rss" 16 }}</div>
{{end}} {{end}}

4
web_src/css/features/heatmap.css
View file

@ -56,3 +56,7 @@
bottom: -4px; bottom: -4px;
} }
} }
.vch__legend-right {
margin-right: 1em;
}

10
web_src/js/components/ActivityHeatmap.vue
View file

@ -12,6 +12,10 @@ export default {
type: Object, type: Object,
default: () => {}, default: () => {},
}, },
extra: {
type: Object,
default: () => {},
},
}, },
data: () => ({ data: () => ({
colorRange: [ colorRange: [
@ -54,7 +58,11 @@ export default {
}; };
</script> </script>
<template> <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 }} {{ locale.contributions_in_the_last_12_months }}
</div> </div>
<calendar-heatmap <calendar-heatmap

8
web_src/js/features/heatmap.js
View file

@ -28,9 +28,15 @@ export function initHeatmap() {
contributions_few: el.getAttribute('data-locale-contributions-few'), contributions_few: el.getAttribute('data-locale-contributions-few'),
more: el.getAttribute('data-locale-more'), more: el.getAttribute('data-locale-more'),
less: el.getAttribute('data-locale-less'), 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); View.mount(el);
el.classList.remove('is-loading'); el.classList.remove('is-loading');
} catch (err) { } catch (err) {