diff --git a/client/package.json b/client/package.json index 30f1c4cbe..4441e84a2 100644 --- a/client/package.json +++ b/client/package.json @@ -48,7 +48,7 @@ "@babel/core": "^7.15.0", "@babel/preset-env": "^7.15.0", "@neos21/bootstrap3-glyphicons": "^1.0.1", - "@ng-bootstrap/ng-bootstrap": "^11.0.0", + "@ng-bootstrap/ng-bootstrap": "^12.1.2", "@ng-select/ng-select": "^8.1.1", "@ngx-loading-bar/core": "^6.0.0", "@ngx-loading-bar/http-client": "^6.0.0", @@ -57,6 +57,7 @@ "@peertube/p2p-media-loader-hlsjs": "^1.0.8", "@peertube/videojs-contextmenu": "^5.5.0", "@peertube/xliffmerge": "^2.0.3", + "@popperjs/core": "^2.11.5", "@types/chart.js": "^2.9.16", "@types/core-js": "^2.5.2", "@types/debug": "^4.1.5", @@ -79,7 +80,7 @@ "angular2-hotkeys": "^13.1.0", "angularx-qrcode": "13.0.3", "babel-loader": "^8.2.2", - "bootstrap": "^4.1.3", + "bootstrap": "^5.1.3", "buffer": "^6.0.3", "cache-chunk-store": "^3.0.0", "chart.js": "^3.5.1", diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html index 6bc1d0448..f16f8bd71 100644 --- a/client/src/app/+about/about-follows/about-follows.component.html +++ b/client/src/app/+about/about-follows/about-follows.component.html @@ -1,5 +1,6 @@
-

Follows

+

Follows

+

Follower instances ({{ followersPagination.totalItems }})

