Merge branch 'DotNetCore' of https://github.com/tidusjar/Ombi into DotNetCore

This commit is contained in:
tidusjar 2018-01-05 19:38:22 +00:00
commit eb5eb074b8
11 changed files with 126 additions and 159 deletions

View file

@ -31,7 +31,7 @@
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li id="Requests" [routerLinkActive]="['active']"> <li id="Requests" [routerLinkActive]="['active']">
<a [routerLink]="['/requests']"> <a [routerLink]="['/requests']">
<i class="fa fa-plus"></i> {{ 'NavigationBar.Requests' | translate }}</a> <i class="fa fa-th-list"></i> {{ 'NavigationBar.Requests' | translate }}</a>
</li> </li>
</ul> </ul>
<ul *ngIf="issuesEnabled" class="nav navbar-nav"> <ul *ngIf="issuesEnabled" class="nav navbar-nav">

View file

@ -1,5 +1,5 @@
<div *ngIf="landingPageSettings && customizationSettings"> <div *ngIf="landingPageSettings && customizationSettings">
<img *ngIf="background" class="landingDiv bg" [style.background-image]="background" /> <div *ngIf="background" class="bg" [style.background-image]="background"></div>
<div class="centered col-md-12"> <div class="centered col-md-12">
<div class="row"> <div class="row">

View file

