mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update recording file names
This commit is contained in:
parent
7d89bd22b9
commit
f7f5c66b77
13 changed files with 66 additions and 33 deletions
|
@ -737,7 +737,7 @@
|
||||||
var deferred = DeferredBuilder.Deferred();
|
var deferred = DeferredBuilder.Deferred();
|
||||||
|
|
||||||
require(['serverdiscovery'], function () {
|
require(['serverdiscovery'], function () {
|
||||||
ServerDiscovery.findServers(1500).done(function (foundServers) {
|
ServerDiscovery.findServers(1000).done(function (foundServers) {
|
||||||
|
|
||||||
var servers = foundServers.map(function (foundServer) {
|
var servers = foundServers.map(function (foundServer) {
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
"tag": "v1.0.4",
|
"tag": "v1.0.4",
|
||||||
"commit": "a7ac7fbdb79b4d82416ec9b41613575386d0d226"
|
"commit": "a7ac7fbdb79b4d82416ec9b41613575386d0d226"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
|
"_source": "git://github.com/polymerelements/paper-behaviors.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
"_originalSource": "PolymerElements/paper-behaviors"
|
"_originalSource": "polymerelements/paper-behaviors"
|
||||||
}
|
}
|
2
dashboard-ui/cordova/ios/backgroundfetch.js
vendored
2
dashboard-ui/cordova/ios/backgroundfetch.js
vendored
|
@ -7,7 +7,7 @@
|
||||||
var fetcher = window.BackgroundFetch;
|
var fetcher = window.BackgroundFetch;
|
||||||
|
|
||||||
fetcher.configure(onBackgroundFetch, onBackgroundFetchFailed, {
|
fetcher.configure(onBackgroundFetch, onBackgroundFetchFailed, {
|
||||||
stopOnTerminate: true // <-- false is default
|
stopOnTerminate: false // <-- false is default
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
37
dashboard-ui/cordova/ios/tabbar.js
vendored
37
dashboard-ui/cordova/ios/tabbar.js
vendored
|
@ -83,7 +83,6 @@
|
||||||
|
|
||||||
TabBar.showItems();
|
TabBar.showItems();
|
||||||
initComplete = true;
|
initComplete = true;
|
||||||
showTabs();
|
|
||||||
|
|
||||||
ignoreNextSelection = true;
|
ignoreNextSelection = true;
|
||||||
TabBar.selectItem('Library');
|
TabBar.selectItem('Library');
|
||||||
|
@ -98,6 +97,26 @@
|
||||||
TabBar.show();
|
TabBar.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function showUserTabs() {
|
||||||
|
|
||||||
|
Dashboard.getCurrentUser().done(function (user) {
|
||||||
|
|
||||||
|
var tabs = ['Library', 'Favorites', 'Search', 'NowPlaying'];
|
||||||
|
|
||||||
|
if (user.Policy.EnableSync) {
|
||||||
|
|
||||||
|
tabs.push('Sync');
|
||||||
|
}
|
||||||
|
|
||||||
|
tabs.push('Settings');
|
||||||
|
|
||||||
|
TabBar.showNamedItems(tabs);
|
||||||
|
|
||||||
|
// We need to make sure the above completes first
|
||||||
|
setTimeout(showTabs, 500);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
var isFirstHide = true;
|
var isFirstHide = true;
|
||||||
function hideTabs() {
|
function hideTabs() {
|
||||||
|
|
||||||
|
@ -118,24 +137,14 @@
|
||||||
|
|
||||||
init();
|
init();
|
||||||
|
|
||||||
Events.on(ConnectionManager, 'localusersignedin', showTabs);
|
showUserTabs();
|
||||||
|
|
||||||
|
Events.on(ConnectionManager, 'localusersignedin', showUserTabs);
|
||||||
Events.on(ConnectionManager, 'localusersignedout', hideTabs);
|
Events.on(ConnectionManager, 'localusersignedout', hideTabs);
|
||||||
Events.on(MediaController, 'beforeplaybackstart', onPlaybackStart);
|
Events.on(MediaController, 'beforeplaybackstart', onPlaybackStart);
|
||||||
Events.on(MediaController, 'playbackstop', onPlaybackStop);
|
Events.on(MediaController, 'playbackstop', onPlaybackStop);
|
||||||
});
|
});
|
||||||
|
|
||||||
pageClassOn('pageshow', "page", function () {
|
|
||||||
|
|
||||||
var page = this;
|
|
||||||
|
|
||||||
if (page.classList.contains('libraryPage')) {
|
|
||||||
showTabs();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
hideTabs();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
function onPlaybackStart(e, state, player) {
|
function onPlaybackStart(e, state, player) {
|
||||||
|
|
||||||
if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video' && player.isLocalPlayer) {
|
if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video' && player.isLocalPlayer) {
|
||||||
|
|
|
@ -146,6 +146,7 @@
|
||||||
cursor: default;
|
cursor: default;
|
||||||
position: relative;
|
position: relative;
|
||||||
top: 1px;
|
top: 1px;
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logoLibraryMenuButtonText {
|
.logoLibraryMenuButtonText {
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
<div class="tvGuideHeader">
|
<div class="tvGuideHeader">
|
||||||
<div class="channelTimeslotHeader">
|
<div class="channelTimeslotHeader">
|
||||||
<div class="timeslotHeaderInner">
|
<div class="timeslotHeaderInner">
|
||||||
<a class="btnSelectDate" href="#" style="display:block;padding-left:5px;color:#fff;text-decoration:none;font-weight:normal!important;padding:4px 10px 4px 0;"><iron-icon icon="schedule" style="margin-right:3px;width:18px;height:18px;"></iron-icon><span class="currentDate" style="vertical-align: middle;"></span></a>
|
<a class="btnSelectDate" href="#" style="display:block;padding-left:5px;color:#fff;text-decoration:none;font-weight:normal!important;padding:5px 10px 4px 0;font-size:13px;"><iron-icon icon="schedule" style="margin-right:3px;width:18px;height:18px;"></iron-icon><span class="currentDate" style="vertical-align: middle;"></span></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="timeslotHeaders hiddenScrollX"></div>
|
<div class="timeslotHeaders hiddenScrollX"></div>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
|
<form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
|
||||||
|
|
||||||
<div class="detailSection homeSections hide">
|
<div class="detailSection homeSections">
|
||||||
<h1>
|
<h1>
|
||||||
${HeaderHomePage}
|
${HeaderHomePage}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
|
@ -582,9 +582,15 @@
|
||||||
self.enableCustomVideoControls = function () {
|
self.enableCustomVideoControls = function () {
|
||||||
|
|
||||||
if (AppInfo.isNativeApp && $.browser.safari) {
|
if (AppInfo.isNativeApp && $.browser.safari) {
|
||||||
|
|
||||||
|
if (navigator.userAgent.toLowerCase().indexOf('iphone') != -1) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Need to disable it in order to support picture in picture
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return self.canAutoPlayVideo() && !$.browser.mobile;
|
return self.canAutoPlayVideo() && !$.browser.mobile;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -273,12 +273,6 @@
|
||||||
|
|
||||||
var page = this;
|
var page = this;
|
||||||
|
|
||||||
if (AppInfo.enableCustomHomeSections) {
|
|
||||||
page.querySelector('.homeSections').classList.remove('hide');
|
|
||||||
} else {
|
|
||||||
page.querySelector('.homeSections').classList.add('hide');
|
|
||||||
}
|
|
||||||
|
|
||||||
Dashboard.showLoadingMsg();
|
Dashboard.showLoadingMsg();
|
||||||
|
|
||||||
var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
|
var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
|
||||||
|
|
|
@ -1726,7 +1726,6 @@ var AppInfo = {};
|
||||||
AppInfo.enableSearchInTopMenu = true;
|
AppInfo.enableSearchInTopMenu = true;
|
||||||
AppInfo.enableHomeFavorites = true;
|
AppInfo.enableHomeFavorites = true;
|
||||||
AppInfo.enableNowPlayingBar = true;
|
AppInfo.enableNowPlayingBar = true;
|
||||||
AppInfo.enableCustomHomeSections = true;
|
|
||||||
AppInfo.enableHomeTabs = true;
|
AppInfo.enableHomeTabs = true;
|
||||||
AppInfo.enableNowPlayingPageBottomTabs = true;
|
AppInfo.enableNowPlayingPageBottomTabs = true;
|
||||||
|
|
||||||
|
@ -1747,7 +1746,6 @@ var AppInfo = {};
|
||||||
AppInfo.enableNavDrawer = false;
|
AppInfo.enableNavDrawer = false;
|
||||||
AppInfo.enableSearchInTopMenu = false;
|
AppInfo.enableSearchInTopMenu = false;
|
||||||
AppInfo.enableHomeFavorites = false;
|
AppInfo.enableHomeFavorites = false;
|
||||||
AppInfo.enableCustomHomeSections = false;
|
|
||||||
AppInfo.enableHomeTabs = false;
|
AppInfo.enableHomeTabs = false;
|
||||||
AppInfo.enableNowPlayingPageBottomTabs = false;
|
AppInfo.enableNowPlayingPageBottomTabs = false;
|
||||||
|
|
||||||
|
|
|
@ -22,10 +22,14 @@
|
||||||
background: rgba(56,56,56,.85);
|
background: rgba(56,56,56,.85);
|
||||||
}
|
}
|
||||||
|
|
||||||
.libraryViewNav a {
|
.libraryViewNav {
|
||||||
font-weight: 500 !important;
|
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.libraryViewNav a {
|
||||||
|
font-weight: 500 !important;
|
||||||
|
}
|
||||||
|
|
||||||
paper-tab {
|
paper-tab {
|
||||||
font-weight: 500 !important;
|
font-weight: 500 !important;
|
||||||
}
|
}
|
||||||
|
@ -34,3 +38,11 @@ paper-tab {
|
||||||
.libraryViewNav .ui-btn-active {
|
.libraryViewNav .ui-btn-active {
|
||||||
border-bottom-color: #52B54B !important;
|
border-bottom-color: #52B54B !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.channelTimeslotHeader {
|
||||||
|
border-right-color: #52B54B !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.channelTimeslotHeader, .timeslotHeader {
|
||||||
|
background: #52B54B !important;
|
||||||
|
}
|
||||||
|
|
|
@ -112,11 +112,11 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
.channelTimeslotHeader {
|
.channelTimeslotHeader {
|
||||||
border-right-color: #007AFF !important;
|
border-right-color: #52B54B !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.channelTimeslotHeader, .timeslotHeader {
|
.channelTimeslotHeader, .timeslotHeader {
|
||||||
background: #007AFF !important;
|
background: #52B54B !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.libraryViewNav, paper-tabs {
|
.libraryViewNav, paper-tabs {
|
||||||
|
|
13
dashboard-ui/thirdparty/paper-button-style.css
vendored
13
dashboard-ui/thirdparty/paper-button-style.css
vendored
|
@ -325,6 +325,19 @@ paper-slider {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.paper-slider-0 #sliderKnobInner.paper-slider {
|
||||||
|
background-color: #52B54B;
|
||||||
|
}
|
||||||
|
|
||||||
|
.paper-slider-0 paper-ripple.paper-slider {
|
||||||
|
color: #52B54B;
|
||||||
|
}
|
||||||
|
.paper-progress-0 #primaryProgress.paper-progress {
|
||||||
|
background-color: #52B54B;
|
||||||
|
}
|
||||||
|
.paper-progress-0 #secondaryProgress.paper-progress {
|
||||||
|
background-color: #92B54B;
|
||||||
|
}
|
||||||
paper-menu-item {
|
paper-menu-item {
|
||||||
padding: .35em .5em;
|
padding: .35em .5em;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue