From 1ebce22276dd25ac930e628ceead5a5f5b0472b2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 14 May 2014 14:04:26 -0400
Subject: [PATCH] rework channel checking

---
 dashboard-ui/metadata.html          |  4 ++--
 dashboard-ui/metadataadvanced.html  |  4 ++--
 dashboard-ui/metadataimages.html    |  4 ++--
 dashboard-ui/metadatasubtitles.html |  4 ++--
 dashboard-ui/scripts/indexpage.js   |  2 +-
 dashboard-ui/scripts/librarymenu.js | 31 ++++++++++++++++-------------
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 513a15f546..5cdf7b33b3 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -11,9 +11,9 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="#" data-role="button" class="ui-btn-active">${TabBasics}</a>
-                    <a href="metadataimages.html" data-role="button">${TabCustomizations}</a>
+                    <a href="metadataimages.html" data-role="button">${TabAdvanced}</a>
                     <a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
-                    <a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
+                    <a href="metadataadvanced.html" data-role="button">${TabOther}</a>
                 </div>
 
                 <form id="metadataConfigurationForm">
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index a53d8c182b..62040edacc 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -11,9 +11,9 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="metadata.html" data-role="button">${TabBasics}</a>
-                    <a href="metadataimages.html" data-role="button">${TabCustomizations}</a>
+                    <a href="metadataimages.html" data-role="button">${TabAdvanced}</a>
                     <a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
-                    <a href="#" data-role="button" class="ui-btn-active">${TabAdvanced}</a>
+                    <a href="#" data-role="button" class="ui-btn-active">${TabOther}</a>
                 </div>
 
                 <form id="advancedMetadataConfigurationForm">
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 7106570c16..6429054f7b 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -11,9 +11,9 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true" style="margin-bottom: 20px!important;">
                     <a href="metadata.html" data-role="button">${TabBasics}</a>
-                    <a href="#" data-role="button" class="ui-btn-active">${TabCustomizations}</a>
+                    <a href="#" data-role="button" class="ui-btn-active">${TabAdvanced}</a>
                     <a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
-                    <a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
+                    <a href="metadataadvanced.html" data-role="button">${TabOther}</a>
                 </div>
 
                 <div class="tabContent">
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index bf6171d143..6a89c62c5a 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -11,9 +11,9 @@
             <div class="content-primary">
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="metadata.html" data-role="button">${TabBasics}</a>
-                    <a href="metadataimages.html" data-role="button">${TabCustomizations}</a>
+                    <a href="metadataimages.html" data-role="button">${TabAdvanced}</a>
                     <a href="#" class="ui-btn-active" data-role="button">${TabSubtitles}</a>
-                    <a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
+                    <a href="metadataadvanced.html" data-role="button">${TabOther}</a>
                 </div>
 
                 <form class="metadataSubtitlesForm">
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index b8496b79f9..3256952732 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -166,7 +166,7 @@
 
             SortBy: "DateCreated",
             SortOrder: "Descending",
-            Limit: screenWidth >= 2400 ? 21 : (screenWidth >= 1920 ? 15 : (screenWidth >= 1440 ? 12 : (screenWidth >= 800 ? 12 : 8))),
+            Limit: screenWidth >= 2400 ? 30 : (screenWidth >= 1920 ? 20 : (screenWidth >= 1440 ? 12 : (screenWidth >= 800 ? 12 : 8))),
             Recursive: true,
             Fields: "PrimaryImageAspectRatio",
             Filters: "IsUnplayed,IsNotFolder",
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 5c940d3ef4..fa2c630980 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -1,6 +1,6 @@
 (function (window, document, $) {
 
-    var itemCountsPromise;
+    var channelsPromise;
     var liveTvInfoPromise;
     var itemsPromise;
 
@@ -10,7 +10,12 @@
             SortBy: "SortName"
 
         });
-        itemCountsPromise = itemCountsPromise || ApiClient.getItemCounts(Dashboard.getCurrentUserId());
+        channelsPromise = channelsPromise || $.getJSON(ApiClient.getUrl("Channels", {
+            userId: Dashboard.getCurrentUserId(),
+
+            // We just want the total record count
+            limit: 0
+        }));
         liveTvInfoPromise = liveTvInfoPromise || ApiClient.getLiveTvInfo();
     }
 
@@ -22,8 +27,6 @@
 
         html += '<a class="desktopHomeLink headerButton headerButtonLeft" href="index.html"><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></a>';
 
-        //html += '<a class="viewMenuRemoteControlButton" href="nowplaying.html" data-role="button" data-icon="play" data-inline="true" data-iconpos="notext" title="Now Playing">Remote Control</a>';
-
         html += '<div class="viewMenuSecondary">';
 
         html += '<a href="nowplaying.html" class="headerButton headerButtonRight headerRemoteButton"><img src="css/images/remote.png" /></a>';
@@ -69,7 +72,7 @@
         return LibraryBrowser.getHref(item);
     }
 
-    function getViewsHtml(user, counts, items, liveTvInfo) {
+    function getViewsHtml(user, channelCount, items, liveTvInfo) {
 
         var html = '';
 
@@ -81,7 +84,7 @@
 
         }).join('');
 
-        var showChannels = counts.ChannelCount;
+        var showChannels = channelCount;
         var showLiveTv = liveTvInfo.EnabledUsers.indexOf(user.Id) != -1;
 
         if (showChannels || showLiveTv) {
@@ -112,22 +115,24 @@
 
         var userPromise = Dashboard.getCurrentUser();
 
-        $.when(itemCountsPromise, itemsPromise, liveTvInfoPromise, userPromise).done(function (response1, response2, response3, response4) {
+        $.when(channelsPromise, itemsPromise, liveTvInfoPromise, userPromise).done(function (response1, response2, response3, response4) {
 
-            var counts = response1[0];
+            var channelCount = response1[0].TotalRecordCount;
             var items = response2[0].Items;
             var liveTvInfo = response3[0];
             var user = response4[0];
 
             var page = $.mobile.activePage;
 
-            var panel = getLibraryMenu(page, user, counts, items, liveTvInfo);
+            var panel = getLibraryMenu(user, channelCount, items, liveTvInfo);
+
+            updateLibraryNavLinks(page);
 
             $(panel).panel('toggle');
         });
     }
 
-    function getLibraryMenu(page, user, counts, items, liveTvInfo) {
+    function getLibraryMenu(user, channelCount, items, liveTvInfo) {
 
         var panel = $('#libraryPanel');
 
@@ -140,7 +145,7 @@
             html += '<p class="libraryPanelHeader"><a href="index.html" class="imageLink"><img src="css/images/mblogoicon.png" /><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></a></p>';
 
             html += '<div style="margin: 0 -1em;">';
-            html += getViewsHtml(user, counts, items, liveTvInfo);
+            html += getViewsHtml(user, channelCount, items, liveTvInfo);
             html += '</div>';
 
             html += '</div>';
@@ -150,8 +155,6 @@
             panel = $('#libraryPanel').panel({}).trigger('create');
         }
 
-        updateLibraryNavLinks(page);
-
         return panel;
     }
 
@@ -259,7 +262,7 @@
                 renderHeader(page, user);
 
                 updateCastIcon();
-                
+
                 updateLibraryNavLinks(page);
             });
         }