Skip to content

Commit

Permalink
Simplify two columns layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chocobozzz
Chocobozzz committed Mar 1, 2024
1 parent c8d1f0d commit 275ba64
Show file tree
Hide file tree
Showing 28 changed files with 390 additions and 430 deletions.
2 changes: 1 addition & 1 deletion client/e2e/src/po/admin-config.po.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export class AdminConfigPage {
}
await go('/admin/config/edit-custom#' + tab)

await $('.section-left-column-title=' + waitTitles[tab]).waitForDisplayed()
await $('h2=' + waitTitles[tab]).waitForDisplayed()
}

async updateNSFWSetting (newValue: 'do_not_list' | 'blur' | 'display') {
Expand Down
16 changes: 8 additions & 8 deletions client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<ng-container [formGroup]="form">

<div class="row mt-5"> <!-- cache grid -->
<div class="pt-two-cols mt-5"> <!-- cache grid -->

<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">CACHE</h2>
<div class="title-col">
<h2 i18n>CACHE</h2>
<div i18n class="inner-form-description">
Some files are not federated, and fetched when necessary. Define their caching policies.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">
<ng-container formGroupName="cache">
<div class="form-group" formGroupName="previews">
<label i18n for="cachePreviewsSize">Number of previews to keep in cache</label>
Expand Down Expand Up @@ -71,16 +71,16 @@ <h2 i18n class="section-left-column-title">CACHE</h2>
</div>
</div>

<div class="row mt-4"> <!-- cache grid -->
<div class="col-12 col-lg-4 col-xl-3">
<div class="pt-two-cols mt-4"> <!-- cache grid -->
<div class="title-col">
<div class="anchor" id="customizations"></div> <!-- customizations anchor -->
<h2 i18n class="section-left-column-title">CUSTOMIZATIONS</h2>
<h2 i18n>CUSTOMIZATIONS</h2>
<div i18n class="inner-form-description">
Slight modifications to your PeerTube instance for when creating a plugin or theme is overkill.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">
<ng-container formGroupName="instance">
<ng-container formGroupName="customizations">
<div class="form-group">
Expand Down
63 changes: 32 additions & 31 deletions client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<ng-container [formGroup]="form">
<div class="row mt-5"> <!-- appearance grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">APPEARANCE</h2>
<div class="pt-two-cols mt-5"> <!-- appearance grid -->
<div class="title-col">
<h2 i18n>APPEARANCE</h2>

<div i18n class="inner-form-description">
Use <a class="link-orange" routerLink="/admin/plugins">plugins & themes</a> for more involved changes, or add slight <a class="link-orange" routerLink="/admin/config/edit-custom" fragment="advanced-configuration">customizations</a>.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="theme">
<div class="form-group">
Expand Down Expand Up @@ -90,14 +91,14 @@ <h2 i18n class="section-left-column-title">APPEARANCE</h2>
</div>

<div class="row mt-4"> <!-- broadcast grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">BROADCAST MESSAGE</h2>
<div class="title-col">
<h2 i18n>BROADCAST MESSAGE</h2>
<div i18n class="inner-form-description">
Display a message on your instance
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="broadcastMessage">

Expand Down Expand Up @@ -146,14 +147,14 @@ <h2 i18n class="section-left-column-title">BROADCAST MESSAGE</h2>
</div>

<div class="row mt-4"> <!-- new users grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">NEW USERS</h2>
<div class="title-col">
<h2 i18n>NEW USERS</h2>
<div i18n class="inner-form-description">
Manage <a class="link-orange" routerLink="/admin/users">users</a> to set their quota individually.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="signup">
<div class="form-group">
Expand Down Expand Up @@ -263,11 +264,11 @@ <h2 i18n class="section-left-column-title">NEW USERS</h2>
</div>

<div class="row mt-4"> <!-- videos grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">VIDEOS</h2>
<div class="title-col">
<h2 i18n>VIDEOS</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="import">

Expand Down Expand Up @@ -375,11 +376,11 @@ <h2 i18n class="section-left-column-title">VIDEOS</h2>
</div>

<div class="row mt-4"> <!-- video channels grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">VIDEO CHANNELS</h2>
<div class="title-col">
<h2 i18n>VIDEO CHANNELS</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">
<div class="form-group" formGroupName="videoChannels">
<label i18n for="videoChannelsMaxPerUser">Max video channels per user</label>

Expand All @@ -397,11 +398,11 @@ <h2 i18n class="section-left-column-title">VIDEO CHANNELS</h2>
</div>

<div class="row mt-4"> <!-- search grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">SEARCH</h2>
<div class="title-col">
<h2 i18n>SEARCH</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="search">
<ng-container formGroupName="remoteUri">
Expand Down Expand Up @@ -486,11 +487,11 @@ <h2 i18n class="section-left-column-title">SEARCH</h2>
</div>

<div class="row mt-4"> <!-- import/export grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">USER IMPORT/EXPORT</h2>
<div class="title-col">
<h2 i18n>USER IMPORT/EXPORT</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="import">
<ng-container formGroupName="users">
Expand Down Expand Up @@ -562,14 +563,14 @@ <h2 i18n class="section-left-column-title">USER IMPORT/EXPORT</h2>
</div>

<div class="row mt-4"> <!-- federation grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">FEDERATION</h2>
<div class="title-col">
<h2 i18n>FEDERATION</h2>
<div i18n class="inner-form-description">
Manage <a class="link-orange" routerLink="/admin/follows">relations</a> with other instances.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="followers">
<ng-container formGroupName="instance">
Expand Down Expand Up @@ -641,11 +642,11 @@ <h2 i18n class="section-left-column-title">FEDERATION</h2>
</div>

<div class="row mt-4"> <!-- administrators grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">ADMINISTRATORS</h2>
<div class="title-col">
<h2 i18n>ADMINISTRATORS</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<div class="form-group" formGroupName="admin">
<label i18n for="adminEmail">Admin email</label>
Expand All @@ -669,15 +670,15 @@ <h2 i18n class="section-left-column-title">ADMINISTRATORS</h2>
</div>

<div class="row mt-4"> <!-- Twitter grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">TWITTER</h2>
<div class="title-col">
<h2 i18n>TWITTER</h2>
<div i18n class="inner-form-description">
Provide the Twitter account representing your instance to improve link previews.
If you don't have a Twitter account, just leave the default value.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="services">
<ng-container formGroupName="twitter">
Expand Down
1 change: 1 addition & 0 deletions client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,4 @@ ngb-tabset:not(.previews) ::ng-deep {
my-actor-banner-edit {
max-width: $form-max-width;
}

8 changes: 4 additions & 4 deletions client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<ng-container formGroupName="instanceCustomHomepage">

<div class="homepage row mt-5"> <!-- homepage grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">INSTANCE HOMEPAGE</h2>
<div class="homepage pt-two-cols mt-5"> <!-- homepage grid -->
<div class="title-col">
<h2 i18n>INSTANCE HOMEPAGE</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<div class="form-group">
<label i18n for="instanceCustomHomepageContent">Homepage</label>
Expand Down
32 changes: 16 additions & 16 deletions client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<ng-container formGroupName="instance">

<div class="row mt-5"> <!-- instance grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">INSTANCE</h2>
<div class="pt-two-cols mt-5"> <!-- instance grid -->
<div class="title-col">
<h2 i18n>INSTANCE</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">
<div class="form-group">
<label i18n for="avatarfile">Square icon</label>

Expand Down Expand Up @@ -102,15 +102,15 @@ <h2 i18n class="section-left-column-title">INSTANCE</h2>
</div>
</div>

<div class="row mt-4"> <!-- moderation & nsfw grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">MODERATION & NSFW</h2>
<div class="pt-two-cols mt-4"> <!-- moderation & nsfw grid -->
<div class="title-col">
<h2 i18n>MODERATION & NSFW</h2>
<div i18n class="inner-form-description">
Manage <a class="link-orange" routerLink="/admin/users">users</a> to build a moderation team.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">
<div class="form-group">
<my-peertube-checkbox inputName="instanceIsNSFW" formControlName="isNSFW">
<ng-template ptTemplate="label">
Expand Down Expand Up @@ -180,12 +180,12 @@ <h2 i18n class="section-left-column-title">MODERATION & NSFW</h2>
</div>
</div>

<div class="row mt-4"> <!-- you and your instance grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">YOU AND YOUR INSTANCE</h2>
<div class="pt-two-cols mt-4"> <!-- you and your instance grid -->
<div class="title-col">
<h2 i18n>YOU AND YOUR INSTANCE</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<div class="form-group">
<label i18n for="instanceAdministrator">Who is behind the instance?</label><my-help helpType="markdownText"></my-help>
Expand Down Expand Up @@ -230,12 +230,12 @@ <h2 i18n class="section-left-column-title">YOU AND YOUR INSTANCE</h2>
</div>
</div>

<div class="row mt-4"> <!-- other information grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">OTHER INFORMATION</h2>
<div class="pt-two-cols mt-4"> <!-- other information grid -->
<div class="title-col">
<h2 i18n>OTHER INFORMATION</h2>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<div class="form-group">
<label i18n for="instanceHardwareInformation">What server/hardware does the instance run on?</label>
Expand Down
17 changes: 9 additions & 8 deletions client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<ng-container [formGroup]="form">

<div class="row mt-5">
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">LIVE</h2>
<div class="pt-two-cols mt-5">
<div class="title-col">
<h2 i18n>LIVE</h2>

<div i18n class="inner-form-description">
Enable users of your instance to stream live.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="live">

Expand Down Expand Up @@ -87,15 +88,15 @@ <h2 i18n class="section-left-column-title">LIVE</h2>
</div>
</div>

<div class="row"> <!-- transcoding live streams grid -->
<div class="col-12 col-lg-4 col-xl-3">
<h2 i18n class="section-left-column-title">TRANSCODING</h2>
<div class="pt-two-cols"> <!-- transcoding live streams grid -->
<div class="title-col">
<h2 i18n>TRANSCODING</h2>
<div i18n class="inner-form-description">
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.
</div>
</div>

<div class="col-12 col-lg-8 col-xl-9">
<div class="content-col">

<ng-container formGroupName="live">
<ng-container formGroupName="transcoding">
Expand Down
Loading

0 comments on commit 275ba64

Please sign in to comment.