mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
use jqm listview for series recordings
This commit is contained in:
parent
1f7bbddb34
commit
607b3482e1
15 changed files with 68 additions and 84 deletions
|
@ -99,7 +99,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.libraryPage > .ui-content {
|
.libraryPage > .ui-content {
|
||||||
padding: 10px 0 100px;
|
padding-top: 10px;
|
||||||
|
padding-bottom: 100px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.libraryPage .currentUsername {
|
.libraryPage .currentUsername {
|
||||||
|
@ -533,12 +534,19 @@ a.itemTag:hover {
|
||||||
.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;
|
||||||
}
|
}
|
||||||
|
|
||||||
.selectedLibraryPanelLink a {
|
.selectedLibraryPanelLink {
|
||||||
background: #38c!important;
|
background: #38c!important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.libraryPanelLink {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 300!important;
|
||||||
|
font-family: 'Open Sans', Arial, Helvetica, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
.desktopHomeLink img {
|
.desktopHomeLink img {
|
||||||
height: 24px;
|
height: 24px;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
|
|
@ -52,13 +52,13 @@
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
font-size: 12px;
|
font-size: 13px;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-weight: normal !important;
|
font-weight: normal !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.searchHintSecondaryText {
|
.searchHintSecondaryText {
|
||||||
font-size: 12px;
|
font-size: 13px;
|
||||||
color: #bbb;
|
color: #bbb;
|
||||||
margin-top: 3px;
|
margin-top: 3px;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|
|
@ -115,7 +115,7 @@ pre, textarea.pre {
|
||||||
Header
|
Header
|
||||||
*/
|
*/
|
||||||
.header {
|
.header {
|
||||||
padding: 10px 0 0 15px;
|
padding: 7px 0 0 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.imgLogoIcon {
|
.imgLogoIcon {
|
||||||
|
|
|
@ -11,11 +11,12 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
|
|
||||||
<br /><br />
|
<br />
|
||||||
|
<br />
|
||||||
<div id="views">
|
<div id="views">
|
||||||
</div>
|
</div>
|
||||||
<br /><br />
|
<br />
|
||||||
<h1 class="listHeader"><a href="itemlist.html">Media Collections<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
|
<h1 class="listHeader"><a href="itemlist.html">Media Folders<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
|
||||||
|
|
||||||
<div id="divCollections"></div>
|
<div id="divCollections"></div>
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<p style="margin: 2em 0;">Refer to the <a href="https://github.com/MediaBrowser/MediaBrowser/wiki/Library-Structure" target="_blank">media library wiki.</a> for suggested folder structures.</p>
|
<p style="margin: 2em 0;">Refer to the <a href="https://github.com/MediaBrowser/MediaBrowser/wiki/Library-Structure" target="_blank">media library wiki.</a> for suggested folder structures.</p>
|
||||||
<div id="divMediaLibrary">
|
<div id="divMediaLibrary">
|
||||||
<p>
|
<p>
|
||||||
<button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
|
<button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media folder</button>
|
||||||
</p>
|
</p>
|
||||||
<div id="divVirtualFolders"></div>
|
<div id="divVirtualFolders"></div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p id="fldCollectionType">
|
<p id="fldCollectionType">
|
||||||
<label for="selectCollectionType">Collection type:</label>
|
<label for="selectCollectionType">Folder type:</label>
|
||||||
<select id="selectCollectionType" name="selectCollectionType"></select>
|
<select id="selectCollectionType" name="selectCollectionType"></select>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,6 @@
|
||||||
<form class="liveTvSeriesTimerForm" style="margin: 0 auto;">
|
<form class="liveTvSeriesTimerForm" style="margin: 0 auto;">
|
||||||
<p><span class="itemName inlineItemName"></span></p>
|
<p><span class="itemName inlineItemName"></span></p>
|
||||||
|
|
||||||
<p>
|
|
||||||
<a id="btnCancelTimer" href="#">Cancel Series</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p class="channel" style="margin-top: 2em;"></p>
|
<p class="channel" style="margin-top: 2em;"></p>
|
||||||
<p class="time"></p>
|
<p class="time"></p>
|
||||||
<p class="overview"></p>
|
<p class="overview"></p>
|
||||||
|
@ -94,17 +90,17 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
<br />
|
<div>
|
||||||
<ul data-role="listview" class="ulForm">
|
<button type="submit" data-theme="a" data-icon="check" data-mini="true">
|
||||||
<li>
|
|
||||||
<button type="submit" data-theme="b" data-icon="check" data-mini="true">
|
|
||||||
Save
|
Save
|
||||||
</button>
|
</button>
|
||||||
<button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
|
<button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
</li>
|
</div>
|
||||||
</ul>
|
<p style="border-top: 1px solid #444; padding-top: .5em; margin-top: 2em;">
|
||||||
|
<button id="btnCancelTimer" type="button" data-mini="true" data-icon="delete">Cancel Series</button>
|
||||||
|
</p>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
</div>
|
</div>
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div style="max-width: 700px; margin: 0 auto;">
|
<div style="max-width: 700px; margin: 0 auto;">
|
||||||
<br />
|
|
||||||
<div id="items"></div>
|
<div id="items"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-role="popup" id="popupLogin" class="popup">
|
<div data-role="popup" id="popupLogin" class="popup" data-dismissible="false">
|
||||||
<form class="loginForm">
|
<form class="loginForm">
|
||||||
<div class="ui-bar-a" style="text-align: center;">
|
<div class="ui-bar-a" style="text-align: center;">
|
||||||
<h3>Please sign in</h3>
|
<h3>Please sign in</h3>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
var tips = [
|
var tips = [
|
||||||
'Did you know that editing the artist or album of a music video will allow it to appear on the artist and album pages?',
|
'Did you know that editing the artist or album of a music video will allow it to appear on the artist and album pages?',
|
||||||
'Did you know that editing the tmdb id, tvdb id, and/or games db id of an album will allow media browser to link it to a movie, series or game as a soundtrack?',
|
'Did you know that editing the tmdb id, tvdb id, and/or games db id of an album will allow media browser to link it to a movie, series or game as a soundtrack?',
|
||||||
'Did you know that you can re-order your media collections by editing their sort names?',
|
'Did you know that you can re-order your media folders by editing their sort names?',
|
||||||
'Did you know that series, seasons, games and boxsets can have local trailers?',
|
'Did you know that series, seasons, games and boxsets can have local trailers?',
|
||||||
'Did you know that movies can have special features by placing them in a "specials" sub-folder underneath the movie folder?',
|
'Did you know that movies can have special features by placing them in a "specials" sub-folder underneath the movie folder?',
|
||||||
'Did you know that the trailer plugin can automatically download trailers for existing movies in your collection?'
|
'Did you know that the trailer plugin can automatically download trailers for existing movies in your collection?'
|
||||||
|
|
|
@ -222,11 +222,10 @@
|
||||||
var link = links[i];
|
var link = links[i];
|
||||||
|
|
||||||
if (selectedIndex == i) {
|
if (selectedIndex == i) {
|
||||||
html += '<li class="selectedLibraryPanelLink">';
|
html += '<li><a class="selectedLibraryPanelLink libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
|
||||||
} else {
|
} else {
|
||||||
html += '<li>';
|
html += '<li><a class="libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
|
||||||
}
|
}
|
||||||
html += '<a href="' + link.href + '">' + link.text + '</a></li>';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '</ul>';
|
html += '</ul>';
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
var html = '';
|
var html = '';
|
||||||
|
|
||||||
html += '<a class="squareTileItem tileItem" href="livetvchannel.html?id=' + channel.Id + '">';
|
html += '<a class="backdropTileItem tileItem" href="livetvchannel.html?id=' + channel.Id + '">';
|
||||||
|
|
||||||
var imgUrl;
|
var imgUrl;
|
||||||
var isDefault;
|
var isDefault;
|
||||||
|
|
|
@ -23,46 +23,21 @@
|
||||||
|
|
||||||
var html = '';
|
var html = '';
|
||||||
|
|
||||||
var cssClass = "detailTable";
|
html += '<ul data-role="listview" data-inset="true">';
|
||||||
|
|
||||||
html += '<div class="detailTableContainer"><table class="' + cssClass + '">';
|
html += '<li data-role="list-divider">Series Recordings</li>';
|
||||||
|
|
||||||
html += '<tr>';
|
|
||||||
|
|
||||||
html += '<th class="tabletColumn"> </th>';
|
|
||||||
html += '<th>Name</th>';
|
|
||||||
html += '<th class="desktopColumn">Channel</th>';
|
|
||||||
html += '<th>Days</th>';
|
|
||||||
html += '<th>Time</th>';
|
|
||||||
|
|
||||||
html += '</tr>';
|
|
||||||
|
|
||||||
for (var i = 0, length = timers.length; i < length; i++) {
|
for (var i = 0, length = timers.length; i < length; i++) {
|
||||||
|
|
||||||
var timer = timers[i];
|
var timer = timers[i];
|
||||||
|
|
||||||
html += '<tr>';
|
html += '<li><a href="livetvseriestimer.html?id=' + timer.Id + '">';
|
||||||
|
|
||||||
html += '<td class="tabletColumn">';
|
html += '<h3>';
|
||||||
html += '<button data-timerid="' + timer.Id + '" class="btnDeleteTimer" type="button" data-icon="delete" data-inline="true" data-mini="true" data-iconpos="notext">Delete</button>';
|
html += timer.Name;
|
||||||
html += '</td>';
|
html += '</h3>';
|
||||||
|
|
||||||
html += '<td>';
|
|
||||||
html += '<a href="livetvseriestimer.html?id=' + timer.Id + '">' + timer.Name + '</a>';
|
|
||||||
html += '</td>';
|
|
||||||
|
|
||||||
html += '<td class="desktopColumn">';
|
|
||||||
|
|
||||||
if (timer.RecordAnyChannel) {
|
|
||||||
html += 'All Channels';
|
|
||||||
}
|
|
||||||
else if (timer.ChannelId) {
|
|
||||||
html += '<a href="livetvchannel.html?id=' + timer.ChannelId + '">' + timer.ChannelName + '</a>';
|
|
||||||
}
|
|
||||||
html += '</td>';
|
|
||||||
|
|
||||||
html += '<td>';
|
|
||||||
|
|
||||||
|
html += '<p>';
|
||||||
if (timer.DayPattern) {
|
if (timer.DayPattern) {
|
||||||
html += timer.DayPattern;
|
html += timer.DayPattern;
|
||||||
}
|
}
|
||||||
|
@ -72,23 +47,29 @@
|
||||||
html += days.join(', ');
|
html += days.join(', ');
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '</td>';
|
if (timer.RecordAnyTime) {
|
||||||
|
|
||||||
html += '<td>' + LiveTvHelpers.getDisplayTime(timer.StartDate) + '</td>';
|
html += ' - Any time.';
|
||||||
|
} else {
|
||||||
|
html += ' - ' + LiveTvHelpers.getDisplayTime(timer.StartDate);
|
||||||
|
}
|
||||||
|
html += '</p>';
|
||||||
|
|
||||||
html += '</tr>';
|
html += '<p>';
|
||||||
|
if (timer.RecordAnyChannel) {
|
||||||
|
html += 'All Channels';
|
||||||
|
}
|
||||||
|
else if (timer.ChannelId) {
|
||||||
|
html += timer.ChannelName;
|
||||||
|
}
|
||||||
|
html += '</p>';
|
||||||
|
|
||||||
|
html += '</li>';
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '</table></div>';
|
html += '</a></ul>';
|
||||||
|
|
||||||
var elem = $('#items', page).html(html).trigger('create');
|
$('#items', page).html(html).trigger('create');
|
||||||
|
|
||||||
$('.btnDeleteTimer', elem).on('click', function () {
|
|
||||||
|
|
||||||
var id = this.getAttribute('data-timerid');
|
|
||||||
|
|
||||||
deleteTimer(page, id);
|
|
||||||
});
|
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,8 +117,8 @@
|
||||||
changeCollectionType: function () {
|
changeCollectionType: function () {
|
||||||
|
|
||||||
Dashboard.alert({
|
Dashboard.alert({
|
||||||
message: "To change the collection type, please remove and rebuild the collection with the new type.",
|
message: "To change the folder type, please remove and rebuild the collection with the new type.",
|
||||||
title: "Change Collection Type"
|
title: "Change Folder Type"
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
|
|
||||||
typeName = typeName ? typeName.name : "General or mixed content";
|
typeName = typeName ? typeName.name : "General or mixed content";
|
||||||
|
|
||||||
html += '<p style="padding-left:.5em;">Collection type: <b>' + typeName + '</b></p>';
|
html += '<p style="padding-left:.5em;">Folder type: <b>' + typeName + '</b></p>';
|
||||||
|
|
||||||
html += '<ul class="mediaFolderLocations" data-inset="true" data-role="listview" data-split-icon="minus">';
|
html += '<ul class="mediaFolderLocations" data-inset="true" data-role="listview" data-split-icon="minus">';
|
||||||
|
|
||||||
|
@ -189,7 +189,7 @@
|
||||||
|
|
||||||
$('.collectionTypeFieldDescription').show();
|
$('.collectionTypeFieldDescription').show();
|
||||||
|
|
||||||
MediaLibraryPage.getTextValue("Add Media Collection", "Name (Movies, Music, TV, etc):", "", true, function (name, type) {
|
MediaLibraryPage.getTextValue("Add Media Folder", "Name (Movies, Music, TV, etc):", "", true, function (name, type) {
|
||||||
|
|
||||||
var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
|
var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div data-role="content">
|
<div data-role="content">
|
||||||
<div class="ehsContent">
|
<div class="ehsContent">
|
||||||
<h1 class="listHeader">Next Episodes</h1>
|
<br />
|
||||||
<div id="nextUpItems">
|
<div id="nextUpItems">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
</p>
|
</p>
|
||||||
<div id="divMediaLibrary">
|
<div id="divMediaLibrary">
|
||||||
<p>
|
<p>
|
||||||
<button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media collection</button>
|
<button type="button" data-mini="true" data-icon="plus" onclick="MediaLibraryPage.addVirtualFolder();">Add media folder</button>
|
||||||
</p>
|
</p>
|
||||||
<div id="divVirtualFolders"></div>
|
<div id="divVirtualFolders"></div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p id="fldCollectionType">
|
<p id="fldCollectionType">
|
||||||
<label for="selectCollectionType">Collection type:</label>
|
<label for="selectCollectionType">Folder type:</label>
|
||||||
<select id="selectCollectionType" name="selectCollectionType"></select>
|
<select id="selectCollectionType" name="selectCollectionType"></select>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue