open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4043 from Ombi-app/develop-test2

Browse Source 
Some new updates on the TV detail page + quick fixes
pull/4069/head v4.0.1102
Jamie 4 years ago committed by GitHub
parent fc66a72695 23705d5069
commit f3b056d12a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 178 additions and 129 deletions
Show Stats Download Patch File Download Diff File

61
src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-information-panel/tv-information-panel.component.html
Unescape View File

@ -1,63 +1,68 @@
<div>
<div class="left-panel-details">
<div>
<div class="rating medium-font">
<span *ngIf="tv.rating">
<img style="width: 4em;" src="{{baseUrl}}/images/tvm-logo.png"> {{tv.rating}}/10
<img class="rating-small" src="{{baseUrl}}/images/tvm-logo.png"> {{tv.rating}}/10
</span>
<span *ngIf="ratings?.score && ratings?.class">
<img class="rating-small" src="{{baseUrl}}/images/{{ratings.class === 'rotten' ? 'rotten-rotten.svg' : 'rotten-fresh.svg'}}"> {{ratings.score}}%
</span>
<div *ngIf="streams?.length > 0">
</div>
<div *ngIf="streams?.length > 0" class="streaming-on-container">
<hr>
<strong>{{'MediaDetails.StreamingOn' | translate }}:</strong>
<div class="streaming-on-content">
<span class="label">{{'MediaDetails.StreamingOn' | translate }}:</span>
<div>
<span *ngFor="let stream of streams">
<img class="stream-small" [matTooltip]="stream.streamingProvider" src="https://image.tmdb.org/t/p/original{{stream.logo}}">
</span>
</div>
</div>
</div>
<hr>
<div *ngIf="tv.status">
<strong>{{'MediaDetails.Status' | translate }}:</strong>
<span class="label">{{'MediaDetails.Status' | translate }}:</span>
{{tv.status}}
</div>
<strong>First Aired:</strong>
<span class="label">First Aired:</span>
{{tv.firstAired | date: 'mediumDate'}}
</div>
</div>
<div *ngIf="seasonCount">
<strong>Seasons:</strong>
<div *ngIf="seasonCount">
<span class="label">Seasons:</span>
{{seasonCount}}
</div>
<div *ngIf="totalEpisodes">
<strong>Episodes:</strong>
</div>
<div *ngIf="totalEpisodes">
<span class="label">Episodes:</span>
{{totalEpisodes}}
</div>
</div>
<div *ngIf="advancedOptions && request?.rootPathOverrideTitle">
<strong>{{'MediaDetails.RootFolderOverride' | translate }}:</strong>
<div *ngIf="advancedOptions && request?.rootPathOverrideTitle">
<span class="label">{{'MediaDetails.RootFolderOverride' | translate }}:</span>
<div>{{request.rootPathOverrideTitle}}</div>
</div>
<div *ngIf="advancedOptions && request?.qualityOverrideTitle">
<strong>{{'MediaDetails.QualityOverride' | translate }}:</strong>
</div>
<div *ngIf="advancedOptions && request?.qualityOverrideTitle">
<span class="label">{{'MediaDetails.QualityOverride' | translate }}:</span>
<div>{{request.qualityOverrideTitle}}</div>
</div>
</div>
<div>
<strong>{{'MediaDetails.Runtime' | translate }}:</strong>
<div>
<span class="label">{{'MediaDetails.Runtime' | translate }}:</span>
{{'MediaDetails.Minutes' | translate:{ runtime: tv.runtime} }}
</div>
</div>
<div *ngIf="tv.network">
<strong>Network:</strong>
<div *ngIf="tv.network">
<span class="label">Network:</span>
{{tv.network.name}}
</div>
</div>
<div *ngIf="tv.genre">
<strong>{{'MediaDetails.Genres' | translate }}:</strong>
<div *ngIf="tv.genre">
<span class="label">{{'MediaDetails.Genres' | translate }}:</span>
<div>
<span *ngFor="let genre of tv.genre">
{{genre}} |
</span>
</div>
</div>
</div>

4
src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
Unescape View File

@ -67,8 +67,8 @@
<div class="row">
<div class="col-12 col-md-2">
<mat-card class="mat-elevation-z8">
<mat-card-content class="medium-font">
<mat-card class="mat-elevation-z8 spacing-below">
<mat-card-content>
<tv-information-panel [tv]="tv" [request]="showRequest"
[advancedOptions]="showAdvanced"></tv-information-panel>
</mat-card-content>

14
src/Ombi/ClientApp/src/app/media-details/media-details.component.scss
Unescape View File

