From f9fb418c1dec9d0a1782f08d50f5df43317e214b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 19 Apr 2013 00:27:16 -0400 Subject: [PATCH] use mblogo instead of home --- dashboard-ui/boxset.html | 6 +- dashboard-ui/boxsets.html | 2 +- dashboard-ui/css/librarybrowser.css | 14 ++- dashboard-ui/css/site.css | 2 +- dashboard-ui/gamegenres.html | 118 +++++++++--------- dashboard-ui/games.html | 180 ++++++++++++++-------------- dashboard-ui/gamesrecommended.html | 48 ++++---- dashboard-ui/gamestudios.html | 118 +++++++++--------- dashboard-ui/gamesystem.html | 2 +- dashboard-ui/gamesystems.html | 120 +++++++++---------- dashboard-ui/moviegenres.html | 2 +- dashboard-ui/moviepeople.html | 2 +- dashboard-ui/movies.html | 2 +- dashboard-ui/moviesrecommended.html | 2 +- dashboard-ui/moviestudios.html | 2 +- dashboard-ui/movietrailers.html | 2 +- dashboard-ui/musicrecommended.html | 2 +- dashboard-ui/playlist.html | 66 +++++----- dashboard-ui/scripts/boxset.js | 2 + dashboard-ui/scripts/site.js | 2 +- dashboard-ui/scripts/tvseason.js | 2 + dashboard-ui/scripts/tvseries.js | 122 +++++++++---------- dashboard-ui/tvgenres.html | 2 +- dashboard-ui/tvpeople.html | 2 +- dashboard-ui/tvrecommended.html | 2 +- dashboard-ui/tvseason.html | 6 +- dashboard-ui/tvseries.html | 6 +- dashboard-ui/tvshows.html | 2 +- dashboard-ui/tvstudios.html | 2 +- 29 files changed, 431 insertions(+), 409 deletions(-) diff --git a/dashboard-ui/boxset.html b/dashboard-ui/boxset.html index 152d754921..15577c7089 100644 --- a/dashboard-ui/boxset.html +++ b/dashboard-ui/boxset.html @@ -6,7 +6,7 @@

- Movies

+ Movies
@@ -42,11 +42,11 @@
-

Titles

+

Titles

-

Trailers

+

Trailers

diff --git a/dashboard-ui/boxsets.html b/dashboard-ui/boxsets.html index 79548f816a..d27ccedd8e 100644 --- a/dashboard-ui/boxsets.html +++ b/dashboard-ui/boxsets.html @@ -6,7 +6,7 @@

- Movies

