From a1a33267616d193e87d5cd34e2ab51449be20202 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 24 Jan 2015 17:33:26 -0500
Subject: [PATCH] sync updates

---
 dashboard-ui/css/site.css                |  2 +-
 dashboard-ui/dashboard.html              |  2 +-
 dashboard-ui/scripts/channelsettings.js  | 14 +++-----------
 dashboard-ui/scripts/moviecollections.js |  6 ++++--
 dashboard-ui/scripts/syncactivity.js     |  9 +++++++++
 dashboard-ui/syncactivity.html           | 13 +++++++++++++
 6 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 8534a8bf61..dd41156e59 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -1047,7 +1047,7 @@ h1 + .accentButton {
     margin: 1em 0;
 }
 
-@media all and (min-width: 1200px) {
+@media all and (min-width: 800px) {
 
     .supporterPromotion {
         position: absolute;
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 82134b73d7..e95fc79d16 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -15,7 +15,7 @@
                 </div>
                 <div class="dashboardContent">
                     <div class="supporterPromotion" style="display:none;">
-                        <a class="btn btnActionAccent" href="supporter.html">
+                        <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
                             <div>
                                 ${HeaderBecomeMediaBrowserSupporter}
                             </div>
diff --git a/dashboard-ui/scripts/channelsettings.js b/dashboard-ui/scripts/channelsettings.js
index 43bdc87f64..92ffad87c6 100644
--- a/dashboard-ui/scripts/channelsettings.js
+++ b/dashboard-ui/scripts/channelsettings.js
@@ -29,13 +29,7 @@
         $('.channelDownloadingList', page).html(html).trigger('create');
     }
     
-    function loadPage(page, config, allChannelFeatures, supporterInfo) {
-
-        if (supporterInfo.IsMBSupporter) {
-            $('#txtDownloadSizeLimit', page).attr('max', '100');
-        } else {
-            $('#txtDownloadSizeLimit', page).attr('max', '.5');
-        }
+    function loadPage(page, config, allChannelFeatures) {
 
         if (allChannelFeatures.length) {
             $('.noChannelsHeader', page).hide();
@@ -92,15 +86,13 @@
 
         var promise1 = ApiClient.getNamedConfiguration("channels");
         var promise2 = ApiClient.getJSON(ApiClient.getUrl("Channels/Features"));
-        var promise3 = Dashboard.getPluginSecurityInfo();
 
-        $.when(promise1, promise2, promise3).done(function (response1, response2, response3) {
+        $.when(promise1, promise2).done(function (response1, response2) {
 
             var config = response1[0];
             var allFeatures = response2[0];
-            var supporterInfo = response3;
 
-            loadPage(page, config, allFeatures, supporterInfo);
+            loadPage(page, config, allFeatures);
 
         });
 
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index f6237445dd..303d482520 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -232,13 +232,15 @@
         if (context == 'movies') {
             $('.collectionTabs', page).hide();
             $('.movieTabs', page).show();
+
+            // TODO: Improve in the future to limit scope
+            query.ParentId = null;
         } else {
             $('.collectionTabs', page).show();
             $('.movieTabs', page).hide();
+            query.ParentId = LibraryMenu.getTopParentId();
         }
 
-        //query.ParentId = LibraryMenu.getTopParentId();
-
         var limit = LibraryBrowser.getDefaultPageSize();
 
         // If the default page size has changed, the start index will have to be reset
diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js
index 59df779644..1ae90f2319 100644
--- a/dashboard-ui/scripts/syncactivity.js
+++ b/dashboard-ui/scripts/syncactivity.js
@@ -246,6 +246,15 @@
 
         var page = this;
 
+        Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
+
+            if (pluginSecurityInfo.IsMBSupporter) {
+                $('.syncPromotion', page).hide();
+            } else {
+                $('.syncPromotion', page).show();
+            }
+        });
+
         reloadData(page);
 
         // on here
diff --git a/dashboard-ui/syncactivity.html b/dashboard-ui/syncactivity.html
index d2d7da7516..20fdbe36c0 100644
--- a/dashboard-ui/syncactivity.html
+++ b/dashboard-ui/syncactivity.html
@@ -19,6 +19,19 @@
                     <progress max="100" min="0" style="width:100px;display:none;" class="syncProgress"></progress>
                 </div>
                 <br />
+                <div class="supporterPromotion syncPromotion" style="display:none;">
+                    <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
+                        <div>
+                            ${HeaderSyncRequiresSupporterMembership}
+                        </div>
+                        <div>
+                            ${HeaderEnjoyDayTrial}
+                        </div>
+                      <div style="font-weight:normal;font-size:90%;margin-top:5px;">
+                            ${ButtonLearnMore}
+                        </div>
+                    </a>
+                </div>
                 <div class="syncActivity">
 
                 </div>