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 channel view

Browse source
This commit is contained in:
Luke Pulverenti 2016-03-29 23:10:01 -04:00
parent 0b7e7078bd
commit cb3b17ee4a
9 changed files with 52 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

28
dashboard-ui/plugincatalog.html
View file

@ -1,31 +1,21 @@
<div id="pluginCatalogPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="scripts/ratingdialog,scripts/plugincatalogpage,jqmcheckbox">
<div id="pluginCatalogPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="scripts/ratingdialog,scripts/plugincatalogpage,paper-toggle-button">
<div data-role="content">
<div class="content-primary">
<br />
<div style="display: flex;align-items:center;">
<div>
<div style="display:inline-block;vertical-align:middle;">
<fieldset data-role="controlgroup" data-type="horizontal">
<legend>${LabelDisplayPluginsFor}</legend>
<input type="radio" name="radioPackageTypes" class="radioPackageTypes" id="radioServer" value="Server" data-mini="true">
<label for="radioServer">${TabServer}</label>
<input type="radio" name="radioPackageTypes" class="radioPackageTypes" id="radioClassic" value="MBClassic" data-mini="true">
<label for="radioClassic">${PluginTabAppClassic}</label>
</fieldset>
</div>
<div style="display:inline-block;vertical-align:bottom;" class="optionAdultContainer">
<div style="margin-left:1em;">
<label for="chkAdult">${OptionDisplayAdultContent}</label>
<input id="chkAdult" type="checkbox" data-mini="true" data-inline="true" />
<label class="selectLabel" for="selectSystem">${LabelDisplayPluginsFor}</label>
<select id="selectSystem">
<option value="Server">${TabServer}</option>
<option value="MBClassic">${PluginTabAppClassic}</option>
</select>
</div>
<div style="margin-left:auto;" class="optionAdultContainer">
<paper-toggle-button id="chkAdult">${OptionDisplayAdultContent}</paper-toggle-button>
</div>
</div>
<br />
<br />
<p style="display: none;">
<input class="chkPremiumFilter" type="checkbox" data-mini="true" data-inline="true" name="chkPremium" id="chkPremium" data-filter="IsPremium" />
<label for="chkPremium">Free Only</label>
</p>
<div id="noPlugins" class="hide">
<div style="text-align: center; margin: 10px;">${MessageNoAvailablePlugins}</div>
</div>

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

@ -446,9 +446,13 @@
title += collapsible.title || '';
title += '<span class="title-separator">–</span>';
title += (link.innerText || link.textContent).trim();
Dashboard.setPageTitle(title);
var secondaryTitle = (link.innerText || link.textContent).trim();
title += secondaryTitle;
var documentTitle = collapsible.title || secondaryTitle;
Dashboard.setPageTitle(title, documentTitle);
} else {
link.classList.remove('selectedSidebarLink');

7
dashboard-ui/scripts/movietrailers.js
View file

@ -12,8 +12,9 @@
query: {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Trailer",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,SyncInfo",
Fields: "PrimaryImageAspectRatio,SortName,MediaSourceCount,SyncInfo",
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0,
@ -39,9 +40,9 @@
Dashboard.showLoadingMsg();
var query = getQuery(page);
query.UserId = Dashboard.getCurrentUserId();
var userId = Dashboard.getCurrentUserId();
ApiClient.getJSON(ApiClient.getUrl('Trailers', query)).then(function (result) {
ApiClient.getItems(userId, query).then(function (result) {
// Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0);

4
dashboard-ui/scripts/mypreferenceshome.js
View file

@ -129,7 +129,7 @@
page.querySelector('.chkDisplayCollectionView').checked = user.Configuration.DisplayCollectionsView || false;
page.querySelector('.chkHidePlayedFromLatest').checked = user.Configuration.HidePlayedInLatest || false;
page.querySelector('.chkDisplayChannelsInline').checked = user.Configuration.DisplayChannelsInline || false;
page.querySelector('.chkDisplayChannelsInline').checked = !(user.Configuration.EnableChannelView || false);
$('#selectHomeSection1', page).val(displayPreferences.CustomPrefs.home0 || '');
$('#selectHomeSection2', page).val(displayPreferences.CustomPrefs.home1 || '');
@ -166,7 +166,7 @@
user.Configuration.DisplayCollectionsView = page.querySelector('.chkDisplayCollectionView').checked;
user.Configuration.HidePlayedInLatest = page.querySelector('.chkHidePlayedFromLatest').checked;
user.Configuration.DisplayChannelsInline = page.querySelector('.chkDisplayChannelsInline').checked;
user.Configuration.EnableChannelView = !page.querySelector('.chkDisplayChannelsInline').checked;
user.Configuration.LatestItemsExcludes = $(".chkIncludeInLatest", page).get().filter(function (i) {

31
dashboard-ui/scripts/plugincatalogpage.js
View file

@ -247,21 +247,9 @@
var page = this;
$('.chkPremiumFilter', page).on('change', function () {
$('#selectSystem', page).on('change', function () {
if (this.checked) {
query.IsPremium = false;
} else {
query.IsPremium = null;
}
reloadList(page);
});
$('.radioPackageTypes', page).on('change', function () {
var val = $('.radioPackageTypes:checked', page).val();
query.TargetSystems = val;
query.TargetSystems = this.value;
reloadList(page);
});
@ -275,21 +263,6 @@
var page = this;
$(".radioPackageTypes", page).each(function () {
this.checked = this.value == query.TargetSystems;
}).checkboxradio('refresh');
// Reset form values using the last used query
$('.chkPremiumFilter', page).each(function () {
var filters = query.IsPremium || false;
this.checked = filters;
}).checkboxradio('refresh');
reloadList(page);
});

1
dashboard-ui/scripts/secondaryitems.js
View file

@ -130,6 +130,7 @@
if (query.IncludeItemTypes == "MusicAlbum") {
posterOptions.overlayText = false;
posterOptions.showParentTitle = true;
posterOptions.showTitle = true;
posterOptions.overlayPlayButton = true;
}
else if (query.IncludeItemTypes == "MusicArtist") {

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

@ -1282,12 +1282,13 @@ var Dashboard = {
});
},
setPageTitle: function (title) {
setPageTitle: function (title, documentTitle) {
LibraryMenu.setTitle(title || 'Emby');
if (title) {
document.title = title;
documentTitle = documentTitle || title;
if (documentTitle) {
document.title = documentTitle;
}
},

4
dashboard-ui/serversecurity.html
View file

@ -1,8 +1,7 @@
<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="jqmtable,scripts/serversecurity,detailtablecss">
<div data-role="content">
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<div class="detailSectionHeader" style="margin-top:2.5em;">
<div class="detailSectionHeader">
<h3 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
${HeaderApiKeys}
</h3>
@ -28,5 +27,4 @@
</table>
</div>
</div>
</div>
</div>

1
dashboard-ui/userprofiles.html
View file

@ -2,7 +2,6 @@
<div data-role="content">
<div class="content-primary">
<br />
<div class="detailSectionHeader">
<h3 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
<span style="vertical-align:middle;">${HeaderUsers}</span>