Commit 291af1f0 authored by tidusjar's avatar tidusjar

Merge branch 'develop' of https://github.com/tidusjar/ombi into develop

parents 23cceec6 dd785b29
# Changelog
## (unreleased)
## v3.0.4817 (2019-10-15)
### **New Features**
......
<!-- Movie tab -->
<div role="tabpanel" class="tab-pane active" id="MoviesTab">
<ng-template #FilterRef>
<div class="btn-group" role="group">
<a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
{{ 'Search.Suggestions' | translate }}
<i class="fa fa-chevron-down"></i>
</a>
<ul class="dropdown-menu">
<li><a (click)="popularMovies()" [translate]="'Search.Movies.PopularMovies'"></a></li>
<li><a (click)="upcomingMovies()" [translate]="'Search.Movies.UpcomingMovies'"></a></li>
<li><a (click)="topRatedMovies()" [translate]="'Search.Movies.TopRatedMovies'"></a></li>
<li><a (click)="nowPlayingMovies()" [translate]="'Search.Movies.NowPlayingMovies'"></a></li>
</ul>
<button class="btn btn-sm btn-primary-outline" (click)="refineOpen()">
{{ 'Search.Refine' | translate }}
<i class="fa" [ngClass]="{'fa-chevron-down': !refineSearchEnabled, 'fa-chevron-up': refineSearchEnabled}"></i>
</button>
</div>
</ng-template>
<div class="input-group search-bar-background">
<input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate}}" class="form-control form-control-custom form-control-search form-control-withbuttons"
(keyup)="search($event)">
<input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate}}"
class="form-control form-control-custom form-control-search form-control-withbuttons"
(keyup)="search($event)">
<div class="input-group-addon right-radius">
<div class="btn-group" role="group">
<a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
{{ 'Search.Suggestions' | translate }}
<i class="fa fa-chevron-down"></i>
</a>
<ul class="dropdown-menu">
<li><a (click)="popularMovies()" [translate]="'Search.Movies.PopularMovies'"></a></li>
<li><a (click)="upcomingMovies()" [translate]="'Search.Movies.UpcomingMovies'"></a></li>
<li><a (click)="topRatedMovies()" [translate]="'Search.Movies.TopRatedMovies'"></a></li>
<li><a (click)="nowPlayingMovies()" [translate]="'Search.Movies.NowPlayingMovies'"></a></li>
</ul>
<button class="btn btn-sm btn-primary-outline" (click)="refineOpen()">
{{ 'Search.Refine' | translate }}
<i class="fa" [ngClass]="{'fa-chevron-down': !refineSearchEnabled, 'fa-chevron-up': refineSearchEnabled}"></i>
</button>
<div class="search-button-container-inline">
<ng-template [ngTemplateOutlet]="FilterRef"></ng-template>
</div>
<i class="fa fa-search"></i>
</div>
</div>
<div class="row search-button-container">
<ng-template [ngTemplateOutlet]="FilterRef"></ng-template>
</div>
<!-- Refine search options -->
<div class="row top-spacing form-group vcenter" *ngIf="refineSearchEnabled">
<div class="col-md-1">
......
......@@ -3,7 +3,7 @@
padding-top: 5%
}
.form-control-search {
width: 77%;
padding-right: 165px;
}
}
......
<!-- Movie tab -->
<div role="tabpanel" class="tab-pane" id="TvShowTab">
<ng-template #FilterRef>
<div class="btn-group" role="group">
<a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
{{ 'Search.Suggestions' | translate }}
<i class="fa fa-chevron-down"></i>
</a>
<ul class="dropdown-menu">
<li>
<a (click)="popularShows()">{{ 'Search.TvShows.Popular' | translate }} </a>
</li>
<li>
<a (click)="trendingShows()">{{ 'Search.TvShows.Trending' | translate }}</a>
</li>
<li>
<a (click)="mostWatchedShows()">{{ 'Search.TvShows.MostWatched' | translate }}</a>
</li>
<li>
<a (click)="anticipatedShows()">{{ 'Search.TvShows.MostAnticipated' | translate }}</a>
</li>
</ul>
</div>
</ng-template>
<div class="input-group">
<input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate }}" class="form-control form-control-custom form-control-search form-control-withbuttons" (keyup)="search($event)">
<input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate }}"
class="form-control form-control-custom form-control-search form-control-withbuttons"
(keyup)="search($event)">
<div class="input-group-addon right-radius">
<div class="btn-group">
<a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
{{ 'Search.Suggestions' | translate }}
<i class="fa fa-chevron-down"></i>
</a>
<ul class="dropdown-menu">
<li>
<a (click)="popularShows()">{{ 'Search.TvShows.Popular' | translate }} </a>
</li>
<li>
<a (click)="trendingShows()">{{ 'Search.TvShows.Trending' | translate }}</a>
</li>
<li>
<a (click)="mostWatchedShows()">{{ 'Search.TvShows.MostWatched' | translate }}</a>
</li>
<li>
<a (click)="anticipatedShows()">{{ 'Search.TvShows.MostAnticipated' | translate }}</a>
</li>
</ul>
<div class="search-button-container-inline">
<ng-template [ngTemplateOutlet]="FilterRef"></ng-template>
</div>
<i id="tvSearchButton" class="fa fa-search"></i>
</div>
</div>
<div class="row search-button-container">
<ng-template [ngTemplateOutlet]="FilterRef"></ng-template>
</div>
<remaining-requests [tv]="true" [quotaRefreshEvents]="tvRequested.asObservable()" #remainingTvShows></remaining-requests>
<!-- Movie content -->
......@@ -159,6 +171,7 @@
<br/>
<br/>
</div>
</div>
</div>
</div>
......
......@@ -389,6 +389,27 @@ $border-radius: 10px;
padding-right: 105px;
}
.search-button-container {
margin-top: 10px;
text-align: center;
}
@media (max-width: 450px) {
.form-control-search {
padding-right: 0 !important;
}
.search-button-container-inline {
display: none;
}
}
@media (min-width: 450px) {
.search-button-container {
display: none;
}
}
.input-group-addon .btn-group {
position: absolute;
right: 45px;
......
{
}
\ No newline at end of file
"Login": {
"SignInButton": "Prihláste sa",
"UsernamePlaceholder": "Užívateľské meno",
"PasswordPlaceholder": "Heslo",
"RememberMe": "Zapamätať prihlásenie",
"ForgottenPassword": "Zabudli ste heslo?",
"Errors": {
"IncorrectCredentials": "Nesprávne meno alebo heslo"
}
},
"Common": {
"ContinueButton": "Pokračovať",
"Available": "Dostupné",
"PartiallyAvailable": "Čiastočne dostupné",
"Monitored": "Sledované",
"NotAvailable": "Nie je k dispozícii",
"ProcessingRequest": "Spracovávanie požiadavky",
"PendingApproval": "Čaká na schválenie",
"RequestDenied": "Požiadavka zamietnutá",
"NotRequested": "Nepožiadané",
"Requested": "Požiadané",
"Request": "Požiadať",
"Denied": "Zamietnuté",
"Approve": "Schválené",
"PartlyAvailable": "Čiastočne dostupné",
"Errors": {
"Validation": "Skontrolujte zadaný obsah"
}
},
"PasswordReset": {
"EmailAddressPlaceholder": "Emailová adresa",
"ResetPasswordButton": "Nastaviť nové heslo"
},
"LandingPage": {
"OnlineHeading": "Momentálne online",
"OnlineParagraph": "Mediálny server je momentálne online",
"PartiallyOnlineHeading": "Čiastočne online",
"PartiallyOnlineParagraph": "Mediálny server je momentálne online.",
"MultipleServersUnavailable": "Momntálne je {{serversUnavailable}} serverov offline z {{totalServers}}.",
"SingleServerUnavailable": "Momntálne je {{serversUnavailable}} server offline z {{totalServers}}.",
"OfflineHeading": "Momentálne offline",
"OfflineParagraph": "Mediálny server je momentálne offline.",
"CheckPageForUpdates": "Prezrite túto stránku pre aktualizácie."
},
"NavigationBar": {
"Search": "Hľadať",
"Requests": "Požiadavky",
"UserManagement": "Správa užívateľov",
"Issues": "Problémy",
"Vote": "Hlasovať",
"Donate": "Prispieť!",
"DonateLibraryMaintainer": "Darovať správcovi knižnice",
"DonateTooltip": "Takto som presvedčil svoju manželku, aby mi umožnila tráviť svoj voľný čas vývojom Ombi ;)",
"UpdateAvailableTooltip": "K dispozícii je aktualizácia!",
"Settings": "Nastavenie",
"Welcome": "Vitaj {{username}}",
"UpdateDetails": "Aktualizovať údaje",
"Logout": "Odhlásiť sa",
"OpenMobileApp": "Otvoriť mobilnú aplikáciu",
"RecentlyAdded": "Nedávno pridané"
},
"Search": {
"Title": "Hľadať",
"Paragraph": "Chcete sledovať niečo, čo v súčasnosti nie je k dispozícii? Žiadny problém. Vyhľadajte to nižšie a požiadajte o to!",
"MoviesTab": "Filmy",
"TvTab": "Seriály",
"MusicTab": "Hudba",
"Suggestions": "Návrhy",
"NoResults": "Ľutujeme, nenašli sme žiadne výsledky!",
"DigitalDate": "Online vydanie: {{date}}",
"TheatricalRelease": "Kino vydanie: {{date}}",
"ViewOnPlex": "Zobraziť na Plex",
"ViewOnEmby": "Zobraziť na Emby",
"RequestAdded": "Žiadosť o {{title}} bola úspešne pridaná",
"Similar": "Podobné",
"Refine": "Filtrovať",
"SearchBarPlaceholder": "Tu zadajte pre vyhľadávanie",
"Movies": {
"PopularMovies": "Populárne filmy",
"UpcomingMovies": "Očakávané filmy",
"TopRatedMovies": "Najlepšie hodnotené filmy",
"NowPlayingMovies": "Teraz prehrávané filmy",
"HomePage": "Úvodná stránka",
"Trailer": "Upútavka"
},
"TvShows": {
"Popular": "Populárne",
"Trending": "Trendy",
"MostWatched": "Najsledovanejšie",
"MostAnticipated": "Najočakávanejšie",
"Results": "Výsledky",
"AirDate": "Dátum vysielania:",
"AllSeasons": "Všetky série",
"FirstSeason": "Prvá séria",
"LatestSeason": "Posledná séria",
"Select": "Vybrať ...",
"SubmitRequest": "Poslať žiadosť",
"Season": "Séria: {{seasonNumber}}",
"SelectAllInSeason": "Vybrať všetko v danej sérii {{seasonNumber}}"
}
},
"Requests": {
"Title": "Požiadavky",
"Paragraph": "Nižšie nájdete svoje a všetky ďalšie žiadosti, ako aj stav ich sťahovania a schvaľovania.",
"MoviesTab": "Filmy",
"TvTab": "Seriály",
"MusicTab": "Hudba",
"RequestedBy": "Vyžiadané od:",
"Status": "Stav:",
"RequestStatus": "Stav požiadavky:",
"Denied": " Zamietnuté:",
"TheatricalRelease": "Kino vydanie: {{date}}",
"ReleaseDate": "Vydané: {{date}}",
"TheatricalReleaseSort": "Kino vydanie",
"DigitalRelease": "Online vydanie: {{date}}",
"RequestDate": "Dátum požiadavky:",
"QualityOverride": "Prepísanie kvality:",
"RootFolderOverride": "Prepísanie Root priečinku:",
"ChangeRootFolder": "Koreňový priečinok",
"ChangeQualityProfile": "Profil kvality",
"MarkUnavailable": "Označiť nedostupné",
"MarkAvailable": "Označiť dostupné",
"Remove": "Odstrániť",
"Deny": "Odmietnuť",
"Season": "Séria:",
"GridTitle": "Názov",
"AirDate": "Dátum vysielania",
"GridStatus": "Stav",
"ReportIssue": "Nahlásiť problém",
"Filter": "Filter",
"Sort": "Triediť",
"SeasonNumberHeading": "Séria: {seasonNumber}",
"SortTitleAsc": "Názov ▲",
"SortTitleDesc": "Názov ▼",
"SortRequestDateAsc": "Dátum požiadavky ▲",
"SortRequestDateDesc": "Dátum požiadavky ▼",
"SortStatusAsc": "Stav ▲",
"SortStatusDesc": "Stav ▼",
"Remaining": {
"Quota": "{{remaining}}/{{total}} zostávajúce žiadosti",
"NextDays": "Ďalšia žiadosť bude pridaná o {{time}} dní",
"NextHours": "Ďalšia žiadosť bude pridaná o {{time}} hodín",
"NextMinutes": "Ďalšia žiadosť bude pridaná o {{time}} minút",
"NextMinute": "Ďalšia žiadosť bude pridaná o {{time}} minútu"
}
},
"Issues": {
"Title": "Problémy",
"PendingTitle": "Nevyriešené problémy",
"InProgressTitle": "Riešené problémy",
"ResolvedTitle": "Vyiešené problémy",
"ColumnTitle": "Názov",
"Category": "Kategória",
"Status": "Stav",
"Details": "Podrobnosti",
"Description": "Popis",
"NoComments": "Žiadne komentáre!",
"MarkInProgress": "Označiť ako prebiehajúce",
"MarkResolved": "Označiť ako vyriešené",
"SendMessageButton": "Odoslať",
"Subject": "Predmet",
"Comments": "Komentáre",
"WriteMessagePlaceholder": "Napíšte správu sem...",
"ReportedBy": "Nahlásené od"
},
"Filter": {
"ClearFilter": "Vymazať filter",
"FilterHeaderAvailability": "Dostupnosť",
"FilterHeaderRequestStatus": "Stav",
"Approved": "Schválené",
"PendingApproval": "Čaká na schválenie"
},
"UserManagment": {
"TvRemaining": "TV: {{remaining}}/{{total}} zostávajúce",
"MovieRemaining": "Filmy: {{remaining}}/{{total}} zostávajúce",
"MusicRemaining": "Hudba: {{remaining}}/{{total}} zostávajúce",
"TvDue": "TV: {{date}}",
"MovieDue": "Film: {{date}}",
"MusicDue": "Hudba: {{date}}"
},
"Votes": {
"CompletedVotesTab": "Hlasované",
"VotesTab": "Potrebné hlasovanie"
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment