diff options
Diffstat (limited to 'client/src/app/shared')
5 files changed, 13 insertions, 11 deletions
diff --git a/client/src/app/shared/confirm/confirm.component.ts b/client/src/app/shared/confirm/confirm.component.ts index 763454c4f..d67d4f3c8 100644 --- a/client/src/app/shared/confirm/confirm.component.ts +++ b/client/src/app/shared/confirm/confirm.component.ts | |||
@@ -60,7 +60,7 @@ export class ConfirmComponent implements OnInit { | |||
60 | showModal () { | 60 | showModal () { |
61 | this.inputValue = '' | 61 | this.inputValue = '' |
62 | 62 | ||
63 | this.openedModal = this.modalService.open(this.confirmModal) | 63 | this.openedModal = this.modalService.open(this.confirmModal, { centered: true }) |
64 | 64 | ||
65 | this.openedModal.result | 65 | this.openedModal.result |
66 | .then(() => this.confirmService.confirmResponse.next(true)) | 66 | .then(() => this.confirmService.confirmResponse.next(true)) |
diff --git a/client/src/app/shared/forms/input-readonly-copy.component.html b/client/src/app/shared/forms/input-readonly-copy.component.html index b6a56ec44..9566e9741 100644 --- a/client/src/app/shared/forms/input-readonly-copy.component.html +++ b/client/src/app/shared/forms/input-readonly-copy.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <div class="input-group"> | 1 | <div class="input-group input-group-sm"> |
2 | <input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="value" /> | 2 | <input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="value" /> |
3 | 3 | ||
4 | <div class="input-group-append"> | 4 | <div class="input-group-append"> |
diff --git a/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss b/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss index f1b6cd601..1724449e8 100644 --- a/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss +++ b/client/src/app/shared/video-playlist/video-add-to-playlist.component.scss | |||
@@ -4,7 +4,7 @@ | |||
4 | .header, | 4 | .header, |
5 | .dropdown-item, | 5 | .dropdown-item, |
6 | .input-container { | 6 | .input-container { |
7 | padding: 6px 24px 10px 24px; | 7 | padding: 8px 24px; |
8 | } | 8 | } |
9 | 9 | ||
10 | .header { | 10 | .header { |
@@ -54,11 +54,12 @@ | |||
54 | } | 54 | } |
55 | 55 | ||
56 | .playlist { | 56 | .playlist { |
57 | display: flex; | 57 | display: inline-flex; |
58 | cursor: pointer; | 58 | cursor: pointer; |
59 | 59 | ||
60 | my-peertube-checkbox { | 60 | my-peertube-checkbox { |
61 | margin-right: 10px; | 61 | margin-right: 10px; |
62 | align-self: center; | ||
62 | } | 63 | } |
63 | 64 | ||
64 | .display-name { | 65 | .display-name { |
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 @@ | |||
1 | import { AfterViewInit, Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core' | 1 | import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core' |
2 | import { I18n } from '@ngx-translate/i18n-polyfill' | 2 | import { I18n } from '@ngx-translate/i18n-polyfill' |
3 | import { DropdownAction, DropdownButtonSize, DropdownDirection } from '@app/shared/buttons/action-dropdown.component' | 3 | import { DropdownAction, DropdownButtonSize, DropdownDirection } from '@app/shared/buttons/action-dropdown.component' |
4 | import { AuthService, ConfirmService, Notifier, ServerService } from '@app/core' | 4 | import { AuthService, ConfirmService, Notifier } from '@app/core' |
5 | import { BlocklistService } from '@app/shared/blocklist' | ||
6 | import { Video } from '@app/shared/video/video.model' | 5 | import { Video } from '@app/shared/video/video.model' |
7 | import { VideoService } from '@app/shared/video/video.service' | 6 | import { VideoService } from '@app/shared/video/video.service' |
8 | import { VideoDetails } from '@app/shared/video/video-details.model' | 7 | import { 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 | ) { } |