aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.ts17
-rw-r--r--client/src/app/+videos/video-list/trending/video-trending-header.component.html4
-rw-r--r--client/src/app/shared/shared-share-modal/video-share.component.scss4
3 files changed, 17 insertions, 8 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index b698d554f..dff37c034 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -12,6 +12,7 @@ import {
12 Notifier, 12 Notifier,
13 PeerTubeSocket, 13 PeerTubeSocket,
14 RestExtractor, 14 RestExtractor,
15 ScreenService,
15 ServerService, 16 ServerService,
16 UserService 17 UserService
17} from '@app/core' 18} from '@app/core'
@@ -126,14 +127,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
126 private hotkeysService: HotkeysService, 127 private hotkeysService: HotkeysService,
127 private hooks: HooksService, 128 private hooks: HooksService,
128 private peertubeSocket: PeerTubeSocket, 129 private peertubeSocket: PeerTubeSocket,
130 private screenService: ScreenService,
129 private location: PlatformLocation, 131 private location: PlatformLocation,
130 @Inject(LOCALE_ID) private localeId: string 132 @Inject(LOCALE_ID) private localeId: string
131 ) { 133 ) { }
132 this.tooltipLike = $localize`Like this video`
133 this.tooltipDislike = $localize`Dislike this video`
134 this.tooltipSupport = $localize`Support options for this video`
135 this.tooltipSaveToPlaylist = $localize`Save to playlist`
136 }
137 134
138 get user () { 135 get user () {
139 return this.authService.getUser() 136 return this.authService.getUser()
@@ -144,6 +141,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
144 } 141 }
145 142
146 async ngOnInit () { 143 async ngOnInit () {
144 // Hide the tooltips for unlogged users in mobile view, this adds confusion with the popover
145 if (this.user || !this.screenService.isInMobileView()) {
146 this.tooltipLike = $localize`Like this video`
147 this.tooltipDislike = $localize`Dislike this video`
148 this.tooltipSupport = $localize`Support options for this video`
149 this.tooltipSaveToPlaylist = $localize`Save to playlist`
150 }
151
147 PeertubePlayerManager.initState() 152 PeertubePlayerManager.initState()
148 153
149 this.serverConfig = this.serverService.getTmpConfig() 154 this.serverConfig = this.serverService.getTmpConfig()
diff --git a/client/src/app/+videos/video-list/trending/video-trending-header.component.html b/client/src/app/+videos/video-list/trending/video-trending-header.component.html
index 7eb1e4f95..db81ce6a1 100644
--- a/client/src/app/+videos/video-list/trending/video-trending-header.component.html
+++ b/client/src/app/+videos/video-list/trending/video-trending-header.component.html
@@ -1,8 +1,8 @@
1<div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" [(ngModel)]="data.model" (ngModelChange)="setSort()"> 1<div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" [(ngModel)]="data.model" (ngModelChange)="setSort()">
2 <ng-container *ngFor="let button of buttons"> 2 <ng-container *ngFor="let button of buttons">
3 <label *ngIf="!button.hidden" ngbButtonLabel class="btn-light" placement="bottom" [ngbTooltip]="button.tooltip" container="body"> 3 <label *ngIf="!button.hidden" ngbButtonLabel class="btn-light" placement="bottom right-bottom left-bottom" [ngbTooltip]="button.tooltip" container="body">
4 <my-global-icon [iconName]="button.iconName"></my-global-icon> 4 <my-global-icon [iconName]="button.iconName"></my-global-icon>
5 <input ngbButton type="radio" [value]="button.value"> {{ button.label }} 5 <input ngbButton type="radio" [value]="button.value"> {{ button.label }}
6 </label> 6 </label>
7 </ng-container> 7 </ng-container>
8</div> \ No newline at end of file 8</div>
diff --git a/client/src/app/shared/shared-share-modal/video-share.component.scss b/client/src/app/shared/shared-share-modal/video-share.component.scss
index e4d3aacff..a18e3f5fc 100644
--- a/client/src/app/shared/shared-share-modal/video-share.component.scss
+++ b/client/src/app/shared/shared-share-modal/video-share.component.scss
@@ -36,6 +36,10 @@ my-input-toggle-hidden {
36.filters { 36.filters {
37 margin-top: 30px; 37 margin-top: 30px;
38 38
39 .advanced-filters.show {
40 overflow: visible !important;
41 }
42
39 .advanced-filters-button { 43 .advanced-filters-button {
40 display: flex; 44 display: flex;
41 justify-content: center; 45 justify-content: center;