aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKimsible <kimsible@users.noreply.github.com>2021-04-28 23:45:23 +0200
committerKimsible <kimsible@users.noreply.github.com>2021-05-05 11:48:25 +0200
commit718873964490d1aa31b0e99852002165637e4b9e (patch)
tree55b66793e382e901a4fbceb15fc2b5822e54e650
parent69e076ddb0deda9e4120bab095d3369bb19fbd1e (diff)
downloadPeerTube-718873964490d1aa31b0e99852002165637e4b9e.tar.gz
PeerTube-718873964490d1aa31b0e99852002165637e4b9e.tar.zst
PeerTube-718873964490d1aa31b0e99852002165637e4b9e.zip
Make /a and /c default URLs for accounts and channels
-rw-r--r--client/src/app/+accounts/account-video-channels/account-video-channels.component.ts2
-rw-r--r--client/src/app/+admin/users/user-edit/user-edit.component.html2
-rw-r--r--client/src/app/+admin/users/user-list/user-list.component.html2
-rw-r--r--client/src/app/+my-library/+my-video-channels/my-video-channels.component.html4
-rw-r--r--client/src/app/+my-library/my-subscriptions/my-subscriptions.component.html6
-rw-r--r--client/src/app/+remote-interaction/remote-interaction.component.ts2
-rw-r--r--client/src/app/+search/search.component.ts2
-rw-r--r--client/src/app/+video-channels/video-channels.component.ts2
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.component.html2
-rw-r--r--client/src/app/+videos/+video-watch/video-avatar-channel.component.html4
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.html6
-rw-r--r--client/src/app/+videos/video-list/overview/video-overview.component.html2
-rw-r--r--client/src/app/app-routing.module.ts12
-rw-r--r--client/src/app/menu/menu.component.html2
-rw-r--r--client/src/app/root.component.ts8
-rw-r--r--client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts2
-rw-r--r--client/src/app/shared/shared-main/users/user-notification.model.ts2
-rw-r--r--client/src/app/shared/shared-video-comment/video-comment.model.ts2
-rw-r--r--client/src/app/shared/shared-video-miniature/video-miniature.component.html8
-rw-r--r--client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html2
-rw-r--r--client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html2
21 files changed, 38 insertions, 38 deletions
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
index 0628c7a96..96d1e0f85 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.ts
@@ -133,6 +133,6 @@ export class AccountVideoChannelsComponent implements OnInit, OnDestroy {
133 } 133 }
134 134
135 getVideoChannelLink (videoChannel: VideoChannel) { 135 getVideoChannelLink (videoChannel: VideoChannel) {
136 return [ '/video-channels', videoChannel.nameWithHost ] 136 return [ '/c', videoChannel.nameWithHost ]
137 } 137 }
138} 138}
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html
index 5e92c0f36..772ebf272 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/users/user-edit/user-edit.component.html
@@ -10,7 +10,7 @@
10 <ng-container *ngIf="!isCreation()"> 10 <ng-container *ngIf="!isCreation()">
11 <li class="breadcrumb-item active" i18n>Edit</li> 11 <li class="breadcrumb-item active" i18n>Edit</li>
12 <li class="breadcrumb-item active" aria-current="page"> 12 <li class="breadcrumb-item active" aria-current="page">
13 <a *ngIf="user" [routerLink]="[ '/accounts', user?.username ]">{{ user?.username }}</a> 13 <a *ngIf="user" [routerLink]="[ '/a', user?.username ]">{{ user?.username }}</a>
14 </li> 14 </li>
15 </ng-container> 15 </ng-container>
16 </ol> 16 </ol>
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index 44d8a7e87..5b4f35c77 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
@@ -87,7 +87,7 @@
87 </td> 87 </td>
88 88
89 <td *ngIf="isSelected('username')"> 89 <td *ngIf="isSelected('username')">
90 <a i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer" [routerLink]="[ '/accounts/' + user.username ]"> 90 <a i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer" [routerLink]="[ '/a/' + user.username ]">
91 <div class="chip two-lines"> 91 <div class="chip two-lines">
92 <my-actor-avatar [account]="user?.account" size="32"></my-actor-avatar> 92 <my-actor-avatar [account]="user?.account" size="32"></my-actor-avatar>
93 <div> 93 <div>
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html
index e41cbe921..9f139b4f2 100644
--- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html
+++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html
@@ -17,10 +17,10 @@
17 17
18<div class="video-channels"> 18<div class="video-channels">
19 <div *ngFor="let videoChannel of videoChannels; let i = index" class="video-channel"> 19 <div *ngFor="let videoChannel of videoChannels; let i = index" class="video-channel">
20 <my-actor-avatar [channel]="videoChannel" [internalHref]="[ '/video-channels', videoChannel.nameWithHost ]"></my-actor-avatar> 20 <my-actor-avatar [channel]="videoChannel" [internalHref]="[ '/c', videoChannel.nameWithHost ]"></my-actor-avatar>
21 21
22 <div class="video-channel-info"> 22 <div class="video-channel-info">
23 <a [routerLink]="[ '/video-channels', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Channel page"> 23 <a [routerLink]="[ '/c', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Channel page">
24 <div class="video-channel-display-name">{{ videoChannel.displayName }}</div> 24 <div class="video-channel-display-name">{{ videoChannel.displayName }}</div>
25 <div class="video-channel-name">{{ videoChannel.nameWithHost }}</div> 25 <div class="video-channel-name">{{ videoChannel.nameWithHost }}</div>
26 </a> 26 </a>
diff --git a/client/src/app/+my-library/my-subscriptions/my-subscriptions.component.html b/client/src/app/+my-library/my-subscriptions/my-subscriptions.component.html
index f91cebacf..1bd459059 100644
--- a/client/src/app/+my-library/my-subscriptions/my-subscriptions.component.html
+++ b/client/src/app/+my-library/my-subscriptions/my-subscriptions.component.html
@@ -14,17 +14,17 @@
14 14
15<div class="video-channels" myInfiniteScroller [autoInit]="true" (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()"> 15<div class="video-channels" myInfiniteScroller [autoInit]="true" (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()">
16 <div *ngFor="let videoChannel of videoChannels" class="video-channel"> 16 <div *ngFor="let videoChannel of videoChannels" class="video-channel">
17 <my-actor-avatar [channel]="videoChannel" [internalHref]="[ '/video-channels', videoChannel.nameWithHost ]"></my-actor-avatar> 17 <my-actor-avatar [channel]="videoChannel" [internalHref]="[ '/c', videoChannel.nameWithHost ]"></my-actor-avatar>
18 18
19 <div class="video-channel-info"> 19 <div class="video-channel-info">
20 <a [routerLink]="[ '/video-channels', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Channel page"> 20 <a [routerLink]="[ '/c', videoChannel.nameWithHost ]" class="video-channel-names" i18n-title title="Channel page">
21 <div class="video-channel-display-name">{{ videoChannel.displayName }}</div> 21 <div class="video-channel-display-name">{{ videoChannel.displayName }}</div>
22 <div class="video-channel-name">{{ videoChannel.nameWithHost }}</div> 22 <div class="video-channel-name">{{ videoChannel.nameWithHost }}</div>
23 </a> 23 </a>
24 24
25 <div i18n class="video-channel-followers">{{ videoChannel.followersCount }} subscribers</div> 25 <div i18n class="video-channel-followers">{{ videoChannel.followersCount }} subscribers</div>
26 26
27 <a [routerLink]="[ '/accounts', videoChannel.ownerBy ]" i18n-title title="Owner account page" class="actor-owner"> 27 <a [routerLink]="[ '/a', videoChannel.ownerBy ]" i18n-title title="Owner account page" class="actor-owner">
28 <span i18n>Created by {{ videoChannel.ownerBy }}</span> 28 <span i18n>Created by {{ videoChannel.ownerBy }}</span>
29 29
30 <my-actor-avatar [account]="videoChannel.ownerAccount" size="18"></my-actor-avatar> 30 <my-actor-avatar [account]="videoChannel.ownerAccount" size="18"></my-actor-avatar>
diff --git a/client/src/app/+remote-interaction/remote-interaction.component.ts b/client/src/app/+remote-interaction/remote-interaction.component.ts
index e24607b24..3ebe62f49 100644
--- a/client/src/app/+remote-interaction/remote-interaction.component.ts
+++ b/client/src/app/+remote-interaction/remote-interaction.component.ts
@@ -43,7 +43,7 @@ export class RemoteInteractionComponent implements OnInit {
43 } else if (channelResult.data.length !== 0) { 43 } else if (channelResult.data.length !== 0) {
44 const channel = new VideoChannel(channelResult.data[0]) 44 const channel = new VideoChannel(channelResult.data[0])
45 45
46 redirectUrl = '/video-channels/' + channel.nameWithHost 46 redirectUrl = '/c/' + channel.nameWithHost
47 } else { 47 } else {
48 this.error = $localize`Cannot access to the remote resource` 48 this.error = $localize`Cannot access to the remote resource`
49 return 49 return
diff --git a/client/src/app/+search/search.component.ts b/client/src/app/+search/search.component.ts
index ecede19a3..8a781cbe4 100644
--- a/client/src/app/+search/search.component.ts
+++ b/client/src/app/+search/search.component.ts
@@ -214,7 +214,7 @@ export class SearchComponent implements OnInit, OnDestroy {
214 const linkType = this.getVideoLinkType() 214 const linkType = this.getVideoLinkType()
215 215
216 if (linkType === 'internal') { 216 if (linkType === 'internal') {
217 return [ '/video-channels', channel.nameWithHost ] 217 return [ '/c', channel.nameWithHost ]
218 } 218 }
219 219
220 if (linkType === 'lazy-load') { 220 if (linkType === 'lazy-load') {
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index 41fdb5e79..3833d9c54 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -112,7 +112,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
112 } 112 }
113 113
114 getAccountUrl () { 114 getAccountUrl () {
115 return [ '/accounts', this.videoChannel.ownerBy ] 115 return [ '/a', this.videoChannel.ownerBy ]
116 } 116 }
117 117
118 private loadChannelVideosCount () { 118 private loadChannelVideosCount () {
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
index d7ba40ef6..fc0d66ffd 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
@@ -11,7 +11,7 @@
11 11
12 <div class="comment-account-date"> 12 <div class="comment-account-date">
13 <div class="comment-account"> 13 <div class="comment-account">
14 <a [routerLink]="[ '/accounts', comment.by ]"> 14 <a [routerLink]="[ '/a', comment.by ]">
15 <span class="comment-account-name" [ngClass]="{ 'video-author': video.account.id === comment.account.id }"> 15 <span class="comment-account-name" [ngClass]="{ 'video-author': video.account.id === comment.account.id }">
16 {{ comment.account.displayName }} 16 {{ comment.account.displayName }}
17 </span> 17 </span>
diff --git a/client/src/app/+videos/+video-watch/video-avatar-channel.component.html b/client/src/app/+videos/+video-watch/video-avatar-channel.component.html
index 5f149cbd1..5a7221858 100644
--- a/client/src/app/+videos/+video-watch/video-avatar-channel.component.html
+++ b/client/src/app/+videos/+video-watch/video-avatar-channel.component.html
@@ -1,11 +1,11 @@
1<div class="wrapper" [ngClass]="{ 'generic-channel': genericChannel }"> 1<div class="wrapper" [ngClass]="{ 'generic-channel': genericChannel }">
2 <my-actor-avatar 2 <my-actor-avatar
3 class="channel" [channel]="video.channel" 3 class="channel" [channel]="video.channel"
4 [internalHref]="[ '/video-channels', video.byVideoChannel ]" [title]="channelLinkTitle" 4 [internalHref]="[ '/c', video.byVideoChannel ]" [title]="channelLinkTitle"
5 ></my-actor-avatar> 5 ></my-actor-avatar>
6 6
7 <my-actor-avatar 7 <my-actor-avatar
8 class="account" [account]="video.account" 8 class="account" [account]="video.account"
9 [internalHref]="[ '/accounts', video.byAccount ]" [title]="accountLinkTitle"> 9 [internalHref]="[ '/a', video.byAccount ]" [title]="accountLinkTitle">
10 </my-actor-avatar> 10 </my-actor-avatar>
11</div> 11</div>
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index 4779602d2..bb41fba77 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -183,16 +183,16 @@
183 183
184 <div class="video-info-channel-left-links ml-1"> 184 <div class="video-info-channel-left-links ml-1">
185 <ng-container *ngIf="!isChannelDisplayNameGeneric()"> 185 <ng-container *ngIf="!isChannelDisplayNameGeneric()">
186 <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Channel page"> 186 <a [routerLink]="[ '/c', video.byVideoChannel ]" i18n-title title="Channel page">
187 {{ video.channel.displayName }} 187 {{ video.channel.displayName }}
188 </a> 188 </a>
189 <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Account page"> 189 <a [routerLink]="[ '/a', video.byAccount ]" i18n-title title="Account page">
190 <span i18n>By {{ video.byAccount }}</span> 190 <span i18n>By {{ video.byAccount }}</span>
191 </a> 191 </a>
192 </ng-container> 192 </ng-container>
193 193
194 <ng-container *ngIf="isChannelDisplayNameGeneric()"> 194 <ng-container *ngIf="isChannelDisplayNameGeneric()">
195 <a [routerLink]="[ '/accounts', video.byAccount ]" class="single-link" i18n-title title="Account page"> 195 <a [routerLink]="[ '/a', video.byAccount ]" class="single-link" i18n-title title="Account page">
196 <span i18n>{{ video.byAccount }}</span> 196 <span i18n>{{ video.byAccount }}</span>
197 </a> 197 </a>
198 </ng-container> 198 </ng-container>
diff --git a/client/src/app/+videos/video-list/overview/video-overview.component.html b/client/src/app/+videos/video-list/overview/video-overview.component.html
index e21bffb6c..d3c602aa5 100644
--- a/client/src/app/+videos/video-list/overview/video-overview.component.html
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.html
@@ -32,7 +32,7 @@
32 32
33 <div class="section channel videos" *ngFor="let object of overview.channels"> 33 <div class="section channel videos" *ngFor="let object of overview.channels">
34 <div class="section-title"> 34 <div class="section-title">
35 <a [routerLink]="[ '/video-channels', buildVideoChannelBy(object) ]"> 35 <a [routerLink]="[ '/c', buildVideoChannelBy(object) ]">
36 <my-actor-avatar [channel]="buildVideoChannel(object)"></my-actor-avatar> 36 <my-actor-avatar [channel]="buildVideoChannel(object)"></my-actor-avatar>
37 37
38 <h2 class="section-title">{{ object.channel.displayName }}</h2> 38 <h2 class="section-title">{{ object.channel.displayName }}</h2>
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 23fd52e8b..0a43ab0ad 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -27,11 +27,11 @@ const routes: Routes = [
27 loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule) 27 loadChildren: () => import('./+signup/+verify-account/verify-account.module').then(m => m.VerifyAccountModule)
28 }, 28 },
29 { 29 {
30 path: 'accounts', 30 path: 'a',
31 loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule) 31 loadChildren: () => import('./+accounts/accounts.module').then(m => m.AccountsModule)
32 }, 32 },
33 { 33 {
34 path: 'video-channels', 34 path: 'c',
35 loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule) 35 loadChildren: () => import('./+video-channels/video-channels.module').then(m => m.VideoChannelsModule)
36 }, 36 },
37 { 37 {
@@ -67,12 +67,12 @@ const routes: Routes = [
67 redirectTo: 'videos/watch/playlist' 67 redirectTo: 'videos/watch/playlist'
68 }, 68 },
69 { 69 {
70 path: 'a', 70 path: 'accounts',
71 redirectTo: 'accounts' 71 redirectTo: 'a'
72 }, 72 },
73 { 73 {
74 path: 'c', 74 path: 'video-channels',
75 redirectTo: 'video-channels' 75 redirectTo: 'c'
76 }, 76 },
77 { 77 {
78 matcher: (url): UrlMatchResult => { 78 matcher: (url): UrlMatchResult => {
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 2e07deca2..3a7ffcbb6 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -18,7 +18,7 @@
18 </div> 18 </div>
19 19
20 <div ngbDropdownMenu> 20 <div ngbDropdownMenu>
21 <a *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/accounts', user.account.nameWithHost ]" 21 <a *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/a', user.account.nameWithHost ]"
22 #profile (click)="onActiveLinkScrollToAnchor(profile)"> 22 #profile (click)="onActiveLinkScrollToAnchor(profile)">
23 <my-global-icon iconName="go" aria-hidden="true"></my-global-icon> <ng-container i18n>Public profile</ng-container> 23 <my-global-icon iconName="go" aria-hidden="true"></my-global-icon> <ng-container i18n>Public profile</ng-container>
24 </a> 24 </a>
diff --git a/client/src/app/root.component.ts b/client/src/app/root.component.ts
index c65f59448..ae999e058 100644
--- a/client/src/app/root.component.ts
+++ b/client/src/app/root.component.ts
@@ -30,12 +30,12 @@ export class RootComponent implements OnInit {
30 ])) 30 ]))
31 ) 31 )
32 .subscribe(actor => { 32 .subscribe(actor => {
33 if (actor.constructor.name === 'Account') { 33 if (/\/accounts\//.test(actor.url)) {
34 this.router.navigateByUrl(`/accounts/${actor.name}`) 34 this.router.navigate([ `/a/${actor.name}` ], { state: { type: 'others', obj: { status: 200 } }, skipLocationChange: true })
35 } 35 }
36 36
37 if (actor.constructor.name === 'VideoChannel') { 37 if (/\/video-channels\//.test(actor.url)) {
38 this.router.navigateByUrl(`/video-channels/${actor.name}`) 38 this.router.navigate([ `/c/${actor.name}` ], { state: { type: 'others', obj: { status: 200 } }, skipLocationChange: true })
39 } 39 }
40 }) 40 })
41 } 41 }
diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
index 4dc2b4f10..07b9dddba 100644
--- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
+++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
@@ -124,7 +124,7 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
124 } 124 }
125 125
126 getAccountUrl (abuse: ProcessedAbuse) { 126 getAccountUrl (abuse: ProcessedAbuse) {
127 return '/accounts/' + abuse.flaggedAccount.nameWithHost 127 return '/a/' + abuse.flaggedAccount.nameWithHost
128 } 128 }
129 129
130 getVideoEmbed (abuse: AdminAbuse) { 130 getVideoEmbed (abuse: AdminAbuse) {
diff --git a/client/src/app/shared/shared-main/users/user-notification.model.ts b/client/src/app/shared/shared-main/users/user-notification.model.ts
index ed5791794..002a01583 100644
--- a/client/src/app/shared/shared-main/users/user-notification.model.ts
+++ b/client/src/app/shared/shared-main/users/user-notification.model.ts
@@ -242,7 +242,7 @@ export class UserNotification implements UserNotificationServer {
242 } 242 }
243 243
244 private buildAccountUrl (account: { name: string, host: string }) { 244 private buildAccountUrl (account: { name: string, host: string }) {
245 return '/accounts/' + Actor.CREATE_BY_STRING(account.name, account.host) 245 return '/a/' + Actor.CREATE_BY_STRING(account.name, account.host)
246 } 246 }
247 247
248 private buildVideoImportUrl () { 248 private buildVideoImportUrl () {
diff --git a/client/src/app/shared/shared-video-comment/video-comment.model.ts b/client/src/app/shared/shared-video-comment/video-comment.model.ts
index 9a4e3954e..1a2fe03db 100644
--- a/client/src/app/shared/shared-video-comment/video-comment.model.ts
+++ b/client/src/app/shared/shared-video-comment/video-comment.model.ts
@@ -95,7 +95,7 @@ export class VideoCommentAdmin implements VideoCommentAdminServerModel {
95 if (this.account) { 95 if (this.account) {
96 this.by = Actor.CREATE_BY_STRING(this.account.name, this.account.host) 96 this.by = Actor.CREATE_BY_STRING(this.account.name, this.account.host)
97 97
98 this.account.localUrl = '/accounts/' + this.by 98 this.account.localUrl = '/a/' + this.by
99 } 99 }
100 } 100 }
101} 101}
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
index 645be92bd..6c34123ed 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
@@ -12,12 +12,12 @@
12 <div class="d-flex video-miniature-meta"> 12 <div class="d-flex video-miniature-meta">
13 <my-actor-avatar 13 <my-actor-avatar
14 *ngIf="displayOptions.avatar && displayOwnerVideoChannel()" [title]="channelLinkTitle" 14 *ngIf="displayOptions.avatar && displayOwnerVideoChannel()" [title]="channelLinkTitle"
15 [channel]="video.channel" [size]="actorImageSize" [internalHref]="[ '/video-channels', video.byVideoChannel ]" 15 [channel]="video.channel" [size]="actorImageSize" [internalHref]="[ '/c', video.byVideoChannel ]"
16 ></my-actor-avatar> 16 ></my-actor-avatar>
17 17
18 <my-actor-avatar 18 <my-actor-avatar
19 *ngIf="displayOptions.avatar && displayOwnerAccount()" [title]="channelLinkTitle" 19 *ngIf="displayOptions.avatar && displayOwnerAccount()" [title]="channelLinkTitle"
20 [account]="video.account" [size]="actorImageSize" [internalHref]="[ '/video-channels', video.byVideoChannel ]" 20 [account]="video.account" [size]="actorImageSize" [internalHref]="[ '/c', video.byVideoChannel ]"
21 ></my-actor-avatar> 21 ></my-actor-avatar>
22 22
23 <div class="w-100 d-flex flex-column"> 23 <div class="w-100 d-flex flex-column">
@@ -39,10 +39,10 @@
39 </span> 39 </span>
40 </span> 40 </span>
41 41
42 <a tabindex="-1" *ngIf="displayOptions.by && displayOwnerAccount()" class="video-miniature-account" [routerLink]="[ '/video-channels', video.byVideoChannel ]"> 42 <a tabindex="-1" *ngIf="displayOptions.by && displayOwnerAccount()" class="video-miniature-account" [routerLink]="[ '/c', video.byVideoChannel ]">
43 {{ video.byAccount }} 43 {{ video.byAccount }}
44 </a> 44 </a>
45 <a tabindex="-1" *ngIf="displayOptions.by && displayOwnerVideoChannel()" class="video-miniature-channel" [routerLink]="[ '/video-channels', video.byVideoChannel ]"> 45 <a tabindex="-1" *ngIf="displayOptions.by && displayOwnerVideoChannel()" class="video-miniature-channel" [routerLink]="[ '/c', video.byVideoChannel ]">
46 {{ video.byVideoChannel }} 46 {{ video.byVideoChannel }}
47 </a> 47 </a>
48 48
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
index ec004a407..e74f58f47 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html
@@ -20,7 +20,7 @@
20 [attr.title]="playlistElement.video.name" 20 [attr.title]="playlistElement.video.name"
21 >{{ playlistElement.video.name }}</a> 21 >{{ playlistElement.video.name }}</a>
22 22
23 <a *ngIf="accountLink" tabindex="-1" class="video-info-account" [routerLink]="[ '/accounts', playlistElement.video.byAccount ]"> 23 <a *ngIf="accountLink" tabindex="-1" class="video-info-account" [routerLink]="[ '/a', playlistElement.video.byAccount ]">
24 {{ playlistElement.video.byAccount }} 24 {{ playlistElement.video.byAccount }}
25 </a> 25 </a>
26 <span *ngIf="!accountLink" tabindex="-1" class="video-info-account">{{ playlistElement.video.byAccount }}</span> 26 <span *ngIf="!accountLink" tabindex="-1" class="video-info-account">{{ playlistElement.video.byAccount }}</span>
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html
index f50f95003..81c36e6fe 100644
--- a/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html
+++ b/client/src/app/shared/shared-video-playlist/video-playlist-miniature.component.html
@@ -19,7 +19,7 @@
19 {{ playlist.displayName }} 19 {{ playlist.displayName }}
20 </a> 20 </a>
21 21
22 <a i18n [routerLink]="[ '/video-channels', playlist.videoChannelBy ]" class="by" *ngIf="displayChannel && playlist.videoChannelBy"> 22 <a i18n [routerLink]="[ '/c', playlist.videoChannelBy ]" class="by" *ngIf="displayChannel && playlist.videoChannelBy">
23 {{ playlist.videoChannelBy }} 23 {{ playlist.videoChannelBy }}
24 </a> 24 </a>
25 25