update app buttons

dashboard-ui/css/site.css

@@ -416,7 +416,7 @@ h1 .imageLink {
     }
 
 .appLinks img {
-    height: 32px;
+    height: 36px;
 }
 
 .activeDevicesCollapsible .ui-collapsible-content {

dashboard-ui/dashboard.html

@@ -16,9 +16,9 @@
                 </div>
                 <div class="dashboardContent">
                     <div class="ui-bar-a welcomeMessage" style="display: none; padding: 2em; border-radius: 10px; margin: 2em 0; font-weight: normal; max-width: 800px;">
-                        <h1 style="margin-top: 0;">${HeaderWelcomeToMediaBrowserServerDashboard}</h1>
+                        <h1 style="margin-top: 0;" class="tourHeader"></h1>
                         <p>
-                            <button class="btnTakeTour" type="button" data-icon="arrow-r" data-iconpos="right">${ButtonTakeTheTour}</button>
+                            <button class="btnTakeTour" type="button" data-icon="arrow-r" data-iconpos="right"><span class="tourButtonText"></span></button>
                         </p>
                     </div>
 
@@ -120,9 +120,7 @@
                         <div id="contribute" style="margin-top: 2em; display: none;">
                             <h2 style="margin: 0 0 .35em;">${HeaderHelpImproveMediaBrowser}</h2>
                             <div>
-                                <a data-role="button" data-icon="mail" data-mini="true" href="supporter.html">
+                                <a data-role="button" data-icon="mail" data-mini="true" href="supporter.html">${ButtonDonate}</a>
-                                    <img src="css/images/supporter/donatepaypal.png" />
-                                </a>
                                 <a href="https://github.com/MediaBrowser/MediaBrowser/wiki" data-role="button" target="_blank" data-icon="user" data-mini="true">Join the Development Team</a>
 
                                 <p class="appLinks" style="padding-left: 5px;">

dashboard-ui/index.html

@@ -17,9 +17,9 @@
         <div data-role="content">
 
             <div class="ui-bar-b readOnlyContent welcomeMessage" style="display: none; padding: 2em; border-radius: 10px; margin: 2em auto; font-weight: normal;">
-                <h1 style="margin-top: 0;">${HeaderWelcomeToMediaBrowserWebClient}</h1>
+                <h1 style="margin-top: 0;" class="tourHeader"></h1>
                 <p>
-                    <button class="btnTakeTour" type="button" data-icon="arrow-r" data-iconpos="right">${ButtonTakeTheTour}</button>
+                    <button class="btnTakeTour" type="button" data-icon="arrow-r" data-iconpos="right"><span class="tourButtonText"></span></button>
                 </p>
             </div>
 

dashboard-ui/scripts/dashboardpage.js

@@ -1249,7 +1249,7 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
 
 (function ($, document, window) {
 
-    var welcomeDismissValue = '8';
+    var welcomeDismissValue = '10';
     var welcomeTourKey = 'welcomeTour';
 
     function dismissWelcome(page, userId) {
@@ -1272,7 +1272,19 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
             if (result.CustomPrefs[welcomeTourKey] == welcomeDismissValue) {
                 $('.welcomeMessage', page).hide();
             } else {
-                $('.welcomeMessage', page).show();
+
+                var elem = $('.welcomeMessage', page).show();
+
+                if (result.CustomPrefs[welcomeTourKey]) {
+
+                    $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeBack'));
+                    $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTourToSeeWhatsNew'));
+
+                } else {
+                    
+                    $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeToMediaBrowserServerDashboard'));
+                    $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTour'));
+                }
             }
         });
     }

dashboard-ui/scripts/indexpage.js

@@ -533,8 +533,25 @@
         });
     }
 
-    function showWelcomeIfNeeded() {
+    function showWelcomeIfNeeded(page, displayPreferences) {
-        
+
+        if (displayPreferences.CustomPrefs[homePageTourKey] == homePageDismissValue) {
+            $('.welcomeMessage', page).hide();
+        } else {
+
+            var elem = $('.welcomeMessage', page).show();
+
+            if (displayPreferences.CustomPrefs[homePageTourKey]) {
+
+                $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeBack'));
+                $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTourToSeeWhatsNew'));
+
+            } else {
+
+                $('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeToMediaBrowserWebClient'));
+                $('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTour'));
+            }
+        }
     }
 
     function takeTour(page, userId) {
@@ -581,12 +598,7 @@
 
         ApiClient.getDisplayPreferences('home', userId, 'webclient').done(function (result) {
 
-            if (result.CustomPrefs[homePageTourKey] == homePageDismissValue) {
+            showWelcomeIfNeeded(page, result);
-                $('.welcomeMessage', page).hide();
-            } else {
-                $('.welcomeMessage', page).show();
-            }
-
             loadSections(page, userId, result);
         });
 

dashboard-ui/scripts/supporterpage.js

@@ -105,14 +105,14 @@
 
                 $('.planSummary', page)
                     .html(Globalize.translate('MessageYouHaveALifetimeMembership'))
-                    .css('color', 'blue');
+                    .css('color', 'green');
 
             }
             else if (info.IsActiveSupporter) {
 
                 $('.planSummary', page)
                     .html(Globalize.translate('MessageYouHaveAnActiveRecurringMembership').replace('{0}', info.PlanType))
-                    .css('color', 'blue');
+                    .css('color', 'green');
 
             }
             else if (info.IsExpiredSupporter) {
@@ -191,6 +191,8 @@
 
         $('.radioDonationType', page).trigger('change');
 
+        $('.benefits', page).html(Globalize.translate('HeaderSupporterBenefit', '<a href="http://mediabrowser.tv/donate" target="_blank">', '</a>')).trigger('create');
+
         loadUserInfo(page);
     });
 

dashboard-ui/supporter.html

@@ -21,7 +21,7 @@
                     <h3>${HeaderSupportTheTeam}</h3>
                     <p>${HeaderSupportTheTeamHelp}</p>
 
-                    <p>${HeaderSupporterBenefit}</p>
+                    <p class="benefits"></p>
 
                     <div class="currentPlanInfo" style="display:none;margin-top:1.5em;">
                         <p class="planSummary"></p>

dashboard-ui/wizardfinish.html

@@ -36,7 +36,7 @@
                     <a href="http://forum.team-mediaportal.com/threads/plugin-mediabrowser-for-mediaportal-v0-13-beta-2013-10-21.119513" target="_blank" title="Media Portal">
                         <img src="css/images/clients/mediaportal.png" /></a>
                 </p>
-
+                
                 <div class="wizardNavigation">
                     <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">${LabelPrevious}</button>
                     <button type="button" data-iconpos="right" data-icon="check" data-inline="true" onclick="WizardFinishPage.onFinish();" data-theme="b">${LabelFinish}</button>