1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update components

This commit is contained in:
Luke Pulverenti 2015-06-19 00:23:55 -04:00
parent 615cc844ae
commit b9598ffaa1
88 changed files with 366 additions and 501 deletions

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="channelsLatestPage" data-role="page" class="page libraryPage channelsPage" data-contextname="${HeaderChannels}" data-require="scripts/sections,scripts/channelslatest,paperbuttonstyle"> <div id="channelsLatestPage" data-role="page" class="page libraryPage channelsPage" data-contextname="${HeaderChannels}" data-require="scripts/sections,scripts/channelslatest,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="#" class="ui-btn-active latestChannelItemsTab"><i class="material-icons">new_releases</i>${TabLatest}</a> <a href="#" class="ui-btn-active latestChannelItemsTab"><i class="material-icons">new_releases</i>${TabLatest}</a>
<a href="channels.html"><i class="material-icons">live_tv</i>${TabChannels}</a> <a href="channels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>

View file

@ -33,6 +33,8 @@
<div class="noItemsMessage" style="display: none; text-align: center;"> <div class="noItemsMessage" style="display: none; text-align: center;">
<p>${MessageNoCollectionsAvailable}</p> <p>${MessageNoCollectionsAvailable}</p>
</div> </div>
<paper-fab class="btnNewCollection" icon="add" style="position:fixed;bottom:60px;right:30px;background-color:#db4437;"></paper-fab>
</div> </div>
<div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true"> <div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">

View file

@ -6,8 +6,6 @@
<body class="serverlessPage"> <body class="serverlessPage">
<div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin,paperbuttonstyle"> <div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div data-role="content"> <div data-role="content">
<form class="connectLoginForm" style="text-align: center; margin: 0 auto;display:none;"> <form class="connectLoginForm" style="text-align: center; margin: 0 auto;display:none;">

View file

@ -55,6 +55,10 @@
margin: 4px; margin: 4px;
} }
.defaultBackground .cardImage {
background-color: #333;
}
@media all and (max-width: 800px) { @media all and (max-width: 800px) {
.cardBox { .cardBox {
@ -261,7 +265,7 @@
position: relative; position: relative;
} }
.iconCardImage .fa { .iconCardImage .fa {
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
position: absolute; position: absolute;
left: 0; left: 0;
@ -269,7 +273,7 @@
font-size: 50px; font-size: 50px;
margin: auto; margin: auto;
top: 25%; top: 25%;
} }
.bannerCard { .bannerCard {
width: 100%; width: 100%;

View file

@ -13,24 +13,16 @@
} }
.backdropPage.ui-page-theme-a { .backdropPage.ui-page-theme-a {
background-color: rgba(240, 240,240, .90) !important;
}
.backdropPage.ui-page-theme-a:not(.lightBackdropPage) {
background-color: rgba(240, 240,240, .94) !important; background-color: rgba(240, 240,240, .94) !important;
} }
.ui-page-theme-b { .ui-page-theme-b {
background-color: #1f1f1f; background-color: #1f1f1f;
} }
.backdropPage.ui-page-theme-b { .backdropPage.ui-page-theme-b {
background-color: rgba(20, 20,20, .90) !important;
}
.backdropPage.ui-page-theme-b:not(.lightBackdropPage) {
background-color: rgba(20, 20,20, .94) !important; background-color: rgba(20, 20,20, .94) !important;
} }
.backdropContainer { .backdropContainer {
position: fixed; position: fixed;
@ -999,10 +991,10 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
display: inline-block; display: inline-block;
} }
.textIndicator { .textIndicator {
height: 22px; height: 22px;
padding-top: 2px; padding-top: 2px;
} }
.mediaSourceIndicator { .mediaSourceIndicator {
display: block; display: block;

View file

@ -111,7 +111,7 @@
border-bottom: 2px solid #0B487D; border-bottom: 2px solid #0B487D;
} }
.tvProgram:hover, .tvProgram:hover .tvProgramInfo { .pointerInput .tvProgram:hover, .pointerInput .tvProgram:hover .tvProgramInfo {
background-color: #444; background-color: #444;
} }
@ -231,7 +231,7 @@
position: relative; position: relative;
} }
.channelHeaderCell:hover { .pointerInput .channelHeaderCell:hover {
background-color: #444; background-color: #444;
} }
@ -269,7 +269,7 @@
overflow: hidden; overflow: hidden;
} }
.programCellInner:hover { .pointerInput .programCellInner:hover {
background-color: #444; background-color: #444;
} }

View file

