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

read/write remote trailers to xml

This commit is contained in:
Luke Pulverenti 2013-12-01 15:17:40 -05:00
parent 4a439addcd
commit c6dd5d44df
35 changed files with 64 additions and 42 deletions

View file

@ -13,7 +13,7 @@
} }
} }
@media all and (min-width: 665px) { @media all and (min-width: 690px) {
.pageViewCount5 { .pageViewCount5 {
padding-top: 35px !important; padding-top: 35px !important;
} }
@ -35,6 +35,7 @@
top: 0; top: 0;
border-bottom: 1px solid #111; border-bottom: 1px solid #111;
} }
.viewMenuLink { .viewMenuLink {
font-size: 90%; font-size: 90%;
} }
@ -105,7 +106,7 @@
padding: 10px; padding: 10px;
} }
.libraryPage:not(.metadataEditorPage), .libraryPage:not(.metadataEditorPage) .itemListContent { .libraryPage, .libraryPage .itemListContent {
background: #494949 url(images/bgflip.png) repeat-x!important; background: #494949 url(images/bgflip.png) repeat-x!important;
background-attachment: fixed!important; background-attachment: fixed!important;
} }
@ -427,9 +428,9 @@ a.itemTag:hover {
font-size: 22px; font-size: 22px;
} }
.itemName + .itemMiscInfo { .itemName + .itemMiscInfo {
margin-left: 1em; margin-left: 1em;
} }
.itemOverview { .itemOverview {
max-height: 80px; max-height: 80px;
@ -437,22 +438,22 @@ a.itemTag:hover {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.libraryPage:not(.metadataEditorPage) ::-webkit-scrollbar { .libraryPage ::-webkit-scrollbar {
width: 10px; width: 10px;
height: 10px; height: 10px;
} }
.libraryPage:not(.metadataEditorPage) ::-webkit-scrollbar-button:start:decrement, .libraryPage ::-webkit-scrollbar-button:start:decrement,
.libraryPage:not(.metadataEditorPage) ::-webkit-scrollbar-button:end:increment { .libraryPage ::-webkit-scrollbar-button:end:increment {
display: none; display: none;
} }
.libraryPage:not(.metadataEditorPage) ::-webkit-scrollbar-track-piece { .libraryPage ::-webkit-scrollbar-track-piece {
background-color: #3b3b3b; background-color: #3b3b3b;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
} }
.libraryPage:not(.metadataEditorPage) ::-webkit-scrollbar-thumb:vertical { .libraryPage ::-webkit-scrollbar-thumb:vertical {
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
background: #666 no-repeat center; background: #666 no-repeat center;
} }

View file

@ -100,7 +100,7 @@
overflow-y: scroll; overflow-y: scroll;
overflow-x: auto!important; overflow-x: auto!important;
display: block; display: block;
border-right: 1px solid #ccc; border-right: 1px solid #555;
} }
.editPageInnerContent { .editPageInnerContent {
@ -118,14 +118,13 @@
display: inline-block; display: inline-block;
margin: 5px; margin: 5px;
padding: 10px; padding: 10px;
border: 1px solid #ccc; border: 1px solid #505050;
background: #eee; background-image: -webkit-gradient(linear,left top,left bottom,from(#444),to(#2d2d2d));
background-image: -webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1)); background-image: -webkit-linear-gradient(#444,#2d2d2d);
background-image: -webkit-linear-gradient(#fff,#f1f1f1); background-image: -moz-linear-gradient(#444,#2d2d2d);
background-image: -moz-linear-gradient(#fff,#f1f1f1); background-image: -ms-linear-gradient(#444,#2d2d2d);
background-image: -ms-linear-gradient(#fff,#f1f1f1); background-image: -o-linear-gradient(#444,#2d2d2d);
background-image: -o-linear-gradient(#fff,#f1f1f1); background-image: linear-gradient(#444,#2d2d2d);
background-image: linear-gradient(#fff,#f1f1f1);
} }
.imageEditorTile { .imageEditorTile {
@ -137,11 +136,7 @@
margin: .5em 0; margin: .5em 0;
} }
.editorTile .tileContent{ .editorTile .ui-field-contain {
color: #000;
}
.editorTile .ui-field-contain{
margin: 0 0 .5em; margin: 0 0 .5em;
} }
@ -212,6 +207,17 @@
} }
} }
@media all and (min-width: 1800px) {
.editPageSidebar {
width: 22.5%;
}
.editPageInnerContent {
width: 75%;
}
}
@media all and (min-height: 800px) { @media all and (min-height: 800px) {
.availableImagesList { .availableImagesList {

View file

@ -78,7 +78,7 @@ h1 a {
text-decoration: none; text-decoration: none;
} }
.libraryPage:not(.metadataEditorPage) h1 a { .libraryPage h1 a {
color: #fff!important; color: #fff!important;
} }

View file

@ -5,6 +5,14 @@
font-weight: normal!important; font-weight: normal!important;
display: block; display: block;
position: relative; position: relative;
/*border: 1px solid #505050;
background-image: -webkit-gradient(linear,left top,left bottom,from(#444),to(#2d2d2d));
background-image: -webkit-linear-gradient(#444,#2d2d2d);
background-image: -moz-linear-gradient(#444,#2d2d2d);
background-image: -ms-linear-gradient(#444,#2d2d2d);
background-image: -o-linear-gradient(#444,#2d2d2d);
background-image: linear-gradient(#444,#2d2d2d);*/
} }
.tileItem .starRating { .tileItem .starRating {

View file

@ -4,7 +4,7 @@
<title>Media Browser</title> <title>Media Browser</title>
</head> </head>
<body> <body>
<div id="editItemImagesPage" data-role="page" class="page libraryPage metadataEditorPage"> <div id="editItemImagesPage" data-role="page" data-theme="a" class="page libraryPage metadataEditorPage">
<div data-role="content editPageContent"> <div data-role="content editPageContent">
<div class="editPageSidebar"> <div class="editPageSidebar">
<div class="libraryTree"> <div class="libraryTree">

View file

@ -4,7 +4,7 @@
<title>Media Browser</title> <title>Media Browser</title>
</head> </head>
<body> <body>
<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage"> <div id="editItemMetadataPage" data-role="page" data-theme="a" class="page libraryPage metadataEditorPage">
<div data-role="content editPageContent"> <div data-role="content editPageContent">
<div class="editPageSidebar"> <div class="editPageSidebar">
<div class="libraryTree"> <div class="libraryTree">
@ -103,7 +103,7 @@
<input type="number" id="txtCommunityRating" name="txtCommunityRating" step=".1" data-mini="true" /> <input type="number" id="txtCommunityRating" name="txtCommunityRating" step=".1" data-mini="true" />
</div> </div>
<div id="fldCommunityVoteCount" style="display: none;" data-role="fieldcontain"> <div id="fldCommunityVoteCount" style="display: none;" data-role="fieldcontain">
<label for="txtCommunityVoteCount">Community vote count:</label> <label for="txtCommunityVoteCount">Vote count:</label>
<input type="number" id="txtCommunityVoteCount" name="txtCommunityVoteCount" data-mini="true" /> <input type="number" id="txtCommunityVoteCount" name="txtCommunityVoteCount" data-mini="true" />
</div> </div>
<div data-role="fieldcontain" id="fldCriticRating" style="display: none;"> <div data-role="fieldcontain" id="fldCriticRating" style="display: none;">

View file

@ -4,7 +4,7 @@
<title>Media Browser</title> <title>Media Browser</title>
</head> </head>
<body> <body>
<div id="editItemPeoplePage" data-role="page" class="page libraryPage metadataEditorPage"> <div id="editItemPeoplePage" data-role="page" data-theme="a" class="page libraryPage metadataEditorPage">
<div data-role="content editPageContent"> <div data-role="content editPageContent">
<div class="editPageSidebar"> <div class="editPageSidebar">
<div class="libraryTree"> <div class="libraryTree">

View file

@ -321,7 +321,7 @@
html += '<div style="height:108px;vertical-align:top;background-repeat:no-repeat;background-size:contain;background-image:url(\'' + LibraryBrowser.getImageUrl(currentItem, image.ImageType, image.ImageIndex, { maxheight: 216 }) + '\');"></div>'; html += '<div style="height:108px;vertical-align:top;background-repeat:no-repeat;background-size:contain;background-image:url(\'' + LibraryBrowser.getImageUrl(currentItem, image.ImageType, image.ImageIndex, { maxheight: 216 }) + '\');"></div>';
html += '<div>'; html += '<div>';
if (image.ImageType !== "Backdrop" && image.ImageType !== "Screenshot") { if (image.ImageType !== "Backdrop" && image.ImageType !== "Screenshot") {
html += '<p>' + image.ImageType + '</p>'; html += '<p>' + image.ImageType + '</p>';
} }
@ -345,12 +345,12 @@
} }
} }
html += '<button type="button" data-icon="delete" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.deleteImage(\'' + image.ImageType + '\', ' + (image.ImageIndex != null ? image.ImageIndex : "null") + ');">Delete</button>';
if (imageProviders.length) { if (imageProviders.length) {
html += '<button type="button" data-icon="cloud" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.showDownloadMenu(\'' + image.ImageType + '\');">Browse Online Images</button>'; html += '<button type="button" data-icon="cloud" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.showDownloadMenu(\'' + image.ImageType + '\');">Browse Online Images</button>';
} }
html += '<button type="button" data-icon="delete" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.deleteImage(\'' + image.ImageType + '\', ' + (image.ImageIndex != null ? image.ImageIndex : "null") + ');">Delete</button>';
html += '</p>'; html += '</p>';
html += '</div>'; html += '</div>';

