Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/glance/static/js/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,15 +270,15 @@ function setupGroups() {
return;
}

openURLInNewTab(title.dataset.titleUrl, false);
openURLInNewTab(title.dataset.titleUrl, false, title.dataset.titleTarget);
event.preventDefault();
});
}

title.addEventListener("click", () => {
if (t == current) {
if (title.dataset.titleUrl !== undefined) {
openURLInNewTab(title.dataset.titleUrl);
openURLInNewTab(title.dataset.titleUrl, undefined, title.dataset.titleTarget);
}

return;
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/static/js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export function clamp(value, min, max) {
// NOTE: inconsistent behavior between browsers when it comes to
// whether the newly opened tab gets focused or not, potentially
// depending on the event that this function is called from
export function openURLInNewTab(url, focus = true) {
const newWindow = window.open(url, '_blank', 'noopener,noreferrer');
export function openURLInNewTab(url, focus = true, target = '_blank') {
const newWindow = window.open(url, target, 'noopener,noreferrer');

if (focus && newWindow != null) newWindow.focus();
}
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/templates/change-detection.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<ul class="list list-gap-14 collapsible-container" data-collapse-after="{{ .CollapseAfter }}">
{{ range .ChangeDetections }}
<li>
<a class="size-h4 block text-truncate color-highlight" href="{{ .URL }}" target="_blank" rel="noreferrer">{{ .Title }}</a>
<a class="size-h4 block text-truncate color-highlight" href="{{ .URL }}" target="{{ $.Target }}" rel="noreferrer">{{ .Title }}</a>
<ul class="list-horizontal-text">
<li {{ dynamicRelativeTimeAttrs .LastChanged }}></li>
<li class="shrink min-width-0"><a class="visited-indicator" href="{{ .DiffURL }}" target="_blank" rel="noreferrer">diff:{{ .PreviousHash }}</a></li>
<li class="shrink min-width-0"><a class="visited-indicator" href="{{ .DiffURL }}" target="{{ $.Target }}" rel="noreferrer">diff:{{ .PreviousHash }}</a></li>
</ul>
</li>
{{ else }}
Expand Down
2 changes: 1 addition & 1 deletion internal/glance/templates/docker-containers.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<div class="min-width-0 grow">
{{- if .URL }}
<a href="{{ .URL | safeURL }}" class="color-highlight size-title-dynamic block text-truncate" {{ if not .SameTab }}target="_blank"{{ end }} rel="noreferrer">{{ .Name }}</a>
<a href="{{ .URL | safeURL }}" class="color-highlight size-title-dynamic block text-truncate" target="{{ .Target }}" rel="noreferrer">{{ .Name }}</a>
{{- else }}
<div class="color-highlight text-truncate size-title-dynamic">{{ .Name }}</div>
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/templates/forum-posts.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{{- end }}
{{- end }}
<div class="grow min-width-0">
<a href="{{ .DiscussionUrl | safeURL }}" class="size-title-dynamic color-primary-if-not-visited" target="_blank" rel="noreferrer">{{ .Title }}</a>
<a href="{{ .DiscussionUrl | safeURL }}" class="size-title-dynamic color-primary-if-not-visited" target="{{ $.Target }}" rel="noreferrer">{{ .Title }}</a>
{{- if .Tags }}
<div class="inline-block forum-post-tags-container">
<ul class="attachments">
Expand All @@ -41,7 +41,7 @@
<li class="shrink-0">{{ .Score | formatApproxNumber }} points</li>
<li class="shrink-0{{ if .TargetUrl | safeURL }} forum-post-autohide{{ end }}">{{ .CommentCount | formatApproxNumber }} comments</li>
{{- if .TargetUrl }}
<li class="min-width-0"><a class="visited-indicator text-truncate block" href="{{ .TargetUrl }}" target="_blank" rel="noreferrer">{{ .TargetUrlDomain }}</a></li>
<li class="min-width-0"><a class="visited-indicator text-truncate block" href="{{ .TargetUrl }}" target="{{ $.Target }}" rel="noreferrer">{{ .TargetUrlDomain }}</a></li>
{{- end }}
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion internal/glance/templates/group.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="widget-group-header">
<div class="widget-header gap-20" role="tablist">
{{- range $i, $widget := .Widgets }}
<button class="widget-group-title{{ if eq $i 0 }} widget-group-title-current{{ end }}"{{ if ne "" .TitleURL }} data-title-url="{{ .TitleURL }}"{{ end }} aria-selected="{{ if eq $i 0 }}true{{ else }}false{{ end }}" arial-level="2" role="tab" aria-controls="widget-{{ .GetID }}-tabpanel-{{ $i }}" id="widget-{{ .GetID }}-tab-{{ $i }}">{{ $widget.Title }}</button>
<button class="widget-group-title{{ if eq $i 0 }} widget-group-title-current{{ end }}"{{ if ne "" .TitleURL }} data-title-url="{{ .TitleURL }}"{{ end }}{{ if ne "" .TitleTarget }} data-title-target="{{ .TitleTarget }}"{{ end }} aria-selected="{{ if eq $i 0 }}true{{ else }}false{{ end }}" arial-level="2" role="tab" aria-controls="widget-{{ .GetID }}-tabpanel-{{ $i }}" id="widget-{{ .GetID }}-tab-{{ $i }}">{{ $widget.Title }}</button>
{{- end }}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/templates/markets.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
{{ range .Markets }}
<div class="flex items-center gap-15">
<div class="min-width-0">
<a{{ if ne "" .SymbolLink }} href="{{ .SymbolLink }}" target="_blank" rel="noreferrer"{{ end }} class="color-highlight size-h3 block text-truncate">{{ .Symbol }}</a>
<a{{ if ne "" .SymbolLink }} href="{{ .SymbolLink }}" target="{{ $.Target }}" rel="noreferrer"{{ end }} class="color-highlight size-h3 block text-truncate">{{ .Symbol }}</a>
<div class="text-truncate">{{ .Name }}</div>
</div>

<a class="market-chart" {{ if ne "" .ChartLink }} href="{{ .ChartLink }}" target="_blank" rel="noreferrer"{{ end }}>
<a class="market-chart" {{ if ne "" .ChartLink }} href="{{ .ChartLink }}" target="{{ $.Target }}" rel="noreferrer"{{ end }}>
<svg class="market-chart shrink-0" viewBox="0 0 100 50">
<polyline fill="none" stroke="var(--color-text-subdue)" stroke-linejoin="round" stroke-width="1.5px" points="{{ .SvgChartPoints }}" vector-effect="non-scaling-stroke"></polyline>
</svg>
Expand Down
2 changes: 1 addition & 1 deletion internal/glance/templates/monitor-compact.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{{ if .Icon.URL }}
{{ .Icon.ElemWithClass "square-20" }}
{{ end }}
<a class="size-title-dynamic color-highlight text-truncate block grow" href="{{ .URL | safeURL }}" {{ if not .SameTab }}target="_blank"{{ end }} rel="noreferrer">{{ .Title }}</a>
<a class="size-title-dynamic color-highlight text-truncate block grow" href="{{ .URL | safeURL }}" target="{{ .Target }}" rel="noreferrer">{{ .Title }}</a>
{{ if not .Status.TimedOut }}<div>{{ .Status.ResponseTime.Milliseconds | formatNumber }}ms</div>{{ end }}
{{ if eq .StatusStyle "ok" }}
<div class="square-18 shrink-0" title="{{ .Status.Code }}">
Expand Down
2 changes: 1 addition & 1 deletion internal/glance/templates/monitor.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{ .Icon.ElemWithClass "square-32" }}
{{ end }}
<div class="grow min-width-0">
<a class="size-h3 color-highlight text-truncate block" href="{{ .URL | safeURL }}" {{ if not .SameTab }}target="_blank"{{ end }} rel="noreferrer">{{ .Title }}</a>
<a class="size-h3 color-highlight text-truncate block" href="{{ .URL | safeURL }}" target="{{ .Target }}" rel="noreferrer">{{ .Title }}</a>
<ul class="list-horizontal-text">
{{ if not .Status.Error }}
<li title="{{ .Status.Code }}">{{ .StatusText }}</li>
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/templates/reddit-horizontal-cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
{{ end }}
<div class="padding-widget flex flex-column grow relative">
{{ if ne "" .TargetUrl }}
<a class="color-highlight size-h5 text-truncate visited-indicator" href="{{ .TargetUrl }}" target="_blank" rel="noreferrer">{{ .TargetUrlDomain }}</a>
<a class="color-highlight size-h5 text-truncate visited-indicator" href="{{ .TargetUrl }}" target="{{ $.Target }}" rel="noreferrer">{{ .TargetUrlDomain }}</a>
{{ else }}
<div class="color-highlight size-h5 text-truncate">/r/{{ $.Subreddit }}</div>
{{ end }}
<a href="{{ .DiscussionUrl }}" class="text-truncate-3-lines color-primary-if-not-visited margin-top-7 margin-bottom-auto" target="_blank" rel="noreferrer">{{ .Title }}</a>
<a href="{{ .DiscussionUrl }}" class="text-truncate-3-lines color-primary-if-not-visited margin-top-7 margin-bottom-auto" target="{{ $.Target }}" rel="noreferrer">{{ .Title }}</a>
<ul class="list-horizontal-text margin-top-7">
<li {{ dynamicRelativeTimeAttrs .TimePosted }}></li>
<li>{{ .Score | formatApproxNumber }} points</li>
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/templates/reddit-vertical-cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
{{ end }}
<div class="padding-widget relative">
{{ if ne "" .TargetUrl }}
<a class="color-highlight size-h5 text-truncate visited-indicator block" href="{{ .TargetUrl }}" target="_blank" rel="noreferrer">{{ .TargetUrlDomain }}</a>
<a class="color-highlight size-h5 text-truncate visited-indicator block" href="{{ .TargetUrl }}" target="{{ $.Target }}" rel="noreferrer">{{ .TargetUrlDomain }}</a>
{{ else }}
<div class="color-highlight size-h5 text-truncate">/r/{{ $.Subreddit }}</div>
{{ end }}
<a href="{{ .DiscussionUrl }}" class="text-truncate-3-lines color-primary-if-not-visited margin-top-7" target="_blank" rel="noreferrer">{{ .Title }}</a>
<a href="{{ .DiscussionUrl }}" class="text-truncate-3-lines color-primary-if-not-visited margin-top-7" target="{{ $.Target }}" rel="noreferrer">{{ .Title }}</a>
<ul class="list-horizontal-text margin-top-7">
<li {{ dynamicRelativeTimeAttrs .TimePosted }}></li>
<li>{{ .Score | formatApproxNumber }} points</li>
Expand Down
2 changes: 1 addition & 1 deletion internal/glance/templates/releases.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ range .Releases }}
<li>
<div class="flex items-center gap-10">
<a class="size-h4 block text-truncate color-primary-if-not-visited" href="{{ .NotesUrl }}" target="_blank" rel="noreferrer">{{ .Name }}</a>
<a class="size-h4 block text-truncate color-primary-if-not-visited" href="{{ .NotesUrl }}" target="{{ $.Target }}" rel="noreferrer">{{ .Name }}</a>
{{ if $.ShowSourceIcon }}
<img class="flat-icon release-source-icon" src="{{ .SourceIconURL }}" alt="" loading="lazy">
{{ end }}
Expand Down
14 changes: 7 additions & 7 deletions internal/glance/templates/repository.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{{ template "widget-base.html" . }}

{{ define "widget-content" }}
<a class="size-h4 color-highlight" href="https://github.com/{{ $.Repository.Name }}" target="_blank" rel="noreferrer">{{ .Repository.Name }}</a>
<a class="size-h4 color-highlight" href="https://github.com/{{ $.Repository.Name }}" target="{{ $.Target }}" rel="noreferrer">{{ .Repository.Name }}</a>
<ul class="list-horizontal-text">
<li>{{ .Repository.Stars | formatNumber }} stars</li>
<li>{{ .Repository.Forks | formatNumber }} forks</li>
</ul>

{{ if gt (len .Repository.Commits) 0 }}
<hr class="margin-block-8">
<a class="text-compact" href="https://github.com/{{ $.Repository.Name }}/commits" target="_blank" rel="noreferrer">Last {{ .CommitsLimit }} commits</a>
<a class="text-compact" href="https://github.com/{{ $.Repository.Name }}/commits" target="{{ $.Target }}" rel="noreferrer">Last {{ .CommitsLimit }} commits</a>
<div class="flex gap-7 size-h5 size-base-on-mobile margin-top-3">
<ul class="list list-gap-2">
{{ range .Repository.Commits }}
Expand All @@ -18,15 +18,15 @@
</ul>
<ul class="list list-gap-2 min-width-0">
{{ range .Repository.Commits }}
<li><a class="color-primary-if-not-visited text-truncate block" title="{{ .Author }}" target="_blank" rel="noreferrer" href="https://github.com/{{ $.Repository.Name }}/commit/{{ .Sha }}">{{ .Message }}</a></li>
<li><a class="color-primary-if-not-visited text-truncate block" title="{{ .Author }}" target="{{ $.Target }}" rel="noreferrer" href="https://github.com/{{ $.Repository.Name }}/commit/{{ .Sha }}">{{ .Message }}</a></li>
{{ end }}
</ul>
</div>
{{ end }}

{{ if gt (len .Repository.PullRequests) 0 }}
<hr class="margin-block-8">
<a class="text-compact" href="https://github.com/{{ $.Repository.Name }}/pulls" target="_blank" rel="noreferrer">Open pull requests ({{ .Repository.OpenPullRequests | formatNumber }} total)</a>
<a class="text-compact" href="https://github.com/{{ $.Repository.Name }}/pulls" target="{{ $.Target }}" rel="noreferrer">Open pull requests ({{ .Repository.OpenPullRequests | formatNumber }} total)</a>
<div class="flex gap-7 size-h5 size-base-on-mobile margin-top-3">
<ul class="list list-gap-2">
{{ range .Repository.PullRequests }}
Expand All @@ -35,15 +35,15 @@
</ul>
<ul class="list list-gap-2 min-width-0">
{{ range .Repository.PullRequests }}
<li><a class="color-primary-if-not-visited text-truncate block" target="_blank" rel="noreferrer" href="https://github.com/{{ $.Repository.Name }}/pull/{{ .Number }}">{{ .Title }}</a></li>
<li><a class="color-primary-if-not-visited text-truncate block" target="{{ $.Target }}" rel="noreferrer" href="https://github.com/{{ $.Repository.Name }}/pull/{{ .Number }}">{{ .Title }}</a></li>
{{ end }}
</ul>
</div>
{{ end }}

{{ if gt (len .Repository.Issues) 0 }}
<hr class="margin-block-10">
<a class="text-compact" href="https://github.com/{{ $.Repository.Name }}/issues" target="_blank" rel="noreferrer">Open issues ({{ .Repository.OpenIssues | formatNumber }} total)</a>
<a class="text-compact" href="https://github.com/{{ $.Repository.Name }}/issues" target="{{ $.Target }}" rel="noreferrer">Open issues ({{ .Repository.OpenIssues | formatNumber }} total)</a>
<div class="flex gap-7 size-h5 size-base-on-mobile margin-top-3">
<ul class="list list-gap-2">
{{ range .Repository.Issues }}
Expand All @@ -52,7 +52,7 @@
</ul>
<ul class="list list-gap-2 min-width-0">
{{ range .Repository.Issues }}
<li><a class="color-primary-if-not-visited text-truncate block" target="_blank" rel="noreferrer" href="https://github.com/{{ $.Repository.Name }}/issues/{{ .Number }}">{{ .Title }}</a></li>
<li><a class="color-primary-if-not-visited text-truncate block" target="{{ $.Target }}" rel="noreferrer" href="https://github.com/{{ $.Repository.Name }}/issues/{{ .Number }}">{{ .Title }}</a></li>
{{ end }}
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/templates/rss-detailed-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
{{ end }}
</div>
<div class="grow min-width-0">
<a class="size-h3 color-primary-if-not-visited" href="{{ .Link }}" target="_blank" rel="noreferrer">{{ .Title }}</a>
<a class="size-h3 color-primary-if-not-visited" href="{{ .Link }}" target="{{ $.Target }}" rel="noreferrer">{{ .Title }}</a>
<ul class="list-horizontal-text flex-nowrap">
<li {{ dynamicRelativeTimeAttrs .PublishedAt }}></li>
<li class="min-width-0">
<a class="block text-truncate" href="{{ .ChannelURL }}" target="_blank" rel="noreferrer">{{ .ChannelName }}</a>
<a class="block text-truncate" href="{{ .ChannelURL }}" target="{{ $.Target }}" rel="noreferrer">{{ .ChannelName }}</a>
</li>
</ul>
{{ if ne "" .Description }}
Expand Down
2 changes: 1 addition & 1 deletion internal/glance/templates/rss-horizontal-cards-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</svg>
{{ end }}
<div class="rss-card-2-content padding-inline-widget">
<a href="{{ .Link }}" class="block text-truncate color-primary-if-not-visited" target="_blank" rel="noreferrer">{{ .Title }}</a>
<a href="{{ .Link }}" class="block text-truncate color-primary-if-not-visited" target="{{ $.Target }}" rel="noreferrer">{{ .Title }}</a>
<ul class="list-horizontal-text flex-nowrap margin-top-5">
<li class="shrink-0" {{ dynamicRelativeTimeAttrs .PublishedAt }}></li>
<li class="min-width-0 text-truncate">{{ .ChannelName }}</li>
Expand Down
2 changes: 1 addition & 1 deletion internal/glance/templates/rss-horizontal-cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</svg>
{{ end }}
<div class="margin-bottom-widget padding-inline-widget flex flex-column grow">
<a href="{{ .Link }}" class="text-truncate-3-lines color-primary-if-not-visited margin-top-10 margin-bottom-auto" target="_blank" rel="noreferrer">{{ .Title }}</a>
<a href="{{ .Link }}" class="text-truncate-3-lines color-primary-if-not-visited margin-top-10 margin-bottom-auto" target="{{ $.Target }}" rel="noreferrer">{{ .Title }}</a>
<ul class="list-horizontal-text flex-nowrap margin-top-7">
<li class="shrink-0" {{ dynamicRelativeTimeAttrs .PublishedAt }}></li>
<li class="min-width-0 text-truncate">{{ .ChannelName }}</li>
Expand Down
4 changes: 2 additions & 2 deletions internal/glance/templates/rss-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<ul class="list list-gap-14 collapsible-container{{ if .SingleLineTitles }} single-line-titles{{ end }}" data-collapse-after="{{ .CollapseAfter }}">
{{ range .Items }}
<li>
<a class="title size-title-dynamic color-primary-if-not-visited" href="{{ .Link }}" target="_blank" rel="noreferrer">{{ .Title }}</a>
<a class="title size-title-dynamic color-primary-if-not-visited" href="{{ .Link }}" target="{{ $.Target }}" rel="noreferrer">{{ .Title }}</a>
<ul class="list-horizontal-text flex-nowrap">
<li {{ dynamicRelativeTimeAttrs .PublishedAt }}></li>
<li class="min-width-0">
<a class="block text-truncate" href="{{ .ChannelURL }}" target="_blank" rel="noreferrer">{{ .ChannelName }}</a>
<a class="block text-truncate" href="{{ .ChannelURL }}" target="{{ $.Target }}" rel="noreferrer">{{ .ChannelName }}</a>
</li>
</ul>
</li>
Expand Down
6 changes: 3 additions & 3 deletions internal/glance/templates/twitch-channels.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>
{{ end }}
{{ if .Exists }}
<a href="https://twitch.tv/{{ .Login }}" target="_blank" rel="noreferrer">
<a href="https://twitch.tv/{{ .Login }}" target="{{ $.Target }}" rel="noreferrer">
<img class="twitch-channel-avatar thumbnail" src="{{ .AvatarUrl }}" alt="" loading="lazy">
</a>
{{ else }}
Expand All @@ -23,11 +23,11 @@
{{ end }}
</div>
<div class="min-width-0">
<a href="https://twitch.tv/{{ .Login }}" class="size-h3{{ if .IsLive }} color-highlight{{ end }} block text-truncate" target="_blank" rel="noreferrer">{{ .Name }}</a>
<a href="https://twitch.tv/{{ .Login }}" class="size-h3{{ if .IsLive }} color-highlight{{ end }} block text-truncate" target="{{ $.Target }}" rel="noreferrer">{{ .Name }}</a>
{{ if .Exists }}
{{ if .IsLive }}
{{ if .Category }}
<a class="text-truncate block" href="https://www.twitch.tv/directory/category/{{ .CategorySlug }}" target="_blank" rel="noreferrer">{{ .Category }}</a>
<a class="text-truncate block" href="https://www.twitch.tv/directory/category/{{ .CategorySlug }}" target="{{ $.Target }}" rel="noreferrer">{{ .Category }}</a>
{{ end }}
<ul class="list-horizontal-text">
<li {{ dynamicRelativeTimeAttrs .LiveSince }}></li>
Expand Down
2 changes: 1 addition & 1 deletion internal/glance/templates/twitch-games-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="flex gap-10 items-start">
<img class="twitch-category-thumbnail thumbnail" loading="lazy" src="{{ .AvatarUrl }}" alt="">
<div class="min-width-0">
<a class="size-h3 color-highlight text-truncate block" href="https://www.twitch.tv/directory/category/{{ .Slug }}" target="_blank" rel="noreferrer">{{ .Name }}</a>
<a class="size-h3 color-highlight text-truncate block" href="https://www.twitch.tv/directory/category/{{ .Slug }}" target="{{ $.Target }}" rel="noreferrer">{{ .Name }}</a>
<ul class="list-horizontal-text">
<li>{{ .ViewersCount | formatApproxNumber }} viewers</li>
{{ if .IsNew }}
Expand Down
Loading