diff --git a/dashboard-ui/css/chromecast.css b/dashboard-ui/css/chromecast.css index 7a7c4de886..f1d623b013 100644 --- a/dashboard-ui/css/chromecast.css +++ b/dashboard-ui/css/chromecast.css @@ -3,9 +3,10 @@ background-size: 100%; background-repeat: no-repeat; background-position: center center; - width: 22px; + width: 26px; height: 100%; display: inline-block; + vertical-align: middle; } .btnDefaultCast .btnCastImage { diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css index 8d304db4e9..c5ad3cf117 100644 --- a/dashboard-ui/css/search.css +++ b/dashboard-ui/css/search.css @@ -138,3 +138,53 @@ -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; +} diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 15afd48e90..dcc6b9c615 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -283,13 +283,7 @@ h1 .imageLink { .warningFieldDescription { padding: 5px; border: 1px solid #f4c63f; - background: #fadb4e; - 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); + background: #ffefaa; border-radius: 5px; } diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 3268a35018..8774ec0ea0 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -16,6 +16,11 @@ html += '
MEDIABROWSER
'; + //html += '
'; + //html += ''; + //html += ''; + //html += '
'; + html += '
'; if (user.localUser) { diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js index e39db22ad1..d95e68b9e8 100644 --- a/dashboard-ui/scripts/search.js +++ b/dashboard-ui/scripts/search.js @@ -38,7 +38,7 @@ if (currentTimeout != searchHintTimeout) { return; } - + renderSearchHintResult(page, result.SearchHints); }); } @@ -175,7 +175,7 @@ else if (hint.ProductionYear && hint.MediaType != "Audio" && hint.Type != "Episode") { html += '
' + hint.ProductionYear + '
'; } - + else if (hint.RunTimeTicks) { html += '
' + Dashboard.getDisplayTime(hint.RunTimeTicks) + '
'; } @@ -198,9 +198,9 @@ $('#searchHints', page).html(html); } - + function getSearchPanel(page) { - + var panel = $('#searchPanel', page); if (!panel.length) { @@ -246,7 +246,7 @@ } }); - + $('#searchHints', page).on("keydown", '.searchHint', function (e) { // Down @@ -294,11 +294,56 @@ window.Search = new search(); + function getSearchResultsPanel() { + + var elem = $('.searchResultsOverlay'); + + if (!elem.length) { + elem = $('
').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 () { $('#txtSearch', this).val(''); $('#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); \ No newline at end of file diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js index 2001028993..d66180a502 100644 --- a/dashboard-ui/scripts/syncjob.js +++ b/dashboard-ui/scripts/syncjob.js @@ -64,7 +64,7 @@ var cssClass = 'ui-li-has-thumb listItem'; - html += '
  • '; var hasActions = ['Queued', 'Cancelled', 'Failed', 'Transferring', 'Converting', 'Synced'].indexOf(jobItem.Status) != -1;