From 680c0abd05e1cdbd961540c7bc608017872dd8d0 Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Thu, 26 Apr 2018 03:23:16 -0700
Subject: [PATCH 1/9] fix for issue #2152

---
 src/Ombi/ClientApp/app/app.component.html | 2 +-
 src/Ombi/ClientApp/app/app.component.ts   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Ombi/ClientApp/app/app.component.html b/src/Ombi/ClientApp/app/app.component.html
index 0db13fa9c..9ea51768a 100644
--- a/src/Ombi/ClientApp/app/app.component.html
+++ b/src/Ombi/ClientApp/app/app.component.html
@@ -1,4 +1,4 @@
-<div class="{{ user.name && (hasRole('Admin') || hasRole('PowerUser')) ? 'adminUser' : 'user'}}">
+<div [ngClass]="user.name && roleClass()">
     <p-growl [value]="notificationService.messages" [life]="3000"></p-growl>
     <nav *ngIf="showNav" class="navbar navbar-default navbar-fixed-top">
         <div class="container-fluid">
diff --git a/src/Ombi/ClientApp/app/app.component.ts b/src/Ombi/ClientApp/app/app.component.ts
index a1841109a..c88cc79f1 100644
--- a/src/Ombi/ClientApp/app/app.component.ts
+++ b/src/Ombi/ClientApp/app/app.component.ts
@@ -73,6 +73,15 @@ export class AppComponent implements OnInit {
         });
     }
 
+    public roleClass() {
+        if (this.user.roles.some(r => r === 'Admin')) {
+            return "adminUser";
+        } else if (this.user.roles.some(r => r === 'PowerUser')) {
+            return "powerUser";
+        }
+        return "user";
+    }
+
     public hasRole(role: string): boolean {
         return this.user.roles.some(r => r === role);
     }

From 82a7efc7b8387a3d9ba7ff8026c8f835205e1c70 Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Thu, 26 Apr 2018 03:39:31 -0700
Subject: [PATCH 2/9] separated reported by and subject and added classes

---
 src/Ombi/ClientApp/app/issues/issueDetails.component.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Ombi/ClientApp/app/issues/issueDetails.component.html b/src/Ombi/ClientApp/app/issues/issueDetails.component.html
index 990b9d636..1f2820bf0 100644
--- a/src/Ombi/ClientApp/app/issues/issueDetails.component.html
+++ b/src/Ombi/ClientApp/app/issues/issueDetails.component.html
@@ -8,9 +8,11 @@
             <span class="label label-info">{{IssueStatus[issue.status]}}</span>
             <span class="label label-success">{{issue.issueCategory.value}}</span>
 
-            <h3 *ngIf="issue.userReported?.alias">{{'Issues.ReportedBy' | translate}}: {{issue.userReported.alias}}</h3>
-            <h3 *ngIf="!issue.userReported?.alias">{{'Issues.ReportedBy' | translate}}: {{issue.userReported.userName}}</h3>
-            <h3 *ngIf="issue.subject">{{'Issues.Subject' | translate}}: {{issue.subject}}</h3>
+            <span class="reported-user">
+                <h3 *ngIf="issue.userReported?.alias">{{'Issues.ReportedBy' | translate}}: {{issue.userReported.alias}}</h3>
+                <h3 *ngIf="!issue.userReported?.alias">{{'Issues.ReportedBy' | translate}}: {{issue.userReported.userName}}</h3>
+            </span>
+            <span class="issue-subject"><h3 *ngIf="issue.subject">{{'Issues.Subject' | translate}}: {{issue.subject}}</h3></span>
             <br>
             <div class="form-group">
                 <label for="description" class="control-label" [translate]="'Issues.Description'"></label>

From faf663056d21ccf93e6a5b6f9e0b6cfe3678cb3f Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Thu, 26 Apr 2018 03:58:11 -0700
Subject: [PATCH 3/9] added classes and ids to issue status

---
 src/Ombi/ClientApp/app/issues/issueDetails.component.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Ombi/ClientApp/app/issues/issueDetails.component.html b/src/Ombi/ClientApp/app/issues/issueDetails.component.html
index 1f2820bf0..ed9f93e20 100644
--- a/src/Ombi/ClientApp/app/issues/issueDetails.component.html
+++ b/src/Ombi/ClientApp/app/issues/issueDetails.component.html
@@ -5,7 +5,12 @@
         <h1>{{issue.title}} </h1>
         <div class="col-md-6">
             <img class="img-responsive poster" src="{{posterPath}}" alt="poster">
-            <span class="label label-info">{{IssueStatus[issue.status]}}</span>
+
+            <div class="issue-status">
+                <span *ngIf="issue.status === IssueStatus.Pending" id="pendingLabel" class="label label-warning">{{IssueStatus[issue.status]}}</span>
+                <span *ngIf="issue.status === IssueStatus.InProgress" id="inprogressLabel" class="label label-info">{{IssueStatus[issue.status]}}</span>
+                <span *ngIf="issue.status === IssueStatus.Resolved" id="resolvedLabel" class="label label-success">{{IssueStatus[issue.status]}}</span>
+            </div>
             <span class="label label-success">{{issue.issueCategory.value}}</span>
 
             <span class="reported-user">