@ -1,29 +1,19 @@
landingDiv { div.centered {
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}
div.centered {
position: fixed; position: fixed;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
img.bg { div.bg {
/* Set rules to fill background */ background-position: center center;
min-height: 100%; background-repeat: no-repeat;
min-width: 1024px; background-attachment: fixed;
/* Set up proportionate scaling */ background-clip: inherit;
width: 100%; background-size: cover;
height: auto; height: 100vh;
/* Set up positioning */ width: 100vw;
position: fixed; position: fixed;
top: 0;
left: 0;
z-index: -1;
} }
.vcenter { .vcenter {
@ -47,12 +37,4 @@ img.bg {
p { p {
font-size: 14px !important; font-size: 14px !important;
} }
@media screen and (max-width: 1024px) { /* Specific to this particular image */
img.bg {
left: 50%;
margin-left: -512px; /* 50% */
}
}

View file

@ -4,7 +4,7 @@ include the remember me checkbox
--> -->
<div *ngIf="form && customizationSettings"> <div *ngIf="form && customizationSettings">
<img *ngIf="background" class="landingDiv bg" [style.background-image]="background" /> <div *ngIf="background" class="bg" [style.background-image]="background"></div>
<div class="container" id="login"> <div class="container" id="login">
<div class="card card-container"> <div class="card card-container">
<!-- <img class="profile-img-card" src="//lh3.googleusercontent.com/-6V8xOA6M7BA/AAAAAAAAAAI/AAAAAAAAAAA/rzlHcD0KYwo/photo.jpg?sz=120" alt="" /> --> <!-- <img class="profile-img-card" src="//lh3.googleusercontent.com/-6V8xOA6M7BA/AAAAAAAAAAI/AAAAAAAAAAA/rzlHcD0KYwo/photo.jpg?sz=120" alt="" /> -->

View file

@ -16,36 +16,21 @@ body, html {
background-image: linear-gradient(rgb(104, 145, 162), rgb(12, 97, 33)) !important; background-image: linear-gradient(rgb(104, 145, 162), rgb(12, 97, 33)) !important;
} }
landingDiv {
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}
img.center { img.center {
display: block; display: block;
margin: 0 auto; margin: 0 auto;
max-width: 100%; max-width: 100%;
} }
img.bg { div.bg {
/* Set rules to fill background */ background-position: center center;
min-height: 100%; background-repeat: no-repeat;
min-width: 1024px; background-attachment: fixed;
/* Set up proportionate scaling */ background-clip: inherit;
width: 100%; background-size: cover;
height: auto; height: 100vh;
/* Set up positioning */ width: 100vw;
position: fixed; position: fixed;
top: 0;
left: 0;
z-index: -1;
/*-webkit-filter: blur(5px);
-moz-filter: blur(5px);
-o-filter: blur(5px);
-ms-filter: blur(5px);
filter: blur(5px);*/
} }
.card-container.card { .card-container.card {

View file

@ -3,7 +3,7 @@ you can substitue the span of reauth email for a input with the email and
include the remember me checkbox include the remember me checkbox
--> -->
<div *ngIf="form && customizationSettings && background"> <div *ngIf="form && customizationSettings && background">
<img class="landingDiv bg" [style.background-image]="background" /> <div class="bg" [style.background-image]="background"></div>
<div class="container" id="login"> <div class="container" id="login">
<div class="card card-container"> <div class="card card-container">
<!-- <img class="profile-img-card" src="//lh3.googleusercontent.com/-6V8xOA6M7BA/AAAAAAAAAAI/AAAAAAAAAAA/rzlHcD0KYwo/photo.jpg?sz=120" alt="" /> --> <!-- <img class="profile-img-card" src="//lh3.googleusercontent.com/-6V8xOA6M7BA/AAAAAAAAAAI/AAAAAAAAAAA/rzlHcD0KYwo/photo.jpg?sz=120" alt="" /> -->

View file

@ -43,7 +43,7 @@
"Search": "Søg", "Search": "Søg",
"Requests": "Anmodninger", "Requests": "Anmodninger",
"UserManagement": "Brugeradministration", "UserManagement": "Brugeradministration",
"Issues": "Issues", "Issues": "Problemer",
"Donate": "Donér!", "Donate": "Donér!",
"DonateTooltip": "Sådan overbeviser jeg min kone om, at jeg skal bruge min fritid på at udvikle Ombi :)", "DonateTooltip": "Sådan overbeviser jeg min kone om, at jeg skal bruge min fritid på at udvikle Ombi :)",
"UpdateAvailableTooltip": "Ny opdatering venter!", "UpdateAvailableTooltip": "Ny opdatering venter!",
@ -105,22 +105,22 @@
"GridStatus": "Status" "GridStatus": "Status"
}, },
"Issues": { "Issues": {
"Title": "Issues", "Title": "Problemer",
"PendingTitle": "Pending Issues", "PendingTitle": "Afventende problemer",
"InProgressTitle": "In Progress Issues", "InProgressTitle": "Igangværende probemer",
"ResolvedTitle": "Resolved Issues", "ResolvedTitle": "Løste problemer",
"ColumnTitle": "Title", "ColumnTitle": "Titel",
"Category": "Category", "Category": "Kategori",
"Status": "Status", "Status": "Status",
"Details": "Details", "Details": "Detaljer",
"Description": "Description", "Description": "Beskrivelse",
"NoComments": "No Comments!", "NoComments": "Ingen kommentarer!",
"MarkInProgress": "Mark In Progress", "MarkInProgress": "Markér som igangværende",
"MarkResolved": "Mark Resolved", "MarkResolved": "Markér som løst",
"SendMessageButton": "Send", "SendMessageButton": "Send",
"Subject": "Subject", "Subject": "Emne",
"Comments": "Comments", "Comments": "Kommentarer",
"WriteMessagePlaceholder": "Write your message here...", "WriteMessagePlaceholder": "Indtast din besked her...",
"ReportedBy": "Reported By" "ReportedBy": "Anmeldt af"
} }
} }

View file

@ -1,16 +1,16 @@
{ {
"Login": { "Login": {
"SignInButton": "Entrar", "SignInButton": "Iniciar sesión",
"UsernamePlaceholder": "Nombre de usuario", "UsernamePlaceholder": "Usuario",
"PasswordPlaceholder": "Contraseña", "PasswordPlaceholder": "Contraseña",
"RememberMe": "Recordarme", "RememberMe": "Recuérdame",
"ForgottenPassword": "Has olvidado tu contraseña?", "ForgottenPassword": "¿Has olvidado tu contraseña?",
"Errors": { "Errors": {
"IncorrectCredentials": "Nombre de usuario o contraseña\nincorrectos" "IncorrectCredentials": "Nombre de usuario o contraseña\nincorrectos"
} }
}, },
"Common": { "Common": {
"ContinueButton": "Continuar", "ContinueButton": "Continue",
"Available": "Disponible", "Available": "Disponible",
"ProcessingRequest": "Procesando solicitud", "ProcessingRequest": "Procesando solicitud",
"PendingApproval": "Pendiente de aprobación", "PendingApproval": "Pendiente de aprobación",
@ -21,36 +21,36 @@
"Denied": "Denegado", "Denied": "Denegado",
"Approve": "Aprobar", "Approve": "Aprobar",
"Errors": { "Errors": {
"Validation": "Por favor, compruebe los valores introducidos" "Validation": "Por favor, comprueba los datos introducidos"
} }
}, },
"PasswordReset": { "PasswordReset": {
"EmailAddressPlaceholder": "Dirección de correo electrónico", "EmailAddressPlaceholder": "Correo electrónico",
"ResetPasswordButton": "Restablecer contraseña" "ResetPasswordButton": "Reset Password"
}, },
"LandingPage": { "LandingPage": {
"OnlineHeading": "Actualmente en línea", "OnlineHeading": "En línea",
"OnlineParagraph": "El servidor de medios es actualmente en línea", "OnlineParagraph": "El servidor de medios esta en línea",
"PartiallyOnlineHeading": "Parcialmente en línea", "PartiallyOnlineHeading": "Partially Online",
"PartiallyOnlineParagraph": "El servidor de medios es parcialmente en línea.", "PartiallyOnlineParagraph": "El servidor de medios es parcialmente en línea.",
"MultipleServersUnavailable": "Hay servidores de {{serversUnavailable}} línea de {{totalServers}}.", "MultipleServersUnavailable": "{{serversUnavailable}} de {{totalServers}} servidores están fuera de línea.",
"SingleServerUnavailable": "Hay {{serversUnavailable}} servidor offline fuera de {{totalServers}}.", "SingleServerUnavailable": "There is {{serversUnavailable}} server offline out of {{totalServers}}.",
"OfflineHeading": "Actualmente fuera de línea", "OfflineHeading": "Fuera de línea",
"OfflineParagraph": "El servidor de medios está actualmente fuera de línea.", "OfflineParagraph": "El servidor de medios está fuera de línea.",
"CheckPageForUpdates": "Consulte esta página para estar actualizado con las últiimas novedades." "CheckPageForUpdates": "Consulte esta página para ver las últimas novedades."
}, },
"NavigationBar": { "NavigationBar": {
"Search": "Búsqueda de", "Search": "Buscar",
"Requests": "Solicitudes de", "Requests": "Solicitar",
"UserManagement": "Gestión de usuarios", "UserManagement": "User Management",
"Issues": "Issues", "Issues": "Incidencias",
"Donate": "¡Dona!", "Donate": "¡Donar!",
"DonateTooltip": "Esto es cómo convencer a mi esposa que me dejara pasar mi tiempo libre desarrollando Ombi ;)", "DonateTooltip": "Para que mi esposa me deje desarrollar Ombi ;)",
"UpdateAvailableTooltip": "¡Actualización disponible!", "UpdateAvailableTooltip": "Update Available!",
"Settings": "Configuración", "Settings": "Ajustes",
"Welcome": "Bienvenido {{username}}", "Welcome": "Welcome {{username}}",
"UpdateDetails": "Actualizar datos", "UpdateDetails": "Update Details",
"Logout": "Cierre de sesión", "Logout": "Cerrar sesión",
"Language": { "Language": {
"English": "Inglés", "English": "Inglés",
"French": "Francés", "French": "Francés",
@ -63,7 +63,7 @@
}, },
"Search": { "Search": {
"Title": "Buscar", "Title": "Buscar",
"Paragraph": "¿Quieres ver algo que no está disponible actualmente? No hay problema, sólo tienes que buscarlo debajo y solicitarlo!", "Paragraph": "¿Quieres ver algo que no está disponible? No hay problema, búscalo y solicítalo!",
"MoviesTab": "Películas", "MoviesTab": "Películas",
"TvTab": "Series", "TvTab": "Series",
"Suggestions": "Sugerencias", "Suggestions": "Sugerencias",
@ -105,22 +105,22 @@
"GridStatus": "Estado" "GridStatus": "Estado"
}, },
"Issues": { "Issues": {
"Title": "Issues", "Title": "Incidencias",
"PendingTitle": "Pending Issues", "PendingTitle": "Incidencias pendientes",
"InProgressTitle": "In Progress Issues", "InProgressTitle": "Incidencias en progreso",
"ResolvedTitle": "Resolved Issues", "ResolvedTitle": "Incidencias resueltas",
"ColumnTitle": "Title", "ColumnTitle": "Título",
"Category": "Category", "Category": "Categoría",
"Status": "Status", "Status": "Estado",
"Details": "Details", "Details": "Detalles",
"Description": "Description", "Description": "Descripción",
"NoComments": "No Comments!", "NoComments": "¡Sin comentarios!",
"MarkInProgress": "Mark In Progress", "MarkInProgress": "Marcar En Proceso",
"MarkResolved": "Mark Resolved", "MarkResolved": "Marcar resuelto",
"SendMessageButton": "Send", "SendMessageButton": "Enviar",
"Subject": "Subject", "Subject": "Asunto",
"Comments": "Comments", "Comments": "Comentarios",
"WriteMessagePlaceholder": "Write your message here...", "WriteMessagePlaceholder": "Escribe tu mensaje aquí...",
"ReportedBy": "Reported By" "ReportedBy": "Informado por"
} }
} }

View file

@ -43,7 +43,7 @@
"Search": "Rechercher", "Search": "Rechercher",
"Requests": "Demandes", "Requests": "Demandes",
"UserManagement": "Gestion des utilisateurs", "UserManagement": "Gestion des utilisateurs",
"Issues": "Issues", "Issues": "Problèmes",
"Donate": "Faire un don !", "Donate": "Faire un don !",
"DonateTooltip": "Cest pour convaincre ma femme de me laisser passer mon temps libre à développer Ombi ;)", "DonateTooltip": "Cest pour convaincre ma femme de me laisser passer mon temps libre à développer Ombi ;)",
"UpdateAvailableTooltip": "Mise à jour disponible !", "UpdateAvailableTooltip": "Mise à jour disponible !",
@ -105,22 +105,22 @@
"GridStatus": "Statut" "GridStatus": "Statut"
}, },
"Issues": { "Issues": {
"Title": "Issues", "Title": "Problèmes",
"PendingTitle": "Pending Issues", "PendingTitle": "Problèmes en attente",
"InProgressTitle": "In Progress Issues", "InProgressTitle": "Problèmes en cours de traitement",
"ResolvedTitle": "Resolved Issues", "ResolvedTitle": "Problèmes résolus",
"ColumnTitle": "Title", "ColumnTitle": "Titre",
"Category": "Category", "Category": "Catégorie",
"Status": "Status", "Status": "Statut",
"Details": "Details", "Details": "Détails",
"Description": "Description", "Description": "Description",
"NoComments": "No Comments!", "NoComments": "Aucun commentaire !",
"MarkInProgress": "Mark In Progress", "MarkInProgress": "Marquer en cours de traitement",
"MarkResolved": "Mark Resolved", "MarkResolved": "Marquer résolu",
"SendMessageButton": "Send", "SendMessageButton": "Envoyer",
"Subject": "Subject", "Subject": "Sujet",
"Comments": "Comments", "Comments": "Commentaires",
"WriteMessagePlaceholder": "Write your message here...", "WriteMessagePlaceholder": "Ecrivez votre message ici...",
"ReportedBy": "Reported By" "ReportedBy": "Signalé par"
} }
} }