View file

@ -245,7 +245,7 @@
themes: { themes: {
theme: 'mb3', theme: 'mb3',
url: 'thirdparty/jstree1.0fix3/themes/mb3/style.css?v=' + Dashboard.initialServerVersion url: 'thirdparty/jstree1.0/themes/mb3/style.css?v=' + Dashboard.initialServerVersion
} }
}).off('select_node.jstree').on('select_node.jstree', function (event, data) { }).off('select_node.jstree').on('select_node.jstree', function (event, data) {

View file

@ -56,7 +56,7 @@
}, },
shouldRefreshLibraryAfterChanges: function () { shouldRefreshLibraryAfterChanges: function () {
return $($.mobile.activePage).is('#mediaLibraryPage'); return $($.mobile.activePage).is('#mediaLibraryPage');
}, },
@ -84,6 +84,12 @@
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}, },
changeCollectionType: function () {
Dashboard.alert("To change the collection type, please remove and rebuild the collection with the new type.");
},
getVirtualFolderHtml: function (virtualFolder, isCollapsed, index) { getVirtualFolderHtml: function (virtualFolder, isCollapsed, index) {
isCollapsed = isCollapsed ? "true" : "false"; isCollapsed = isCollapsed ? "true" : "false";
@ -118,8 +124,9 @@
html += '</ul>'; html += '</ul>';
html += '<p>'; html += '<p>';
html += '<button type="button" data-inline="true" data-icon="minus" data-folderindex="' + index + '" onclick="MediaLibraryPage.deleteVirtualFolder(this);" data-mini="true">Remove collection</button>'; html += '<button type="button" data-inline="true" data-icon="minus" data-folderindex="' + index + '" onclick="MediaLibraryPage.deleteVirtualFolder(this);" data-mini="true">Remove</button>';
html += '<button type="button" data-inline="true" data-icon="pencil" data-folderindex="' + index + '" onclick="MediaLibraryPage.renameVirtualFolder(this);" data-mini="true">Rename collection</button>'; html += '<button type="button" data-inline="true" data-icon="pencil" data-folderindex="' + index + '" onclick="MediaLibraryPage.renameVirtualFolder(this);" data-mini="true">Rename</button>';
html += '<button type="button" data-inline="true" data-icon="pencil" data-folderindex="' + index + '" onclick="MediaLibraryPage.changeCollectionType(this);" data-mini="true">Change type</button>';
html += '</p>'; html += '</p>';
html += '</div>'; html += '</div>';
@ -226,7 +233,7 @@
if (showCollectionType) { if (showCollectionType) {
var collectionType = $('#selectCollectionType', popup).val(); var collectionType = $('#selectCollectionType', popup).val();
// The server expects an empty value for mixed // The server expects an empty value for mixed
if (collectionType == 'mixed') { if (collectionType == 'mixed') {
collectionType = ''; collectionType = '';
@ -245,7 +252,7 @@
getCollectionTypeOptionsHtml: function () { getCollectionTypeOptionsHtml: function () {
return MediaLibraryPage.getCollectionTypeOptions().filter(function(i) { return MediaLibraryPage.getCollectionTypeOptions().filter(function (i) {
return i.isSelectable !== false; return i.isSelectable !== false;

View file

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 331 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 43 B

After

Width:  |  Height:  |  Size: 43 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 43 B

After

Width:  |  Height:  |  Size: 43 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 132 B

After

Width:  |  Height:  |  Size: 132 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Before After
Before After

View file

@ -12,7 +12,7 @@
.jstree-mb3 .jstree-closed > ins { background-position:-54px 0; } .jstree-mb3 .jstree-closed > ins { background-position:-54px 0; }
.jstree-mb3 .jstree-leaf > ins { background-position:-36px 0; } .jstree-mb3 .jstree-leaf > ins { background-position:-36px 0; }
.jstree-mb3 .jstree-hovered { background:#ddd; border:1px solid transparent; padding:0 2px 0 1px; } .jstree-mb3 .jstree-hovered { background:#666; border:1px solid transparent; padding:0 2px 0 1px; }
.jstree-mb3 .jstree-clicked { background:#3388CC;border:1px solid transparent; padding:0 2px 0 1px; } .jstree-mb3 .jstree-clicked { background:#3388CC;border:1px solid transparent; padding:0 2px 0 1px; }
.jstree-mb3 a .jstree-icon { background-position:-56px -19px; } .jstree-mb3 a .jstree-icon { background-position:-56px -19px; }
@ -58,7 +58,7 @@
#vakata-contextmenu.jstree-mb3-context li ul { margin-left:-4px; } #vakata-contextmenu.jstree-mb3-context li ul { margin-left:-4px; }
.jstree a { .jstree a {
color: #000!important; color: #fff!important;
} }
.jstree-mb3 .jstree-clicked { .jstree-mb3 .jstree-clicked {
color: #fff!important; color: #fff!important;
@ -71,7 +71,7 @@
.jstree li { .jstree li {
margin-left: 10px; margin-left: 10px;
min-width: 10px; min-width: 10px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #505050;
} }
.jstree li:last-child { .jstree li:last-child {

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.203" targetFramework="net45" /> <package id="MediaBrowser.ApiClient.Javascript" version="3.0.204" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" /> <package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
</packages> </packages>