From 2c39fa3f6ebe54f062b140a0f94196675f521f86 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 30 Sep 2015 00:13:48 -0400
Subject: [PATCH] 3.0.5724.6

---
 dashboard-ui/addplugin.html               |   4 +-
 dashboard-ui/cinemamodeconfiguration.html |   8 +-
 dashboard-ui/scripts/dashboardpage.js     | 108 +++++++++++-----------
 dashboard-ui/scripts/supporterpage.js     |   8 +-
 dashboard-ui/supporter.html               |   8 +-
 5 files changed, 74 insertions(+), 62 deletions(-)

diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index bcc855e861..132f148c1f 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -66,14 +66,14 @@
 
                                             <p>${MessageSupporterPluginRequiresMembership}</p>
 
-                                            <p><a href="supporter.html">${LinkSupporterMembership}</a></p>
+                                            <p><a href="http://emby.media/donate" target="_blank">${LinkSupporterMembership}</a></p>
 
                                         </div>
                                         <div class="premiumDescription">
 
                                             <p>${MessagePremiumPluginRequiresMembership}</p>
 
-                                            <p><a href="supporter.html">${LinkSupporterMembership}</a></p>
+                                            <p><a href="http://emby.media/donate" target="_blank">${LinkSupporterMembership}</a></p>
                                         </div>
                                         <div class="premiumHasPrice" style="display: none">
                                             <p id="regPrice">
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 28ec4ffec9..3afabfe86a 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -43,7 +43,7 @@
                                 <input type="checkbox" id="chkOtherTrailers" />
                             </fieldset>
                             <div class="fieldDescription">${LabelTheseFeaturesRequireSupporterHelpAndTrailers}</div>
-                            <div class="fieldDescription"><a class="lnkSupporterLearnMore" href="supporter.html" style="display:none;">${ButtonLearnMore}</a></div>
+                            <div class="fieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/donate" target="_blank" style="display:none;">${ButtonLearnMore}</a></div>
                         </li>
                         <li>
                             <label for="chkMyMovieTrailers">${OptionTrailersFromMyMovies}</label>
@@ -53,10 +53,10 @@
                         </li>
                         <li>
                             <label for="txtCustomIntrosPath">${LabelCustomIntrosPath}</label>
-                            <div>
-                                <input type="text" id="txtCustomIntrosPath" style="display: inline-block; width: 85%;" />
-                                <paper-icon-button id="btnSelectCustomIntrosPath" icon="search"></paper-icon-button>
+                            <div style="display: inline-block; width: 85%;">
+                                <input type="text" id="txtCustomIntrosPath" />
                             </div>
+                            <button id="btnSelectCustomIntrosPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
                             <div class="fieldDescription">${LabelCustomIntrosPathHelp}</div>
                         </li>
                         <li>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 99bf99bfed..f1aee54f9f 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -39,9 +39,7 @@
 
         $('.activityItems', page).activityLogList();
 
