mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' into release-10.2.z
This commit is contained in:
commit
058b3c8ab0
14 changed files with 11 additions and 30 deletions
|
@ -68,20 +68,6 @@ define(['connectionManager', 'cardBuilder', 'registrationServices', 'appSettings
|
|||
|
||||
return Promise.all(promises).then(function () {
|
||||
|
||||
html = '';
|
||||
|
||||
var style = 'margin-top:4em;';
|
||||
|
||||
if (layoutManager.tv) {
|
||||
style += 'padding: 0 7.5%;';
|
||||
}
|
||||
|
||||
html += '<div class="verticalSection padded-left padded-right customizeSection hide" style="' + style + '">';
|
||||
html += '<a href="' + appRouter.getRouteUrl('settings') + '" is="emby-linkbutton" class="raised block"><span>' + globalize.translate('HeaderCustomizeHomeScreen') + '</span></a>';
|
||||
html += '</div>';
|
||||
|
||||
elem.insertAdjacentHTML('beforeend', html);
|
||||
|
||||
return resume(elem, {
|
||||
refresh: true,
|
||||
returnPromise: false
|
||||
|
@ -125,9 +111,7 @@ define(['connectionManager', 'cardBuilder', 'registrationServices', 'appSettings
|
|||
promises.push(elems[i].resume(options));
|
||||
}
|
||||
|
||||
var promise = Promise.all(promises).then(function () {
|
||||
elem.querySelector('.customizeSection').classList.remove('hide');
|
||||
});
|
||||
var promise = Promise.all(promises);
|
||||
|
||||
if (!options || options.returnPromise !== false) {
|
||||
return promise;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon"></i></button>
|
||||
<h3 class="formDialogHeaderTitle">${Subtitles}</h3>
|
||||
|
||||
<a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://github.com/MediaBrowser/Wiki/wiki/Subtitles" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon"></i><span style="margin-left:.25em;">${Help}</span></a>
|
||||
<a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216115510/https://github.com/MediaBrowser/Wiki/wiki/Subtitles" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon"></i><span style="margin-left:.25em;">${Help}</span></a>
|
||||
|
||||
</div>
|
||||
<div class="formDialogContent smoothScrollY">
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<div class="selectContainer">
|
||||
<select is="emby-select" id="selectSystem" label="${LabelDisplayPluginsFor}">
|
||||
<option value="Server">${HeaderEmbyServer}</option>
|
||||
<option value="Server">${HeaderJellyfinServer}</option>
|
||||
<option value="MBClassic">${PluginTabAppClassic}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
|
|
@ -485,7 +485,6 @@
|
|||
"HeaderCreatePassword": "Crear Contraseña",
|
||||
"HeaderCredits": "Créditos",
|
||||
"HeaderCustomDlnaProfiles": "Perfiles Personalizados",
|
||||
"HeaderCustomizeHomeScreen": "Personalizar la Pantalla de Inicio",
|
||||
"HeaderDashboardUserPassword": "Las contraseñas de usuario son manejadas dentro de las configuraciones personales de cada perfil de usuario.",
|
||||
"HeaderDate": "Fecha",
|
||||
"HeaderDateIssued": "Fecha de Emisión",
|
||||
|
|
|
@ -496,7 +496,6 @@
|
|||
"HeaderCreatePassword": "Utwórz hasło:",
|
||||
"HeaderCredits": "Zasługi",
|
||||
"HeaderCustomDlnaProfiles": "Profile niestandardowe",
|
||||
"HeaderCustomizeHomeScreen": "Dostosuj ekran startowy",
|
||||
"HeaderDashboardUserPassword": "Hasła użytkowników są zarządzane z osobistych ustawień profilu każdego z użytkowników.",
|
||||
"HeaderDate": "Data",
|
||||
"HeaderDateIssued": "Data wydania",
|
||||
|
|
|
@ -481,7 +481,6 @@
|
|||
"HeaderCreatePassword": "Criar Senha",
|
||||
"HeaderCredits": "Créditos",
|
||||
"HeaderCustomDlnaProfiles": "Personalizar Perfis",
|
||||
"HeaderCustomizeHomeScreen": "Personalizar Tela Início",
|
||||
"HeaderDashboardUserPassword": "As senhas do usuário são gerenciadas dentro das preferências de cada perfil de usuário.",
|
||||
"HeaderDate": "Data",
|
||||
"HeaderDateIssued": "Data da Emissão",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue