Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove uneccessary details to link titles #2879

Merged
merged 1 commit into from
Jun 18, 2020
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

<span class="plugin-version">{{ plugin.version }}</span>

<a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="plugin.homepage" i18n-title title="Go to the plugin homepage">
<a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="plugin.homepage" i18n-title title="Plugin homepage (new window)">
<my-global-icon iconName="home"></my-global-icon>
</a>

<a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="'https://www.npmjs.com/package/peertube-plugin-' + plugin.name" i18n-title title="Go to the plugin homepage">
<a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="'https://www.npmjs.com/package/peertube-plugin-' + plugin.name" i18n-title title="Plugin homepage (new window)">
<my-global-icon iconName="npm"></my-global-icon>
</a>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@

<span class="plugin-version">{{ plugin.latestVersion }}</span>

<a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="plugin.homepage" i18n-title title="Go to the plugin homepage">
<a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="plugin.homepage" i18n-title title="Plugin homepage (new window)">
<my-global-icon iconName="home"></my-global-icon>
</a>

<a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="'https://www.npmjs.com/package/peertube-plugin-' + plugin.name" i18n-title title="Go to the plugin npm package">
<a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="'https://www.npmjs.com/package/peertube-plugin-' + plugin.name" i18n-title title="Plugin npm package (new window)">
<my-global-icon iconName="npm"></my-global-icon>
</a>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ <h1 class="sr-only" i18n>Ownership changes</h1>
<ng-template pTemplate="body" let-videoChangeOwnership>
<tr>
<td>
<a [href]="videoChangeOwnership.initiatorAccount.url" i18n-title title="Go to the account"
<a [href]="videoChangeOwnership.initiatorAccount.url" i18n-title title="Account page"
target="_blank" rel="noopener noreferrer">
{{ createByString(videoChangeOwnership.initiatorAccount) }}
</a>
</td>
<td>
<a [href]="videoChangeOwnership.video.url" i18n-title title="Go to the video" target="_blank" rel="noopener noreferrer">
<a [href]="videoChangeOwnership.video.url" i18n-title title="Video page" target="_blank" rel="noopener noreferrer">
{{ videoChangeOwnership.video.name }}
</a>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ <h1 class="sr-only" i18n>Subscriptions</h1>
</a>

<div class="video-channel-info">
<a [routerLink]="[ '/video-channels', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Go to the channel">
<a [routerLink]="[ '/video-channels', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Channel page">
<div class="video-channel-display-name">{{ videoChannel.displayName }}</div>
<div class="video-channel-name">{{ videoChannel.nameWithHost }}</div>
</a>

<div i18n class="video-channel-followers">{{ videoChannel.followersCount }} subscribers</div>

<a [routerLink]="[ '/accounts', videoChannel.ownerBy ]" i18n-title title="Go the owner account page" class="actor-owner">
<a [routerLink]="[ '/accounts', videoChannel.ownerBy ]" i18n-title title="Owner account page" class="actor-owner">
<span i18n>Created by {{ videoChannel.ownerBy }}</span>
<img [src]="videoChannel.ownerAvatarUrl" alt="Owner account avatar" />
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h1 class="sr-only" i18n>My channels</h1>
</a>

<div class="video-channel-info">
<a [routerLink]="[ '/video-channels', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Go to the channel">
<a [routerLink]="[ '/video-channels', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Channel page">
<div class="video-channel-display-name">{{ videoChannel.displayName }}</div>
<div class="video-channel-name">{{ videoChannel.nameWithHost }}</div>
</a>
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="top-left-block">
<span class="icon icon-menu" (click)="menu.toggleMenu()"></span>

<a class="peertube-title" [routerLink]="defaultRoute" title="Homepage" i18n-title>
<a class="peertube-title" [routerLink]="defaultRoute">
<span class="icon icon-logo"></span>
<span class="instance-name">{{ instanceName }}</span>
</a>
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/menu/menu.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@

<div class="footer-copyleft">
<small class="d-inline" i18n-title title="powered by PeerTube - CopyLeft 2015-2020">
<a href="https://joinpeertube.org" class="mr-1" i18n-title title="PeerTube website" target="_blank" rel="noopener noreferrer" i18n>powered by PeerTube</a>
<a href="https://joinpeertube.org" class="mr-1" target="_blank" rel="noopener noreferrer" i18n>powered by PeerTube</a>

<a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" i18n-title title="PeerTube license" target="_blank" rel="noopener noreferrer">
<a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" target="_blank" rel="noopener noreferrer">
<span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">&copy;</span> 2015-2020
</a>
</small>
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/shared/channel/avatar.component.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="wrapper" [ngClass]="'avatar-' + size">
<a [routerLink]="[ '/video-channels', video.byVideoChannel ]" [title]="channelLinkTitle">
<img [src]="video.videoChannelAvatarUrl" alt="Channel avatar" />
<img [src]="video.videoChannelAvatarUrl" i18n-alt alt="Channel avatar" />
</a>
<a [routerLink]="[ '/accounts', video.byAccount ]" [title]="accountLinkTitle">
<img [src]="video.accountAvatarUrl" alt="Account avatar" />
<img [src]="video.accountAvatarUrl" i18n-alt alt="Account avatar" />
</a>
</div>
4 changes: 2 additions & 2 deletions client/src/app/shared/channel/avatar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ export class AvatarComponent implements OnInit {

ngOnInit () {
this.channelLinkTitle = this.i18n(
'Go to the channel page of {{name}} ({{handle}})',
'{{name}} (channel page)',
{ name: this.video.channel.name, handle: this.video.byVideoChannel }
)
this.accountLinkTitle = this.i18n(
'Go to the account page of {{name}} ({{handle}})',
'{{name}} (account page)',
{ name: this.video.account.name, handle: this.video.byAccount }
)
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/shared/video/video-miniature.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export class VideoMiniatureComponent implements OnInit {
this.setUpBy()

this.channelLinkTitle = this.i18n(
'Go to the channel page of {{name}} ({{handle}})',
'{{name}} (channel page)',
{ name: this.video.channel.name, handle: this.video.byVideoChannel }
)

Expand Down
4 changes: 2 additions & 2 deletions client/src/app/videos/+video-watch/video-watch.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ <h1 class="video-info-name">{{ video.name }}</h1>
<avatar-channel [video]="video"></avatar-channel>

<div class="video-info-channel-left-links ml-1">
<a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Go the channel page">
<a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Channel page">
{{ video.channel.displayName }}
</a>
<a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Go to the account page">
<a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Account page">
<span i18n>By {{ video.byAccount }}</span>
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class PeerTubeLinkButton extends Button {
const el = videojs.dom.createEl('a', {
href: buildVideoLink(),
innerHTML: 'PeerTube',
title: this.player().localize('Go to the video page'),
title: this.player().localize('Video page (new window)'),
className: 'vjs-peertube-link',
target: '_blank'
})
Expand Down