diff --git a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs index 299a775c5..2b0b8b17e 100644 --- a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs +++ b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs @@ -146,7 +146,6 @@ namespace Ombi.Core.Engine.V2 item.Approved = oldModel.Approved; item.SeasonRequests = oldModel.SeasonRequests; item.RequestId = oldModel.RequestId; - item.Banner = item.Banner.Replace("http", "https"); if (!string.IsNullOrEmpty(item.Images?.Medium)) { diff --git a/src/Ombi/ClientApp/src/app/app.module.ts b/src/Ombi/ClientApp/src/app/app.module.ts index 16dfba6a8..1094ea7dc 100644 --- a/src/Ombi/ClientApp/src/app/app.module.ts +++ b/src/Ombi/ClientApp/src/app/app.module.ts @@ -33,6 +33,8 @@ import { MatCardModule } from "@angular/material/card"; import { MatInputModule } from "@angular/material/input"; import { MatSlideToggleModule } from "@angular/material/slide-toggle"; import { MatTabsModule } from "@angular/material/tabs"; +import { MatTooltipModule } from "@angular/material/tooltip"; + import { MDBBootstrapModule, CardsFreeModule, NavbarModule } from "angular-bootstrap-md"; @@ -60,10 +62,8 @@ import { LayoutModule } from '@angular/cdk/layout'; import { SearchV2Service } from "./services/searchV2.service"; import { NavSearchComponent } from "./my-nav/nav-search.component"; import { OverlayModule } from "@angular/cdk/overlay"; -import { getBaseLocation } from "./shared/functions/common-functions"; import { StorageService } from "./shared/storage/storage-service"; import { SignalRNotificationService } from "./services/signlarnotification.service"; - const routes: Routes = [ { path: "*", component: PageNotFoundComponent }, { path: "", redirectTo: "/discover", pathMatch: "full" }, @@ -125,6 +125,7 @@ export function JwtTokenGetter() { MatButtonModule, NavbarModule, MatCardModule, + MatTooltipModule, MatInputModule, MatTabsModule, ReactiveFormsModule, diff --git a/src/Ombi/ClientApp/src/app/interfaces/ICommon.ts b/src/Ombi/ClientApp/src/app/interfaces/ICommon.ts index db11b80a0..f0bcd8983 100644 --- a/src/Ombi/ClientApp/src/app/interfaces/ICommon.ts +++ b/src/Ombi/ClientApp/src/app/interfaces/ICommon.ts @@ -33,4 +33,8 @@ export interface INavBar { link: string; requiresAdmin: boolean; enabled: boolean; + toolTip?: boolean; + toolTipMessage?: string; + style?: string; + donation?: boolean; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html index 01ad85faf..c849d80e8 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html @@ -3,18 +3,29 @@ {{applicationName}} - - {{nav.icon}} -  {{nav.name | translate}} - - - exit_to_app - {{ 'NavigationBar.Logout' | translate }} - +
+ + + + + + {{nav.icon}} +  {{nav.name | translate}} + + + + {{nav.icon}} +  {{nav.name | translate}} + + +
+ + + + exit_to_app + {{ 'NavigationBar.Logout' | translate }} +
@@ -34,16 +45,16 @@ - -
-
- - wb_incandescent - brightness_4 - -
-
- + +
+
+ + wb_incandescent + brightness_4 + +
+
+ diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts index 4a20f6047..3b61bc4f8 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts @@ -47,6 +47,7 @@ export class MyNavComponent implements OnInit { { name: "NavigationBar.Issues", icon: "notification_important", link: "/issues", requiresAdmin: false, enabled: this.issuesEnabled }, { name: "NavigationBar.UserManagement", icon: "account_circle", link: "/usermanagement", requiresAdmin: true, enabled: true }, { name: "NavigationBar.Calendar", icon: "calendar_today", link: "/calendar", requiresAdmin: false, enabled: true }, + { name: "NavigationBar.Donate", icon: "attach_money", link: "https://www.paypal.me/PlexRequestsNet", donation: true, requiresAdmin: true, enabled: true, toolTip: true, style: "color:red;", toolTipMessage: 'NavigationBar.DonateTooltip' }, { name: "NavigationBar.Settings", icon: "settings", link: "/Settings/About", requiresAdmin: true, enabled: true }, { name: "NavigationBar.UserPreferences", icon: "person", link: "/user-preferences", requiresAdmin: false, enabled: true }, ];