diff --git a/ApiClient.js b/ApiClient.js index b23e337efa..a44bdc4d22 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -102,7 +102,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { self.encodeName = function (name) { name = name.split('/').join('-'); - + name = name.split('?').join('-'); var val = $.param({ name: name }); @@ -2279,6 +2279,23 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { }); }; + self.getItemCounts = function (userId) { + + var options = {}; + + if (userId) { + options.userId = userId; + } + + var url = self.getUrl("Items/Counts", options); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + /** Gets a variety of item counts that a person appears in */ diff --git a/dashboard-ui/boxsets.html b/dashboard-ui/boxsets.html index 7d6901b479..8797fe133c 100644 --- a/dashboard-ui/boxsets.html +++ b/dashboard-ui/boxsets.html @@ -4,9 +4,7 @@ Media Browser -
-

- Movies

+
Suggested diff --git a/dashboard-ui/css/images/views/games.png b/dashboard-ui/css/images/views/games.png new file mode 100644 index 0000000000..bd3db64905 Binary files /dev/null and b/dashboard-ui/css/images/views/games.png differ diff --git a/dashboard-ui/css/images/views/movies.png b/dashboard-ui/css/images/views/movies.png new file mode 100644 index 0000000000..356f37c24c Binary files /dev/null and b/dashboard-ui/css/images/views/movies.png differ diff --git a/dashboard-ui/css/images/views/music.png b/dashboard-ui/css/images/views/music.png new file mode 100644 index 0000000000..05e3904db7 Binary files /dev/null and b/dashboard-ui/css/images/views/music.png differ diff --git a/dashboard-ui/css/images/views/tvshows.png b/dashboard-ui/css/images/views/tvshows.png new file mode 100644 index 0000000000..a2b7357215 Binary files /dev/null and b/dashboard-ui/css/images/views/tvshows.png differ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index a53c928676..961daf084e 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -3,18 +3,65 @@ background: none!important; } +.viewMenuBar { + background: #444; + background-image: linear-gradient(#444,#2d2d2d); + border-bottom: 1px solid #444; + font-size: 13px; + font-weight: bold; +} + +.viewMenuLink { + text-decoration: none; + color: #bbb; + padding: 7px .9em 6px; + display: inline-block; + vertical-align: middle; +} + + .viewMenuLink:hover { + color: #fff; + } + + .viewMenuLink:hover img { + opacity: .5; + } + + .viewMenuLink img { + height: 20px; + vertical-align: top; + } + +.viewMenuSecondary { + float: right; +} + +.viewMenuTextLink { + display: none; + height: 20px; + padding-top: 9px; + text-transform: uppercase; +} + +.viewName { + vertical-align: middle; +} + +.selectedViewLink { + color: #fff; +} + +.selectedViewIndicator { + margin-right: .25em; + vertical-align: middle; + position: relative; + top: -1px; +} + .libraryPage .header { padding-bottom: 0; } -.libraryPageHeader { - margin: -5px 0 0; -} - - .libraryPageHeader a { - margin-right: 15px; - } - .libraryPage .ui-content { padding: 10px; } @@ -192,6 +239,14 @@ .galleryImage { width: 150px; } + + .viewMenuTextLink { + display: inline-block; + } + + .viewMenuImageLink { + display: none; + } } @media all and (min-width: 1200px) { @@ -203,7 +258,7 @@ @media all and (min-width: 650px) { .libraryPage .ui-content { - padding: 0 20px 100px; + padding: 15px 20px 100px; } .viewControls, .listTopPaging { diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css index fa2e5c7c6b..53c89131a3 100644 --- a/dashboard-ui/css/search.css +++ b/dashboard-ui/css/search.css @@ -1,17 +1,16 @@ .headerSearch { display: none; - margin-right: 3em; + margin-right: 1em; position: relative; } .txtSearch { vertical-align: middle; - font: 16px arial,sans-serif; - height: 28px; - line-height: 28px; + font: 13px arial,sans-serif; margin: 0 .15em 0 0; width: 150px; padding: 0; + border: 1px solid #4d90fe; } .btnSearch { @@ -30,7 +29,6 @@ -webkit-border-radius: 2px; border-radius: 2px; font-weight: bold; - height: 28px; min-width: 54px; padding: 0 8px; text-align: center; @@ -40,8 +38,13 @@ text-align: center; } +.txtSearch, .btnSearch { + height: 22px; + line-height: 22px; +} + .btnSearch img { - height: 28px; + height: 22px; margin: 0 auto; border: 0; } @@ -133,21 +136,11 @@ @media all and (min-width: 1200px) { .txtSearch { - width: 350px; + width: 300px; } .searchHints { - width: 348px; - } -} - -@media all and (min-width: 1440px) { - .txtSearch { - width: 400px; - } - - .searchHints { - width: 398px; + width: 298px; } } diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html index ddcab8f7d9..f3a1cb5483 100644 --- a/dashboard-ui/gamegenres.html +++ b/dashboard-ui/gamegenres.html @@ -4,9 +4,7 @@ Media Browser -
-

- Games

+
Suggested diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html index 166d91c72d..deb9e16742 100644 --- a/dashboard-ui/games.html +++ b/dashboard-ui/games.html @@ -4,9 +4,7 @@ Media Browser -
-

- Games

+
Suggested diff --git a/dashboard-ui/gamesrecommended.html b/dashboard-ui/gamesrecommended.html index 9431cc585b..51a16d9a37 100644 --- a/dashboard-ui/gamesrecommended.html +++ b/dashboard-ui/gamesrecommended.html @@ -4,9 +4,7 @@ Media Browser -
-

- Games

+
Suggested diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html index 9253ca0841..9d07b0fda2 100644 --- a/dashboard-ui/gamestudios.html +++ b/dashboard-ui/gamestudios.html @@ -4,9 +4,7 @@ Media Browser -
-

- Games

+
Suggested diff --git a/dashboard-ui/gamesystems.html b/dashboard-ui/gamesystems.html index fa77c62088..19253914a4 100644 --- a/dashboard-ui/gamesystems.html +++ b/dashboard-ui/gamesystems.html @@ -4,9 +4,7 @@ Media Browser -
-

- Games

+
Suggested diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index fb49fee565..cc62d67b0d 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -4,13 +4,7 @@ -
-
- -
-

-

+