From 543d70fdf6402104171bd8d833409acda109fd31 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 24 Jan 2015 14:03:55 -0500 Subject: [PATCH] added HasSyncJob --- dashboard-ui/css/materialize.css | 18 +++++++++++++++--- dashboard-ui/css/search.css | 4 ++-- dashboard-ui/itembynamedetails.html | 2 +- dashboard-ui/scripts/indexpage.js | 2 +- dashboard-ui/scripts/moviecollections.js | 3 ++- dashboard-ui/scripts/search.js | 19 +++++++++---------- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dashboard-ui/css/materialize.css b/dashboard-ui/css/materialize.css index 0ad8599f24..732e84d8f0 100644 --- a/dashboard-ui/css/materialize.css +++ b/dashboard-ui/css/materialize.css @@ -59,6 +59,14 @@ } .btn-floating { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + text-transform: uppercase; + border: none; + outline: 0; + -webkit-tap-highlight-color: transparent; + margin-bottom: 15px; + display: inline-block; position: relative; z-index: 1; @@ -88,12 +96,12 @@ line-height: 37px; } - .btn-floating.btn-large { + .btn-floating.btn-floating-large { width: 55.5px; height: 55.5px; } - .btn-floating.btn-large i { + .btn-floating.btn-floating-large i { line-height: 55.5px; } @@ -120,6 +128,10 @@ font-size: 1.6rem; } + .btn-floating-large i { + font-size: 1.6rem; + } + .btn, .btn-large { background-color: #38c; @@ -167,7 +179,7 @@ button.btn:not(.btn-inline),button.btn-large:not(.btn-inline) { width: 100%; } -.btn i, .btn-large i, .btn span, .btn-large span { +.btn i, .btn-large i, .btn-floating-large i, .btn span, .btn-large span { vertical-align: middle; } diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css index b24659c4e7..ee75357daa 100644 --- a/dashboard-ui/css/search.css +++ b/dashboard-ui/css/search.css @@ -150,7 +150,7 @@ font-family: Roboto; outline: none; vertical-align: middle; - width: 200px; + width: 180px; } .searchInputIcon { @@ -194,6 +194,6 @@ } .btnCloseSearch { - margin-left: 5px; + padding: 0 5px; outline: 0; } diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 69e8701e09..79e4bcb73f 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -162,7 +162,7 @@
-
+
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index 1782cb19d1..06f3916f0c 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -223,7 +223,7 @@ } - $(elem).html(html).lazyChildren(); + $(elem).html(html).lazyChildren().createCardMenus(); handleLibraryLinkNavigations(elem); }); diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index 4e02b8196b..f6237445dd 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -477,8 +477,9 @@ supportsAddingToCollection: function (item) { + var invalidTypes = ['Person', 'Genre', 'MusicGenre', 'Studio', 'GameGenre', 'BoxSet', 'Playlist', 'UserView', 'CollectionFolder']; - return item.LocationType == 'FileSystem'; + return item.LocationType == 'FileSystem' && !item.CollectionType && invalidTypes.indexOf(item.Type) == -1; } }; diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js index 10d95b7423..0b9f226c77 100644 --- a/dashboard-ui/scripts/search.js +++ b/dashboard-ui/scripts/search.js @@ -313,7 +313,8 @@ shape: "square", lazy: true, overlayText: false, - showTitle: true + showTitle: true, + centerText: true }); $('.itemsContainer', elem).html(html).lazyChildren(); } @@ -410,10 +411,12 @@ }); - $('.btnCloseSearch').on('click', function () { - $('.headerSearchInput').val(''); - onHeaderSearchChange(''); - }); + $('.btnCloseSearch').on('click', closeSearchOverlay); + } + + function closeSearchOverlay() { + $('.headerSearchInput').val(''); + onHeaderSearchChange(''); } $(document).on('pagehide', ".libraryPage", function () { @@ -421,11 +424,7 @@ $('#txtSearch', this).val(''); $('#searchHints', this).empty(); - }).on('pagecontainerbeforehide', function () { - - $('.headerSearchInput').val(''); - getSearchOverlay(false).hide(); - }); + }).on('pagecontainerbeforehide', closeSearchOverlay); $(document).on('headercreated', function () {