From 0b7a7a6bbbe86e326dc00a1a21c081cc40590219 Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Sun, 26 Aug 2018 23:26:15 +0100
Subject: [PATCH] Sorted out the requests page UI !wip #2313

---
 src/Ombi.Core/Engine/MusicSearchEngine.cs     |  2 +-
 .../music/musicrequests.component.html        | 21 +++++++---------
 .../search/music/albumsearch.component.scss   |  3 ---
 .../app/search/music/albumsearch.component.ts |  1 -
 src/Ombi/ClientApp/styles/base.scss           | 24 ++++---------------
 src/Ombi/wwwroot/translations/en.json         |  1 +
 6 files changed, 14 insertions(+), 38 deletions(-)
 delete mode 100644 src/Ombi/ClientApp/app/search/music/albumsearch.component.scss

diff --git a/src/Ombi.Core/Engine/MusicSearchEngine.cs b/src/Ombi.Core/Engine/MusicSearchEngine.cs
index 17f1aed54..d0e577801 100644
--- a/src/Ombi.Core/Engine/MusicSearchEngine.cs
+++ b/src/Ombi.Core/Engine/MusicSearchEngine.cs
@@ -154,7 +154,7 @@ namespace Ombi.Core.Engine
                 Title = a.title,
                 Disk = a.images?.FirstOrDefault(x => x.coverType.Equals("disc"))?.url
             };
