mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-20 21:33:15 -07:00
Sorted out the requests page UI !wip #2313
This commit is contained in:
parent
b72905ab4a
commit
0b7a7a6bbb
6 changed files with 14 additions and 38 deletions
|
@ -154,7 +154,7 @@ namespace Ombi.Core.Engine
|
||||||
Title = a.title,
|
Title = a.title,
|
||||||
Disk = a.images?.FirstOrDefault(x => x.coverType.Equals("disc"))?.url
|
Disk = a.images?.FirstOrDefault(x => x.coverType.Equals("disc"))?.url
|
||||||
};
|
};
|
||||||
if (vm.Monitored)
|
if (a.artistId > 0)
|
||||||
{
|
{
|
||||||
//TODO THEY HAVE FIXED THIS IN DEV
|
//TODO THEY HAVE FIXED THIS IN DEV
|
||||||
// The JSON is different for some stupid reason
|
// The JSON is different for some stupid reason
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
|
|
||||||
<div>
|
<div class="col-md-12">
|
||||||
<div *ngFor="let request of albumRequests" class="col-md-4">
|
<div *ngFor="let request of albumRequests" class="col-md-4">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="album-bg backdrop" [style.background-image]="request.background"></div>
|
<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.alias}}</span>
|
||||||
<span *ngIf="isAdmin && !request.requestedUser.alias">{{request.requestedUser.userName}}</span>
|
<span *ngIf="isAdmin && !request.requestedUser.alias">{{request.requestedUser.userName}}</span>
|
||||||
</div>
|
</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">
|
<div class="requested-status">
|
||||||
<span>{{ 'Requests.RequestStatus' | translate }} </span>
|
<span>{{ 'Requests.RequestStatus' | translate }} </span>
|
||||||
|
@ -101,19 +97,18 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div id="releaseDate">{{ 'Requests.TheatricalRelease' | translate: {date: request.releaseDate | date: 'mediumDate'} }}</div>
|
<div id="releaseDate">{{ 'Requests.ReleaseDate' | 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: 'mediumDate'}}</div>
|
||||||
<div id="requestedDate">{{ 'Requests.RequestDate' | translate }} {{request.requestedDate | date}}</div>
|
|
||||||
<br />
|
<br />
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="isAdmin">
|
<!-- <div *ngIf="isAdmin">
|
||||||
<div *ngIf="request.qualityOverrideTitle" class="quality-override">{{ 'Requests.QualityOverride' | translate }}
|
<div *ngIf="request.qualityOverrideTitle" class="quality-override">{{ 'Requests.QualityOverride' | translate }}
|
||||||
<span>{{request.qualityOverrideTitle}} </span>
|
<span>{{request.qualityOverrideTitle}} </span>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="request.rootPathOverrideTitle" class="root-override">{{ 'Requests.RootFolderOverride' | translate }}
|
<div *ngIf="request.rootPathOverrideTitle" class="root-override">{{ 'Requests.RootFolderOverride' | translate }}
|
||||||
<span>{{request.rootPathOverrideTitle}} </span>
|
<span>{{request.rootPathOverrideTitle}} </span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div> -->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-12 small-padding">
|
<div class="col-sm-12 small-padding">
|
||||||
|
@ -130,7 +125,7 @@
|
||||||
</div> -->
|
</div> -->
|
||||||
<div *ngIf="isAdmin">
|
<div *ngIf="isAdmin">
|
||||||
<div *ngIf="!request.approved" id="approveBtn">
|
<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">
|
<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 }}
|
<i class="fa fa-plus"></i> {{ 'Common.Approve' | translate }}
|
||||||
</button>
|
</button>
|
||||||
|
@ -168,13 +163,13 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div> -->
|
</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">
|
<button type="button" (click)="deny(request)" class="btn btn-sm btn-danger-outline deny">
|
||||||
<i class="fa fa-times"></i> {{ 'Requests.Deny' | translate }}
|
<i class="fa fa-times"></i> {{ 'Requests.Deny' | translate }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</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">
|
<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 }}
|
<i class="fa fa-minus"></i> {{ 'Requests.Remove' | translate }}
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
.album-cover {
|
|
||||||
width:300px;
|
|
||||||
}
|
|
|
@ -9,7 +9,6 @@ import { NotificationService, RequestService } from "../../services";
|
||||||
@Component({
|
@Component({
|
||||||
selector: "album-search",
|
selector: "album-search",
|
||||||
templateUrl: "./albumsearch.component.html",
|
templateUrl: "./albumsearch.component.html",
|
||||||
styleUrls: ["./albumsearch.component.scss"],
|
|
||||||
})
|
})
|
||||||
export class AlbumSearchComponent {
|
export class AlbumSearchComponent {
|
||||||
|
|
||||||
|
|
|
@ -1005,23 +1005,7 @@ a > h4:hover {
|
||||||
border-radius: .25em;
|
border-radius: .25em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form-control-grid {
|
.album-cover {
|
||||||
display: block;
|
width:300px;
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -125,6 +125,7 @@
|
||||||
"RequestStatus": "Request status:",
|
"RequestStatus": "Request status:",
|
||||||
"Denied": " Denied:",
|
"Denied": " Denied:",
|
||||||
"TheatricalRelease": "Theatrical Release: {{date}}",
|
"TheatricalRelease": "Theatrical Release: {{date}}",
|
||||||
|
"ReleaseDate": "Released: {{date}}",
|
||||||
"TheatricalReleaseSort": "Theatrical Release",
|
"TheatricalReleaseSort": "Theatrical Release",
|
||||||
"DigitalRelease": "Digital Release: {{date}}",
|
"DigitalRelease": "Digital Release: {{date}}",
|
||||||
"RequestDate": "Request Date:",
|
"RequestDate": "Request Date:",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue