aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/forms/markdown-textarea.component.html26
-rw-r--r--client/src/app/shared/shared.module.ts6
-rw-r--r--client/src/app/shared/video/modals/video-download.component.html75
3 files changed, 62 insertions, 45 deletions
diff --git a/client/src/app/shared/forms/markdown-textarea.component.html b/client/src/app/shared/forms/markdown-textarea.component.html
index 0925b9ad5..fb6e1343d 100644
--- a/client/src/app/shared/forms/markdown-textarea.component.html
+++ b/client/src/app/shared/forms/markdown-textarea.component.html
@@ -5,13 +5,23 @@
5 [id]="name" [name]="name"> 5 [id]="name" [name]="name">
6 </textarea> 6 </textarea>
7 7
8 <ngb-tabset *ngIf="arePreviewsDisplayed()" class="previews" type="pills"> 8 <div ngbNav #nav="ngbNav" class="nav-pills previews">
9 <ngb-tab *ngIf="truncate !== undefined" i18n-title title="Truncated preview"> 9 <ng-container ngbNavItem *ngIf="truncate !== undefined">
10 <ng-template ngbTabContent><div [innerHTML]="truncatedPreviewHTML"></div></ng-template> 10 <a ngbNavLink i18n>Truncated preview</a>
11 </ngb-tab>
12 11
13 <ngb-tab i18n-title title="Complete preview"> 12 <ng-template ngbNavContent>
14 <ng-template ngbTabContent><div [innerHTML]="previewHTML"></div></ng-template> 13 <div [innerHTML]="truncatedPreviewHTML"></div>
15 </ngb-tab> 14 </ng-template>
16 </ngb-tabset> 15 </ng-container>
16
17 <ng-container ngbNavItem>
18 <a ngbNavLink i18n>Complete preview</a>
19
20 <ng-template ngbNavContent>
21 <div [innerHTML]="previewHTML"></div>
22 </ng-template>
23 </ng-container>
24 </div>
25
26 <div [ngbNavOutlet]="nav"></div>
17</div> 27</div>
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index b89f0a8d1..a952880a6 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -58,7 +58,7 @@ import {
58 NgbDropdownModule, 58 NgbDropdownModule,
59 NgbModalModule, 59 NgbModalModule,
60 NgbPopoverModule, 60 NgbPopoverModule,
61 NgbTabsetModule, 61 NgbNavModule,
62 NgbTooltipModule 62 NgbTooltipModule
63} from '@ng-bootstrap/ng-bootstrap' 63} from '@ng-bootstrap/ng-bootstrap'
64import { RemoteSubscribeComponent, SubscribeButtonComponent, UserSubscriptionService } from '@app/shared/user-subscription' 64import { RemoteSubscribeComponent, SubscribeButtonComponent, UserSubscriptionService } from '@app/shared/user-subscription'
@@ -119,7 +119,7 @@ import { ActorAvatarInfoComponent } from '@app/+my-account/shared/actor-avatar-i
119 NgbDropdownModule, 119 NgbDropdownModule,
120 NgbModalModule, 120 NgbModalModule,
121 NgbPopoverModule, 121 NgbPopoverModule,
122 NgbTabsetModule, 122 NgbNavModule,
123 NgbTooltipModule, 123 NgbTooltipModule,
124 NgbCollapseModule, 124 NgbCollapseModule,
125 125
@@ -204,7 +204,7 @@ import { ActorAvatarInfoComponent } from '@app/+my-account/shared/actor-avatar-i
204 NgbDropdownModule, 204 NgbDropdownModule,
205 NgbModalModule, 205 NgbModalModule,
206 NgbPopoverModule, 206 NgbPopoverModule,
207 NgbTabsetModule, 207 NgbNavModule,
208 NgbTooltipModule, 208 NgbTooltipModule,
209 NgbCollapseModule, 209 NgbCollapseModule,
210 210
diff --git a/client/src/app/shared/video/modals/video-download.component.html b/client/src/app/shared/video/modals/video-download.component.html
index 391fe245e..ab6f4449d 100644
--- a/client/src/app/shared/video/modals/video-download.component.html
+++ b/client/src/app/shared/video/modals/video-download.component.html
@@ -1,7 +1,7 @@
1<ng-template #modal let-hide="close"> 1<ng-template #modal let-hide="close">
2 <div class="modal-header"> 2 <div class="modal-header">
3 <h4 class="modal-title">Download 3 <h4 class="modal-title">
4 <span *ngIf="!videoCaptions" i18n>video</span> 4 <ng-container i18n>Download</ng-container>
5 5
6 <div *ngIf="videoCaptions" ngbDropdown class="d-inline-block"> 6 <div *ngIf="videoCaptions" ngbDropdown class="d-inline-block">
7 <span id="dropdownDownloadType" ngbDropdownToggle> 7 <span id="dropdownDownloadType" ngbDropdownToggle>
@@ -38,41 +38,48 @@
38 </div> 38 </div>
39 </div> 39 </div>
40 40
41 <ngb-tabset *ngIf="type === 'video' && videoFile?.metadata"> 41 <ng-container *ngIf="type === 'video' && videoFile?.metadata">
42 <ngb-tab> 42 <div ngbNav #nav="ngbNav" class="nav-tabs">
43 <ng-template ngbTabTitle i18n>Format</ng-template> 43
44 <ng-template ngbTabContent> 44 <ng-container ngbNavItem>
45 <div class="file-metadata"> 45 <a ngbNavLink i18n>Format</a>
46 <div class="metadata-attribute metadata-attribute-tags" *ngFor="let item of videoFileMetadataFormat | keyvalue"> 46 <ng-template ngbNavContent>
47 <span i18n class="metadata-attribute-label">{{ item.value.label }}</span> 47 <div class="file-metadata">
48 <span class="metadata-attribute-value">{{ item.value.value }}</span> 48 <div class="metadata-attribute metadata-attribute-tags" *ngFor="let item of videoFileMetadataFormat | keyvalue">
49 <span i18n class="metadata-attribute-label">{{ item.value.label }}</span>
50 <span class="metadata-attribute-value">{{ item.value.value }}</span>
51 </div>
49 </div> 52 </div>
50 </div> 53 </ng-template>
51 </ng-template> 54 </ng-container>
52 </ngb-tab> 55
53 <ngb-tab [disabled]="videoFileMetadataVideoStream === undefined"> 56 <ng-container ngbNavItem [disabled]="videoFileMetadataVideoStream === undefined">
54 <ng-template ngbTabTitle i18n>Video stream</ng-template> 57 <a ngbNavLink i18n>Video stream</a>
55 <ng-template ngbTabContent> 58 <ng-template ngbNavContent>
56 <div class="file-metadata"> 59 <div class="file-metadata">
57 <div class="metadata-attribute metadata-attribute-tags" *ngFor="let item of videoFileMetadataVideoStream | keyvalue"> 60 <div class="metadata-attribute metadata-attribute-tags" *ngFor="let item of videoFileMetadataVideoStream | keyvalue">
58 <span i18n class="metadata-attribute-label">{{ item.value.label }}</span> 61 <span i18n class="metadata-attribute-label">{{ item.value.label }}</span>
59 <span class="metadata-attribute-value">{{ item.value.value }}</span> 62 <span class="metadata-attribute-value">{{ item.value.value }}</span>
63 </div>
60 </div> 64 </div>
61 </div> 65 </ng-template>
62 </ng-template> 66 </ng-container>
63 </ngb-tab> 67
64 <ngb-tab [disabled]="videoFileMetadataAudioStream === undefined"> 68 <ng-container ngbNavItem [disabled]="videoFileMetadataAudioStream === undefined">
65 <ng-template ngbTabTitle i18n>Audio stream</ng-template> 69 <a ngbNavLink i18n>Audio stream</a>
66 <ng-template ngbTabContent> 70 <ng-template ngbNavContent>
67 <div class="file-metadata"> 71 <div class="file-metadata">
68 <div class="metadata-attribute metadata-attribute-tags" *ngFor="let item of videoFileMetadataAudioStream | keyvalue"> 72 <div class="metadata-attribute metadata-attribute-tags" *ngFor="let item of videoFileMetadataAudioStream | keyvalue">
69 <span i18n class="metadata-attribute-label">{{ item.value.label }}</span> 73 <span i18n class="metadata-attribute-label">{{ item.value.label }}</span>
70 <span class="metadata-attribute-value">{{ item.value.value }}</span> 74 <span class="metadata-attribute-value">{{ item.value.value }}</span>
75 </div>
71 </div> 76 </div>
72 </div> 77 </ng-template>
73 </ng-template> 78 </ng-container>
74 </ngb-tab> 79 </div>
75 </ngb-tabset> 80
81 <div [ngbNavOutlet]="nav"></div>
82 </ng-container>
76 83
77 <div class="download-type" *ngIf="type === 'video'"> 84 <div class="download-type" *ngIf="type === 'video'">
78 <div class="peertube-radio-container"> 85 <div class="peertube-radio-container">