View file

@ -3,7 +3,7 @@
"SignInButton": "Aanmelden", "SignInButton": "Aanmelden",
"UsernamePlaceholder": "Gebruikersnaam", "UsernamePlaceholder": "Gebruikersnaam",
"PasswordPlaceholder": "Wachtwoord", "PasswordPlaceholder": "Wachtwoord",
"RememberMe": "Onthoud mijn gegevens", "RememberMe": "Onthoud Mij",
"ForgottenPassword": "Wachtwoord vergeten?", "ForgottenPassword": "Wachtwoord vergeten?",
"Errors": { "Errors": {
"IncorrectCredentials": "Onjuiste gebruikersnaam of wachtwoord" "IncorrectCredentials": "Onjuiste gebruikersnaam of wachtwoord"

View file

@ -14,7 +14,7 @@
"Available": "Tillgänglig", "Available": "Tillgänglig",
"ProcessingRequest": "Bearbetar förfrågan", "ProcessingRequest": "Bearbetar förfrågan",
"PendingApproval": "I väntan på godkännande", "PendingApproval": "I väntan på godkännande",
"RequestDenied": "Begäran nekas", "RequestDenied": "Efterfrågan nekas",
"NotRequested": "Inte önskad", "NotRequested": "Inte önskad",
"Requested": "Begärd önskan", "Requested": "Begärd önskan",
"Request": "Begär", "Request": "Begär",
@ -43,7 +43,7 @@
"Search": "Sök", "Search": "Sök",
"Requests": "Förfrågningar", "Requests": "Förfrågningar",
"UserManagement": "Användarhantering", "UserManagement": "Användarhantering",
"Issues": "Issues", "Issues": "Problem",
"Donate": "Donera!", "Donate": "Donera!",
"DonateTooltip": "Det är så här jag övertygar min fru att jag vill spendera min fritid att utveckla Ombi ;)", "DonateTooltip": "Det är så här jag övertygar min fru att jag vill spendera min fritid att utveckla Ombi ;)",
"UpdateAvailableTooltip": "Uppdatering tillgänglig!", "UpdateAvailableTooltip": "Uppdatering tillgänglig!",
@ -70,7 +70,7 @@
"NoResults": "Tyvärr, hittade vi inte några resultat!", "NoResults": "Tyvärr, hittade vi inte några resultat!",
"ReleaseDate": "Publiceringsdatum", "ReleaseDate": "Publiceringsdatum",
"ViewOnPlex": "Visa på Plex", "ViewOnPlex": "Visa på Plex",
"RequestAdded": "Begäran om {{title}} har lagts till framgångsrikt", "RequestAdded": "Efterfrågan om {{title}} har lagts till",
"Movies": { "Movies": {
"PopularMovies": "Populära filmer", "PopularMovies": "Populära filmer",
"UpcomingMovies": "Kommande filmer", "UpcomingMovies": "Kommande filmer",
@ -81,16 +81,16 @@
} }
}, },
"Requests": { "Requests": {
"Title": "rfrågningar", "Title": "Efterfrågningar",
"Paragraph": "Nedan kan du se din och andra förfrågningar, samt status och godkännande.", "Paragraph": "Nedan kan du se din och andras efterfrågningar, samt nedladdnings och godkännande status.",
"MoviesTab": "Filmer", "MoviesTab": "Filmer",
"TvTab": "TV-serier", "TvTab": "TV-serier",
"RequestedBy": "Begärts av:", "RequestedBy": "Efterfrågats av:",
"Status": "Status:", "Status": "Status:",
"RequestStatus:": "Begärandestatus för:", "RequestStatus:": "Efterfrågandestatus för:",
"Denied": " Nekad:", "Denied": " Nekad:",
"ReleaseDate": "Releasedatum:", "ReleaseDate": "Releasedatum:",
"RequestDate": "Datum för begäran:", "RequestDate": "Datum för efterfrågan:",
"QualityOverride": "Kvalité överskridande:", "QualityOverride": "Kvalité överskridande:",
"RootFolderOverride": "Root mapp överskridande:", "RootFolderOverride": "Root mapp överskridande:",
"ChangeRootFolder": "Byt Root mapp", "ChangeRootFolder": "Byt Root mapp",
@ -105,22 +105,22 @@
"GridStatus": "Status" "GridStatus": "Status"
}, },
"Issues": { "Issues": {
"Title": "Issues", "Title": "Problem",
"PendingTitle": "Pending Issues", "PendingTitle": "Väntande Problem",
"InProgressTitle": "In Progress Issues", "InProgressTitle": "Pågående problem",
"ResolvedTitle": "Resolved Issues", "ResolvedTitle": "Lösta problem",
"ColumnTitle": "Title", "ColumnTitle": "Titel",
"Category": "Category", "Category": "Kategori",
"Status": "Status", "Status": "Status",
"Details": "Details", "Details": "Detaljer",
"Description": "Description", "Description": "Beskrivning",
"NoComments": "No Comments!", "NoComments": "Inga Kommentarer!",
"MarkInProgress": "Mark In Progress", "MarkInProgress": "Markera som pågående",
"MarkResolved": "Mark Resolved", "MarkResolved": "Markera som löst",
"SendMessageButton": "Send", "SendMessageButton": "Skicka",
"Subject": "Subject", "Subject": "Ämne",
"Comments": "Comments", "Comments": "Kommentarer",
"WriteMessagePlaceholder": "Write your message here...", "WriteMessagePlaceholder": "Skriv ditt meddelande här...",
"ReportedBy": "Reported By" "ReportedBy": "Rapporterad av"
} }
} }