-            if (vm.Monitored)
+            if (a.artistId > 0)
             {
                 //TODO THEY HAVE FIXED THIS IN DEV
                 // The JSON is different for some stupid reason
diff --git a/src/Ombi/ClientApp/app/requests/music/musicrequests.component.html b/src/Ombi/ClientApp/app/requests/music/musicrequests.component.html
index 221d829a0..85150edeb 100644
--- a/src/Ombi/ClientApp/app/requests/music/musicrequests.component.html
+++ b/src/Ombi/ClientApp/app/requests/music/musicrequests.component.html
@@ -44,7 +44,7 @@
 <br />
 
 
-<div>
+<div class="col-md-12">
     <div *ngFor="let request of albumRequests"  class="col-md-4">
         <div class="row">
             <div class="album-bg backdrop" [style.background-image]="request.background"></div>
@@ -77,10 +77,6 @@
                         <span *ngIf="isAdmin && request.requestedUser.alias">{{request.requestedUser.alias}}</span>
                         <span *ngIf="isAdmin && !request.requestedUser.alias">{{request.requestedUser.userName}}</span>
                     </div>
-                    <div class="request-status">
-                        <span>{{ 'Requests.Status' | translate }} </span>
-                        <span class="label label-success" id="requestedStatusLabel">{{request.status}}</span>
-                    </div>
 
                     <div class="requested-status">
                         <span>{{ 'Requests.RequestStatus' | translate }} </span>
@@ -101,19 +97,18 @@
                     </div>
 
 
-                    <div id="releaseDate">{{ 'Requests.TheatricalRelease' | translate: {date: request.releaseDate | date: 'mediumDate'} }}</div>
-                    <div *ngIf="request.digitalReleaseDate" id="digitalReleaseDate">{{ 'Requests.DigitalRelease' | translate: {date: request.digitalReleaseDate | date: 'mediumDate'} }}</div>
-                    <div id="requestedDate">{{ 'Requests.RequestDate' | translate }} {{request.requestedDate | date}}</div>
+                    <div id="releaseDate">{{ 'Requests.ReleaseDate' | translate: {date: request.releaseDate | date: 'mediumDate'} }}</div>
+                    <div id="requestedDate">{{ 'Requests.RequestDate' | translate }} {{request.requestedDate | date: 'mediumDate'}}</div>
                     <br />
                 </div>
-                <div *ngIf="isAdmin">
+                <!-- <div *ngIf="isAdmin">
                     <div *ngIf="request.qualityOverrideTitle" class="quality-override">{{ 'Requests.QualityOverride' | translate }}
                         <span>{{request.qualityOverrideTitle}} </span>
                     </div>
                     <div *ngIf="request.rootPathOverrideTitle" class="root-override">{{ 'Requests.RootFolderOverride' | translate }}
                         <span>{{request.rootPathOverrideTitle}} </span>
                     </div>
-                </div>
+                </div> -->
 
             </div>
             <div class="col-sm-12 small-padding">
@@ -130,7 +125,7 @@
                 </div> -->
                 <div *ngIf="isAdmin">
                     <div *ngIf="!request.approved" id="approveBtn">
-                        <form>
+                        <form class="col-md-6"> 
                             <button (click)="approve(request)" style="text-align: right" class="btn btn-sm btn-success-outline approve" type="submit">
                                 <i class="fa fa-plus"></i> {{ 'Common.Approve' | translate }}
                             </button>
@@ -168,13 +163,13 @@
                             </ul>
                         </div> -->
 
-                        <div *ngIf="!request.denied" id="denyBtn">
+                        <div *ngIf="!request.denied" id="denyBtn" class="col-md-6">
                             <button type="button" (click)="deny(request)" class="btn btn-sm btn-danger-outline deny">
                                 <i class="fa fa-times"></i> {{ 'Requests.Deny' | translate }}
                             </button>
                         </div>
                     </div>
-                    <form id="removeBtn">
+                    <form id="removeBtn" class="col-md-6">
                         <button (click)="removeRequest(request)" style="text-align: right" class="btn btn-sm btn-danger-outline delete">
                             <i class="fa fa-minus"></i> {{ 'Requests.Remove' | translate }}
                         </button>
diff --git a/src/Ombi/ClientApp/app/search/music/albumsearch.component.scss b/src/Ombi/ClientApp/app/search/music/albumsearch.component.scss
deleted file mode 100644
index 799b4957f..000000000
--- a/src/Ombi/ClientApp/app/search/music/albumsearch.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.album-cover {
-    width:300px;
-}
diff --git a/src/Ombi/ClientApp/app/search/music/albumsearch.component.ts b/src/Ombi/ClientApp/app/search/music/albumsearch.component.ts
index 29824a970..0f9a373e2 100644
--- a/src/Ombi/ClientApp/app/search/music/albumsearch.component.ts
+++ b/src/Ombi/ClientApp/app/search/music/albumsearch.component.ts
@@ -9,7 +9,6 @@ import { NotificationService, RequestService } from "../../services";
 @Component({
     selector: "album-search",
     templateUrl: "./albumsearch.component.html",
-    styleUrls: ["./albumsearch.component.scss"],
 })
 export class AlbumSearchComponent {
 
diff --git a/src/Ombi/ClientApp/styles/base.scss b/src/Ombi/ClientApp/styles/base.scss
index 1afad391c..a9f3119fa 100644
--- a/src/Ombi/ClientApp/styles/base.scss
+++ b/src/Ombi/ClientApp/styles/base.scss
@@ -1005,23 +1005,7 @@ a > h4:hover {
     border-radius: .25em;
 }
 
-.form-control-grid {
-    display: block;
-    width: inherit !important;
-    height: 39px;
-    color: #fefefe;
-    border-radius: 5px;
-    padding: 8px 16px;
-    font-size: 15px;
-    line-height: 1.42857143;
-    color: #2b3e50;
-    background-color: #ffffff;
-    background-image: none;
-    border: 1px solid transparent;
-    border-radius: 0;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-    box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-    -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-}
\ No newline at end of file
+.album-cover {
+    width:300px;
+}
+
diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index 74a6fc7cc..d5d8969df 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -125,6 +125,7 @@
     "RequestStatus": "Request status:",
     "Denied": " Denied:",
     "TheatricalRelease": "Theatrical Release: {{date}}",
+    "ReleaseDate": "Released: {{date}}",
     "TheatricalReleaseSort": "Theatrical Release",
     "DigitalRelease": "Digital Release: {{date}}",
     "RequestDate": "Request Date:",