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

add subtitle delivery methods to StreamBuilder

Browse source
This commit is contained in:
Luke Pulverenti 2014-07-18 15:07:28 -04:00
parent b431c1c498
commit 455d3111d9
5 changed files with 93 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

74
dashboard-ui/css/librarybrowser.css
View file

@ -1,6 +1,6 @@
/* Fixes the issue of jqm panels altering the page background. */ /* Fixes the issue of jqm panels altering the page background. */
.ui-panel-content-wrap { .ui-panel-content-wrap {
background: none!important; background: none !important;
} }
.ui-panel fieldset + fieldset { .ui-panel fieldset + fieldset {
@ -13,7 +13,7 @@
} }
.backdropPage { .backdropPage {
background-color: rgba(15, 15,15, .94)!important; background-color: rgba(15, 15,15, .94) !important;
} }
.backdropContainer { .backdropContainer {
@ -119,11 +119,11 @@
@media all and (min-width: 1600px) { @media all and (min-width: 1600px) {
.ehsContent { .ehsContent {
width: 1200px; width: 1200px;
} }
.squareEhsContent { .squareEhsContent {
width: 1200px; width: 1200px;
} }
} }
@ -151,11 +151,11 @@
} }
.viewControls + .listTopPaging { .viewControls + .listTopPaging {
margin-left: .5em!important; margin-left: .5em !important;
} }
.labelPageSize { .labelPageSize {
margin-left: 1em!important; margin-left: 1em !important;
display: inline !important; display: inline !important;
} }
@ -163,9 +163,21 @@
display: inline-block; display: inline-block;
} }
.itemImageContainer {
vertical-align: top;
padding: 0 .8em 0 0;
display: inline-block;
}
@media all and (min-width: 650px) {
.itemImageContainer {
float: left;
}
}
@media all and (max-width: 650px) { @media all and (max-width: 650px) {
.pageSizeContainer { .pageSizeContainer {
display: none!important; display: none !important;
} }
} }
@ -301,7 +313,7 @@
} }
.criticRatingSummary { .criticRatingSummary {
color: #506A16!important; color: #506A16 !important;
background-color: #F2F0C4; background-color: #F2F0C4;
background-image: -webkit-gradient(linear,left top,left bottom,from(#FFE37C),to(#F2F0C4)); background-image: -webkit-gradient(linear,left top,left bottom,from(#FFE37C),to(#F2F0C4));
background-image: -webkit-linear-gradient(top,#FFE37C,#F2F0C4); background-image: -webkit-linear-gradient(top,#FFE37C,#F2F0C4);
@ -324,9 +336,9 @@
padding: 5px 7px; padding: 5px 7px;
font-size: 13px; font-size: 13px;
margin: 0 5px 5px 0; margin: 0 5px 5px 0;
color: #fff!important; color: #fff !important;
text-decoration: none; text-decoration: none;
font-weight: normal!important; font-weight: normal !important;
} }
a.itemTag:hover { a.itemTag:hover {
@ -396,10 +408,10 @@ a.itemTag:hover {
position: fixed; position: fixed;
top: 105px; top: 105px;
text-decoration: none; text-decoration: none;
font-weight: normal!important; font-weight: normal !important;
display: none; display: none;
background-color: rgba(0,0,0,0.6); background-color: rgba(0,0,0,0.6);
color: #ddd!important; color: #ddd !important;
background-color: transparent; background-color: transparent;
padding: 0; padding: 0;
} }
@ -411,7 +423,7 @@ a.itemTag:hover {
@media all and (max-width: 1000px) { @media all and (max-width: 1000px) {
.lnkSibling { .lnkSibling {
display: none!important; display: none !important;
} }
} }
@ -529,8 +541,8 @@ a.itemTag:hover {
} }
.lblDetailTab { .lblDetailTab {
font-size: 14px!important; font-size: 14px !important;
font-weight: 400!important; font-weight: 400 !important;
font-family: 'Open Sans'; font-family: 'Open Sans';
padding: .5em 1em; padding: .5em 1em;
border-color: #1f1f1f !important; border-color: #1f1f1f !important;
@ -562,22 +574,22 @@ a.itemTag:hover {
} }
.mediaBrowserAccent { .mediaBrowserAccent {
color: #52B54B!important; color: #52B54B !important;
} }
.libraryPanelCollapsibleHeader a { .libraryPanelCollapsibleHeader a {
font-size: 16px; font-size: 16px;
font-weight: 300!important; font-weight: 300 !important;
font-family: 'Open Sans', Arial, Helvetica, sans-serif; font-family: 'Open Sans', Arial, Helvetica, sans-serif;
} }
.selectedLibraryPanelLink { .selectedLibraryPanelLink {
background: #38c!important; background: #38c !important;
} }
.libraryPanelLink { .libraryPanelLink {
font-size: 14px; font-size: 14px;
font-weight: 300!important; font-weight: 300 !important;
font-family: 'Open Sans', Arial, Helvetica, sans-serif; font-family: 'Open Sans', Arial, Helvetica, sans-serif;
} }
@ -644,9 +656,9 @@ a.itemTag:hover {
} }
.inlineItemName + .itemMiscInfo { .inlineItemName + .itemMiscInfo {
margin-left: 0!important; margin-left: 0 !important;
margin-top: 1em; margin-top: 1em;
display: block!important; display: block !important;
} }
.primaryDetailPageContent { .primaryDetailPageContent {
@ -654,7 +666,7 @@ a.itemTag:hover {
} }
.primaryDetailPageContent .userDataIcons { .primaryDetailPageContent .userDataIcons {
margin-left: 0!important; margin-left: 0 !important;
margin-top: 1.5em; margin-top: 1.5em;
display: block; display: block;
} }
@ -819,19 +831,19 @@ a.itemTag:hover {
} }
.scenePosterViewItem img { .scenePosterViewItem img {
max-width: 150px!important; max-width: 150px !important;
} }
@media all and (min-width: 650px) { @media all and (min-width: 650px) {
.libraryTabs .ui-btn-inner { .libraryTabs .ui-btn-inner {
padding: .5em 15px!important; padding: .5em 15px !important;
} }
} }
@media all and (min-width: 1200px) { @media all and (min-width: 1200px) {
.scenePosterViewItem img { .scenePosterViewItem img {
max-width: 200px!important; max-width: 200px !important;
} }
} }
@ -941,16 +953,16 @@ a.itemTag:hover {
display: block; display: block;
text-decoration: none; text-decoration: none;
padding: 1px 0; padding: 1px 0;
color: #bbb!important; color: #bbb !important;
} }
.alphabetPicker a:hover:not(.selectedCharacter) { .alphabetPicker a:hover:not(.selectedCharacter) {
background: #666!important; background: #666 !important;
color: #fff!important; color: #fff !important;
} }
.selectedCharacter { .selectedCharacter {
color: #fff!important; color: #fff !important;
background: #4d90fe; background: #4d90fe;
} }
@ -1157,7 +1169,7 @@ a.itemTag:hover {
@media all and (min-height: 1079px) and (min-width: 1400px) { @media all and (min-height: 1079px) and (min-width: 1400px) {
.type-home { .type-home {
overflow-x: visible!important; overflow-x: visible !important;
} }
} }
@ -1223,7 +1235,7 @@ a.itemTag:hover {
.itemsListview { .itemsListview {
max-width: 800px; max-width: 800px;
margin: 0 auto!important; margin: 0 auto !important;
} }
.itemsListview .ui-li-aside { .itemsListview .ui-li-aside {

65
dashboard-ui/itemdetails.html
View file

@ -108,39 +108,38 @@
<div id="itemBackdrop" class="itemBackdrop noBackdrop"> <div id="itemBackdrop" class="itemBackdrop noBackdrop">
<div class="itemBackdropContent"> <div class="itemBackdropContent">
<table class="detailPageContent primaryDetailPageContent"> <div class="detailPageContent primaryDetailPageContent">
<tr>
<td style="vertical-align: top; padding: 0 .8em 0 0;"> <div class="itemImageContainer">
<div class="itemImageContainer"> <div id="itemImage">
<div id="itemImage"> </div>
</div> </div>
</div>
</td> <div style="vertical-align: top; padding: 0; position: relative;">
<td style="vertical-align: top; padding: 0; position: relative;"> <p><span class="parentName"></span><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p>
<p><span class="parentName"></span><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p> <p>
<p> <span class="itemCommunityRating"></span>
<span class="itemCommunityRating"></span> <span class="userDataIcons"></span>
<span class="userDataIcons"></span> </p>
</p> <p id="artist"></p>
<p id="artist"></p> <p class="itemGenres desktopGenres"></p>
<p class="itemGenres desktopGenres"></p> <p class="itemOverview desktopOverview"></p>
<p class="itemOverview desktopOverview"></p> <div class="detailButtonsContainer desktopDetailButtons" style="text-align:left;">
<div class="detailButtonsContainer desktopDetailButtons" style="text-align: left;"> <span class="missingIndicator" style="margin-left: .5em; display: none;">
<span class="missingIndicator" style="margin-left: .5em; display: none;"> <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelMissing}</span>
<span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelMissing}</span> </span>
</span> <span class="offlineIndicator" style="margin-left: .5em; display: none;">
<span class="offlineIndicator" style="margin-left: .5em; display: none;"> <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelOffline}</span>
<span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelOffline}</span> </span>
</span> <button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button>
<button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button> <button class="btnPlayTrailer hide" type="button" data-icon="video" data-inline="true" data-mini="true">${ButtonPlayTrailer}</button>
<button class="btnPlayTrailer hide" type="button" data-icon="video" data-inline="true" data-mini="true">${ButtonPlayTrailer}</button> <a class="btnPlayExternalTrailer hide" data-role="button" data-icon="video" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlayTrailer}</a>
<a class="btnPlayExternalTrailer hide" data-role="button" data-icon="video" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlayTrailer}</a> <a class="btnPlayExternal hide" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlay}</a>
<a class="btnPlayExternal hide" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlay}</a> <a class="btnEdit hide" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a>
<a class="btnEdit hide" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a> </div>
</div> </div>
</td>
</tr> </div>
</table>
<div class="detailButtonsContainer mobileDetailButtons"> <div class="detailButtonsContainer mobileDetailButtons">
<span class="missingIndicator" style="margin-left: .5em; display: none;"> <span class="missingIndicator" style="margin-left: .5em; display: none;">
<span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelMissing}</span> <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelMissing}</span>

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