From f1320c16de9a07466792c2a451fc63f5b3f74805 Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Thu, 26 Apr 2018 13:21:47 -0700
Subject: [PATCH 4/9] changed theme content textarea to use monospace font

---
 src/Ombi/ClientApp/styles/base.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Ombi/ClientApp/styles/base.scss b/src/Ombi/ClientApp/styles/base.scss
index 2f9b35982..eb6976ea2 100644
--- a/src/Ombi/ClientApp/styles/base.scss
+++ b/src/Ombi/ClientApp/styles/base.scss
@@ -962,4 +962,8 @@ a > h4:hover {
 .ui-state-active {
     background-color: $primary-colour-outline $i;
     color: black $i;
+}
+
+#themeContent {
+    font-family: monospace;
 }
\ No newline at end of file

From ff0ad91a96f538d90154f7cac2e5590161ccbd31 Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Thu, 26 Apr 2018 15:17:38 -0700
Subject: [PATCH 5/9] fixed settings nav item not retaining active class when
 in other tabs in the settings page

---
 src/Ombi/ClientApp/app/app.component.html                 | 2 +-
 src/Ombi/ClientApp/app/settings/settingsmenu.component.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Ombi/ClientApp/app/app.component.html b/src/Ombi/ClientApp/app/app.component.html
index 9ea51768a..2f2c5a5a1 100644
--- a/src/Ombi/ClientApp/app/app.component.html
+++ b/src/Ombi/ClientApp/app/app.component.html
@@ -72,7 +72,7 @@
 
 
                 <ul class="nav navbar-nav navbar-right">
-                    <li *ngIf="hasRole('Admin') " [routerLinkActive]="['active']">
+                    <li *ngIf="hasRole('Admin') " id="settings" [routerLinkActive]="['active']">
                         <a [routerLink]="['/Settings/About']">
 
                             <i *ngIf="!updateAvailable" class="fa fa-cog"></i>
diff --git a/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts b/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
index fa2a30c88..15ab21d28 100644
--- a/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
+++ b/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
@@ -7,4 +7,11 @@ export class SettingsMenuComponent {
     public ignore(event: any): void {
         event.preventDefault();
     }
+
+    public ngOnInit() {
+        var element = document.getElementById("settings");
+        if (element != null) {
+            element.classList.add("active");
+        }
+    }
  }

From 24bd1146113e162c1d87da2a0eafbf6c1e173e16 Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Thu, 26 Apr 2018 15:47:50 -0700
Subject: [PATCH 6/9] fixed linting errors

---
 src/Ombi/ClientApp/app/app.component.ts                   | 4 ++--
 src/Ombi/ClientApp/app/settings/settingsmenu.component.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Ombi/ClientApp/app/app.component.ts b/src/Ombi/ClientApp/app/app.component.ts
index c88cc79f1..182f49226 100644
--- a/src/Ombi/ClientApp/app/app.component.ts
+++ b/src/Ombi/ClientApp/app/app.component.ts
@@ -74,9 +74,9 @@ export class AppComponent implements OnInit {
     }
 
     public roleClass() {
-        if (this.user.roles.some(r => r === 'Admin')) {
+        if (this.user.roles.some(r => r === "Admin")) {
             return "adminUser";
-        } else if (this.user.roles.some(r => r === 'PowerUser')) {
+        } else if (this.user.roles.some(r => r === "PowerUser")) {
             return "powerUser";
         }
         return "user";
diff --git a/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts b/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
index 15ab21d28..ce7f67309 100644
--- a/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
+++ b/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
@@ -9,7 +9,7 @@ export class SettingsMenuComponent {
     }
 
     public ngOnInit() {
-        var element = document.getElementById("settings");
+        const element = document.getElementById("settings");
         if (element != null) {
             element.classList.add("active");
         }

From 79b852ccfb20ad8d45fb0b287b0aa87ece77b82a Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Fri, 27 Apr 2018 15:51:58 -0700
Subject: [PATCH 7/9] added id to emby button to distinguish for UI purposes

---
 src/Ombi/ClientApp/app/search/moviesearch.component.html | 2 +-
 src/Ombi/ClientApp/app/search/tvsearch.component.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Ombi/ClientApp/app/search/moviesearch.component.html b/src/Ombi/ClientApp/app/search/moviesearch.component.html
index 3130cb79d..a2b59df79 100644
--- a/src/Ombi/ClientApp/app/search/moviesearch.component.html
+++ b/src/Ombi/ClientApp/app/search/moviesearch.component.html
@@ -85,7 +85,7 @@
                     <br/>
                     <div *ngIf="result.available">
                         <a *ngIf="result.plexUrl" style="text-align: right" class="btn btn-sm btn-success-outline" href="{{result.plexUrl}}" target="_blank"><i class="fa fa-eye"></i> View On Plex</a>
-                        <a *ngIf="result.embyUrl" style="text-align: right" class="btn btn-sm btn-success-outline" href="{{result.embyUrl}}" target="_blank"><i class="fa fa-eye"></i> View On Emby</a>
+                        <a *ngIf="result.embyUrl" style="text-align: right" id="embybtn" class="btn btn-sm btn-success-outline" href="{{result.embyUrl}}" target="_blank"><i class="fa fa-eye"></i> View On Emby</a>
                     </div>
                     <div class="dropdown" *ngIf="result.available && issueCategories && issuesEnabled">
                         <button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
diff --git a/src/Ombi/ClientApp/app/search/tvsearch.component.html b/src/Ombi/ClientApp/app/search/tvsearch.component.html
index df16b6968..ee5667f76 100644
--- a/src/Ombi/ClientApp/app/search/tvsearch.component.html
+++ b/src/Ombi/ClientApp/app/search/tvsearch.component.html
@@ -129,7 +129,7 @@
                                     </a>
                                 </div>
                                 <div *ngIf="node.data.embyUrl && node.data.available">
-                                    <a style="text-align: right" class="btn btn-sm btn-success-outline" href="{{node.data.embyUrl}}"
+                                    <a style="text-align: right" id="embybtn" class="btn btn-sm btn-success-outline" href="{{node.data.embyUrl}}"
                                        target="_blank">
                                         <i class="fa fa-eye"></i> {{ 'Search.ViewOnEmby' | translate }}
                                     </a>

From 1a01ce6efda5e16a127886b5d08a616535e94b45 Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Fri, 27 Apr 2018 16:35:08 -0700
Subject: [PATCH 8/9] Separated user and subject details into spans and fixed
 styling

---
 .../app/issues/issueDetails.component.html         | 14 ++++++++++----
 src/Ombi/ClientApp/styles/base.scss                |  7 +++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Ombi/ClientApp/app/issues/issueDetails.component.html b/src/Ombi/ClientApp/app/issues/issueDetails.component.html
index ed9f93e20..ece2d9966 100644
--- a/src/Ombi/ClientApp/app/issues/issueDetails.component.html
+++ b/src/Ombi/ClientApp/app/issues/issueDetails.component.html
@@ -12,12 +12,18 @@
                 <span *ngIf="issue.status === IssueStatus.Resolved" id="resolvedLabel" class="label label-success">{{IssueStatus[issue.status]}}</span>
             </div>
             <span class="label label-success">{{issue.issueCategory.value}}</span>
-
+            <br>
+            <span class="reported-by">
+                <h3 *ngIf="issue.userReported?.alias">{{'Issues.ReportedBy' | translate}}:</h3>
+                <h3 *ngIf="!issue.userReported?.alias">{{'Issues.ReportedBy' | translate}}:</h3>
+            </span>
             <span class="reported-user">
-                <h3 *ngIf="issue.userReported?.alias">{{'Issues.ReportedBy' | translate}}: {{issue.userReported.alias}}</h3>
-                <h3 *ngIf="!issue.userReported?.alias">{{'Issues.ReportedBy' | translate}}: {{issue.userReported.userName}}</h3>
+                <h3 *ngIf="issue.userReported?.alias">{{issue.userReported.alias}}</h3>
+                <h3 *ngIf="!issue.userReported?.alias">{{issue.userReported.userName}}</h3>
             </span>
-            <span class="issue-subject"><h3 *ngIf="issue.subject">{{'Issues.Subject' | translate}}: {{issue.subject}}</h3></span>
+            <br>
+            <span class="subject-category"><h3 *ngIf="issue.subject">{{'Issues.Subject' | translate}}:</h3></span>
+            <span class="subject"><h3 *ngIf="issue.subject">{{issue.subject}}</h3></span>
             <br>
             <div class="form-group">
                 <label for="description" class="control-label" [translate]="'Issues.Description'"></label>
diff --git a/src/Ombi/ClientApp/styles/base.scss b/src/Ombi/ClientApp/styles/base.scss
index eb6976ea2..eac9da0a0 100644
--- a/src/Ombi/ClientApp/styles/base.scss
+++ b/src/Ombi/ClientApp/styles/base.scss
@@ -966,4 +966,11 @@ a > h4:hover {
 
 #themeContent {
     font-family: monospace;
+}
+
+.reported-by,
+.reported-user,
+.subject-category,
+.subject {
+    display: inline-block;
 }
\ No newline at end of file

From ddd3be260f46a14aa9b08807ee4122ff01f55a08 Mon Sep 17 00:00:00 2001
From: Anojh <anojh@hotmail.com>
Date: Fri, 27 Apr 2018 17:42:53 -0700
Subject: [PATCH 9/9] fixed settings retaining active class when elsewhere in
 UI

---
 src/Ombi/ClientApp/app/settings/settingsmenu.component.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts b/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
index ce7f67309..eb4cafe16 100644
--- a/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
+++ b/src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
@@ -14,4 +14,12 @@ export class SettingsMenuComponent {
             element.classList.add("active");
         }
     }
+
+    public ngOnDestroy() {
+        const element = document.getElementById("settings");
+        if (element != null) {
+            element.classList.remove("active");
+        }
+    }
+
  }