mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update dialogs

Browse source
This commit is contained in:
Luke Pulverenti 2016-05-18 17:46:56 -04:00
parent c00d7cba09
commit 92b687f9a5
16 changed files with 242 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

72
dashboard-ui/scripts/dashboardhosting.js
View file

@ -1,22 +1,5 @@
define(['jQuery'], function ($) {
function loadPage(page, config) {
$('#txtPortNumber', page).val(config.HttpServerPortNumber);
$('#txtPublicPort', page).val(config.PublicPort);
$('#txtPublicHttpsPort', page).val(config.PublicHttpsPort);
$('#chkEnableHttps', page).checked(config.EnableHttps);
$('#txtHttpsPort', page).val(config.HttpsPortNumber);
$('#txtDdns', page).val(config.WanDdns || '');
$('#txtCertificatePath', page).val(config.CertificatePath || '');
$('#chkEnableUpnp', page).checked(config.EnableUPnP);
Dashboard.hideLoadingMsg();
}
function onSubmit() {
Dashboard.showLoadingMsg();
@ -52,24 +35,43 @@
}];
}
$(document).on('pageshow', "#dashboardHostingPage", function () {
return function (view, params) {
LibraryMenu.setTabs('adminadvanced', 0, getTabs);
Dashboard.showLoadingMsg();
var self = this;
var page = this;
function loadPage(page, config) {
ApiClient.getServerConfiguration().then(function (config) {
$('#txtPortNumber', page).val(config.HttpServerPortNumber);
$('#txtPublicPort', page).val(config.PublicPort);
$('#txtPublicHttpsPort', page).val(config.PublicHttpsPort);
loadPage(page, config);
var chkEnableHttps = page.querySelector('#chkEnableHttps');
chkEnableHttps.checked = config.EnableHttps;
});
$('#txtHttpsPort', page).val(config.HttpsPortNumber);
}).on('pageinit', "#dashboardHostingPage", function () {
$('#txtDdns', page).val(config.WanDdns || '');
var page = this;
var txtCertificatePath = page.querySelector('#txtCertificatePath');
txtCertificatePath.value = config.CertificatePath || '';
$('#btnSelectCertPath', page).on("click.selectDirectory", function () {
$('#chkEnableUpnp', page).checked(config.EnableUPnP);
onCertPathChange.call(txtCertificatePath);
Dashboard.hideLoadingMsg();
}
function onCertPathChange() {
if (this.value) {
view.querySelector('#txtDdns').setAttribute('required', 'required');
} else {
view.querySelector('#txtDdns').removeAttribute('required');
}
}
$('#btnSelectCertPath', view).on("click.selectDirectory", function () {
require(['directorybrowser'], function (directoryBrowser) {
@ -83,7 +85,7 @@
callback: function (path) {
if (path) {
$('#txtCertificatePath', page).val(path);
$('#txtCertificatePath', view).val(path);
}
picker.close();
},
@ -94,6 +96,18 @@
});
$('.dashboardHostingForm').off('submit', onSubmit).on('submit', onSubmit);
});
view.querySelector('#txtCertificatePath').addEventListener('change', onCertPathChange);
view.addEventListener('viewshow', function (e) {
LibraryMenu.setTabs('adminadvanced', 0, getTabs);
Dashboard.showLoadingMsg();
ApiClient.getServerConfiguration().then(function (config) {
loadPage(view, config);
});
});
};
});

21
dashboard-ui/scripts/itemdetailpage.js
View file

@ -1,4 +1,4 @@
define(['layoutManager', 'datetime', 'jQuery', 'mediaInfo', 'scrollStyles'], function (layoutManager, datetime, $, mediaInfo) {
define(['layoutManager', 'datetime', 'jQuery', 'mediaInfo', 'backdrop', 'scrollStyles'], function (layoutManager, datetime, $, mediaInfo, backdrop) {
var currentItem;
@ -75,14 +75,13 @@
// For these types, make the backdrop a little smaller so that the items are more quickly accessible
if (item.Type == 'MusicArtist' || item.Type == "MusicAlbum" || item.Type == "Playlist" || item.Type == "BoxSet" || item.MediaType == "Audio" || !layoutManager.mobile) {
$('#itemBackdrop', page).addClass('noBackdrop').css('background-image', 'none');
require(['backdrop'], function (backdrop) {
backdrop.setBackdrops([item]);
});
backdrop.setBackdrops([item]);
}
else {
//$('#itemBackdrop', page).addClass('noBackdrop').css('background-image', 'none');
//Backdrops.setBackdrops(page, [item]);
hasBackdrop = LibraryBrowser.renderDetailPageBackdrop(page, item);
backdrop.clear();
}
var transparentHeader = hasBackdrop && page.classList.contains('noSecondaryNavPage');
@ -475,7 +474,7 @@
});
});
$('.itemGenres', page).each(function() {
$('.itemGenres', page).each(function () {
LibraryBrowser.renderGenres(this, item, null, isStatic);
});
LibraryBrowser.renderStudios($('.itemStudios', page), item, isStatic);
@ -1098,10 +1097,13 @@
html += '<div class="detailSection">';
html += '<div style="display:flex;align-items:center;">';
html += '<h1>';
html += '<span>' + type.name + '</span>';
html += '</h1>';
html += '<button class="btnAddToCollection" type="button" is="paper-icon-button-light" style="margin-left:1em;"><iron-icon icon="add"></iron-icon></button>';
html += '</div>';
html += '<div class="detailSectionContent itemsContainer">';
@ -1131,6 +1133,15 @@
removeFromCollection(page, parentItem, [itemId], user, context);
});
collectionItems.querySelector('.btnAddToCollection').addEventListener('click', function () {
require(['alert'], function (alert) {
alert({
text: Globalize.translate('AddItemToCollectionHelp'),
html: Globalize.translate('AddItemToCollectionHelp') + '<br/><br/><a target="_blank" href="https://github.com/MediaBrowser/Wiki/wiki/Collections">' + Globalize.translate('ButtonLearnMore') + '</a>'
});
});
});
}
function removeFromCollection(page, parentItem, itemIds, user, context) {

3
dashboard-ui/scripts/librarybrowser.js
View file

@ -1066,7 +1066,8 @@
}
if (item.CollectionType == 'games') {
return 'gamesrecommended.html?topParentId=' + item.Id;
return id ? "itemlist.html?parentId=" + id : "#";
//return 'gamesrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'playlists') {
return 'playlists.html?topParentId=' + item.Id;

2
dashboard-ui/scripts/librarymenu.js
View file

@ -743,7 +743,7 @@
var helpUrl = page.getAttribute('data-helpurl');
if (helpUrl) {
html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-left:2em;" title="' + Globalize.translate('ButtonHelp') + '"><paper-button class="accent" style="margin:0;font-weight:normal;font-size:13px;padding:.25em;display:flex;align-items:center;"><iron-icon icon="info"></iron-icon><span>Help</span></paper-button></a>';
html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-left:2em;" title="' + Globalize.translate('ButtonHelp') + '"><paper-button class="accent" style="margin:0;font-weight:normal;font-size:13px;padding:.25em;display:flex;align-items:center;"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></paper-button></a>';
}
}
}