-        $('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html', {
-            api_key: ApiClient.accessToken()
-        }));
+        $('.swaggerLink', page).attr('href', apiClient.getUrl('swagger-ui/index.html'));
     },
 
     onPageHide: function () {
@@ -117,7 +115,7 @@
 
         var query = {
             StartIndex: DashboardPage.newsStartIndex,
-            Limit: 7
+            Limit: 5
         };
 
         ApiClient.getProductNews(query).done(function (result) {
@@ -126,31 +124,15 @@
 
                 var itemHtml = '';
 
-                itemHtml += '<a class="clearLink" href="' + item.Link + '" target="_blank">';
-                itemHtml += '<paper-icon-item>';
+                itemHtml += '<div class="newsItem">';
+                itemHtml += '<a class="newsItemHeader" href="' + item.Link + '" target="_blank">' + item.Title + '</a>';
 
-                itemHtml += '<paper-fab class="listAvatar blue" icon="dvr" item-icon></paper-fab>';
-
-                itemHtml += '<paper-item-body three-line>';
-
-                itemHtml += '<div>';
-                itemHtml += item.Title;
-                itemHtml += '</div>';
-
-                itemHtml += '<div secondary>';
                 var date = parseISO8601Date(item.Date, { toLocal: true });
-                itemHtml += date.toLocaleDateString();
+                itemHtml += '<div class="newsItemDate">' + date.toLocaleDateString() + '</div>';
+
+                itemHtml += '<div class="newsItemDescription">' + item.Description + '</div>';
                 itemHtml += '</div>';
 
-                itemHtml += '<div secondary>';
-                itemHtml += item.Description;
-                itemHtml += '</div>';
-
-                itemHtml += '</paper-item-body>';
-
-                itemHtml += '</paper-icon-item>';
-                itemHtml += '</a>';
-
                 return itemHtml;
             });
 
@@ -769,7 +751,7 @@
 
                 html += "<span style='color:#009F00;margin-left:5px;margin-right:5px;'>" + progress + "%</span>";
 
-                html += '<paper-icon-button title="' + Globalize.translate('ButtonStop') + '" icon="cancel" onclick="DashboardPage.stopTask(\'' + task.Id + '\');"></paper-icon-button>';
+                html += '<button type="button" data-icon="delete" data-iconpos="notext" data-inline="true" data-mini="true" onclick="DashboardPage.stopTask(\'' + task.Id + '\');">' + Globalize.translate('ButtonStop') + '</button>';
             }
             else if (task.State == "Cancelling") {
                 html += '<span style="color:#cc0000;">' + Globalize.translate('LabelStopping') + '</span>';
@@ -817,13 +799,13 @@
             imgUrl = "css/images/supporter/supporterbadge.png";
             text = Globalize.translate('MessageThankYouForSupporting');
 
-            $('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="supporter.html" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /></a><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span>');
+            $('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="http://emby.media/donate" target="_blank" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /></a><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span>');
         } else {
 
             imgUrl = "css/images/supporter/nonsupporterbadge.png";
             text = Globalize.translate('MessagePleaseSupportProject');
 
-            $('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="supporter.html" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span></a>');
+            $('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="http://emby.media/donate" target="_blank" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span></a>');
         }
     },
 
@@ -1003,7 +985,7 @@
     }
 };
 
-$(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide);
+$(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide);
 
 (function ($, document, window) {
 
@@ -1084,42 +1066,60 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
 
         var html = '';
 
-        html += '<paper-icon-item>';
+        html += '<div class="newsItem" style="padding: .5em 0;">';
 
-        var color = entry.Severity == 'Error' || entry.Severity == 'Fatal' || entry.Severity == 'Warn' ? '#cc0000' : '#52B54B';
+        html += '<div class="notificationContent" style="display:block;">';
 
+        var date = parseISO8601Date(entry.Date, { toLocal: true });
+
+        var color = entry.Severity == 'Error' || entry.Severity == 'Fatal' || entry.Severity == 'Warn' ? '#cc0000' : 'green';
+
+        html += '<div style="margin: 0;color:' + color + ';">';
         if (entry.UserId && entry.UserPrimaryImageTag) {
 
             var userImgUrl = ApiClient.getUserImageUrl(entry.UserId, {
                 type: 'Primary',
                 tag: entry.UserPrimaryImageTag,
-                height: 40
+                height: 20
             });
-
-            html += '<paper-fab class="listAvatar" style="background-color:' + color + ';background-image:url(\'' + userImgUrl + '\');background-repeat:no-repeat;background-position:center center;background-size: cover;" item-icon></paper-fab>';
-        }
-        else {
-            html += '<paper-fab class="listAvatar" icon="dvr" style="background-color:' + color + '" item-icon></paper-fab>';
+            html += '<img src="' + userImgUrl + '" style="height:20px;vertical-align:middle;margin-right:5px;" />';
         }
 
-        html += '<paper-item-body three-line>';
-
-        html += '<div>';
-        html += entry.Name;
-        html += '</div>';
-
-        html += '<div secondary>';
-        var date = parseISO8601Date(entry.Date, { toLocal: true });
         html += date.toLocaleDateString() + ' ' + date.toLocaleTimeString().toLowerCase();
         html += '</div>';
 
-        html += '<div secondary>';
-        html += entry.ShortOverview || '';
+        html += '<div class="notificationName" style="margin:.5em 0 0;white-space:nowrap;">';
+        html += entry.Name;
         html += '</div>';
 
-        html += '</paper-item-body>';
+        entry.ShortOverview = entry.ShortOverview || '&nbsp;';
 
-        html += '</paper-icon-item>';
+        if (entry.ShortOverview) {
+
+            html += '<div class="newsItemDescription" style="margin: .5em 0 0;">';
+
+            if (entry.Overview) {
+                html += '<a href="#" class="btnShowOverview" style="text-decoration:none;font-weight:500;">';
+            }
+            html += entry.ShortOverview;
+            if (entry.Overview) {
+                html += '</a>';
+            }
+
+            html += '</div>';
+
+            if (entry.Overview) {
+                html += '<div class="newsItemLongDescription" style="display:none;">' + entry.Overview + '</div>';
+            }
+        }
+
+        //if (notification.Url) {
+        //    html += '<p style="margin: .25em 0;"><a href="' + notification.Url + '" target="_blank">' + Globalize.translate('ButtonMoreInformation') + '</a></p>';
+        //}
+
+        html += '</div>';
+
+        html += '</div>';
 
         return html;
     }
@@ -1287,7 +1287,7 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
             result.CustomPrefs[welcomeTourKey] = welcomeDismissValue;
             ApiClient.updateDisplayPreferences('dashboard', result, userId, 'dashboard');
 
-            $(page).off('pageshow', onPageShowCheckTour);
+            $(page).off('pageshowready', onPageShowReadyCheckTour);
         });
     }
 
