mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-14 02:26:55 -07:00
merge
This commit is contained in:
commit
f60fbcc6d7
3 changed files with 11 additions and 7 deletions
|
@ -12,6 +12,9 @@ ____
|
|||
___
|
||||
<a href='https://play.google.com/store/apps/details?id=com.tidusjar.Ombi&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img width="150" alt='Get it on Google Play' src='https://play.google.com/intl/en_gb/badges/images/generic/en_badge_web_generic.png'/></a>
|
||||
|
||||
<a href='https://itunes.apple.com/us/app/ombi/id1335260043?ls=1&mt=8'><img width="150" alt='Get it on App Store' src='https://i.imgur.com/cJFa0M4.png'/></a>
|
||||
|
||||
|
||||
___
|
||||
|
||||
We also now have merch up on Teespring!
|
||||
|
|
|
@ -72,6 +72,10 @@
|
|||
|
||||
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li [routerLinkActive]="['active']">
|
||||
<a href="#" (click)="openMobileApp($event)">
|
||||
<i class="fa fa-mobile"></i>{{ 'NavigationBar.OpenMobileApp' | translate }}</a>
|
||||
</li>
|
||||
<li *ngIf="hasRole('Admin') " id="settings" [routerLinkActive]="['active']">
|
||||
<a [routerLink]="['/Settings/About']">
|
||||
|
||||
|
@ -93,10 +97,6 @@
|
|||
<a [routerLink]="['/usermanagement/updatedetails']">
|
||||
<i class="fa fa-key"></i>{{ 'NavigationBar.UpdateDetails' | translate }}</a>
|
||||
</li>
|
||||
<li [routerLinkActive]="['active']">
|
||||
<a href="#" (click)="openMobileApp($event)">
|
||||
<i class="fa fa-mobile"></i>{{ 'NavigationBar.OpenMobileApp' | translate }}</a>
|
||||
</li>
|
||||
<li [routerLinkActive]="['active']">
|
||||
<a (click)="logOut()">
|
||||
<i class="fa fa-sign-out"></i> {{ 'NavigationBar.Logout' | translate }}</a>
|
||||
|
|
|
@ -124,13 +124,14 @@
|
|||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-sm-2 col-sm-push-3 small-padding">
|
||||
|
||||
<div style="float:right">
|
||||
<div class="col-sm-3 col-sm-push-3 small-padding">
|
||||
<div class="row">
|
||||
<div class="col-md-2 col-md-push-6">
|
||||
|
||||
<a *ngIf="request.showSubscribe && !request.subscribed" style="color:white" (click)="subscribe(request)" pTooltip="Subscribe for notifications"> <i class="fa fa-rss"></i></a>
|
||||
<a *ngIf="request.showSubscribe && request.subscribed" style="color:red" (click)="unSubscribe(request)" pTooltip="Unsubscribe notification"> <i class="fa fa-rss"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="isAdmin">
|
||||
<div *ngIf="!request.approved" id="approveBtn">
|
||||
<form>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue