Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

dashboard-ui/boxset.html

@@ -40,6 +40,19 @@
                 </div>
             </div>
 
+            <div data-role="collapsible" id="moviesCollapsible">
+                <h3>Titles</h3>
+                <div id="moviesContent"></div>
+            </div>
+            <div data-role="collapsible" id="trailersCollapsible" class="hide">
+                <h3>Trailers</h3>
+                <div id="trailersContent"></div>
+            </div>
+            <div data-role="collapsible" id="galleryCollapsible">
+                <h3>Gallery</h3>
+                <div id="galleryContent"></div>
+            </div>
+
         </div>
     </div>
 </body>

dashboard-ui/css/librarybrowser.css

@@ -110,10 +110,6 @@
     margin: 0 0 5px;
 }
 
-.detailPagePrimaryInfo {
-    padding: 0 10px;
-}
-
 .itemMiscInfo {
     color: #ddd;
     font-size: 14px;
@@ -240,6 +236,12 @@
     display: none;
 }
 
+@media all and (min-width: 650px) {
+    .detailPagePrimaryInfo {
+        padding: 0 10px;
+    }
+}
+
 @media all and (min-width: 850px) {
     .posterDetailViewItem {
         width: 46%;

dashboard-ui/scripts/boxset.js

@@ -59,8 +59,43 @@
         $('#itemRatings', page).html(LibraryBrowser.getUserDataIconsHtml(item));
     }
 
+    function renderMovies(page) {
+
+        ApiClient.getItems(Dashboard.getCurrentUserId(), {
+
+            ParentId: getParameterByName('id'),
+            SortBy: "SortName"
+
+        }).done(function (result) {
+
+            var html = LibraryBrowser.getPosterDetailViewHtml({
+                items: result.Items,
+                useAverageAspectRatio: true
+            });
+
+
+            $('#moviesContent', page).html(html);
+        });
+    }
+
     $(document).on('pageshow', "#boxsetPage", function () {
-        reload(this);
+        
+        var page = this;
+
+        reload(page);
+
+        $('#moviesCollapsible', page).on('expand.lazyload', function () {
+
+            renderMovies(page);
+
+            $(this).off('expand.lazyload');
+        });
+        
+    }).on('pagehide', "#boxsetPage", function () {
+
+        var page = this;
+
+        $('#moviesCollapsible', page).off('expand.lazyload');
     });
 
 

dashboard-ui/scripts/librarybrowser.js

@@ -7,7 +7,7 @@
             if (window.location.toString().toLowerCase().indexOf('localhost') != -1) {
                 return 100;
             }
-            return 25;
+            return 20;
         },
 
         getPosterDetailViewHtml: function (options) {

dashboard-ui/scripts/tvseries.js

@@ -73,6 +73,24 @@
         $('#itemRatings', page).html(LibraryBrowser.getUserDataIconsHtml(item));
     }
 
+	function renderSeasons(page) {
+        
+        ApiClient.getItems(Dashboard.getCurrentUserId(), {
+            
+            ParentId: getParameterByName('id'),
+            SortBy: "SortName"
+            
+        }).done(function(result) {
+            
+            var html = LibraryBrowser.getPosterDetailViewHtml({
+                items: result.Items,
+                useAverageAspectRatio: true
+            });
+
+            $('#seasonsContent', page).html(html);
+        });
+    }
+
 	function renderGallery(page, item) {
 
 		var imageTags = item.ImageTags || {};
@@ -149,6 +167,13 @@
 
 		reload(page);
 
+		$('#seasonsCollapsible', page).on('expand.lazyload', function () {
+
+			renderSeasons(page);
+
+			$(this).off('expand.lazyload');
+		});
+
 		$('#castCollapsible', page).on('expand.lazyload', function () {
 			renderCast(page, currentItem);
 
@@ -167,6 +192,7 @@
 		currentItem = null;
 		var page = this;
 
+		$('#seasonsCollapsible', page).off('expand.lazyload');
 		$('#castCollapsible', page).off('expand.lazyload');
 		$('#galleryCollapsible', page).off('expand.lazyload');
 	});