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

Merge pull request #2197 from anojht/cakeday

Browse source 
Final Prep for Cakeday
This commit is contained in:
Jamie 2018-04-28 20:51:17 +01:00 • committed by GitHub
commit 9a8ba3932f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 57 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Ombi/ClientApp/app/app.component.html
View file

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

9
src/Ombi/ClientApp/app/app.component.ts
View file

@ -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);
}

23
src/Ombi/ClientApp/app/issues/issueDetails.component.html
View file

@ -5,12 +5,25 @@
<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>
<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>
<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>
<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">{{issue.userReported.alias}}</h3>
<h3 *ngIf="!issue.userReported?.alias">{{issue.userReported.userName}}</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>

2
src/Ombi/ClientApp/app/search/moviesearch.component.html
View file

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

2
src/Ombi/ClientApp/app/search/tvsearch.component.html
View file

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

15
src/Ombi/ClientApp/app/settings/settingsmenu.component.ts
View file

@ -7,4 +7,19 @@ export class SettingsMenuComponent {
public ignore(event: any): void {
event.preventDefault();
}
public ngOnInit() {
const element = document.getElementById("settings");
if (element != null) {
element.classList.add("active");
}
}
public ngOnDestroy() {
const element = document.getElementById("settings");
if (element != null) {
element.classList.remove("active");
}
}
}

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

@ -962,4 +962,15 @@ a > h4:hover {
.ui-state-active {
background-color: $primary-colour-outline $i;
color: black $i;
}
#themeContent {
font-family: monospace;
}
.reported-by,
.reported-user,
.subject-category,
.subject {
display: inline-block;
}