@ -1179,7 +1179,7 @@
Recursive: true, Recursive: true,
ImageRefreshMode: imageRefreshMode == 'none' ? 'None' : 'FullRefresh', ImageRefreshMode: imageRefreshMode == 'none' ? 'None' : 'FullRefresh',
MetadataRefreshMode: metadataRefreshMode == 'none' ? 'None' : (metadataRefreshMode == 'local' ? 'ValidationOnly' : 'FullRefresh'), MetadataRefreshMode: metadataRefreshMode == 'none' ? 'None' : (metadataRefreshMode == 'local' ? 'ValidationOnly' : 'FullRefresh'),
ReplaceAllImages: imageRefreshMode == imageRefreshMode == 'all', ReplaceAllImages: imageRefreshMode == 'all',
ReplaceAllMetadata: metadataRefreshMode == 'all' ReplaceAllMetadata: metadataRefreshMode == 'all'
}); });

4
dashboard-ui/scripts/librarylist.js
View file

@ -122,7 +122,7 @@
} }
if (currentUser.Configuration.IsAdministrator && commands.indexOf('edit') != -1) { if (currentUser.Configuration.IsAdministrator && commands.indexOf('edit') != -1) {
html += '<button type="button" data-mini="true" data-inline="true" data-icon="edit" data-iconpos="notext" title="' + Globalize.translate('ButtonEdit') + '" onclick="Dashboard.navigate(\'edititemmetadata.html?id=' + item.Id + '\');return false;" style="' + buttonMargin + '">' + Globalize.translate('ButtonEdit') + '</button>'; html += '<a data-role="button" data-mini="true" data-inline="true" data-icon="edit" data-iconpos="notext" title="' + Globalize.translate('ButtonEdit') + '" href="edititemmetadata.html?id=' + item.Id + '" style="' + buttonMargin + '">' + Globalize.translate('ButtonEdit') + '</button>';
buttonCount++; buttonCount++;
} }
@ -351,7 +351,7 @@
html += '<div>'; html += '<div>';
html += '<ul data-role="listview">'; html += '<ul data-role="listview">';
var href = LibraryBrowser.getHref(item); var href = posterItem.href || LibraryBrowser.getHref(item);
var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '<a href="' + href + '">' + item.Name + '</a>'); var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '<a href="' + href + '">' + item.Name + '</a>');
html += '<li data-role="list-divider">' + header + '</li>'; html += '<li data-role="list-divider">' + header + '</li>';

15
dashboard-ui/scripts/sync.js Normal file
View file

@ -0,0 +1,15 @@
(function (window, $) {
function showSyncMenu(items) {
}
window.SyncManager = {
showMenu: showSyncMenu
};
})(window, jQuery);