@ -1,7 +1,5 @@
.tileItem { .tileItem {
background: rgba(30, 30, 30, .7); padding: 5px 7px 5px;
padding: 10px 7px 5px;
margin: 3px 0;
font-weight: normal !important; font-weight: normal !important;
display: block; display: block;
position: relative; position: relative;
@ -51,26 +49,8 @@
overflow: hidden; overflow: hidden;
} }
.backdropTileItem .tileImage {
height: 90px;
width: 45%;
}
.backdropTileItem .tileContent {
width: 50%;
}
.posterTileItem .tileImage {
height: 120px;
width: 30%;
}
.posterTileItem .tileContent {
width: 65%;
}
.smallPosterTileItem .tileImage { .smallPosterTileItem .tileImage {
height: 110px; height: 150px;
width: 35%; width: 35%;
} }
@ -78,24 +58,6 @@
width: 60%; width: 60%;
} }
.smallBackdropTileItem .tileImage {
height: 125px;
width: 45%;
}
.smallBackdropTileItem .tileContent {
width: 50%;
}
.squareTileItem .tileImage {
height: 100px;
width: 35%;
}
.squareTileItem .tileContent {
width: 60%;
}
@media all and (min-width: 540px) { @media all and (min-width: 540px) {
.tileItem { .tileItem {
@ -104,296 +66,17 @@
margin-right: 3px; margin-right: 3px;
} }
.backdropTileItem {
display: block;
}
.posterTileItem, .squareTileItem {
width: 45%;
}
.posterTileItem .tileImage {
height: 120px;
}
.squareTileItem .tileImage {
height: 115px;
}
.smallPosterTileItem { .smallPosterTileItem {
width: 46%; width: 46%;
display: inline-block; display: inline-block;
margin: 3px;
}
.smallBackdropTileItem {
display: block;
} }
} }
@media all and (min-width: 750px) { @media all and (min-width: 750px) {
.smallBackdropTileItem {
display: block;
}
.backdropTileItem {
display: inline-block;
}
.smallPosterTileItem { .smallPosterTileItem {
width: 30%;
}
.backdropTileItem, .posterTileItem, .squareTileItem {
width: 46%;
}
.backdropTileItem .tileImage {
height: 88px;
}
.posterTileItem .tileImage {
height: 120px;
}
.squareTileItem .tileImage {
height: 115px;
}
}
@media all and (min-width: 850px) {
.smallBackdropTileItem {
width: 47%;
display: inline-block;
}
.backdropTileItem .tileImage {
height: 105px;
}
.posterTileItem .tileImage {
height: 120px;
}
.posterTileItem {
width: 30.5%;
}
}
@media all and (min-width: 1000px) {
.backdropTileItem, .posterTileItem, .squareTileItem {
width: 47.5%;
}
.posterTileItem {
width: 31%; width: 31%;
} }
.backdropTileItem .tileImage {
height: 110px;
}
.posterTileItem .tileImage {
height: 136px;
}
.squareTileItem {
width: 31%;
}
.squareTileItem .tileImage {
height: 105px;
}
}
@media all and (min-width: 1200px) {
.backdropTileItem .tileImage {
height: 100px;
}
.posterTileItem .tileImage {
height: 160px;
}
.backdropTileItem, .posterTileItem, .squareTileItem {
width: 31.5%;
}
.squareTileItem .tileImage {
height: 130px;
}
}
@media all and (min-width: 1440px) {
.backdropTileItem .tileImage {
height: 110px;
}
.posterTileItem .tileImage {
height: 150px;
}
.backdropTileItem, .squareTileItem, .backdropTileItem.posterTileItem {
width: 31.5%;
}
.squareTileItem .tileImage {
height: 155px;
}
.posterTileItem {
width: 23.5%;
}
}
@media all and (min-width: 1700px) {
.backdropTileItem .tileImage {
height: 132px;
}
.posterTileItem .tileImage {
height: 170px;
}
.backdropTileItem, .backdropTileItem.posterTileItem {
width: 32%;
}
.posterTileItem {
width: 23.5%;
}
.squareTileItem {
width: 23.5%;
}
.squareTileItem .tileImage {
height: 140px;
}
}
@media all and (min-width: 1920px) {
.backdropTileItem, .backdropTileItem.posterTileItem {
width: 31.5%;
}
.tileImage {
height: 155px;
}
.posterTileItem {
width: 18.8%;
}
.posterTileItem .tileImage {
height: 160px;
}
.squareTileItem {
width: 18.8%;
}
.squareTileItem .tileImage {
height: 120px;
}
}
@media all and (min-width: 2000px) {
.backdropTileItem, .backdropTileItem.posterTileItem {
width: 23.5%;
}
.tileImage {
height: 117px;
}
.posterTileItem {
width: 18.8%;
}
.posterTileItem .tileImage {
height: 160px;
}
.squareTileItem {
width: 18.8%;
}
.squareTileItem .tileImage {
height: 130px;
}
}
@media all and (min-width: 2200px) {
.backdropTileItem, .backdropTileItem.posterTileItem {
width: 24%;
}
.tileImage {
height: 145px;
}
.posterTileItem {
width: 18.8%;
}
.posterTileItem .tileImage {
height: 185px;
}
.squareTileItem {
width: 18.8%;
}
.squareTileItem .tileImage {
height: 140px;
}
}
@media all and (min-width: 2540px) {
.backdropTileItem, .backdropTileItem.posterTileItem {
width: 18.75%;
}
.tileImage {
height: 120px;
}
.posterTileItem {
width: 15.8%;
}
.posterTileItem .tileImage {
height: 180px;
}
.squareTileItem {
width: 15.8%;
}
.squareTileItem .tileImage {
height: 140px;
}
}
.posterItem {
margin: 5px 5px;
font-weight: normal !important;
display: inline-block;
position: relative;
color: #fff !important;
text-decoration: none;
text-align: left;
-webkit-transition: all 500ms ease;
-moz-transition: all 500ms ease;
-o-transition: all 500ms ease;
-ms-transition: all 500ms ease;
transition: all 500ms ease;
} }
.posterItemText { .posterItemText {

View file

@ -6,7 +6,6 @@
<body> <body>
<div id="favoritesPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/favorites,paperbuttonstyle"> <div id="favoritesPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/favorites,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="index.html"><i class="material-icons">home</i>${TabHome}</a> <a href="index.html"><i class="material-icons">home</i>${TabHome}</a>
<a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a> <a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="homeLatestPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/sections,scripts/homelatest,paperbuttonstyle"> <div id="homeLatestPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/sections,scripts/homelatest,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="index.html"><i class="material-icons">home</i>${TabHome}</a> <a href="index.html"><i class="material-icons">home</i>${TabHome}</a>
<a href="#" class="ui-btn-active"><i class="material-icons">new_releases</i>${TabLatest}</a> <a href="#" class="ui-btn-active"><i class="material-icons">new_releases</i>${TabLatest}</a>

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="indexPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/sections,scripts/indexpage,paperbuttonstyle"> <div id="indexPage" data-role="page" class="page type-home libraryPage allLibraryPage backdropPage" data-backdroptype="movie,series,game,book" data-require="scripts/sections,scripts/indexpage,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="#" class="ui-btn-active"><i class="material-icons">home</i>${TabHome}</a> <a href="#" class="ui-btn-active"><i class="material-icons">home</i>${TabHome}</a>
<a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a> <a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>

View file

@ -5,7 +5,7 @@
</head> </head>
<body> <body>
<div id="itemByNameDetailPage" data-role="page" class="page libraryPage itemDetailPage lightBackdropPage" data-require="scripts/itembynamedetailpage"> <div id="itemByNameDetailPage" data-role="page" class="page libraryPage itemDetailPage backdropPage" data-require="scripts/itembynamedetailpage">
<div id="movieGenreTabs" class="itemTabs" style="display: none;"> <div id="movieGenreTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a> <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage" data-theme="b" data-require="scripts/itemdetailpage,paperbuttonstyle"> <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage" data-theme="b" data-require="scripts/itemdetailpage,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="itemTabs homeTabs" style="display: none;"> <div class="itemTabs homeTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="index.html" class="lnkHomeHome"><i class="material-icons">home</i>${TabHome}</a> <a href="index.html" class="lnkHomeHome"><i class="material-icons">home</i>${TabHome}</a>

View file

@ -5,7 +5,6 @@
</head> </head>
<body> <body>
<div id="liveTvRecordingsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvrecordings,paperbuttonstyle"> <div id="liveTvRecordingsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvrecordings,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav"> <div class="libraryViewNav">
<a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a> <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>

View file

@ -5,7 +5,6 @@
</head> </head>
<body> <body>
<div id="liveTvSuggestedPage" data-role="page" class="page libraryPage liveTvPage backdropPage globalBackdropPage" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie" data-require="scripts/livetvsuggested,paperbuttonstyle"> <div id="liveTvSuggestedPage" data-role="page" class="page libraryPage liveTvPage backdropPage globalBackdropPage" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie" data-require="scripts/livetvsuggested,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav"> <div class="libraryViewNav">
<a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a> <a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>

View file

@ -6,7 +6,6 @@
<body> <body>
<div id="loginPage" data-role="page" class="page standalonePage" data-theme="b" data-require="scripts/loginpage,paperbuttonstyle"> <div id="loginPage" data-role="page" class="page standalonePage" data-theme="b" data-require="scripts/loginpage,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div data-role="content"> <div data-role="content">
<form class="manualLoginForm" style="display: none; text-align: center; margin: 0 auto;"> <form class="manualLoginForm" style="display: none; text-align: center; margin: 0 auto;">

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="movie" data-require="scripts/moviesrecommended,paperbuttonstyle"> <div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="movie" data-require="scripts/moviesrecommended,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a> <a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>
<a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a> <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>

View file

@ -6,7 +6,6 @@
</head> </head>
<body> <body>
<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferencesdisplay,scripts/mypreferencescommon,paperbuttonstyle,jqmicons"> <div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferencesdisplay,scripts/mypreferencescommon,paperbuttonstyle,jqmicons">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav"> <div class="libraryViewNav">
<a href="#" class="ui-btn-active lnkDisplayPreferences">${TabDisplay}</a> <a href="#" class="ui-btn-active lnkDisplayPreferences">${TabDisplay}</a>

View file

@ -6,7 +6,6 @@
</head> </head>
<body> <body>
<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferenceslanguages,scripts/mypreferencescommon,paperbuttonstyle,jqmicons"> <div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferenceslanguages,scripts/mypreferencescommon,paperbuttonstyle,jqmicons">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav"> <div class="libraryViewNav">
<a href="#" class="lnkDisplayPreferences">${TabDisplay}</a> <a href="#" class="lnkDisplayPreferences">${TabDisplay}</a>

View file

@ -6,7 +6,6 @@
</head> </head>
<body> <body>
<div id="webClientPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferenceswebclient,scripts/mypreferencescommon,paperbuttonstyle,jqmicons"> <div id="webClientPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}" data-require="scripts/mypreferenceswebclient,scripts/mypreferencescommon,paperbuttonstyle,jqmicons">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav"> <div class="libraryViewNav">
<a href="#" class="lnkDisplayPreferences">${TabDisplay}</a> <a href="#" class="lnkDisplayPreferences">${TabDisplay}</a>

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage" data-contextname="${HeaderPreferences}" data-require="scripts/myprofile,scripts/mypreferencescommon,paperbuttonstyle,jqmicons"> <div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage" data-contextname="${HeaderPreferences}" data-require="scripts/myprofile,scripts/mypreferencescommon,paperbuttonstyle,jqmicons">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav"> <div class="libraryViewNav">
<a href="#" class="lnkDisplayPreferences">${TabDisplay}</a> <a href="#" class="lnkDisplayPreferences">${TabDisplay}</a>
<a href="#" class="lnkLanguagePreferences">${TabPlayback}</a> <a href="#" class="lnkLanguagePreferences">${TabPlayback}</a>

View file

@ -13,34 +13,14 @@
<div data-role="content"> <div data-role="content">
<h2 style="text-align:center;" class="playlistName"></h2> <h2 style="text-align:center;" class="playlistName"></h2>
<div class="viewSettings"> <div class="viewSettings">
<div class="listTopPaging"> <div class="listTopPaging"></div>
&nbsp; <paper-button raised class="secondary btnPlay hide"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonPlay}</span></paper-button>
</div>
<button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true" style="margin-left:1em;">${ButtonPlay}</button>
</div> </div>
<div id="items" class="itemsContainer"></div> <div id="items" class="itemsContainer"></div>
<div class="noItemsMessage" style="display: none; text-align: center;"> <div class="noItemsMessage" style="display: none; text-align: center;">
<p>${MessageNoPlaylistItemsAvailable}</p> <p>${MessageNoPlaylistItemsAvailable}</p>
</div> </div>
</div> </div>
<div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
<form>
<div data-role="controlgroup" data-type="horizontal" data-mini="true" class="viewPanelTabs">
<a href="#" data-role="button" class="viewTabButton" data-tab="tabView">${TabView}</a>
</div>
<div class="tabView viewTab">
<div>
<label for="selectPageSize">${LabelPageSize}</label>
<select id="selectPageSize"></select>
</div>
</div>
</form>
</div>
</div> </div>
</body> </body>
</html> </html>

View file

@ -0,0 +1,15 @@
(function () {
function show(options) {
// items
// positionTo
// showCancel
}
window.ActionSheet = {
show: show
};
})();

View file

@ -129,7 +129,7 @@
} }
if ($.browser.android && AppInfo.isNativeApp) { if ($.browser.android && AppInfo.isNativeApp) {
return true; return screen.availWidth >= 1200;
} }
if ($.browser.mobile) { if ($.browser.mobile) {

View file

@ -256,7 +256,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#channelItemsPage", function () { }).on('pagebeforeshowready', "#channelItemsPage", function () {
var page = this; var page = this;
var limit = LibraryBrowser.getDefaultPageSize(); var limit = LibraryBrowser.getDefaultPageSize();

View file

@ -61,7 +61,7 @@
} }
$(document).on('pageshowready', "#channelsPage", function () { $(document).on('pagebeforeshowready', "#channelsPage", function () {
LibraryBrowser.loadSavedQueryValues('channels', query); LibraryBrowser.loadSavedQueryValues('channels', query);

View file

@ -5,7 +5,7 @@
Sections.loadLatestChannelItems($(".items", page), Dashboard.getCurrentUserId()); Sections.loadLatestChannelItems($(".items", page), Dashboard.getCurrentUserId());
} }
$(document).on('pageshowready', "#channelsLatestPage", function () { $(document).on('pagebeforeshowready', "#channelsLatestPage", function () {
reloadItems(this); reloadItems(this);

View file

@ -321,7 +321,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#episodesPage", function () { }).on('pagebeforeshowready', "#episodesPage", function () {
var page = this; var page = this;
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -109,7 +109,7 @@
}); });
} }
$(document).on('pageshowready', "#favoritesPage", function () { $(document).on('pagebeforeshowready', "#favoritesPage", function () {
var page = this; var page = this;

View file

@ -96,7 +96,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#gameGenresPage", function () { }).on('pagebeforeshowready', "#gameGenresPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -239,7 +239,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#gamesPage", function () { }).on('pagebeforeshowready', "#gamesPage", function () {
var page = this; var page = this;
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -1,6 +1,6 @@
(function ($, document) { (function ($, document) {
$(document).on('pageshowready', "#gamesRecommendedPage", function () { $(document).on('pagebeforeshowready', "#gamesRecommendedPage", function () {
var parentId = LibraryMenu.getTopParentId(); var parentId = LibraryMenu.getTopParentId();
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();

View file

@ -98,7 +98,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#gameStudiosPage", function () { }).on('pagebeforeshowready', "#gameStudiosPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -52,7 +52,7 @@
// Reset form values using the last used query // Reset form values using the last used query
} }
$(document).on('pageshowready', "#gamesystemsPage", function () { $(document).on('pagebeforeshowready', "#gamesystemsPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -170,7 +170,7 @@
takeTour(page, Dashboard.getCurrentUserId()); takeTour(page, Dashboard.getCurrentUserId());
}); });
}).on('pageshowready', "#indexPage", function () { }).on('pagebeforeshowready', "#indexPage", function () {
var page = this; var page = this;

View file

@ -587,7 +587,7 @@
}); });
}); });
}).on('pageshowready', "#itemByNameDetailPage", function () { }).on('pagebeforeshowready', "#itemByNameDetailPage", function () {
var page = this; var page = this;

View file

@ -1627,7 +1627,7 @@
}); });
}).on('pageshowready', "#itemDetailPage", function () { }).on('pagebeforeshowready', "#itemDetailPage", function () {
var page = this; var page = this;

View file

@ -244,7 +244,7 @@
$(page).on('click', '.mediaItem', onListItemClick); $(page).on('click', '.mediaItem', onListItemClick);
}).on('pageshowready', "#itemListPage", function () { }).on('pagebeforeshowready', "#itemListPage", function () {
var page = this; var page = this;

View file

@ -2,8 +2,6 @@
var pageSizeKey = 'pagesize_v4'; var pageSizeKey = 'pagesize_v4';
var defaultBackground = "#333";
return { return {
getDefaultPageSize: function (key, defaultValue) { getDefaultPageSize: function (key, defaultValue) {
@ -1214,7 +1212,6 @@
var html = ''; var html = '';
var imgUrl = null; var imgUrl = null;
var icon; var icon;
var background = null;
var width = null; var width = null;
var height = null; var height = null;
@ -1222,6 +1219,8 @@
var enableImageEnhancers = options.enableImageEnhancers !== false; var enableImageEnhancers = options.enableImageEnhancers !== false;
var cssClass = "card";
if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.5) { if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.5) {
width = posterWidth; width = posterWidth;
@ -1386,7 +1385,7 @@
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-music'; icon = 'fa-music';
} }
background = defaultBackground; cssClass += " defaultBackground";
} else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") { } else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") {
@ -1394,28 +1393,26 @@
icon = 'fa-folder-open'; icon = 'fa-folder-open';
} }
background = defaultBackground; cssClass += " defaultBackground";
} else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") { } else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-video-camera'; icon = 'fa-video-camera';
} }
background = defaultBackground; cssClass += " defaultBackground";
} else if (item.Type == "Person") { } else if (item.Type == "Person") {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-user'; icon = 'fa-user';
} }
background = defaultBackground; cssClass += " defaultBackground";
} else { } else {
if (item.Name && options.showTitle) { if (item.Name && options.showTitle) {
icon = 'fa-folder-open'; icon = 'fa-folder-open';
} }
background = defaultBackground; cssClass += " defaultBackground";
} }
var cssClass = "card";
cssClass += ' ' + options.shape + 'Card'; cssClass += ' ' + options.shape + 'Card';
var mediaSourceCount = item.MediaSourceCount || 1; var mediaSourceCount = item.MediaSourceCount || 1;
@ -1453,10 +1450,6 @@
style += 'background-image:url(\'' + imgUrl + '\');'; style += 'background-image:url(\'' + imgUrl + '\');';
} }
if (background) {
style += "background-color:" + background + ";";
}
var imageCssClass = 'cardImage'; var imageCssClass = 'cardImage';
if (icon) { if (icon) {
@ -2129,12 +2122,15 @@
if (options.viewButton) { if (options.viewButton) {
//html += '<paper-button raised class="subdued notext"><iron-icon icon="view-comfy"></iron-icon></paper-button>';
html += '<paper-button raised class="subdued notext" onclick="require([\'jqmicons\']);jQuery(\'.viewPanel\', jQuery(this).parents(\'.page\')).panel(\'toggle\');"><iron-icon icon="more-vert"></iron-icon></paper-button>'; html += '<paper-button raised class="subdued notext" onclick="require([\'jqmicons\']);jQuery(\'.viewPanel\', jQuery(this).parents(\'.page\')).panel(\'toggle\');"><iron-icon icon="more-vert"></iron-icon></paper-button>';
} }
html += '</div>'; html += '</div>';
if (showControls && options.showLimit !== false) { if (showControls && options.showLimit !== false) {
require(['jqmicons']);
var id = "selectPageSize"; var id = "selectPageSize";
var pageSizes = options.pageSizes || LibraryBrowser.getDefaultPageSizeSelections(); var pageSizes = options.pageSizes || LibraryBrowser.getDefaultPageSizeSelections();

View file

@ -176,7 +176,7 @@
Dashboard.navigate("edititemmetadata.html?channelid=" + currentItem.Id); Dashboard.navigate("edititemmetadata.html?channelid=" + currentItem.Id);
}); });
}).on('pageshowready', "#liveTvChannelPage", function () { }).on('pagebeforeshowready', "#liveTvChannelPage", function () {
var page = this; var page = this;

View file

@ -109,7 +109,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#liveTvChannelsPage", function () { }).on('pagebeforeshowready', "#liveTvChannelsPage", function () {
// Can't use pagebeforeshow here or the loading popup won't center correctly // Can't use pagebeforeshow here or the loading popup won't center correctly
var page = this; var page = this;

View file

@ -478,7 +478,7 @@
reloadPage(page); reloadPage(page);
}); });
}).on('pageshowready', "#liveTvGuidePage", function () { }).on('pagebeforeshowready', "#liveTvGuidePage", function () {
var page = this; var page = this;
reloadPage(page); reloadPage(page);

View file

@ -137,7 +137,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#liveTvItemsPage", function () { }).on('pagebeforeshowready', "#liveTvItemsPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -121,7 +121,7 @@
deleteTimer(page, currentItem.TimerId); deleteTimer(page, currentItem.TimerId);
}); });
}).on('pageshowready', "#liveTvProgramPage", function () { }).on('pagebeforeshowready', "#liveTvProgramPage", function () {
var page = this; var page = this;

View file

@ -84,7 +84,7 @@
var page = this; var page = this;
}).on('pageshowready', "#liveTvRecordingListPage", function () { }).on('pagebeforeshowready', "#liveTvRecordingListPage", function () {
var page = this; var page = this;

View file

@ -102,7 +102,7 @@
}); });
} }
$(document).on('pageshowready', "#liveTvRecordingsPage", function () { $(document).on('pagebeforeshowready', "#liveTvRecordingsPage", function () {
var page = this; var page = this;

View file

@ -116,7 +116,7 @@
}).checkboxradio('refresh'); }).checkboxradio('refresh');
} }
$(document).on('pageshowready', "#liveTvSeriesTimersPage", function () { $(document).on('pagebeforeshowready', "#liveTvSeriesTimersPage", function () {
var page = this; var page = this;

View file

@ -104,7 +104,7 @@
}); });
} }
$(document).on('pageshowready', "#liveTvSuggestedPage", function () { $(document).on('pagebeforeshowready', "#liveTvSuggestedPage", function () {
var page = this; var page = this;

View file

@ -107,7 +107,7 @@
}); });
} }
$(document).on('pageshowready', "#liveTvTimersPage", function () { $(document).on('pagebeforeshowready', "#liveTvTimersPage", function () {
var page = this; var page = this;

View file

@ -122,6 +122,7 @@
throw new Error('null player'); throw new Error('null player');
} }
currentPairingId = null;
currentPlayer = player; currentPlayer = player;
currentTargetInfo = targetInfo; currentTargetInfo = targetInfo;
@ -745,12 +746,14 @@
html += '<div class="players"></div>'; html += '<div class="players"></div>';
html += '<br/>'; html += '<br/>';
html += '<p><a href="nowplaying.html" data-role="button" data-icon="remote" data-transition="slideup">' + Globalize.translate('ButtonRemoteControl') + '</a></p>'; html += '<p><a href="nowplaying.html" data-transition="slideup" class="clearLink"><paper-button raised class="block"><iron-icon icon="tablet-android"></iron-icon><span>' + Globalize.translate('ButtonRemoteControl') + '</span></paper-button></a></p>';
html += '</div>'; html += '</div>';
$(document.body).append(html); $(document.body).append(html);
require(['jqmicons']);
var elem = $('#playerSelectionPanel').panel({}).trigger('create').panel("open").on("panelclose", function () { var elem = $('#playerSelectionPanel').panel({}).trigger('create').panel("open").on("panelclose", function () {
$(this).off("panelclose").remove(); $(this).off("panelclose").remove();

View file

@ -37,17 +37,12 @@
var html = ''; var html = '';
var addiontalButtonsHtml = user.Policy.IsAdministrator ?
('<button class="btnNewCollection" data-mini="true" data-icon="plus" data-inline="true" data-iconpos="notext">' + Globalize.translate('ButtonNew') + '</button>') :
'';
$('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({ $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
viewButton: true, viewButton: true,
showLimit: false, showLimit: false,
additionalButtonsHtml: addiontalButtonsHtml
})).trigger('create'); })).trigger('create');
updateFilterControls(page); updateFilterControls(page);
@ -257,7 +252,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#boxsetsPage", function () { }).on('pagebeforeshowready', "#boxsetsPage", function () {
var page = this; var page = this;

View file

@ -154,7 +154,7 @@
LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
}); });
}).on('pageshowready', "#movieGenresPage", function () { }).on('pagebeforeshowready', "#movieGenresPage", function () {
var page = this; var page = this;
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -140,7 +140,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#moviePeoplePage", function () { }).on('pagebeforeshowready', "#moviePeoplePage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -399,7 +399,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#moviesPage", function () { }).on('pagebeforeshowready', "#moviesPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -235,7 +235,7 @@
$('.recommendations', page).createCardMenus(); $('.recommendations', page).createCardMenus();
}).on('pageshowready', "#moviesRecommendedPage", function () { }).on('pagebeforeshowready', "#moviesRecommendedPage", function () {
var parentId = LibraryMenu.getTopParentId(); var parentId = LibraryMenu.getTopParentId();

View file

@ -99,7 +99,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#movieStudiosPage", function () { }).on('pagebeforeshowready', "#movieStudiosPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -212,7 +212,7 @@
$('.popupTrailerReelForm').off('submit', onSubmit).on('submit', onSubmit); $('.popupTrailerReelForm').off('submit', onSubmit).on('submit', onSubmit);
}).on('pageshowready', "#movieTrailersPage", function () { }).on('pagebeforeshowready', "#movieTrailersPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -190,7 +190,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#musicAlbumArtistsPage", function () { }).on('pagebeforeshowready', "#musicAlbumArtistsPage", function () {
var page = this; var page = this;
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -242,7 +242,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#musicAlbumsPage", function () { }).on('pagebeforeshowready', "#musicAlbumsPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -191,7 +191,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#musicArtistsPage", function () { }).on('pagebeforeshowready', "#musicArtistsPage", function () {
var page = this; var page = this;

View file

@ -115,7 +115,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#musicGenresPage", function () { }).on('pagebeforeshowready', "#musicGenresPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -167,7 +167,7 @@
}); });
} }
$(document).on('pageshowready', "#musicRecommendedPage", function () { $(document).on('pagebeforeshowready', "#musicRecommendedPage", function () {
var parentId = LibraryMenu.getTopParentId(); var parentId = LibraryMenu.getTopParentId();

View file

@ -183,7 +183,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#musicVideosPage", function () { }).on('pagebeforeshowready', "#musicVideosPage", function () {
var page = this; var page = this;

View file

@ -41,7 +41,7 @@
ApiClient.updateDisplayPreferences('home', displayPreferences, userId, 'webclient').done(function () { ApiClient.updateDisplayPreferences('home', displayPreferences, userId, 'webclient').done(function () {
Dashboard.alert(Globalize.translate('SettingsSaved')); Dashboard.alert(Globalize.translate('SettingsSaved'));
Dashboard.hideLoadingMsg();
}); });
} }

View file

@ -722,7 +722,7 @@
$('.sendMessageForm').off('submit', NowPlayingPage.onMessageSubmit).on('submit', NowPlayingPage.onMessageSubmit); $('.sendMessageForm').off('submit', NowPlayingPage.onMessageSubmit).on('submit', NowPlayingPage.onMessageSubmit);
$('.typeTextForm').off('submit', NowPlayingPage.onSendStringSubmit).on('submit', NowPlayingPage.onSendStringSubmit); $('.typeTextForm').off('submit', NowPlayingPage.onSendStringSubmit).on('submit', NowPlayingPage.onSendStringSubmit);
}).on('pageshowready', "#nowPlayingPage", function () { }).on('pagebeforeshowready', "#nowPlayingPage", function () {
var page = this; var page = this;

View file

@ -282,7 +282,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#photosPage", function () { }).on('pagebeforeshowready', "#photosPage", function () {
var page = this; var page = this;

View file

@ -81,8 +81,9 @@
startIndex: query.StartIndex, startIndex: query.StartIndex,
limit: query.Limit, limit: query.Limit,
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
viewButton: true, showLimit: false,
showLimit: false updatePageSizeSetting: false
})).trigger('create'); })).trigger('create');
updateFilterControls(page); updateFilterControls(page);
@ -171,20 +172,12 @@
}).checkboxradio('refresh'); }).checkboxradio('refresh');
$('#selectView', page).val(view).selectmenu('refresh'); $('#selectView', page).val(view).selectmenu('refresh');
$('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
} }
$(document).on('pageinitdepends', "#playlistEditorPage", function () { $(document).on('pageinitdepends', "#playlistEditorPage", function () {
var page = this; var page = this;
$('#selectPageSize', page).on('change', function () {
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(page);
});
$('.btnPlay', page).on('click', function () { $('.btnPlay', page).on('click', function () {
var userdata = currentItem.UserData || {}; var userdata = currentItem.UserData || {};
@ -215,7 +208,7 @@
}); });
}).on('pageshowready', "#playlistEditorPage", function () { }).on('pagebeforeshowready', "#playlistEditorPage", function () {
var page = this; var page = this;

View file

@ -183,7 +183,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#playlistsPage", function () { }).on('pagebeforeshowready', "#playlistsPage", function () {
var page = this; var page = this;

View file

@ -321,13 +321,11 @@
function handleLibraryLinkNavigations(elem) { function handleLibraryLinkNavigations(elem) {
$('a.posterItem', elem).on('click', function () { $('a', elem).on('click', function () {
var textElem = $('.posterItemText span', this); var card = $(this).parents('.card');
var textElem = $('.cardText', card);
if (!textElem.length) {
textElem = $('.posterItemText', this);
}
var text = textElem.html(); var text = textElem.html();
LibraryMenu.setText(text); LibraryMenu.setText(text);

View file

@ -50,7 +50,7 @@ var Dashboard = {
$.event.special.swipe.verticalDistanceThreshold = 40; $.event.special.swipe.verticalDistanceThreshold = 40;
$.mobile.loader.prototype.options.disabled = true; $.mobile.loader.prototype.options.disabled = true;
$.mobile.page.prototype.options.domCache = true; //$.mobile.page.prototype.options.domCache = true;
$.mobile.loadingMessage = false; $.mobile.loadingMessage = false;
$.mobile.loader.prototype.options.html = ""; $.mobile.loader.prototype.options.html = "";
@ -1735,6 +1735,10 @@ var AppInfo = {};
window.ConnectionManager = new MediaBrowser.ConnectionManager(Logger, credentialProvider, AppInfo.appName, AppInfo.appVersion, AppInfo.deviceName, AppInfo.deviceId, capabilities); window.ConnectionManager = new MediaBrowser.ConnectionManager(Logger, credentialProvider, AppInfo.appName, AppInfo.appVersion, AppInfo.deviceName, AppInfo.deviceId, capabilities);
if (getWindowUrl().toLowerCase().indexOf('wizardstart.html') != -1) {
window.ConnectionManager.clearData();
}
$(ConnectionManager).on('apiclientcreated', function (e, newApiClient) { $(ConnectionManager).on('apiclientcreated', function (e, newApiClient) {
initializeApiClient(newApiClient); initializeApiClient(newApiClient);
@ -1795,6 +1799,8 @@ var AppInfo = {};
if (AppInfo.isTouchPreferred) { if (AppInfo.isTouchPreferred) {
elem.addClass('touch'); elem.addClass('touch');
} else {
elem.addClass('pointerInput');
} }
if (AppInfo.cardMargin) { if (AppInfo.cardMargin) {
@ -1829,9 +1835,14 @@ var AppInfo = {};
function onDocumentReady() { function onDocumentReady() {
// Do these now to prevent a flash of content // Do these now to prevent a flash of content
if (AppInfo.isNativeApp && $.browser.safari) { if (AppInfo.isNativeApp) {
if ($.browser.android) {
Dashboard.importCss('themes/android.css');
}
else if ($.browser.safari) {
Dashboard.importCss('themes/ios.css'); Dashboard.importCss('themes/ios.css');
} }
}
if ($.browser.safari && $.browser.mobile) { if ($.browser.safari && $.browser.mobile) {
initFastClick(); initFastClick();
@ -2038,6 +2049,7 @@ var AppInfo = {};
Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css'); Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css');
return {}; return {};
}); });
define("actionsheet", ["scripts/actionsheet"]);
//requirejs(['http://viblast.com/player/free-version/qy2fdwajo1/viblast.js']); //requirejs(['http://viblast.com/player/free-version/qy2fdwajo1/viblast.js']);

View file

@ -174,7 +174,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#songsPage", function () { }).on('pagebeforeshowready', "#songsPage", function () {
var page = this; var page = this;

View file

@ -169,7 +169,7 @@
LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
}); });
}).on('pageshowready', "#tvGenresPage", function () { }).on('pagebeforeshowready', "#tvGenresPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();
var page = this; var page = this;

View file

@ -5,7 +5,7 @@
return 'Thumb'; return 'Thumb';
} }
$(document).on('pageshowready', "#tvNextUpPage", function () { $(document).on('pagebeforeshowready', "#tvNextUpPage", function () {
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();

View file

@ -147,7 +147,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#tvPeoplePage", function () { }).on('pagebeforeshowready', "#tvPeoplePage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -360,7 +360,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#tvShowsPage", function () { }).on('pagebeforeshowready', "#tvShowsPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -108,7 +108,7 @@
reloadItems(page); reloadItems(page);
}); });
}).on('pageshowready', "#tvStudiosPage", function () { }).on('pagebeforeshowready', "#tvStudiosPage", function () {
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver,paperbuttonstyle"> <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div data-role="content"> <div data-role="content">
<div class="ehsContent" style="margin: 0 auto;"> <div class="ehsContent" style="margin: 0 auto;">

View file

@ -0,0 +1,15 @@
.viewMenuBar, .libraryViewNav {
background-color: #181818;
}
.ui-page-theme-b {
background-color: #282828;
}
.backdropPage.ui-page-theme-b {
background-color: rgba(20, 20,20, .94) !important;
}
.defaultBackground .cardImage {
background-color: #383838;
}

View file

@ -8,6 +8,10 @@
background-color: rgba(28,28,28,.97); background-color: rgba(28,28,28,.97);
} }
.backdropPage.ui-page-theme-b {
background-color: rgba(28,28,28,.92) !important;
}
.ui-page-theme-b { .ui-page-theme-b {
background-color: #1c1c1c; background-color: #1c1c1c;
} }
@ -130,3 +134,15 @@ h1, h1 a {
.libraryViewNav a:not(.ui-btn-active):hover { .libraryViewNav a:not(.ui-btn-active):hover {
color: #539FFD !important; color: #539FFD !important;
} }
@media (min-width: 600px) {
/* This needs a little extra space to account for the longer date format */
.channelHeaderCell, .channelTimeslotHeader {
width: 209px;
}
.programGrid, .timeslotHeaders {
margin-left: 210px;
}
}

View file

@ -171,7 +171,6 @@
}); });
var existingServer = existingServers.length ? existingServers[0] : {}; var existingServer = existingServers.length ? existingServers[0] : {};
existingServer.DateLastAccessed = new Date().getTime(); existingServer.DateLastAccessed = new Date().getTime();
existingServer.LastConnectionMode = MediaBrowser.ConnectionMode.Manual; existingServer.LastConnectionMode = MediaBrowser.ConnectionMode.Manual;
existingServer.ManualAddress = apiClient.serverAddress(); existingServer.ManualAddress = apiClient.serverAddress();
@ -204,6 +203,18 @@
}); });
}; };
self.clearData = function () {
logger.log('connection manager clearing data');
connectUser = null;
var credentials = credentialProvider.credentials();
credentials.ConnectAccessToken = null;
credentials.ConnectUserId = null;
credentials.Servers = [];
credentialProvider.credentials(credentials);
};
function onConnectUserSignIn(user) { function onConnectUserSignIn(user) {
connectUser = user; connectUser = user;

View file

@ -634,16 +634,15 @@
$(MediaController).on('playerchange', function (e, newPlayer, newTarget) { $(MediaController).on('playerchange', function (e, newPlayer, newTarget) {
if (currentDevice) {
if (newTarget.id != currentDeviceId) { if (newTarget.id != currentDeviceId) {
if (currentWebAppSession) { if (currentWebAppSession) {
console.log('Disconnecting from chromecast'); console.log('Disconnecting from chromecast');
//currentDevice.disconnect(); //currentDevice.disconnect();
cleanupSession();
currentDevice = null; currentDevice = null;
currentDeviceId = null; currentDeviceId = null;
} }
} }
}
}); });
function onResume() { function onResume() {
@ -657,10 +656,8 @@
} }
} }
if (!$.browser.safari) {
document.addEventListener("resume", onResume, false); document.addEventListener("resume", onResume, false);
} }
}
MediaController.registerPlayer(new chromecastPlayer()); MediaController.registerPlayer(new chromecastPlayer());

