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

sync updates

This commit is contained in:
Luke Pulverenti 2015-01-21 01:26:16 -05:00
parent 77a3d60f5d
commit 84bb89076e
6 changed files with 109 additions and 14 deletions

View file

@ -3,9 +3,10 @@
background-size: 100%; background-size: 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
width: 22px; width: 26px;
height: 100%; height: 100%;
display: inline-block; display: inline-block;
vertical-align: middle;
} }
.btnDefaultCast .btnCastImage { .btnDefaultCast .btnCastImage {

View file

@ -138,3 +138,53 @@
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
} }
} }
.headerSearchInput {
width: 100%;
margin-top: 12px;
background: #222;
border: 0;
color: #ddd;
border-radius: 3px;
padding: 5px 7px 4px 50px;
font-size: 14px;
font-family: Roboto;
outline: none;
}
.searchInputIcon {
position: absolute;
left: 20px;
top: 19px;
font-size: 14px !important;
color: #ddd !important;
}
.viewMenuSearch {
position: absolute;
top: 0;
left: 35%;
right: 35%;
display: none;
}
@media all and (min-width: 1200px) {
.viewMenuSearch {
display: block;
}
.headerSearchButton {
display: none;
}
}
.searchResultsOverlay {
position: fixed;
background: #000;
top: 50px;
left: 0;
right: 0;
bottom: 0;
z-index: 1001;
}

View file

@ -283,13 +283,7 @@ h1 .imageLink {
.warningFieldDescription { .warningFieldDescription {
padding: 5px; padding: 5px;
border: 1px solid #f4c63f; border: 1px solid #f4c63f;
background: #fadb4e; background: #ffefaa;
background-image: -webkit-gradient(linear,left top,left bottom,from(#ffefaa),to(#ffe155));
background-image: -webkit-linear-gradient(#ffefaa,#ffe155);
background-image: -moz-linear-gradient(#ffefaa,#ffe155);
background-image: -ms-linear-gradient(#ffefaa,#ffe155);
background-image: -o-linear-gradient(#ffefaa,#ffe155);
background-image: linear-gradient(#ffefaa,#ffe155);
border-radius: 5px; border-radius: 5px;
} }

View file

@ -16,6 +16,11 @@
html += '<div class="libraryMenuButtonText headerButton"><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></div>'; html += '<div class="libraryMenuButtonText headerButton"><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></div>';
//html += '<div class="viewMenuSearch">';
//html += '<input type="search" data-role="none" class="headerSearchInput" />';
//html += '<div class="searchInputIcon fa fa-search"></div>';
//html += '</div>';
html += '<div class="viewMenuSecondary">'; html += '<div class="viewMenuSecondary">';
if (user.localUser) { if (user.localUser) {

View file

@ -38,7 +38,7 @@
if (currentTimeout != searchHintTimeout) { if (currentTimeout != searchHintTimeout) {
return; return;
} }
renderSearchHintResult(page, result.SearchHints); renderSearchHintResult(page, result.SearchHints);
}); });
} }
@ -175,7 +175,7 @@
else if (hint.ProductionYear && hint.MediaType != "Audio" && hint.Type != "Episode") { else if (hint.ProductionYear && hint.MediaType != "Audio" && hint.Type != "Episode") {
html += '<div class="searchHintSecondaryText">' + hint.ProductionYear + '</div>'; html += '<div class="searchHintSecondaryText">' + hint.ProductionYear + '</div>';
} }
else if (hint.RunTimeTicks) { else if (hint.RunTimeTicks) {
html += '<div class="searchHintSecondaryText">' + Dashboard.getDisplayTime(hint.RunTimeTicks) + '</div>'; html += '<div class="searchHintSecondaryText">' + Dashboard.getDisplayTime(hint.RunTimeTicks) + '</div>';
} }
@ -198,9 +198,9 @@
$('#searchHints', page).html(html); $('#searchHints', page).html(html);
} }
function getSearchPanel(page) { function getSearchPanel(page) {
var panel = $('#searchPanel', page); var panel = $('#searchPanel', page);
if (!panel.length) { if (!panel.length) {
@ -246,7 +246,7 @@
} }
}); });
$('#searchHints', page).on("keydown", '.searchHint', function (e) { $('#searchHints', page).on("keydown", '.searchHint', function (e) {
// Down // Down
@ -294,11 +294,56 @@
window.Search = new search(); window.Search = new search();
function getSearchResultsPanel() {
var elem = $('.searchResultsOverlay');
if (!elem.length) {
elem = $('<div class="searchResultsOverlay"></div>').appendTo(document.body).hide();
}
return elem;
}
function onHeaderSearchChange(val) {
var panel = getSearchResultsPanel();
if (val) {
panel.fadeIn('fast');
} else {
panel.fadeOut('fast');
}
}
$(document).on('pagehide', ".libraryPage", function () { $(document).on('pagehide', ".libraryPage", function () {
$('#txtSearch', this).val(''); $('#txtSearch', this).val('');
$('#searchHints', this).empty(); $('#searchHints', this).empty();
}); });
$(document).on('headercreated', function () {
$('.headerSearchInput').on("keyup", function (e) {
if (e.keyCode != 40) {
onHeaderSearchChange(this.value);
}
}).on("search", function (e) {
if (!this.value) {
onHeaderSearchChange('');
}
});
});
})(jQuery, document, window, clearTimeout, setTimeout); })(jQuery, document, window, clearTimeout, setTimeout);

View file

@ -64,7 +64,7 @@
var cssClass = 'ui-li-has-thumb listItem'; var cssClass = 'ui-li-has-thumb listItem';
html += '<li class="' + cssClass + '"' + ' data-itemid="' + jobItem.Id + '" data-status="' + jobItem.Status + '" data-remove="' + jobItem.IsMarkedForRemoval + '>'; html += '<li class="' + cssClass + '"' + ' data-itemid="' + jobItem.Id + '" data-status="' + jobItem.Status + '" data-remove="' + jobItem.IsMarkedForRemoval + '">';
var hasActions = ['Queued', 'Cancelled', 'Failed', 'Transferring', 'Converting', 'Synced'].indexOf(jobItem.Status) != -1; var hasActions = ['Queued', 'Cancelled', 'Failed', 'Transferring', 'Converting', 'Synced'].indexOf(jobItem.Status) != -1;