diff --git a/client/src/app/+about/about-follows/about-follows.component.scss b/client/src/app/+about/about-follows/about-follows.component.scss index 80eb997e4..057d04ced 100644 --- a/client/src/app/+about/about-follows/about-follows.component.scss +++ b/client/src/app/+about/about-follows/about-follows.component.scss @@ -15,6 +15,7 @@ a { .no-results { justify-content: flex-start; + align-items: flex-start; } .show-more { 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 7f2a6aa77..b113df82f 100644 --- a/client/src/app/+about/about-instance/about-instance.component.html +++ b/client/src/app/+about/about-instance/about-instance.component.html @@ -8,9 +8,9 @@
- {{ category }} + {{ category }} - {{ language }} + {{ language }}
@@ -204,7 +204,7 @@
-

FEATURES

+
diff --git a/client/src/app/+about/about-instance/about-instance.component.scss b/client/src/app/+about/about-instance/about-instance.component.scss index 965c04b6c..a48783639 100644 --- a/client/src/app/+about/about-instance/about-instance.component.scss +++ b/client/src/app/+about/about-instance/about-instance.component.scss @@ -19,18 +19,11 @@ } .instance-badges { - font-size: 16px; margin-bottom: 20px; + font-size: 16px; - .badge { + .pt-badge { @include margin-right(5px); - - font-size: 12px; - font-weight: $font-semibold; - - &.category { - background-color: pvar(--mainColor); - } } } diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.html index 63d429ebf..3b7343a04 100644 --- a/client/src/app/+about/about.component.html +++ b/client/src/app/+about/about.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html index 34dc52029..0dfa87074 100644 --- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html +++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html @@ -1,4 +1,4 @@ -

Video channels

+

Video channels

diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html index e235d9689..d92760ff8 100644 --- a/client/src/app/+accounts/accounts.component.html +++ b/client/src/app/+accounts/accounts.component.html @@ -18,7 +18,7 @@ (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()" > - Banned + Banned
diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss index 5043b98c4..a316bd599 100644 --- a/client/src/app/+accounts/accounts.component.scss +++ b/client/src/app/+accounts/accounts.component.scss @@ -93,6 +93,10 @@ my-user-moderation-dropdown { } } +.pt-badge { + @include margin-right(5px); +} + @media screen and (max-width: $small-view) { .root { --myGlobalTopPadding: 45px; diff --git a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html index 0ab80e5a9..a17b13fdf 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html @@ -1,15 +1,15 @@ -
-
+
+ +
CACHE
Some files are not federated, and fetched when necessary. Define their caching policies.
-
- +
@@ -57,8 +57,8 @@
-
-
+
+
CUSTOMIZATIONS
@@ -66,8 +66,7 @@
-
- +
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html index bae9d9775..f225c388d 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html @@ -1,13 +1,13 @@ -
-
+
+
APPEARANCE
Use plugins & themes for more involved changes, or add slight customizations.
-
+
@@ -88,15 +88,15 @@
-
-
+
+
BROADCAST MESSAGE
Display a message on your instance
-
+
@@ -144,15 +144,15 @@
-
-
+
+
NEW USERS
Manage users to set their quota individually.
-
+
@@ -239,20 +239,20 @@
-
-
+
+
VIDEOS
-
+
-
+
- allows to import multiple videos in parallel. ⚠️ Requires a PeerTube restart. + allows to import multiple videos in parallel. ⚠️ Requires a PeerTube restart.
@@ -309,12 +309,12 @@
-
-
+
+
VIDEO CHANNELS
-
+
@@ -331,12 +331,12 @@
-
-
+
+
SEARCH
-
+
@@ -420,15 +420,15 @@
-
-
+
+
FEDERATION
Manage relations with other instances.
-
+
@@ -499,12 +499,12 @@
-
-
+
+
ADMINISTRATORS
-
+
@@ -527,8 +527,8 @@
-
-
+
+
TWITTER
Provide the Twitter account representing your instance to improve link previews. @@ -536,7 +536,7 @@
-
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 8fef39b79..cc8e699f3 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html @@ -1,4 +1,4 @@ -

Configuration

+

Configuration

Updating instance configuration from the web interface is disabled by the system administrator. @@ -64,7 +64,7 @@
-
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss index 0458d257f..31dd9f54f 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss @@ -102,11 +102,6 @@ input[disabled] { opacity: 0.5; } - -.form-group-right { - padding-top: 2px; -} - ngb-tabset:not(.previews) ::ng-deep { .nav-link { font-size: 105%; diff --git a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html index 2286a5a1a..701c3c0c1 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html @@ -2,12 +2,12 @@ -
-
+
+
INSTANCE HOMEPAGE
-
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html index d806616bd..1c567d962 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html @@ -2,13 +2,12 @@ -
-
+
+
INSTANCE
-
- +
@@ -77,16 +76,15 @@
-
-
+
+
MODERATION & NSFW
-
+
Manage users to build a moderation team.
-
- +
@@ -162,12 +160,12 @@
-
-
+
+
YOU AND YOUR INSTANCE
-
+
@@ -220,12 +218,12 @@
-
-
+
+
OTHER INFORMATION
-
+
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html index 71d5d91f0..a970f3df3 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html @@ -1,14 +1,14 @@ -
-
+
+
LIVE
Enable users of your instance to stream live.
-
+
@@ -89,15 +89,15 @@
-
-
+
+
TRANSCODING
Same as VOD transcoding, transcoding live streams so that they are in a streamable form that any device can play. Requires a beefy CPU, and then some.
-
+
@@ -115,7 +115,7 @@
-
+
@@ -136,7 +136,7 @@
- + will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with VOD transcoding @@ -157,7 +157,7 @@
- new live transcoding profiles can be added by PeerTube plugins + new live transcoding profiles can be added by PeerTube plugins -
-
-
+
+
+
@@ -21,8 +21,8 @@
-
-
+
+
TRANSCODING
Process uploaded videos so that they are in a streamable form that any device can play. Though costly in @@ -30,11 +30,11 @@
-
+
-
+
Transcoding enabled @@ -115,7 +115,7 @@
-
+
- + will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with live transcoding @@ -162,9 +162,9 @@
{{ formErrors.transcoding.threads }}
-
+
- allows to transcode multiple files in parallel. ⚠️ Requires a PeerTube restart + allows to transcode multiple files in parallel. ⚠️ Requires a PeerTube restart
@@ -174,9 +174,9 @@
{{ formErrors.transcoding.concurrency }}
-
+
- new transcoding profiles can be added by PeerTube plugins + new transcoding profiles can be added by PeerTube plugins
-
-
+
+
VIDEO STUDIO
Allows your users to edit their video (cut, add intro/outro, add a watermark etc)
-
+
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html index 1df7bb164..38def2fbb 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.html +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html @@ -12,7 +12,7 @@ >
-
+
@@ -46,10 +46,10 @@ - Accepted + Accepted - Pending + Pending {{ follow.score }} diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html index 767e92d18..207ca81a4 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.html +++ b/client/src/app/+admin/follows/following-list/following-list.component.html @@ -19,7 +19,7 @@
-
+
@@ -48,10 +48,10 @@ - Accepted + Accepted - Pending + Pending {{ follow.createdAt | date: 'short' }} diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html index 3634951c9..b302014b6 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html @@ -13,7 +13,7 @@ >
-
+
@@ -53,11 +53,11 @@ - NSFW + NSFW - Unfederated + Unfederated diff --git a/client/src/app/+admin/overview/comments/video-comment-list.component.html b/client/src/app/+admin/overview/comments/video-comment-list.component.html index 27a5d82ff..6fdefbfe2 100644 --- a/client/src/app/+admin/overview/comments/video-comment-list.component.html +++ b/client/src/app/+admin/overview/comments/video-comment-list.component.html @@ -25,7 +25,7 @@
-
+
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html index 772ebf272..7e0eaf280 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html @@ -57,7 +57,7 @@
-
+
@@ -67,8 +67,8 @@
{{ error }}
-
-
+
+
-
- -
-
- - -
- {{ formErrors.username }} +
+
+ +
+ + +
+ {{ formErrors.username }} +
-
-
- - -
- {{ formErrors.channelName }} +
+ + +
+ {{ formErrors.channelName }} +
-
-
- - -
- {{ formErrors.email }} +
+ + +
+ {{ formErrors.email }} +
-
-
- - - - - If you leave the password empty, an email will be sent to the user. - - - +
+ + + + + If you leave the password empty, an email will be sent to the user. + + + - + -
- {{ formErrors.password }} +
+ {{ formErrors.password }} +
-
-
- -
- + + +
+ +
+ {{ formErrors.role }} +
+
+ +
+ + + + +
+ Transcoding is enabled. The video quota only takes into account original video size.
+ At most, this user could upload ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}. +
+ +
+ {{ formErrors.videoQuota }} +
+
+ +
+ + + + +
+ {{ formErrors.videoQuotaDaily }} +
+
+ +
+ + +
+ +
-
- {{ formErrors.role }} +
+
+ + + + +
+
- -
- - - - -
- Transcoding is enabled. The video quota only takes into account original video size.
- At most, this user could upload ~ {{ computeQuotaWithTranscoding() | bytes: 0 }}. -
- -
- {{ formErrors.videoQuota }} -
-
- -
- - - - -
- {{ formErrors.videoQuotaDaily }} -
-
- -
- - -
- -
-
- -
- -
- - - - -
-
-
-
-
+
+
-
+
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.ts b/client/src/app/+admin/overview/users/user-edit/user-edit.ts index 069b62a53..395d07423 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-edit.ts +++ b/client/src/app/+admin/overview/users/user-edit/user-edit.ts @@ -46,10 +46,6 @@ export abstract class UserEdit extends FormReactive implements OnInit { .concat(this.serverConfig.plugin.registeredExternalAuths.map(p => p.npmName)) } - isInBigView () { - return this.screenService.getWindowInnerWidth() > 1600 - } - buildRoles () { const authUser = this.auth.getUser() diff --git a/client/src/app/+admin/overview/users/user-edit/user-password.component.html b/client/src/app/+admin/overview/users/user-edit/user-password.component.html index 1238d1839..35f36e465 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-password.component.html +++ b/client/src/app/+admin/overview/users/user-edit/user-password.component.html @@ -1,20 +1,16 @@
-
+
+ + +
-
- -
- -
-
-
- {{ formErrors.password }} -
+
+ {{ formErrors.password }}
diff --git a/client/src/app/+admin/overview/users/user-edit/user-password.component.scss b/client/src/app/+admin/overview/users/user-edit/user-password.component.scss index acb680682..54f782086 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-password.component.scss +++ b/client/src/app/+admin/overview/users/user-edit/user-password.component.scss @@ -1,13 +1,9 @@ @use '_variables' as *; @use '_mixins' as *; -input:not([type=submit]):not([type=checkbox]) { +input[type=text], +input[type=password] { @include peertube-input-text(340px); - - display: block; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-right: 0; } input[type=submit] { @@ -17,7 +13,3 @@ input[type=submit] { margin-top: 10px; } - -.input-group-append { - height: 30px; -} diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html index 62eeef8fe..f6915ae9a 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.html +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html @@ -26,7 +26,7 @@
-
+
@@ -90,7 +90,7 @@ - +
@@ -101,13 +101,13 @@
-
Muted
-
Banned
+
Muted
+
Banned
- {{ user.roleLabel }} - {{ user.roleLabel }} + {{ user.roleLabel }} + {{ user.roleLabel }} diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss index 8160703f0..6449f5064 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.scss @@ -1,5 +1,6 @@ @use '_variables' as *; @use '_mixins' as *; +@use '~bootstrap/scss/functions' as *; .add-button { @include create-button; @@ -23,8 +24,8 @@ tr.banned > td { font-weight: $font-semibold; } -.badges-username { - margin-left: 15px; +.cell-username .pt-badge { + @include margin-left(15px); } .user-table-primary-text .glyphicon { diff --git a/client/src/app/+admin/overview/videos/video-list.component.html b/client/src/app/+admin/overview/videos/video-list.component.html index 75d9be5f1..2f36c27b7 100644 --- a/client/src/app/+admin/overview/videos/video-list.component.html +++ b/client/src/app/+admin/overview/videos/video-list.component.html @@ -21,7 +21,7 @@
-
+
@@ -67,25 +67,25 @@ - Local - Remote + Local + Remote - {{ video.privacy.label }} + {{ video.privacy.label }} - NSFW + NSFW - {{ video.state.label }} + {{ video.state.label }} - Account muted - Server muted + Account muted + Server muted - Blocked + Blocked - HLS - WebTorrent ({{ video.files.length }}) - Live + HLS + WebTorrent ({{ video.files.length }}) + Live {{ getFilesSize(video) | bytes: 1 }} @@ -121,7 +121,7 @@
- +
diff --git a/client/src/app/+admin/overview/videos/video-list.component.scss b/client/src/app/+admin/overview/videos/video-list.component.scss index cb47b6548..dcd41a1b4 100644 --- a/client/src/app/+admin/overview/videos/video-list.component.scss +++ b/client/src/app/+admin/overview/videos/video-list.component.scss @@ -7,10 +7,8 @@ my-embed { width: 50%; } -.badge { - @include peertube-badge; - - margin-right: 5px; +.pt-badge { + @include margin-right(5px); } .video-info > div { diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html index 33575ef52..23dde86b4 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html @@ -32,9 +32,9 @@
- Installed + Installed - + Official
diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.scss b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.scss index 10401e9df..55baa038f 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.scss +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.scss @@ -22,11 +22,10 @@ } } -.badge { +.pt-badge { @include margin-left(15px); font-size: 13px; - font-weight: $font-semibold; } .alert { diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html index 301591786..8068fe626 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.html +++ b/client/src/app/+admin/system/jobs/jobs.component.html @@ -21,7 +21,7 @@ any - {{ state }} + {{ state }}
@@ -62,7 +62,7 @@ {{ job.priority }} - {{ job.state }} + {{ job.state }} @@ -107,8 +107,8 @@ - No {{ jobState }} jobs found. - No {{ jobType }} jobs found that are {{ jobState }}. + No {{ jobState }} jobs found. + No {{ jobType }} jobs found that are {{ jobState }}.
diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss index a9e5e8d4b..eadaf7904 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.scss +++ b/client/src/app/+admin/system/jobs/jobs.component.scss @@ -55,7 +55,3 @@ pre { .job-error { color: #ff0000; } - -.select-filter-block .badge { - @include peertube-badge; -} diff --git a/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html b/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html index 3751747a9..61b89082c 100644 --- a/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html +++ b/client/src/app/+manage/video-channel-edit/video-channel-edit.component.html @@ -3,42 +3,41 @@
-
-
+
+
NEW CHANNEL
CHANNEL
- -
+ +
Banner image of the channel
- + - + - +
+
-
- @{{ instanceHost }} -
+
@{{ instanceHost }}
{{ formErrors['name'] }}
- +
- +