@@ -1344,7 +1344,7 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
         });
     }
 
-    function onPageShowCheckTour() {
+    function onPageShowReadyCheckTour() {
         var page = this;
 
         var apiClient = ApiClient;
@@ -1362,13 +1362,13 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
             takeTour(page, Dashboard.getCurrentUserId());
         });
 
-    }).on('pageshow', "#dashboardPage", onPageShowCheckTour);
+    }).on('pageshowready', "#dashboardPage", onPageShowReadyCheckTour);
 
 })(jQuery, document, window);
 
 (function () {
 
-    $(document).on('pageshow', ".type-interior", function () {
+    $(document).on('pageshowready', ".type-interior", function () {
 
         var page = this;
 
@@ -1378,7 +1378,7 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageb
                 $('.supporterPromotion', page).remove();
 
                 if (!pluginSecurityInfo.IsMBSupporter && AppInfo.enableSupporterMembership) {
-                    $('.content-primary', page).append('<div class="supporterPromotion"><a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;"><div>' + Globalize.translate('HeaderSupportTheTeam') + '</div><div style="font-weight:normal;font-size:90%;margin-top:5px;">' + Globalize.translate('TextEnjoyBonusFeatures') + '</div></a></div>');
+                    $('.content-primary', page).append('<div class="supporterPromotion"><a class="btn btnActionAccent" href="http://emby.media/donate" target="_blank" style="font-size:14px;"><div>' + Globalize.translate('HeaderSupportTheTeam') + '</div><div style="font-weight:normal;font-size:90%;margin-top:5px;">' + Globalize.translate('TextEnjoyBonusFeatures') + '</div></a></div>');
                 }
             }
 
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index b0b3a0ae11..73cd1e37f3 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -83,6 +83,12 @@
                 $('.currentPlanInfo', page).hide();
             }
 
+            if (info.IsActiveSupporter) {
+                $('.supporterContainer', page).addClass('hide');
+            } else {
+                $('.supporterContainer', page).removeClass('hide');
+            }
+
             if (info.IsActiveSupporter && info.PlanType == 'Lifetime') {
 
                 $('.planSummary', page)
@@ -182,7 +188,7 @@
 
         $('.supporterForm').off('submit', onSubmit).on('submit', onSubmit);
 
-    }).on('pageshow', "#supporterPage", function () {
+    }).on('pageshowready', "#supporterPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html
index bedb5e381f..210b81ee4c 100644
--- a/dashboard-ui/supporter.html
+++ b/dashboard-ui/supporter.html
@@ -27,7 +27,13 @@
                         <p class="planSummary"></p>
                     </div>
 
-                    <form style="margin-top:1.5em;" name="_xclick" class="supporterForm" method="post">
+                    <div class="supporterContainer hide">
+                        <br />
+                        <a class="clearLink" href="http://emby.media/donate" target="_blank">
+                            <paper-button raised class="block accent"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button>
+                        </a>
+                    </div>
+                    <form style="margin-top:1.5em;display:none;" name="_xclick" class="supporterForm" method="post">
 
                         <fieldset data-role="controlgroup">
                             <legend>${HeaderDonationType}</legend>