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

added new channel settings

This commit is contained in:
Luke Pulverenti 2014-06-01 15:41:35 -04:00
parent 8cf9cab99e
commit 18cd384168
7 changed files with 117 additions and 22 deletions

View file

@ -0,0 +1,46 @@
<!DOCTYPE html>
<html>
<head>
<title>${TitleChannels}</title>
</head>
<body>
<div id="channelSettingsPage" data-role="page" class="page type-interior channelSettingsPage">
<div data-role="content">
<div class="content-primary">
<br />
<form class="channelSettingsForm">
<ul data-role="listview" class="ulForm">
<li>
<label for="selectChannelResolution">${LabelChannelStreamOptionBestAvailable}</label>
<select id="selectChannelResolution">
<option value="">${ChannelStreamOptionBestAvailable}</option>
<option value="1920">1080p</option>
<option value="1280">720p</option>
<option value="720">480p</option>
</select>
<div class="fieldDescription">${LabelChannelStreamOptionBestAvailableHelp}</div>
</li>
</ul>
<ul data-role="listview" class="ulForm">
<li>
<button type="submit" data-theme="b" data-icon="check">
${ButtonSave}
</button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete">
${ButtonCancel}
</button>
</li>
</ul>
</form>
</div>
</div>
<script type="text/javascript">
$('.channelSettingsForm').off('submit', ChannelSettingsPage.onSubmit).on('submit', ChannelSettingsPage.onSubmit);
</script>
</div>
</body>
</html>

View file

@ -196,28 +196,26 @@
.viewMenuTextLink { .viewMenuTextLink {
display: block; display: block;
padding: .6em .5em .6em 43px!important; padding: .6em .5em .6em 39px!important;
font-size: 15px; font-size: 15px;
font-weight: 300!important; font-weight: 300!important;
font-family: Roboto; font-family: Roboto;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 18px 18px; background-size: 14px 14px;
background-position: 16px center; background-position: 14px center;
} }
.musicViewMenu { .musicViewMenu {
background-image: url(images/items/folders/music.png); background-image: url(images/items/folders/music.png);
background-position: 16px 8px; background-position: 14px 8px;
} }
.homeViewMenu { .homeViewMenu {
background-image: url(images/items/folders/home.png); background-image: url(images/items/folders/home.png);
background-position: 16px 9px;
} }
.tvshowsViewMenu { .tvshowsViewMenu {
background-image: url(images/items/folders/tv.png); background-image: url(images/items/folders/tv.png);
background-position: 16px center;
} }
.moviesViewMenu, .trailersViewMenu { .moviesViewMenu, .trailersViewMenu {
@ -226,12 +224,10 @@
.gamesViewMenu { .gamesViewMenu {
background-image: url(images/items/folders/games.png); background-image: url(images/items/folders/games.png);
background-position: 16px 8px;
} }
.channelsViewMenu { .channelsViewMenu {
background-image: url(images/items/folders/channels.png); background-image: url(images/items/folders/channels.png);
background-position: 16px 9px;
} }
.booksViewMenu { .booksViewMenu {
@ -240,12 +236,10 @@
.musicvideosViewMenu { .musicvideosViewMenu {
background-image: url(images/items/folders/musicvideos.png); background-image: url(images/items/folders/musicvideos.png);
background-position: 16px 8px;
} }
.photosViewMenu { .photosViewMenu {
background-image: url(images/items/folders/photos.png); background-image: url(images/items/folders/photos.png);
background-position: 16px 8px;
} }
.homeVideosViewMenu { .homeVideosViewMenu {
@ -258,7 +252,6 @@
.editorViewMenu { .editorViewMenu {
background-image: url(images/items/folders/edit.png); background-image: url(images/items/folders/edit.png);
background-position: 16px 8px;
} }
.dashboardViewMenu { .dashboardViewMenu {

View file

@ -291,7 +291,7 @@ h1 .imageLink {
.sidebarLinks a { .sidebarLinks a {
display: block; display: block;
padding: 12px 20px 12px 30px; padding: 10px 20px 10px 30px;
text-decoration: none; text-decoration: none;
color: #fff!important; color: #fff!important;
text-shadow: none!important; text-shadow: none!important;
@ -311,7 +311,7 @@ h1 .imageLink {
.sidebarDivider { .sidebarDivider {
height: 1px; height: 1px;
background: #404040; background: #383838;
margin: .25em 0; margin: .25em 0;
} }

View file

@ -106,16 +106,22 @@
return val != '0'; return val != '0';
} }
$(document).on('pagebeforeshow', ".backdropPage", function () { $(document).on('pagebeforeshow', ".page", function () {
var page = this; var page = this;
if (enabled()) { if ($(page).hasClass('backdropPage')) {
var type = page.getAttribute('data-backdroptype');
showBackdrop(type); if (enabled()) {
var type = page.getAttribute('data-backdroptype');
showBackdrop(type);
} else {
$(page).removeClass('backdropPage');
clearBackdrop();
}
} else { } else {
$(page).removeClass('backdropPage');
clearBackdrop(); clearBackdrop();
} }

View file

@ -142,7 +142,7 @@
coverImage: true coverImage: true
}); });
html += LibraryBrowser.getPagingHtml(pagingHtml); html += pagingHtml;
$('#items', page).html(html).trigger('create').createPosterItemMenus(); $('#items', page).html(html).trigger('create').createPosterItemMenus();

View file

@ -0,0 +1,47 @@
(function ($, document, window) {
function loadPage(page, config) {
$('#selectChannelResolution', page).val(config.ChannelOptions.PreferredStreamingWidth || '')
.selectmenu("refresh");
Dashboard.hideLoadingMsg();
}
$(document).on('pageshow', "#channelSettingsPage", function () {
Dashboard.showLoadingMsg();
var page = this;
ApiClient.getServerConfiguration().done(function (config) {
loadPage(page, config);
});
});
function onSubmit() {
Dashboard.showLoadingMsg();
var form = this;
ApiClient.getServerConfiguration().done(function (config) {
// This should be null if empty
config.ChannelOptions.PreferredStreamingWidth = $('#selectChannelResolution', form).val() || null;
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
});
// Disable default form submission
return false;
}
window.ChannelSettingsPage = {
onSubmit: onSubmit
};
})(jQuery, document, window);

View file

@ -748,8 +748,12 @@ var Dashboard = {
href: "autoorganizelog.html", href: "autoorganizelog.html",
selected: page.hasClass("organizePage") selected: page.hasClass("organizePage")
}, { }, {
name: "DLNA", name: "Channels",
divider: true, divider: true,
href: "channelsettings.html",
selected: page.hasClass("channelSettingsPage")
}, {
name: "DLNA",
href: "dlnasettings.html", href: "dlnasettings.html",
selected: page.hasClass("dlnaPage") selected: page.hasClass("dlnaPage")
}, { }, {
@ -780,7 +784,6 @@ var Dashboard = {
selected: pageElem.id == "scheduledTasksPage" || pageElem.id == "scheduledTaskPage" selected: pageElem.id == "scheduledTasksPage" || pageElem.id == "scheduledTaskPage"
}, { }, {
name: "Help", name: "Help",
divider: true,
href: "support.html", href: "support.html",
selected: pageElem.id == "supportPage" || pageElem.id == "logPage" || pageElem.id == "supporterPage" || pageElem.id == "supporterKeyPage" || pageElem.id == "aboutPage" selected: pageElem.id == "supportPage" || pageElem.id == "logPage" || pageElem.id == "supporterPage" || pageElem.id == "supporterKeyPage" || pageElem.id == "aboutPage"
}]; }];