github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 13:23:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sorted out the requests page UI !wip #2313

Browse source
This commit is contained in:
Jamie 2018-08-26 23:26:15 +01:00
commit 0b7a7a6bbb
6 changed files with 14 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Core/Engine/MusicSearchEngine.cs
View file

@ -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

21
src/Ombi/ClientApp/app/requests/music/musicrequests.component.html
View file

@ -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>

3
src/Ombi/ClientApp/app/search/music/albumsearch.component.scss
View file

@ -1,3 +0,0 @@
.album-cover {
width:300px;
}

1
src/Ombi/ClientApp/app/search/music/albumsearch.component.ts
View file

@ -9,7 +9,6 @@ import { NotificationService, RequestService } from "../../services";
@Component({
selector: "album-search",
templateUrl: "./albumsearch.component.html",
styleUrls: ["./albumsearch.component.scss"],
})
export class AlbumSearchComponent {

22
src/Ombi/ClientApp/styles/base.scss
View file

@ -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;
.album-cover {
width:300px;
}

1
src/Ombi/wwwroot/translations/en.json
View file

@ -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:",