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 hls

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-28 20:50:39 -04:00
parent 0e1df8a39d
commit 2a830d2a3d
10 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-flex-layout/.bower.json vendored
View file

@ -23,14 +23,14 @@
"paper-styles": "polymerelements/paper-styles#^1.0.0", "paper-styles": "polymerelements/paper-styles#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-flex-layout", "homepage": "https://github.com/PolymerElements/iron-flex-layout",
"_release": "1.0.3", "_release": "1.0.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.3", "tag": "v1.0.3",
"commit": "e6c2cfec18354973ac03e70dcd8afcc3c72d09b9" "commit": "e6c2cfec18354973ac03e70dcd8afcc3c72d09b9"
}, },
"_source": "git://github.com/polymerelements/iron-flex-layout.git", "_source": "git://github.com/PolymerElements/iron-flex-layout.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-flex-layout" "_originalSource": "PolymerElements/iron-flex-layout"
} }

4
dashboard-ui/bower_components/neon-animation/.bower.json vendored
View file

@ -54,7 +54,7 @@
"tag": "v1.0.6", "tag": "v1.0.6",
"commit": "ec51bf68f05c40373536cc726ca674e4549b7db2" "commit": "ec51bf68f05c40373536cc726ca674e4549b7db2"
}, },
"_source": "git://github.com/polymerelements/neon-animation.git", "_source": "git://github.com/PolymerElements/neon-animation.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/neon-animation" "_originalSource": "PolymerElements/neon-animation"
} }

11
dashboard-ui/css/card.css
View file

@ -662,17 +662,24 @@
} }
} }
@media all and (min-width: 1100px) { @media all and (min-width: 800px) {
.homePageSmallBackdropCard { .homePageSmallBackdropCard {
width: 20%; width: 20%;
} }
} }
@media all and (min-width: 1100px) {
.homePageSmallBackdropCard {
width: 16.66666666666667%;
}
}
@media all and (min-width: 1440px) { @media all and (min-width: 1440px) {
.homePageSmallBackdropCard { .homePageSmallBackdropCard {
width: 14.285714285714285714285714285714%; width: 12.5%;
} }
} }

4
dashboard-ui/css/mediaplayer-video.css
View file

@ -208,9 +208,9 @@
@media all and (max-width: 1400px), all and (max-height: 900px) { @media all and (max-width: 1400px), all and (max-height: 900px) {
/*#mediaPlayer .nowPlayingInfo { .mediaButton.infoButton {
display: none !important; display: none !important;
}*/ }
} }
@media all and (max-width: 555px) { @media all and (max-width: 555px) {

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

@ -110,7 +110,7 @@
function setDefault(page) { function setDefault(page) {
getElement().style.backgroundImage = "url(css/images/splash.jpg)"; getElement().style.backgroundImage = "url(css/images/splash.jpg)";
page = $(page)[0];
page.classList.add('backdropPage'); page.classList.add('backdropPage');
page.classList.add('staticBackdropPage'); page.classList.add('staticBackdropPage');
} }

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

@ -52,7 +52,6 @@
} }
function renderRemoteImages(page, item, imagesResult, imageType, startIndex, limit) { function renderRemoteImages(page, item, imagesResult, imageType, startIndex, limit) {
$('.availableImagesPaging', page).html(getPagingHtml(startIndex, limit, imagesResult.TotalRecordCount)).trigger('create'); $('.availableImagesPaging', page).html(getPagingHtml(startIndex, limit, imagesResult.TotalRecordCount)).trigger('create');
var html = ''; var html = '';

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

@ -811,14 +811,22 @@
var title = page.getAttribute('data-title') || page.getAttribute('data-contextname'); var title = page.getAttribute('data-title') || page.getAttribute('data-contextname');
if (title) { if (!title) {
LibraryMenu.setTitle(title); var titleKey = getParameterByName('titlekey');
if (titleKey) {
title = Globalize.translate(titleKey);
}
} }
var titleKey = getParameterByName('titlekey'); if (!title) {
if (page.classList.contains('type-interior')) {
title = Globalize.translate('ButtonHome');
}
}
if (titleKey) { if (title) {
LibraryMenu.setTitle(Globalize.translate(titleKey)); LibraryMenu.setTitle(title);
} }
var mainDrawerButton = document.querySelector('.mainDrawerButton'); var mainDrawerButton = document.querySelector('.mainDrawerButton');

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

@ -67,8 +67,8 @@
} else { } else {
html += '<div class="cardImage" style="text-align:center;">'; html += '<div class="cardImage" style="text-align:center;">';
var icon = server.Id == 'new' ? 'plus-circle' : 'server'; var icon = server.Id == 'new' ? 'add' : 'wifi';
html += '<i class="fa fa-' + icon + '" style="color:#fff;vertical-align:middle;font-size:100px;margin-top:40px;"></i>'; html += '<iron-icon icon="' + icon + '" style="color:#fff;vertical-align:middle;margin-top:30%;height:64px;width:64px;"></iron-icon>';
} }
html += "</div>"; html += "</div>";
@ -298,7 +298,7 @@
html += '<a class="cardContent" href="' + href + '">'; html += '<a class="cardContent" href="' + href + '">';
html += '<div class="cardImage" style="text-align:center;">'; html += '<div class="cardImage" style="text-align:center;">';
html += '<i class="fa fa-globe" style="color:#fff;vertical-align:middle;font-size:100px;margin-top:40px;"></i>'; html += '<iron-icon icon="wifi" style="color:#fff;vertical-align:middle;margin-top:30%;height:64px;width:64px;"></iron-icon>';
html += "</div>"; html += "</div>";
// cardContent // cardContent

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

@ -2087,7 +2087,7 @@ var AppInfo = {};
capabilities.DeviceProfile = MediaPlayer.getDeviceProfile(Math.max(screen.height, screen.width)); capabilities.DeviceProfile = MediaPlayer.getDeviceProfile(Math.max(screen.height, screen.width));
createConnectionManager(capabilities).done(function () { onConnectionManagerCreated(deferred); }); createConnectionManager(capabilities).done(function () { onConnectionManagerCreated(deferred); });
//$(document.body).append('<div style="background:#009688;position:fixed;z-index:999999;top:0;right:0;left:0;bottom:0;padding:50px;"><iron-icon icon="queue-music" style="width:640px;height:640px;color:#fff;"></iron-icon></div>'); //$(document.body).append('<div style="background:#3F51B5;position:fixed;z-index:999999;top:1px;left:1px;width:800px;height:450px;display:flex;align-items:center;justify-content:center;"><iron-icon icon="live-tv" style="width:320px;height:320px;color:#fff;"></iron-icon></div>');
}); });
} }

2
dashboard-ui/selectserver.html
View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver,fontawesome"> <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver">
<div data-role="content"> <div data-role="content">