10
dashboard-ui/scripts/livetvsuggested.js
View file

@ -8,14 +8,6 @@
return enableScrollX() ? 'overflowPortrait' : 'portrait';
}
function getThumbShape() {
return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
}
function getSquareShape() {
return enableScrollX() ? 'overflowSquare' : 'square';
}
function getLimit() {
return enableScrollX() ? 12 : 8;
@ -109,7 +101,7 @@
var html = libraryBrowser.getPosterViewHtml({
items: items,
shape: shape || (enableScrollX() ? getSquareShape() : 'auto'),
shape: shape || (enableScrollX() ? 'autooverflow' : 'auto'),
showTitle: true,
centerText: true,
coverImage: true,

2
dashboard-ui/scripts/moviesrecommended.js
View file

@ -301,7 +301,7 @@
baseUrl += '?topParentId=' + topParentId;
}
libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 4, 5]);
libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 3, 4, 5]);
var tabControllers = [];
var renderedTabs = [];

9
dashboard-ui/scripts/site.js
View file

@ -2243,7 +2243,7 @@ var AppInfo = {};
var baseUrl = 'bower_components/emby-webcomponents/strings/';
var languages = ['da', 'en-US', 'kk', 'nl', 'ru'];
var languages = ['da', 'en-US', 'es-MX', 'kk', 'nb', 'nl', 'ru'];
var translations = languages.map(function (i) {
return {
@ -2404,9 +2404,10 @@ var AppInfo = {};
defineRoute({
path: '/dashboardhosting.html',
dependencies: [],
dependencies: ['paper-checkbox', 'paper-input', 'paper-button'],
autoFocus: false,
roles: 'admin'
roles: 'admin',
controller: 'scripts/dashboardhosting'
});
defineRoute({
@ -2698,7 +2699,7 @@ var AppInfo = {};
defineRoute({
path: '/movies.html',
dependencies: ['paper-checkbox', 'paper-fab', 'scripts/alphapicker', 'paper-button'],
dependencies: ['paper-checkbox', 'scripts/alphapicker', 'paper-button'],
autoFocus: false,
controller: 'scripts/moviesrecommended',
transition: 'fade'