diff options
author | Chocobozzz <me@florianbigard.com> | 2020-04-01 16:52:59 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-04-01 16:52:59 +0200 |
commit | 45c6bcf312d2e9578501eaaf7511183bc570fe91 (patch) | |
tree | 6f526b1e132f532efa0916765222d260618f8095 /client/src/app/videos/+video-watch | |
parent | d96994289b24c4bbd056660c5fe11fff0f77635e (diff) | |
download | PeerTube-45c6bcf312d2e9578501eaaf7511183bc570fe91.tar.gz PeerTube-45c6bcf312d2e9578501eaaf7511183bc570fe91.tar.zst PeerTube-45c6bcf312d2e9578501eaaf7511183bc570fe91.zip |
Remove deprecated NgbTabsetModule module
Diffstat (limited to 'client/src/app/videos/+video-watch')
3 files changed, 24 insertions, 22 deletions
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/videos/+video-watch/modal/video-share.component.html index dd2dd34ab..5e6a2d518 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.html +++ b/client/src/app/videos/+video-watch/modal/video-share.component.html | |||
@@ -27,29 +27,33 @@ | |||
27 | <div class="video"> | 27 | <div class="video"> |
28 | <div class="title-page title-page-single" *ngIf="hasPlaylist()" i18n>Share the video</div> | 28 | <div class="title-page title-page-single" *ngIf="hasPlaylist()" i18n>Share the video</div> |
29 | 29 | ||
30 | <ngb-tabset class="root-tabset bootstrap" (tabChange)="onTabChange($event)"> | 30 | <div ngbNav #nav="ngbNav" class="nav-tabs" [(activeId)]="activeId"> |
31 | 31 | ||
32 | <ngb-tab i18n-title title="URL" id="url"> | 32 | <ng-container ngbNavItem="url"> |
33 | <ng-template ngbTabContent> | 33 | <a ngbNavLink i18n>URL</a> |
34 | 34 | ||
35 | <div class="tab-content"> | 35 | <ng-template ngbNavContent> |
36 | <div class="nav-content"> | ||
36 | <my-input-readonly-copy [value]="getVideoUrl()"></my-input-readonly-copy> | 37 | <my-input-readonly-copy [value]="getVideoUrl()"></my-input-readonly-copy> |
37 | </div> | 38 | </div> |
38 | |||
39 | </ng-template> | 39 | </ng-template> |
40 | </ngb-tab> | 40 | </ng-container> |
41 | |||
42 | <ng-container ngbNavItem="qrcode"> | ||
43 | <a ngbNavLink i18n>QR-Code</a> | ||
41 | 44 | ||
42 | <ngb-tab i18n-title title="QR-Code" id="qrcode"> | 45 | <ng-template ngbNavContent> |
43 | <ng-template ngbTabContent> | 46 | <div class="nav-content"> |
44 | <div class="tab-content"> | ||
45 | <qrcode [qrdata]="getVideoUrl()" [size]="256" level="Q"></qrcode> | 47 | <qrcode [qrdata]="getVideoUrl()" [size]="256" level="Q"></qrcode> |
46 | </div> | 48 | </div> |
47 | </ng-template> | 49 | </ng-template> |
48 | </ngb-tab> | 50 | </ng-container> |
51 | |||
52 | <ng-container ngbNavItem="embed"> | ||
53 | <a ngbNavLink i18n>Embed</a> | ||
49 | 54 | ||
50 | <ngb-tab i18n-title title="Embed" id="embed"> | 55 | <ng-template ngbNavContent> |
51 | <ng-template ngbTabContent> | 56 | <div class="nav-content"> |
52 | <div class="tab-content"> | ||
53 | <my-input-readonly-copy [value]="getVideoIframeCode()"></my-input-readonly-copy> | 57 | <my-input-readonly-copy [value]="getVideoIframeCode()"></my-input-readonly-copy> |
54 | 58 | ||
55 | <div i18n *ngIf="notSecure()" class="alert alert-warning"> | 59 | <div i18n *ngIf="notSecure()" class="alert alert-warning"> |
@@ -57,9 +61,11 @@ | |||
57 | </div> | 61 | </div> |
58 | </div> | 62 | </div> |
59 | </ng-template> | 63 | </ng-template> |
60 | </ngb-tab> | 64 | </ng-container> |
65 | |||
66 | </div> | ||
61 | 67 | ||
62 | </ngb-tabset> | 68 | <div [ngbNavOutlet]="nav"></div> |
63 | 69 | ||
64 | <div class="filters"> | 70 | <div class="filters"> |
65 | <div> | 71 | <div> |
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.scss b/client/src/app/videos/+video-watch/modal/video-share.component.scss index 11cbb8c0b..091d4dc3b 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.scss +++ b/client/src/app/videos/+video-watch/modal/video-share.component.scss | |||
@@ -21,7 +21,7 @@ my-input-readonly-copy { | |||
21 | text-align: center; | 21 | text-align: center; |
22 | } | 22 | } |
23 | 23 | ||
24 | .tab-content { | 24 | .nav-content { |
25 | margin-top: 30px; | 25 | margin-top: 30px; |
26 | display: flex; | 26 | display: flex; |
27 | justify-content: center; | 27 | justify-content: center; |
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/videos/+video-watch/modal/video-share.component.ts index 5109bcd11..56e7d70dd 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-share.component.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component, ElementRef, Input, ViewChild } from '@angular/core' | 1 | import { Component, ElementRef, Input, ViewChild } from '@angular/core' |
2 | import { VideoDetails } from '../../../shared/video/video-details.model' | 2 | import { VideoDetails } from '../../../shared/video/video-details.model' |
3 | import { buildVideoEmbed, buildVideoLink } from '../../../../assets/player/utils' | 3 | import { buildVideoEmbed, buildVideoLink } from '../../../../assets/player/utils' |
4 | import { NgbModal, NgbTabChangeEvent } from '@ng-bootstrap/ng-bootstrap' | 4 | import { NgbModal, NgbNavChangeEvent, NgbTabChangeEvent } from '@ng-bootstrap/ng-bootstrap' |
5 | import { VideoCaption } from '@shared/models' | 5 | import { VideoCaption } from '@shared/models' |
6 | import { VideoPlaylist } from '@app/shared/video-playlist/video-playlist.model' | 6 | import { VideoPlaylist } from '@app/shared/video-playlist/video-playlist.model' |
7 | 7 | ||
@@ -35,7 +35,7 @@ export class VideoShareComponent { | |||
35 | @Input() videoCaptions: VideoCaption[] = [] | 35 | @Input() videoCaptions: VideoCaption[] = [] |
36 | @Input() playlist: VideoPlaylist = null | 36 | @Input() playlist: VideoPlaylist = null |
37 | 37 | ||
38 | activeId: 'url' | 'qrcode' | 'embed' | 38 | activeId: 'url' | 'qrcode' | 'embed' = 'url' |
39 | customizations: Customizations | 39 | customizations: Customizations |
40 | isAdvancedCustomizationCollapsed = true | 40 | isAdvancedCustomizationCollapsed = true |
41 | includeVideoInPlaylist = false | 41 | includeVideoInPlaylist = false |
@@ -101,10 +101,6 @@ export class VideoShareComponent { | |||
101 | return window.location.protocol === 'http:' | 101 | return window.location.protocol === 'http:' |
102 | } | 102 | } |
103 | 103 | ||
104 | onTabChange (event: NgbTabChangeEvent) { | ||
105 | this.activeId = event.nextId as any | ||
106 | } | ||
107 | |||
108 | isInEmbedTab () { | 104 | isInEmbedTab () { |
109 | return this.activeId === 'embed' | 105 | return this.activeId === 'embed' |
110 | } | 106 | } |