+ Movies
Suggested diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index b48d5ab770..3c7a010fb8 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -12,7 +12,7 @@ } .libraryPageHeader a { - margin-right: 20px; + margin-right: 15px; } .libraryPage .ui-content { @@ -61,7 +61,7 @@ .listPaging { text-align: center; - margin: .5em 0; + margin: .5em 0 .25em; } @media all and (min-width: 650px) { @@ -75,6 +75,16 @@ padding-left: 20px; padding-right: 20px; } + + .viewSettings { + margin-bottom: 0; + padding-right: 300px; + } + + .topListPaging { + padding-left: 300px; + margin-top: -35px; + } } /*@media all and (min-width: 1000px) { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index f0668bff95..0766089d77 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -279,7 +279,7 @@ form, .readOnlyContent { } .header { - padding-left: 30px; + padding-left: 15px; padding-top: 15px; padding-bottom: 15px; } diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html index 0f0d6a867b..bf864df65e 100644 --- a/dashboard-ui/gamegenres.html +++ b/dashboard-ui/gamegenres.html @@ -1,76 +1,76 @@ - Media Browser + Media Browser -
-

- Games

-
-
- Suggested - Games - Game Systems - Genres - Studios -
-
- - -
-
-
-
+
+

+ Games

+
+
+ Suggested + Games + Game Systems + Genres + Studios +
+
+ + +
+
+
+
-
-
- - Sort By: - + +
+ + Sort By: + - - -
+ + +
-
- - Sort Order: - +
+ + Sort Order: + - - + + - - -
- -
-
-
-
- - Filters: - - - + + +
+
+
+
+
+
+ + Filters: + + + - - + + - - -
+ + + -
- - Game System: - +
+ + Game System: + -
- -
+ + +
-
+
diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html index 7b6a860697..b0ca088bb8 100644 --- a/dashboard-ui/games.html +++ b/dashboard-ui/games.html @@ -1,116 +1,116 @@ - Media Browser + Media Browser -
-

- Games

-
-
- Suggested - Games - Game Systems - Genres - Studios -
-
- - -
+
+

+ Games

+
+
+ Suggested + Games + Game Systems + Genres + Studios +
+
+ + +
- - - - - - - - - - - - - - - - - -
NameGame SystemRelease YearGenreStudioRating
+ + + + + + + + + + + + + + + + + +
NameGame SystemRelease YearGenreStudioRating
-
-
+
+
-
-
- - Sort By: - + +
+ + Sort By: + - - + + - - + + - - + + - - + + - - + + - - -
+ + +
-
- - Sort Order: - +
+ + Sort Order: + - - + + - - -
- -
-
-
-
- - Filters: - - - + + +
+
+
+
+
+
+ + Filters: + + + - - + + - - + + - - + + - - -
-
- - Game System: - + + +
+
+ + Game System: + -
-
-
-
+ + +
+
diff --git a/dashboard-ui/gamesrecommended.html b/dashboard-ui/gamesrecommended.html index 7893d3c968..d520729b27 100644 --- a/dashboard-ui/gamesrecommended.html +++ b/dashboard-ui/gamesrecommended.html @@ -1,38 +1,38 @@ - Media Browser + Media Browser -
-

- Games

-
-
- Suggested - Games - Game Systems - Genres - Studios -
+
+

+ Games

+
+
+ Suggested + Games + Game Systems + Genres + Studios +
-
-

Latest Unplayed Games

+
+

Latest Unplayed Games

-
-
+
+
- -
+
-
-
+
+
diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html index 9b2513fe29..4f83e1e342 100644 --- a/dashboard-ui/gamestudios.html +++ b/dashboard-ui/gamestudios.html @@ -1,75 +1,75 @@ - Media Browser + Media Browser -
-

- Games

-
-
- Suggested - Games - Game Systems - Genres - Studios -
-
- - -
-
-
-
+
+

+ Games

+
+
+ Suggested + Games + Game Systems + Genres + Studios +
+
+ + +
+
+
+
-
-
- - Sort By: - + +
+ + Sort By: + - - -
+ + +
-
- - Sort Order: - +
+ + Sort Order: + - - + + - - -
- -
-
-
-
- - Filters: - - - + + +
+
+
+
+
+
+ + Filters: + + + - - + + - - -
+ + + -
- - Game Systems: - +
+ + Game Systems: + -
- -
-
+ + +
+
diff --git a/dashboard-ui/gamesystem.html b/dashboard-ui/gamesystem.html index fefd6d6920..4f2b5946ef 100644 --- a/dashboard-ui/gamesystem.html +++ b/dashboard-ui/gamesystem.html @@ -6,7 +6,7 @@

- Games

+ Games
diff --git a/dashboard-ui/gamesystems.html b/dashboard-ui/gamesystems.html index b4e835f4ea..e44c898d0e 100644 --- a/dashboard-ui/gamesystems.html +++ b/dashboard-ui/gamesystems.html @@ -1,76 +1,76 @@ - Media Browser + Media Browser -
-

- Games

-
-
- Suggested - Games - Game Systems - Genres - Studios -
-
- - -
-
-
-
+
+

+ Games

+
+
+ Suggested + Games + Game Systems + Genres + Studios +
+
+ + +
+
+
+
-
-
-
- -

Sort By:

- + +
+
+ +

Sort By:

+ - - + + - - + + - - -
+ + +
-
- -

Sort Order:

- +
+ +

Sort Order:

+ - - + + - - -
-
-
-
-
-
-
- -

Filters:

- - - + + +
+
+ +
+
+
+
+ +

Filters:

+ + + - - + + - - -
-
-
-
+ + + + +
+
diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html index ca8b23a37f..baa2b2f81d 100644 --- a/dashboard-ui/moviegenres.html +++ b/dashboard-ui/moviegenres.html @@ -6,7 +6,7 @@

- Movies

+ Movies
Suggested diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html index 187ac37d5d..f3f32b4dc5 100644 --- a/dashboard-ui/moviepeople.html +++ b/dashboard-ui/moviepeople.html @@ -6,7 +6,7 @@

- Movies

+ Movies
Suggested diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index e176c8742c..0cdc1cc7c3 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -6,7 +6,7 @@

- Movies

+ Movies
Suggested diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html index 03a10b2c24..894504732d 100644 --- a/dashboard-ui/moviesrecommended.html +++ b/dashboard-ui/moviesrecommended.html @@ -6,7 +6,7 @@

- Movies

+ Movies
Suggested diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html index bffbbee31c..c5a667bf52 100644 --- a/dashboard-ui/moviestudios.html +++ b/dashboard-ui/moviestudios.html @@ -6,7 +6,7 @@

- Movies

+ Movies
Suggested diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html index aa07b23391..c92c817b96 100644 --- a/dashboard-ui/movietrailers.html +++ b/dashboard-ui/movietrailers.html @@ -6,7 +6,7 @@

- Movies

+ Movies
Suggested diff --git a/dashboard-ui/musicrecommended.html b/dashboard-ui/musicrecommended.html index f442adf247..7d3461d7ca 100644 --- a/dashboard-ui/musicrecommended.html +++ b/dashboard-ui/musicrecommended.html @@ -6,7 +6,7 @@

- Music

+ Music
Suggested diff --git a/dashboard-ui/playlist.html b/dashboard-ui/playlist.html index 0779d94fe1..3d47c29104 100644 --- a/dashboard-ui/playlist.html +++ b/dashboard-ui/playlist.html @@ -1,42 +1,48 @@ - + -
-

- Now Playing

+
+

+ Now Playing

-
+
- - - - - - - - - - - - - - - - - -
NameSeries/Album/YearTimeRating
+ + + + + + + + + + + + + + + + + +
NameSeries/Album/YearTimeRating
-
-
+
+
- - + + diff --git a/dashboard-ui/scripts/boxset.js b/dashboard-ui/scripts/boxset.js index 5edb75f130..9f43b19a4e 100644 --- a/dashboard-ui/scripts/boxset.js +++ b/dashboard-ui/scripts/boxset.js @@ -28,6 +28,8 @@ $('#galleryCollapsible', page).hide(); } + $('#moviesCollapsible .collapsibleTitle', page).html('Titles (' + item.ChildCount + ')'); + Dashboard.hideLoadingMsg(); }); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 84dd0d80aa..c2df29ecb7 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -719,7 +719,7 @@ var Dashboard = { var html = '
'; - html += '

Tools

'; + html += '

Tools

'; html += '
'; diff --git a/dashboard-ui/scripts/tvseason.js b/dashboard-ui/scripts/tvseason.js index 758c6f625b..43d7c32c9a 100644 --- a/dashboard-ui/scripts/tvseason.js +++ b/dashboard-ui/scripts/tvseason.js @@ -30,6 +30,8 @@ $('#galleryCollapsible', page).hide(); } + $('#episodesCollapsible .collapsibleTitle', page).html('Episodes (' + item.ChildCount + ')'); + Dashboard.hideLoadingMsg(); }); } diff --git a/dashboard-ui/scripts/tvseries.js b/dashboard-ui/scripts/tvseries.js index ae04409659..f787c6c4f5 100644 --- a/dashboard-ui/scripts/tvseries.js +++ b/dashboard-ui/scripts/tvseries.js @@ -1,6 +1,6 @@ (function ($, document, LibraryBrowser, window) { - var currentItem; + var currentItem; function reload(page) { @@ -10,9 +10,9 @@ ApiClient.getItem(Dashboard.getCurrentUserId(), id).done(function (item) { - currentItem = item; + currentItem = item; - var name = item.Name; + var name = item.Name; $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item)); @@ -20,30 +20,30 @@ $('#itemName', page).html(name); - setInitialCollapsibleState(page, item); - renderDetails(page, item); + setInitialCollapsibleState(page, item); + renderDetails(page, item); - if (LibraryBrowser.shouldDisplayGallery(item)) { - $('#galleryCollapsible', page).show(); - } else { - $('#galleryCollapsible', page).hide(); - } + if (LibraryBrowser.shouldDisplayGallery(item)) { + $('#galleryCollapsible', page).show(); + } else { + $('#galleryCollapsible', page).hide(); + } Dashboard.hideLoadingMsg(); }); } - function setInitialCollapsibleState(page, item) { + function setInitialCollapsibleState(page, item) { - if (!item.People || !item.People.length) { - $('#castCollapsible', page).hide(); - } else { - $('#castCollapsible', page).show(); - } - } + if (!item.People || !item.People.length) { + $('#castCollapsible', page).hide(); + } else { + $('#castCollapsible', page).show(); + } + } function renderDetails(page, item) { - + if (item.Taglines && item.Taglines.length) { $('#itemTagline', page).html(item.Taglines[0]).show(); } else { @@ -69,27 +69,29 @@ $('#itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item)); + $('#seasonsCollapsible .collapsibleTitle', page).html('Seasons (' + item.ChildCount + ')'); + LibraryBrowser.renderPremiereDate($('#itemPremiereDate', page), item); LibraryBrowser.renderGenres($('#itemGenres', page), item); LibraryBrowser.renderStudios($('#itemStudios', page), item); renderUserDataIcons(page, item); LibraryBrowser.renderLinks($('#itemLinks', page), item); } - + function renderUserDataIcons(page, item) { $('#itemRatings', page).html(LibraryBrowser.getUserDataIconsHtml(item)); } - function renderSeasons(page) { - + function renderSeasons(page) { + ApiClient.getItems(Dashboard.getCurrentUserId(), { - + ParentId: getParameterByName('id'), SortBy: "SortName", Fields: "PrimaryImageAspectRatio,ItemCounts,DisplayMediaType,DateCreated,UserData" - - }).done(function(result) { - + + }).done(function (result) { + var html = LibraryBrowser.getPosterDetailViewHtml({ items: result.Items, useAverageAspectRatio: true @@ -99,62 +101,62 @@ }); } - function renderGallery(page, item) { + function renderGallery(page, item) { - var html = LibraryBrowser.getGalleryHtml(item); + var html = LibraryBrowser.getGalleryHtml(item); - $('#galleryContent', page).html(html).trigger('create'); - } + $('#galleryContent', page).html(html).trigger('create'); + } - function renderCast(page, item) { - var html = ''; + function renderCast(page, item) { + var html = ''; - var casts = item.People || []; + var casts = item.People || []; - for (var i = 0, length = casts.length; i < length; i++) { + for (var i = 0, length = casts.length; i < length; i++) { - var cast = casts[i]; + var cast = casts[i]; - html += LibraryBrowser.createCastImage(cast); - } + html += LibraryBrowser.createCastImage(cast); + } - $('#castContent', page).html(html); - } + $('#castContent', page).html(html); + } - $(document).on('pageshow', "#tvSeriesPage", function () { + $(document).on('pageshow', "#tvSeriesPage", function () { - var page = this; + var page = this; - reload(page); + reload(page); - $('#seasonsCollapsible', page).on('expand.lazyload', function () { + $('#seasonsCollapsible', page).on('expand.lazyload', function () { - renderSeasons(page); + renderSeasons(page); - $(this).off('expand.lazyload'); - }); + $(this).off('expand.lazyload'); + }); - $('#castCollapsible', page).on('expand.lazyload', function () { - renderCast(page, currentItem); + $('#castCollapsible', page).on('expand.lazyload', function () { + renderCast(page, currentItem); - $(this).off('expand.lazyload'); - }); + $(this).off('expand.lazyload'); + }); - $('#galleryCollapsible', page).on('expand.lazyload', function () { + $('#galleryCollapsible', page).on('expand.lazyload', function () { - renderGallery(page, currentItem); + renderGallery(page, currentItem); - $(this).off('expand.lazyload'); - }); + $(this).off('expand.lazyload'); + }); - }).on('pagehide', "#tvSeriesPage", function () { + }).on('pagehide', "#tvSeriesPage", function () { - currentItem = null; - var page = this; + currentItem = null; + var page = this; - $('#seasonsCollapsible', page).off('expand.lazyload'); - $('#castCollapsible', page).off('expand.lazyload'); - $('#galleryCollapsible', page).off('expand.lazyload'); - }); + $('#seasonsCollapsible', page).off('expand.lazyload'); + $('#castCollapsible', page).off('expand.lazyload'); + $('#galleryCollapsible', page).off('expand.lazyload'); + }); })(jQuery, document, LibraryBrowser, window); diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html index f71d879561..2c303db4de 100644 --- a/dashboard-ui/tvgenres.html +++ b/dashboard-ui/tvgenres.html @@ -6,7 +6,7 @@

- TV Shows

+ TV Shows
Suggested diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html index e57e19c327..884e3b956f 100644 --- a/dashboard-ui/tvpeople.html +++ b/dashboard-ui/tvpeople.html @@ -6,7 +6,7 @@

- TV Shows

+ TV Shows
Suggested diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html index fb5609b7b5..00aaacc539 100644 --- a/dashboard-ui/tvrecommended.html +++ b/dashboard-ui/tvrecommended.html @@ -6,7 +6,7 @@

- TV Shows

+ TV Shows
Suggested diff --git a/dashboard-ui/tvseason.html b/dashboard-ui/tvseason.html index a20b29bf2e..76e58660c9 100644 --- a/dashboard-ui/tvseason.html +++ b/dashboard-ui/tvseason.html @@ -6,7 +6,7 @@

- TV Shows

+ TV Shows
@@ -44,11 +44,11 @@
-

Episodes

+

Episodes

-

Trailers

+

Trailers

diff --git a/dashboard-ui/tvseries.html b/dashboard-ui/tvseries.html index 64fce69acd..ea1130f9b4 100644 --- a/dashboard-ui/tvseries.html +++ b/dashboard-ui/tvseries.html @@ -6,7 +6,7 @@

- TV Shows

+ TV Shows
@@ -43,11 +43,11 @@
-

Seasons

+

Seasons

-

Trailers

+

Trailers

diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html index d579b5d272..150f88b301 100644 --- a/dashboard-ui/tvshows.html +++ b/dashboard-ui/tvshows.html @@ -6,7 +6,7 @@

- TV Shows

+ TV Shows
Suggested diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html index 1f9be0fbba..ea761ec124 100644 --- a/dashboard-ui/tvstudios.html +++ b/dashboard-ui/tvstudios.html @@ -6,7 +6,7 @@

- TV Shows

+ TV Shows