aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared/video
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-03-06 16:58:55 +0100
committerRigel Kent <sendmemail@rigelk.eu>2020-03-06 16:58:55 +0100
commit54e7884775197877dd941b44bef03b3c6387b22a (patch)
tree6a37e8e5476c382b84b77327597e209a9afb64e3 /client/src/app/shared/video
parentde702865f47f647fafb34ca05dde3ea780a4ecb1 (diff)
downloadPeerTube-54e7884775197877dd941b44bef03b3c6387b22a.tar.gz
PeerTube-54e7884775197877dd941b44bef03b3c6387b22a.tar.zst
PeerTube-54e7884775197877dd941b44bef03b3c6387b22a.zip
Normalize modal close buttons, and cancel/submit button styles
Diffstat (limited to 'client/src/app/shared/video')
-rw-r--r--client/src/app/shared/video/modals/video-blacklist.component.html8
-rw-r--r--client/src/app/shared/video/video-actions-dropdown.component.ts7
2 files changed, 8 insertions, 7 deletions
diff --git a/client/src/app/shared/video/modals/video-blacklist.component.html b/client/src/app/shared/video/modals/video-blacklist.component.html
index 1a87bdcd4..857a4dcec 100644
--- a/client/src/app/shared/video/modals/video-blacklist.component.html
+++ b/client/src/app/shared/video/modals/video-blacklist.component.html
@@ -18,8 +18,12 @@
18 <div class="form-group" *ngIf="video.isLocal"> 18 <div class="form-group" *ngIf="video.isLocal">
19 <my-peertube-checkbox 19 <my-peertube-checkbox
20 inputName="unfederate" formControlName="unfederate" 20 inputName="unfederate" formControlName="unfederate"
21 i18n-labelText labelText="Unfederate the video (ask for its deletion from the remote instances)" 21 i18n-labelText labelText="Unfederate the video"
22 ></my-peertube-checkbox> 22 >
23 <ng-container ngProjectAs="description">
24 <span i18n>This will ask remote instances to delete it</span>
25 </ng-container>
26 </my-peertube-checkbox>
23 </div> 27 </div>
24 28
25 <div class="form-group inputs"> 29 <div class="form-group inputs">
diff --git a/client/src/app/shared/video/video-actions-dropdown.component.ts b/client/src/app/shared/video/video-actions-dropdown.component.ts
index 69f45346e..67c4d6fbc 100644
--- a/client/src/app/shared/video/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/video/video-actions-dropdown.component.ts
@@ -1,8 +1,7 @@
1import { AfterViewInit, Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core' 1import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core'
2import { I18n } from '@ngx-translate/i18n-polyfill' 2import { I18n } from '@ngx-translate/i18n-polyfill'
3import { DropdownAction, DropdownButtonSize, DropdownDirection } from '@app/shared/buttons/action-dropdown.component' 3import { DropdownAction, DropdownButtonSize, DropdownDirection } from '@app/shared/buttons/action-dropdown.component'
4import { AuthService, ConfirmService, Notifier, ServerService } from '@app/core' 4import { AuthService, ConfirmService, Notifier } from '@app/core'
5import { BlocklistService } from '@app/shared/blocklist'
6import { Video } from '@app/shared/video/video.model' 5import { Video } from '@app/shared/video/video.model'
7import { VideoService } from '@app/shared/video/video.service' 6import { VideoService } from '@app/shared/video/video.service'
8import { VideoDetails } from '@app/shared/video/video-details.model' 7import { VideoDetails } from '@app/shared/video/video-details.model'
@@ -73,10 +72,8 @@ export class VideoActionsDropdownComponent implements OnChanges {
73 private notifier: Notifier, 72 private notifier: Notifier,
74 private confirmService: ConfirmService, 73 private confirmService: ConfirmService,
75 private videoBlacklistService: VideoBlacklistService, 74 private videoBlacklistService: VideoBlacklistService,
76 private serverService: ServerService,
77 private screenService: ScreenService, 75 private screenService: ScreenService,
78 private videoService: VideoService, 76 private videoService: VideoService,
79 private blocklistService: BlocklistService,
80 private redundancyService: RedundancyService, 77 private redundancyService: RedundancyService,
81 private i18n: I18n 78 private i18n: I18n
82 ) { } 79 ) { }