@ -288,6 +288,18 @@
font-weight:500;
}
.left-panel-details .streaming-on-content{
display:flex;
justify-content: center;
align-items: center;
flex-flow:row wrap;
}
.left-panel-details .streaming-on-content .label{
white-space:nowrap;
padding-right:10px;
}
.left-panel-details{
font-weight:100;
}
@ -314,6 +326,7 @@
padding:2px 1.5em;;
width:170px;
margin-top:10px;
margin-left:10px;
}
@media (max-width:500px){
@ -330,6 +343,7 @@
.media-row .mat-raised-button{
width:100%;
margin-left:0px;
}
.media-row .btn-spacing{

4
src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html
Unescape View File

@ -1,6 +1,6 @@
<settings-menu>
</settings-menu>
<div *ngIf="form" class="container">
<div *ngIf="form" class="small-middle-container">
<fieldset>
<legend>Mobile Notifications</legend>
@ -47,7 +47,7 @@
<div class="md-form-field ">
<div>
<button mat-raised-button type="submit " color="primary" [disabled]="form.invalid ">Submit</button>
<button mat-raised-button type="submit " color="accent" [disabled]="form.invalid ">Submit</button>
</div>
</div>
</form>

1
src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.coponent.ts
Unescape View File

@ -11,6 +11,7 @@ import { MatTableDataSource } from "@angular/material/table";
@Component({
templateUrl: "./cloudmobile.component.html",
styleUrls: ["./notificationtemplate.component.scss"]
})
export class CloudMobileComponent implements OnInit {

4
src/Ombi/ClientApp/src/app/settings/notifications/gotify.component.html
Unescape View File

@ -42,7 +42,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test
<div id="spinner"></div>
</button>
@ -53,7 +53,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
<button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</form>

4
src/Ombi/ClientApp/src/app/settings/notifications/mattermost.component.html
Unescape View File

@ -47,7 +47,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test
<div id="spinner"></div>
</button>
@ -58,7 +58,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
<button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</form>

12
src/Ombi/ClientApp/src/app/settings/notifications/mobile.component.html
Unescape View File

@ -3,6 +3,7 @@
<div *ngIf="form" class="small-middle-container">
<fieldset>
<legend>Legacy Mobile Notifications</legend>
<div class="lmobile-container">
<div class="col-md-6">
<form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
<div class="row">
@ -33,7 +34,7 @@
</div>
</div>
<div class="row">
<div class="row lmobile-actions">
<div class="form-group">
<label for="select" class="control-label">Users</label>
<div>
@ -46,19 +47,19 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-danger-outline">Send Test Notification</button>
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-danger-outline">Send Test Notification</button>
</div>
</div>
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="remove(form)" class="btn btn-danger-outline">Remove User</button>
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="remove(form)" class="btn btn-danger-outline">Remove User</button>
</div>
</div>
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
<button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</div>
@ -66,8 +67,9 @@
</div>
<div class="col-md-6">
<div class="col-md-6 issue-content">
<notification-templates [templates]="templates" [showSubject]="false"></notification-templates>
</div>
</div>
</fieldset>
</div>

31
src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.scss
Unescape View File

@ -1,15 +1,30 @@
@import "~styles/shared.scss";
::ng-deep ngb-accordion > div.card {
color:white;
padding-top: 0px;
}
::ng-deep ngb-accordion > div.card > div.card-header {
padding:0px;
}
.small-middle-container{
margin: auto;
width: 95%;
margin-top:10px;
}
.lmobile-actions{
display:flex;
justify-content: left;
align-items:flex-end;
}
.lmobile-actions .form-group{
margin-right:10px;
}
.lmobile-container{
display:flex;
margin-top:10px;
}
.issue-content{
justify-content: flex-end;
}
.mat-raised-button{
margin-right:10px;
}

4
src/Ombi/ClientApp/src/app/settings/notifications/pushbullet.component.html
Unescape View File

@ -32,7 +32,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test
<div id="spinner"></div>
</button>
@ -43,7 +43,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
<button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</form>

4
src/Ombi/ClientApp/src/app/settings/notifications/pushover.component.html
Unescape View File

@ -74,7 +74,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test
<div id="spinner"></div>
</button>
@ -85,7 +85,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
<button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</form>

4
src/Ombi/ClientApp/src/app/settings/notifications/slack.component.html
Unescape View File

@ -57,7 +57,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test
<div id="spinner"></div>
</button>
@ -68,7 +68,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
<button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</form>

4
src/Ombi/ClientApp/src/app/settings/notifications/telegram.component.html
Unescape View File

@ -43,7 +43,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test
<div id="spinner"></div>
</button>
@ -52,7 +52,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
<button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</form>

4
src/Ombi/ClientApp/src/app/settings/notifications/webhook.component.html
Unescape View File

@ -31,7 +31,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline">
<button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test
<div id="spinner"></div>
</button>
@ -40,7 +40,7 @@
<div class="form-group">
<div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button>
<button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div>
</div>
</form>

12
src/Ombi/ClientApp/src/styles/Styles.scss
Unescape View File

@ -145,3 +145,15 @@
hr{
border-top: 1px solid $ombi-background-primary;
}
.form-control{
background-color: $ombi-background-accent;
color:#FFF;
border: 1px solid $ombi-background-accent;
}
.form-control:focus{
background-color: $ombi-background-accent;
color:#FFF;
border: 1px solid $ombi-active;
}

Write Preview
Loading…
Cancel
Save