View file

@ -647,6 +647,7 @@
if (currentDevice) { if (currentDevice) {
console.log('Disconnecting from connect device'); console.log('Disconnecting from connect device');
//currentDevice.disconnect(); //currentDevice.disconnect();
cleanupSession();
currentDevice = null; currentDevice = null;
currentDeviceId = null; currentDeviceId = null;
currentMediaControl = null; currentMediaControl = null;

View file

@ -38,6 +38,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
<g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></g> <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></g>
<g id="check"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z" /></g> <g id="check"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z" /></g>
<g id="close"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" /></g> <g id="close"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" /></g>
<g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /></g>
<g id="arrow-back"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" /></g> <g id="arrow-back"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" /></g>
<g id="arrow-forward"><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z" /></g> <g id="arrow-forward"><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z" /></g>
<g id="info"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z" /></g> <g id="info"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z" /></g>
@ -48,5 +49,9 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
<g id="folder-open"><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z" /></g> <g id="folder-open"><path d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 12H4V8h16v10z" /></g>
<g id="mode-edit"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" /></g> <g id="mode-edit"><path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" /></g>
<g id="more-vert"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" /></g> <g id="more-vert"><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" /></g>
<g id="cast"><path d="M21 3H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM1 18v3h3c0-1.66-1.34-3-3-3zm0-4v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7zm0-4v2c4.97 0 9 4.03 9 9h2c0-6.08-4.93-11-11-11z" /></g>
<g id="cast-connected"><path d="M1 18v3h3c0-1.66-1.34-3-3-3zm0-4v2c2.76 0 5 2.24 5 5h2c0-3.87-3.13-7-7-7zm18-7H5v1.63c3.96 1.28 7.09 4.41 8.37 8.37H19V7zM1 10v2c4.97 0 9 4.03 9 9h2c0-6.08-4.93-11-11-11zm20-7H3c-1.1 0-2 .9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z" /></g>
<g id="tablet-android"><path d="M18 0H6C4.34 0 3 1.34 3 3v18c0 1.66 1.34 3 3 3h12c1.66 0 3-1.34 3-3V3c0-1.66-1.34-3-3-3zm-4 22h-4v-1h4v1zm5.25-3H4.75V3h14.5v16z" /></g>
<g id="view-comfy"><path d="M3 9h4V5H3v4zm0 5h4v-4H3v4zm5 0h4v-4H8v4zm5 0h4v-4h-4v4zM8 9h4V5H8v4zm5-4v4h4V5h-4zm5 9h4v-4h-4v4zM3 19h4v-4H3v4zm5 0h4v-4H8v4zm5 0h4v-4h-4v4zm5 0h4v-4h-4v4zm0-14v4h4V5h-4z" /></g>
</defs></svg> </defs></svg>
</iron-iconset-svg> </iron-iconset-svg>

View file

@ -20,7 +20,7 @@
// Need to fix those before this can be set to 0 // Need to fix those before this can be set to 0
if (window.AppInfo && AppInfo.isNativeApp && $.browser.safari) { if (window.AppInfo && AppInfo.isNativeApp && $.browser.safari) {
return 10000; return 8000;
} }
var screens = $.browser.mobile ? 2 : 1; var screens = $.browser.mobile ? 2 : 1;

View file

@ -55,11 +55,11 @@
} }
.ui-page-theme-b paper-button.subdued:not([disabled]) { .ui-page-theme-b paper-button.subdued:not([disabled]) {
color: #555; color: #484848;
} }
.ui-page-theme-b paper-button[raised].subdued:not([disabled]) { .ui-page-theme-b paper-button[raised].subdued:not([disabled]) {
background: #555; background: #484848;
color: #fff; color: #fff;
} }

