diff options
author | Ms Kimsible <1877318+kimsible@users.noreply.github.com> | 2021-08-25 11:38:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-25 11:38:10 +0200 |
commit | 4e1592daa41f81667f914f37d36795e8c6c046c3 (patch) | |
tree | 8bed3af237b6d5d4da08af989c3824a168e6f3b6 /client/src/app/+about | |
parent | 644800ef5588e08da2a8227f6d72751d3dca85db (diff) | |
download | PeerTube-4e1592daa41f81667f914f37d36795e8c6c046c3.tar.gz PeerTube-4e1592daa41f81667f914f37d36795e8c6c046c3.tar.zst PeerTube-4e1592daa41f81667f914f37d36795e8c6c046c3.zip |
Alert user for low quota and video auto-block on upload page (#4336)
* Replace wording of instance contact
* Add contact-us button to no-quota alert on upload page
* Add alert for accounts with auto-blocked videos on upload page
* Add alert for accounts without enough quota + refacto on upload page
* Using ng-container and ng-template
* Add alert for daily quota
* Add hook filter for upload page alert messages
* Add instance name as subtitle in contact modal
* Fix eslint max-len on string
* Fix missing word in quota left daily message - upload page
Co-authored-by: Kimsible <kimsible@users.noreply.github.com>
Diffstat (limited to 'client/src/app/+about')
3 files changed, 8 insertions, 2 deletions
diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html index 436d486ab..1026c4e0d 100644 --- a/client/src/app/+about/about-instance/about-instance.component.html +++ b/client/src/app/+about/about-instance/about-instance.component.html | |||
@@ -4,7 +4,7 @@ | |||
4 | <div class="about-instance-title"> | 4 | <div class="about-instance-title"> |
5 | <h1 i18n class="title">About {{ instanceName }}</h1> | 5 | <h1 i18n class="title">About {{ instanceName }}</h1> |
6 | 6 | ||
7 | <a routerLink="/about/contact" i18n *ngIf="isContactFormEnabled" class="contact-admin">Contact administrator</a> | 7 | <a routerLink="/about/contact" i18n *ngIf="isContactFormEnabled" class="contact-admin">Contact us</a> |
8 | </div> | 8 | </div> |
9 | 9 | ||
10 | <div class="instance-badges" *ngIf="categories.length !== 0 || languages.length !== 0"> | 10 | <div class="instance-badges" *ngIf="categories.length !== 0 || languages.length !== 0"> |
diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html index 8b6b707af..ed027af44 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.html +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html | |||
@@ -1,6 +1,6 @@ | |||
1 | <ng-template #modal> | 1 | <ng-template #modal> |
2 | <div class="modal-header"> | 2 | <div class="modal-header"> |
3 | <h1 i18n class="modal-title">Contact {{ instanceName }} administrator</h1> | 3 | <h1 i18n class="modal-title">Contact the administrator(s)<p class="modal-subtitle">{{ instanceName }}</p></h1> |
4 | <my-global-icon iconName="cross" aria-label="Close" tabindex="0" role="button" (click)="hide()" (keydown.enter)="hide()"></my-global-icon> | 4 | <my-global-icon iconName="cross" aria-label="Close" tabindex="0" role="button" (click)="hide()" (keydown.enter)="hide()"></my-global-icon> |
5 | </div> | 5 | </div> |
6 | 6 | ||
diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.scss b/client/src/app/+about/about-instance/contact-admin-modal.component.scss index c0b451b4e..e143a9dc6 100644 --- a/client/src/app/+about/about-instance/contact-admin-modal.component.scss +++ b/client/src/app/+about/about-instance/contact-admin-modal.component.scss | |||
@@ -1,6 +1,12 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | .modal-subtitle { | ||
5 | font-size: 16px; | ||
6 | line-height: 1rem; | ||
7 | margin-bottom: 0; | ||
8 | } | ||
9 | |||
4 | .modal-body { | 10 | .modal-body { |
5 | text-align: left; | 11 | text-align: left; |
6 | } | 12 | } |