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 recording file names

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-27 17:02:39 -04:00
parent 7d89bd22b9
commit f7f5c66b77
13 changed files with 66 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/apiclient/connectionmanager.js
View file

@ -737,7 +737,7 @@
var deferred = DeferredBuilder.Deferred();
require(['serverdiscovery'], function () {
ServerDiscovery.findServers(1500).done(function (foundServers) {
ServerDiscovery.findServers(1000).done(function (foundServers) {
var servers = foundServers.map(function (foundServer) {

4
dashboard-ui/bower_components/paper-behaviors/.bower.json vendored
View file

@ -42,7 +42,7 @@
"tag": "v1.0.4",
"commit": "a7ac7fbdb79b4d82416ec9b41613575386d0d226"
},
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors"
"_originalSource": "polymerelements/paper-behaviors"
}

2
dashboard-ui/cordova/ios/backgroundfetch.js vendored
View file

@ -7,7 +7,7 @@
var fetcher = window.BackgroundFetch;
fetcher.configure(onBackgroundFetch, onBackgroundFetchFailed, {
stopOnTerminate: true // <-- false is default
stopOnTerminate: false // <-- false is default
});
}

37
dashboard-ui/cordova/ios/tabbar.js vendored
View file

@ -83,7 +83,6 @@
TabBar.showItems();
initComplete = true;
showTabs();
ignoreNextSelection = true;
TabBar.selectItem('Library');
@ -98,6 +97,26 @@
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;
function hideTabs() {
@ -118,24 +137,14 @@
init();
Events.on(ConnectionManager, 'localusersignedin', showTabs);
showUserTabs();
Events.on(ConnectionManager, 'localusersignedin', showUserTabs);
Events.on(ConnectionManager, 'localusersignedout', hideTabs);
Events.on(MediaController, 'beforeplaybackstart', onPlaybackStart);
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) {
if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video' && player.isLocalPlayer) {

1
dashboard-ui/css/librarymenu.css
View file

@ -146,6 +146,7 @@
cursor: default;
position: relative;
top: 1px;
white-space: nowrap;
}
.logoLibraryMenuButtonText {

2
dashboard-ui/livetv.html
View file

@ -71,7 +71,7 @@
<div class="tvGuideHeader">
<div class="channelTimeslotHeader">
<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 class="timeslotHeaders hiddenScrollX"></div>

2
dashboard-ui/mypreferenceshome.html
View file

@ -10,7 +10,7 @@
<div data-role="content">
<form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
<div class="detailSection homeSections hide">
<div class="detailSection homeSections">
<h1>
${HeaderHomePage}
</h1>

6
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -582,9 +582,15 @@
self.enableCustomVideoControls = function () {
if (AppInfo.isNativeApp && $.browser.safari) {
if (navigator.userAgent.toLowerCase().indexOf('iphone') != -1) {
return true;
}
// Need to disable it in order to support picture in picture
return false;
}
return self.canAutoPlayVideo() && !$.browser.mobile;
};

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

@ -273,12 +273,6 @@
var page = this;
if (AppInfo.enableCustomHomeSections) {
page.querySelector('.homeSections').classList.remove('hide');
} else {
page.querySelector('.homeSections').classList.add('hide');
}
Dashboard.showLoadingMsg();
var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();

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

@ -1726,7 +1726,6 @@ var AppInfo = {};
AppInfo.enableSearchInTopMenu = true;
AppInfo.enableHomeFavorites = true;
AppInfo.enableNowPlayingBar = true;
AppInfo.enableCustomHomeSections = true;
AppInfo.enableHomeTabs = true;
AppInfo.enableNowPlayingPageBottomTabs = true;
@ -1747,7 +1746,6 @@ var AppInfo = {};
AppInfo.enableNavDrawer = false;
AppInfo.enableSearchInTopMenu = false;
AppInfo.enableHomeFavorites = false;
AppInfo.enableCustomHomeSections = false;
AppInfo.enableHomeTabs = false;
AppInfo.enableNowPlayingPageBottomTabs = false;

16
dashboard-ui/themes/android.css
View file

@ -22,10 +22,14 @@
background: rgba(56,56,56,.85);
}
.libraryViewNav a {
font-weight: 500 !important;
.libraryViewNav {
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2);
}
.libraryViewNav a {
font-weight: 500 !important;
}
paper-tab {
font-weight: 500 !important;
}
@ -34,3 +38,11 @@ paper-tab {
.libraryViewNav .ui-btn-active {
border-bottom-color: #52B54B !important;
}
.channelTimeslotHeader {
border-right-color: #52B54B !important;
}
.channelTimeslotHeader, .timeslotHeader {
background: #52B54B !important;
}

4
dashboard-ui/themes/ios.css
View file

@ -112,11 +112,11 @@ body {
}
.channelTimeslotHeader {
border-right-color: #007AFF !important;
border-right-color: #52B54B !important;
}
.channelTimeslotHeader, .timeslotHeader {
background: #007AFF !important;
background: #52B54B !important;
}
.libraryViewNav, paper-tabs {

13
dashboard-ui/thirdparty/paper-button-style.css vendored
View file

@ -325,6 +325,19 @@ paper-slider {
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 {
padding: .35em .5em;
cursor: pointer;