View file

@ -0,0 +1,175 @@
<!--
@license
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-icon/iron-icon.html">
<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
<link rel="import" href="../paper-styles/default-theme.html">
<link rel="import" href="../paper-styles/color.html">
<link rel="import" href="../paper-material/paper-material.html">
<link rel="import" href="../paper-ripple/paper-ripple.html">
<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
<!--
Material Design: <a href="http://www.google.com/design/spec/components/buttons.html">Button</a>
`paper-fab` is a floating action button. It contains an image placed in the center and
comes in two sizes: regular size and a smaller size by applying the attribute `mini`. When
the user touches the button, a ripple effect emanates from the center of the button.
You may import `iron-icons` to use with this element, or provide a URL to a custom icon.
See `iron-iconset` for more information about how to use a custom icon set.
Example:
<link href="path/to/iron-icons/iron-icons.html" rel="import">
<paper-fab icon="add"></paper-fab>
<paper-fab mini icon="favorite"></paper-fab>
<paper-fab src="star.png"></paper-fab>
### Styling
The following custom properties and mixins are available for styling:
Custom property | Description | Default
----------------|-------------|----------
`--paper-fab-background` | The background color of the button | `--accent-color`
`--paper-fab-keyboard-focus-background` | The background color of the button when focused | `--paper-pink-900`
`--paper-fab-disabled-background` | The background color of the button when it's disabled | `--paper-grey-300`
`--paper-fab-disabled-text` | The text color of the button when it's disabled | `--paper-grey-500`
`--paper-fab` | Mixin applied to the button | `{}`
`--paper-fab-mini` | Mixin applied to a mini button | `{}`
`--paper-fab-disabled` | Mixin applied to a disabled button | `{}`
@group Paper Elements
@demo demo/index.html
-->
<dom-module id="paper-fab">
<style>
:host {
display: inline-block;
position: relative;
outline: none;
-moz-user-select: none;
-ms-user-select: none;
-webkit-user-select: none;
user-select: none;
cursor: pointer;
box-sizing: border-box;
min-width: 0;
width: 56px;
height: 56px;
background: var(--paper-fab-background, --accent-color);
color: var(--text-primary-color);
border-radius: 50%;
padding: 16px;
z-index: 0;
@apply(--paper-fab);
}
:host([mini]) {
width: 40px;
height: 40px;
padding: 8px;
@apply(--paper-fab-mini);
}
:host([disabled]) {
color: var(--paper-fab-disabled-text, --paper-grey-500);
background: var(--paper-fab-disabled-background, --paper-grey-300);
@apply(--paper-fab-disabled);
}
paper-material {
border-radius: inherit;
@apply(--layout-fit);
@apply(--layout-vertical);
@apply(--layout-center-center);
}
.keyboard-focus {
background: var(--paper-fab-keyboard-focus-background, --paper-pink-900);
}
</style>
<template>
<paper-ripple></paper-ripple>
<paper-material class$="[[_computeContentClass(receivedFocusFromKeyboard)]]" elevation="[[_elevation]]" animated>
<iron-icon id="icon" src="[[src]]" icon="[[icon]]"></iron-icon>
</paper-material>
</template>
</dom-module>
<script>
Polymer({
is: 'paper-fab',
behaviors: [
Polymer.PaperButtonBehavior
],
properties: {
/**
* The URL of an image for the icon. If the src property is specified,
* the icon property should not be.
*
* @attribute src
* @type string
* @default ''
*/
src: {
type: String,
value: ''
},
/**
* Specifies the icon name or index in the set of icons available in
* the icon's icon set. If the icon property is specified,
* the src property should not be.
*
* @attribute icon
* @type string
* @default ''
*/
icon: {
type: String,
value: ''
},
/**
* Set this to true to style this is a "mini" FAB.
*
* @attribute mini
* @type boolean
* @default false
*/
mini: {
type: Boolean,
value: false
}
},
_computeContentClass: function(receivedFocusFromKeyboard) {
var className = 'content';
if (receivedFocusFromKeyboard) {
className += ' keyboard-focus';
}
return className;
}
});
</script>

View file

@ -5,7 +5,6 @@
</head> </head>
<body> <body>
<div id="tvNextUpPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvlatest,paperbuttonstyle"> <div id="tvNextUpPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvlatest,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a> <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="tvRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvrecommended,paperbuttonstyle"> <div id="tvRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvrecommended,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div class="libraryViewNav globalNav" style="display: none;"> <div class="libraryViewNav globalNav" style="display: none;">
<a href="index.html"><i class="material-icons">home</i>${TabHome}</a> <a href="index.html"><i class="material-icons">home</i>${TabHome}</a>
<a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a> <a href="homelatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>

View file

@ -6,8 +6,6 @@
<body> <body>
<div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage,paperbuttonstyle"> <div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage,paperbuttonstyle">
<link rel="import" href="thirdparty/paper-button/paper-button.html">
<div data-role="content"> <div data-role="content">
<div class="ui-corner-all ui-shadow wizardContent" style="position:relative;"> <div class="ui-corner-all ui-shadow wizardContent" style="position:relative;">