From 63347a0ff966c7863e5b7431effa1cb0668df893 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 9 Aug 2018 14:55:06 +0200 Subject: Migrate to bootstrap 4 and ng-bootstrap --- client/src/app/+admin/admin.module.ts | 2 - .../edit-custom-config.component.html | 513 +++++++++++---------- .../following-add/following-add.component.html | 2 +- .../src/app/+admin/follows/follows.component.html | 12 +- .../src/app/+admin/follows/follows.component.scss | 6 - client/src/app/+admin/follows/follows.component.ts | 8 +- 6 files changed, 271 insertions(+), 272 deletions(-) (limited to 'client/src/app/+admin') diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts index 8d50b8715..d7ae2f7f0 100644 --- a/client/src/app/+admin/admin.module.ts +++ b/client/src/app/+admin/admin.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core' import { ConfigComponent, EditCustomConfigComponent } from '@app/+admin/config' import { ConfigService } from '@app/+admin/config/shared/config.service' -import { TabsModule } from 'ngx-bootstrap/tabs' import { TableModule } from 'primeng/table' import { SharedModule } from '../shared' import { AdminRoutingModule } from './admin-routing.module' @@ -18,7 +17,6 @@ import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-bl @NgModule({ imports: [ AdminRoutingModule, - TabsModule.forRoot(), TableModule, SharedModule ], 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 0a032df12..49b89cef4 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,290 +1,295 @@
- + - + + -
Instance
+
Instance
-
- - -
- {{ formErrors.instanceName }} -
-
- -
- - -
- {{ formErrors.instanceShortDescription }} -
-
- -
- - -
- {{ formErrors.instanceDescription }} -
-
- -
- - -
- {{ formErrors.instanceTerms }} -
-
- -
- -
- -
-
- {{ formErrors.instanceDefaultClientRoute }} -
-
- -
- - - -
- +
+ + +
+ {{ formErrors.instanceName }} +
-
- {{ formErrors.instanceDefaultNSFWPolicy }} + +
+ + +
+ {{ formErrors.instanceShortDescription }} +
-
- -
Signup
- - - -
- - -
- {{ formErrors.signupLimit }} + +
+ + +
+ {{ formErrors.instanceDescription }} +
-
- -
Import
- - - - - -
Administrator
- -
- - -
- {{ formErrors.adminEmail }} + +
+ + +
+ {{ formErrors.instanceTerms }} +
-
- -
Users
- -
- -
- + +
+ +
+ +
+
+ {{ formErrors.instanceDefaultClientRoute }} +
-
- {{ formErrors.userVideoQuota }} + +
+ + + +
+ +
+
+ {{ formErrors.instanceDefaultNSFWPolicy }} +
-
- - - - -
Twitter
- -
- - - -
- {{ formErrors.servicesTwitterUsername }} + +
Signup
+ + + +
+ + +
+ {{ formErrors.signupLimit }} +
-
- - +
Import
+ + - + -
Transcoding
+
Administrator
- +
+ + +
+ {{ formErrors.adminEmail }} +
+
- +
Users
- +
- +
-
- {{ formErrors.transcodingThreads }} +
+ {{ formErrors.userVideoQuota }}
+ + -
- + + +
Twitter
+
+ + + +
+ {{ formErrors.servicesTwitterUsername }} +
- -
- Cache - - -
- -
- - -
- {{ formErrors.cachePreviewsSize }} + + + + + + + +
Transcoding
+ + + + + +
+ +
+ +
+
+ {{ formErrors.transcodingThreads }} +
+
+ +
+ + +
+ + +
+ Cache + +
-
- -
- - -
- {{ formErrors.cacheCaptionsSize }} + +
+ + +
+ {{ formErrors.cachePreviewsSize }} +
-
- -
Customizations
- -
- - - -
- {{ formErrors.customizationJavascript }} + +
+ + +
+ {{ formErrors.cacheCaptionsSize }} +
-
- -
- - - -
- {{ formErrors.customizationCSS }} + +
Customizations
+ +
+ + + +
+ {{ formErrors.customizationJavascript }} +
-
- - + +
+ + + +
+ {{ formErrors.customizationCSS }} +
+
+ + + It seems the configuration is invalid. Please search potential errors in the different tabs. diff --git a/client/src/app/+admin/follows/following-add/following-add.component.html b/client/src/app/+admin/follows/following-add/following-add.component.html index 72635048c..e08decb3f 100644 --- a/client/src/app/+admin/follows/following-add/following-add.component.html +++ b/client/src/app/+admin/follows/following-add/following-add.component.html @@ -18,5 +18,5 @@ It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers.
- + diff --git a/client/src/app/+admin/follows/follows.component.html b/client/src/app/+admin/follows/follows.component.html index a8258bf70..8eabb3392 100644 --- a/client/src/app/+admin/follows/follows.component.html +++ b/client/src/app/+admin/follows/follows.component.html @@ -1,13 +1,15 @@
Manage follows
- - - + + + + {{ link.title }} - - + + +
diff --git a/client/src/app/+admin/follows/follows.component.scss b/client/src/app/+admin/follows/follows.component.scss index 08b3737f8..766d7853b 100644 --- a/client/src/app/+admin/follows/follows.component.scss +++ b/client/src/app/+admin/follows/follows.component.scss @@ -2,9 +2,3 @@ flex-grow: 0; margin-right: 30px; } - -/deep/ .tab-content { - height: 0; - min-height: 0; - padding: 0; -} diff --git a/client/src/app/+admin/follows/follows.component.ts b/client/src/app/+admin/follows/follows.component.ts index f7af9826c..b6f7715b3 100644 --- a/client/src/app/+admin/follows/follows.component.ts +++ b/client/src/app/+admin/follows/follows.component.ts @@ -1,14 +1,14 @@ import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core' import { NavigationEnd, Router } from '@angular/router' -import { TabsetComponent } from 'ngx-bootstrap/tabs' import { I18n } from '@ngx-translate/i18n-polyfill' +import { NgbTabset } from '@ng-bootstrap/ng-bootstrap' @Component({ templateUrl: './follows.component.html', styleUrls: [ './follows.component.scss' ] }) export class FollowsComponent implements OnInit, AfterViewInit { - @ViewChild('followsMenuTabs') followsMenuTabs: TabsetComponent + @ViewChild('followsMenuTabs') followsMenuTabs: NgbTabset links: { path: string, title: string }[] = [] @@ -53,8 +53,8 @@ export class FollowsComponent implements OnInit, AfterViewInit { for (let i = 0; i < this.links.length; i++) { const path = this.links[i].path - if (url.endsWith(path) === true && this.followsMenuTabs.tabs[i]) { - this.followsMenuTabs.tabs[i].active = true + if (url.endsWith(path) === true) { + this.followsMenuTabs.select(path) return } } -- cgit v1.2.3