diff --git a/NzbDrone.Web/Content/NzbDrone.css b/NzbDrone.Web/Content/NzbDrone.css index f48fa1e17..33e4d2485 100644 --- a/NzbDrone.Web/Content/NzbDrone.css +++ b/NzbDrone.Web/Content/NzbDrone.css @@ -1,4 +1,3 @@ - * { font-family: "Segoe UI" , "Segoe UI Light" , Tahoma, Geneva, sans-serif; @@ -14,11 +13,11 @@ body #centered { - margin-right: auto; - width: 85%; - margin-left: auto; - min-width: 800px; - max-width: 1400px; + margin-right: auto; + width: 85%; + margin-left: auto; + min-width: 800px; + max-width: 1400px; } h1, h2, h3, h4, h5, h6 @@ -256,3 +255,16 @@ select, button, input[type="button"], input[type="submit"], input[type="reset"] top: 30px; right: 15px; } + + +#localSeriesLookup +{ + width: 220px; + float: right; + margin-top: 7px; + margin-bottom: 0px; + border: 0px; + background: rgb(68, 67, 67); + color: rgb(169, 169, 169); + padding: 4px; +} diff --git a/NzbDrone.Web/Content/Slider.css b/NzbDrone.Web/Content/Slider.css deleted file mode 100644 index c3c4ced73..000000000 --- a/NzbDrone.Web/Content/Slider.css +++ /dev/null @@ -1,62 +0,0 @@ -.top-slider { - position: absolute; - opacity: 0.85; - width: 300px; -} - -.sliderButton { - border: 0; -} - -.sliderContent { - background-color:#333333; - text-align:center; - width: 100%; - color:#FFFFFF; - font-weight:bold; - margin: 0px; - display: none; - - border:1px solid #444444; - -moz-border-radius-bottomright: 8px; - -webkit-border-bottom-right-radius: 8px; - -moz-border-radius-bottomleft: 8px; - -webkit-border-bottom-left-radius: 8px; -} - -.sliderButton { - width: 70px; - margin-left:auto; - margin-right:auto; - background-color:#333333; - cursor:pointer; - font-size:12px; - font-weight:bold; - text-align: center; - color:#FFFFFF; - - - border: 1px solid #444444; - border-top: 0px; - -moz-border-radius-bottomright: 10px; - -webkit-border-bottom-right-radius: 10px; - -moz-border-radius-bottomleft: 10px; - -webkit-border-bottom-left-radius: 10px; -} - -.sliderImage { - width: 16px; - height: 16px; - display: inline-block; - margin-bottom: -3px; - margin-right: -5px; - margin-left: 2px; -} - -.sliderClosed { - background:url('../Content/Images/ui-icons_2e83ff_256x240.png') -64px -16px no-repeat; -} - -.sliderOpened { - background:url('../Content/Images/ui-icons_2e83ff_256x240.png') 0px -16px no-repeat; -} \ No newline at end of file diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 082582eb1..2807a8549 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -148,7 +148,6 @@ - @@ -402,7 +401,6 @@ - @@ -495,9 +493,6 @@ - - - diff --git a/NzbDrone.Web/Scripts/NzbDrone/AutoComplete.js b/NzbDrone.Web/Scripts/NzbDrone/AutoComplete.js index 9b520fe73..d5ba70757 100644 --- a/NzbDrone.Web/Scripts/NzbDrone/AutoComplete.js +++ b/NzbDrone.Web/Scripts/NzbDrone/AutoComplete.js @@ -4,6 +4,13 @@ }); bindAutoCompletes(); + + $(document).bind('keydown', 'ctrl+shift+f', function () { + $('#localSeriesLookup').focus(); + }); + $(document).bind('keyup', 's', function () { + $('#localSeriesLookup').focus(); + }); }); // @@ -14,11 +21,10 @@ $('.folderLookup:not(.ui-autocomplete-input), .seriesLookup:not(.ui-autocomplete function bindAutoCompletes() { bindFolderAutoComplete(".folderLookup"); bindSeriesAutoComplete(".seriesLookup"); - bindLocalSeriesAutoComplete(".localSeriesLookup"); + bindLocalSeriesAutoComplete("#localSeriesLookup"); } function bindFolderAutoComplete(selector) { - $(selector).each(function (index, element) { $(element).autocomplete({ //source: "/Directory/GetDirectories", @@ -66,10 +72,12 @@ function bindSeriesAutoComplete(selector) { function bindLocalSeriesAutoComplete(selector) { $(selector).each(function (index, element) { + $(element).watermark('Search...'); $(element).autocomplete({ source: "/Series/LocalSearch", - minLength: 3, - delay: 500, + minLength: 1, + delay: 100, + autoFocus:true, select: function (event, ui) { window.location = "../Series/Details?seriesId=" + ui.item.Id; } diff --git a/NzbDrone.Web/Scripts/NzbDrone/slider.js b/NzbDrone.Web/Scripts/NzbDrone/slider.js deleted file mode 100644 index 5a34e1d45..000000000 --- a/NzbDrone.Web/Scripts/NzbDrone/slider.js +++ /dev/null @@ -1,46 +0,0 @@ -$(document).ready(function () { - $(".sliderButton").live('click', function () { - sliderToggle(this); - }); -}); - -function sliderToggle(sliderButton) { - //Get sliderContent - var sliderContent = $(sliderButton).siblings('.sliderContent'); - - //Open the slider - sliderContent.slideToggle('slow'); - - //Change the slider Image - $(sliderButton).children('.sliderImage').toggleClass('sliderOpened sliderClosed'); - - //Clear the search box - $(sliderContent).children('.localSeriesLookup').val(''); - - //Focus in the search box - $(sliderContent).children('.localSeriesLookup').focus(); - - //Hide the sliders - hideSliders(sliderContent); - - //Prevent the Address Bar from changing - return false; -} - -function hideSliders(newlyOpenedSlider) { - $('.sliderContent').each(function (index, value) { - var newlyOpenedSliderId = $(newlyOpenedSlider).parent('.top-slider').attr('id'); - var id = $(this).parent('.top-slider').attr('id'); - - //If the ID's of the top-sliders don't match then hide it - if (id != newlyOpenedSliderId) - $(this).slideUp(); - }); -} - -//Hide slider when text box loses focus -$('.localSeriesLookup').live('blur', function () { - $('.sliderContent').each(function (index, value) { - $(this).slideUp(); - }); -}); diff --git a/NzbDrone.Web/Views/Shared/LocalSearch.cshtml b/NzbDrone.Web/Views/Shared/LocalSearch.cshtml deleted file mode 100644 index f8553c314..000000000 --- a/NzbDrone.Web/Views/Shared/LocalSearch.cshtml +++ /dev/null @@ -1,41 +0,0 @@ -@{ - Layout = null; -} - -
-
- Local Series Search - -
-
- Search
-
-
-
- diff --git a/NzbDrone.Web/Views/Shared/_Layout.cshtml b/NzbDrone.Web/Views/Shared/_Layout.cshtml index 2821b7a0f..2f8467b8b 100644 --- a/NzbDrone.Web/Views/Shared/_Layout.cshtml +++ b/NzbDrone.Web/Views/Shared/_Layout.cshtml @@ -15,13 +15,11 @@ - @MvcMiniProfiler.MiniProfiler.RenderIncludes() @RenderSection("HeaderContent", required: false) - @{Html.RenderAction("LocalSearch", "Shared");}