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

fix tabs

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-13 12:17:52 -04:00
parent 8de0aadb57
commit 7a3858d368
9 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/css/site.css
View file

@ -775,7 +775,7 @@ paper-input + .fieldDescription {
}
.withTabs .content-primary {
padding-top: 110px;
padding-top: 115px;
}
.mainDrawerPanel:not([narrow]) .content-primary {

2
dashboard-ui/dashboardhosting.html
View file

@ -1,4 +1,4 @@
<div id="dashboardHostingPage" data-role="page" class="page type-interior advancedConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Hosting%20Settings" data-require="scripts/dashboardhosting,paper-checkbox,paper-input">
<div id="dashboardHostingPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Hosting%20Settings" data-require="scripts/dashboardhosting,paper-checkbox,paper-input">
<div data-role="content">
<div class="content-primary">

5
dashboard-ui/device.html
View file

@ -3,11 +3,6 @@
<div data-role="content">
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="devices.html" data-role="button" class="ui-btn-active">${TabDevices}</a>
<a href="devicesupload.html" data-role="button">${TabCameraUpload}</a>
</div>
<div class="readOnlyContent">
<form class="deviceForm">

1
dashboard-ui/playbackconfiguration.html
View file

@ -4,7 +4,6 @@
<div class="content-primary">
<form class="playbackConfigurationForm">
<h2>${HeaderResumeSettings}</h2>
<div>
<ul data-role="listview" class="ulForm">
<li>

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

@ -40,8 +40,21 @@
return false;
}
function getTabs() {
return [
{
href: 'dashboardhosting.html',
name: Globalize.translate('TabHosting')
},
{
href: 'serversecurity.html',
name: Globalize.translate('TabSecurity')
}];
}
$(document).on('pageshow', "#dashboardHostingPage", function () {
LibraryMenu.setTabs('adminadvanced', 0, getTabs);
Dashboard.showLoadingMsg();
var page = this;

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

@ -715,7 +715,7 @@
var options = {
userId: Dashboard.getCurrentUserId(),
limit: screenWidth > 800 && shape == "detailPagePortrait" ? 4 : 4,
fields: "PrimaryImageAspectRatio,UserData,SyncInfo"
fields: "PrimaryImageAspectRatio,UserData,SyncInfo,CanDelete"
};
if (screenWidth >= 800 && screenHeight >= 1000) {
@ -866,7 +866,7 @@
_childrenItemsFunction = null;
var fields = "ItemCounts,AudioInfo,PrimaryImageAspectRatio,SyncInfo";
var fields = "ItemCounts,AudioInfo,PrimaryImageAspectRatio,SyncInfo,CanDelete";
var query = {
ParentId: item.Id,
@ -901,7 +901,8 @@
_childrenItemsFunction = getEpisodesFunction(item.SeriesId, {
seasonId: item.Id,
userId: user.Id
userId: user.Id,
Fields: fields
});
}
else if (item.Type == "MusicAlbum") {
@ -945,6 +946,7 @@
});
}
else if (item.Type == "Season") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "detailPage169",
@ -1318,7 +1320,7 @@
SortOrder: "Ascending",
IncludeItemTypes: "MusicVideo",
Recursive: true,
Fields: "DateCreated,SyncInfo",
Fields: "DateCreated,SyncInfo,CanDelete",
Albums: item.Name
}).then(function (result) {

13
dashboard-ui/scripts/serversecurity.js
View file

@ -123,6 +123,18 @@
});
}
function getTabs() {
return [
{
href: 'dashboardhosting.html',
name: Globalize.translate('TabHosting')
},
{
href: 'serversecurity.html',
name: Globalize.translate('TabSecurity')
}];
}
pageIdOn('pageinit', "serverSecurityPage", function () {
var page = this;
@ -136,6 +148,7 @@
});
pageIdOn('pagebeforeshow', "serverSecurityPage", function () {
LibraryMenu.setTabs('adminadvanced', 1, getTabs);
var page = this;
loadData(page);

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

@ -732,7 +732,7 @@ var Dashboard = {
}, {
name: Globalize.translate('TabDevices'),
href: "devices.html",
pageIds: ['devicesPage'],
pageIds: ['devicesPage', 'devicePage'],
icon: 'tablet'
}, {
name: Globalize.translate('TabUsers'),

2
dashboard-ui/serversecurity.html
View file

@ -1,4 +1,4 @@
<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage" data-require="jqmtable,scripts/serversecurity,detailtablecss">
<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-require="jqmtable,scripts/serversecurity,detailtablecss">
<div data-role="content">
<div class="content-primary">
<div class="detailSectionHeader">