diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index f5b0e3f377..7a4968ebe6 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -7,6 +7,7 @@
{{if .EnableHeatmap}} {{template "user/dashboard/heatmap" .}} +
{{end}} {{template "user/dashboard/feeds" .}}
diff --git a/templates/user/dashboard/heatmap.tmpl b/templates/user/dashboard/heatmap.tmpl index e1a3ca7d3a..626c70dd8d 100644 --- a/templates/user/dashboard/heatmap.tmpl +++ b/templates/user/dashboard/heatmap.tmpl @@ -4,5 +4,4 @@
{{.i18n.Tr "user.heatmap.loading"}}
-
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index f3cac7befb..e07b4b0dd8 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -104,16 +104,10 @@ {{if eq .TabName "activity"}} - {{if .EnableHeatmap}} -
- -
-
{{.i18n.Tr "user.heatmap.loading"}}
-
-
-
-
- {{end}} + {{if .EnableHeatmap}} + {{template "user/dashboard/heatmap" .}} +
+ {{end}}
{{template "user/dashboard/feeds" .}}
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue index 3c46748816..ec241b64fa 100644 --- a/web_src/js/components/ActivityHeatmap.vue +++ b/web_src/js/components/ActivityHeatmap.vue @@ -7,7 +7,6 @@ {{ totalContributions }} total contributions in the last 12 months -