aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/app/+accounts/accounts.component.html2
-rw-r--r--client/src/app/+accounts/accounts.component.ts6
-rw-r--r--client/src/app/+video-channels/video-channels.component.html4
-rw-r--r--client/src/app/+video-channels/video-channels.component.ts8
4 files changed, 16 insertions, 4 deletions
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html
index 6a76393b9..8498fb16f 100644
--- a/client/src/app/+accounts/accounts.component.html
+++ b/client/src/app/+accounts/accounts.component.html
@@ -32,7 +32,7 @@
32 </div> 32 </div>
33 33
34 <div class="right-buttons"> 34 <div class="right-buttons">
35 <a *ngIf="isAccountManageable" routerLink="/my-account" class="btn btn-outline-tertiary mr-2" i18n>Manage</a> 35 <a *ngIf="isAccountManageable && !isInSmallView" routerLink="/my-account" class="btn btn-outline-tertiary mr-2" i18n>Manage</a>
36 <my-subscribe-button *ngIf="videoChannels" [account]="account" [videoChannels]="videoChannels"></my-subscribe-button> 36 <my-subscribe-button *ngIf="videoChannels" [account]="account" [videoChannels]="videoChannels"></my-subscribe-button>
37 </div> 37 </div>
38 </div> 38 </div>
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index 2ca6062c2..bf71179f3 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -11,6 +11,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
11import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' 11import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
12import { VideoChannel } from '@app/shared/video-channel/video-channel.model' 12import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
13import { ListOverflowItem } from '@app/shared/misc/list-overflow.component' 13import { ListOverflowItem } from '@app/shared/misc/list-overflow.component'
14import { ScreenService } from '@app/shared/misc/screen.service'
14 15
15@Component({ 16@Component({
16 templateUrl: './accounts.component.html', 17 templateUrl: './accounts.component.html',
@@ -36,6 +37,7 @@ export class AccountsComponent implements OnInit, OnDestroy {
36 private restExtractor: RestExtractor, 37 private restExtractor: RestExtractor,
37 private redirectService: RedirectService, 38 private redirectService: RedirectService,
38 private authService: AuthService, 39 private authService: AuthService,
40 private screenService: ScreenService,
39 private i18n: I18n 41 private i18n: I18n
40 ) { 42 ) {
41 } 43 }
@@ -91,6 +93,10 @@ export class AccountsComponent implements OnInit, OnDestroy {
91 ) 93 )
92 } 94 }
93 95
96 get isInSmallView () {
97 return this.screenService.isInSmallView()
98 }
99
94 onUserChanged () { 100 onUserChanged () {
95 this.getUserIfNeeded(this.account) 101 this.getUserIfNeeded(this.account)
96 } 102 }
diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html
index 6192b8ae5..d210e2a4b 100644
--- a/client/src/app/+video-channels/video-channels.component.html
+++ b/client/src/app/+video-channels/video-channels.component.html
@@ -18,7 +18,7 @@
18 </div> 18 </div>
19 19
20 <div class="right-buttons"> 20 <div class="right-buttons">
21 <a *ngIf="isChannelManageable" [routerLink]="[ '/my-account/video-channels/update', videoChannel.nameWithHost ]" class="btn btn-outline-tertiary mr-2" i18n>Manage</a> 21 <a *ngIf="isChannelManageable && !isInSmallView" [routerLink]="[ '/my-account/video-channels/update', videoChannel.nameWithHost ]" class="btn btn-outline-tertiary mr-2" i18n>Manage</a>
22 <my-subscribe-button #subscribeButton [videoChannels]="[videoChannel]"></my-subscribe-button> 22 <my-subscribe-button #subscribeButton [videoChannels]="[videoChannel]"></my-subscribe-button>
23 </div> 23 </div>
24 24
@@ -26,7 +26,7 @@
26 <div class="actor-followers" i18n>{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div> 26 <div class="actor-followers" i18n>{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div>
27 27
28 <a [routerLink]="[ '/accounts', videoChannel.ownerBy ]" i18n-title title="Go the owner account page" class="actor-owner"> 28 <a [routerLink]="[ '/accounts', videoChannel.ownerBy ]" i18n-title title="Go the owner account page" class="actor-owner">
29 <span i18n>Created by {{ videoChannel.ownerBy }}</span> 29 <span class="d-inline-flex"><span i18n class="d-none d-sm-block mr-1">Created by</span>{{ videoChannel.ownerBy }}</span>
30 <img [src]="videoChannel.ownerAvatarUrl" alt="Owner account avatar" /> 30 <img [src]="videoChannel.ownerAvatarUrl" alt="Owner account avatar" />
31 </a> 31 </a>
32 </div> 32 </div>
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index 00b9938d9..f3cd5dea5 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -10,6 +10,7 @@ import { Hotkey, HotkeysService } from 'angular2-hotkeys'
10import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component' 10import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component'
11import { I18n } from '@ngx-translate/i18n-polyfill' 11import { I18n } from '@ngx-translate/i18n-polyfill'
12import { ListOverflowItem } from '@app/shared/misc/list-overflow.component' 12import { ListOverflowItem } from '@app/shared/misc/list-overflow.component'
13import { ScreenService } from '@app/shared/misc/screen.service'
13 14
14@Component({ 15@Component({
15 templateUrl: './video-channels.component.html', 16 templateUrl: './video-channels.component.html',
@@ -32,7 +33,8 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
32 private authService: AuthService, 33 private authService: AuthService,
33 private videoChannelService: VideoChannelService, 34 private videoChannelService: VideoChannelService,
34 private restExtractor: RestExtractor, 35 private restExtractor: RestExtractor,
35 private hotkeysService: HotkeysService 36 private hotkeysService: HotkeysService,
37 private screenService: ScreenService
36 ) { } 38 ) { }
37 39
38 ngOnInit () { 40 ngOnInit () {
@@ -79,6 +81,10 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
79 if (this.isUserLoggedIn()) this.hotkeysService.remove(this.hotkeys) 81 if (this.isUserLoggedIn()) this.hotkeysService.remove(this.hotkeys)
80 } 82 }
81 83
84 get isInSmallView () {
85 return this.screenService.isInSmallView()
86 }
87
82 isUserLoggedIn () { 88 isUserLoggedIn () {
83 return this.authService.isLoggedIn() 89 return this.authService.isLoggedIn()
84 } 90 }