From 9c6929e886e6c8eaeb43a124dd4e3e38e0cdf4e9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 31 Aug 2013 12:36:31 -0400
Subject: [PATCH] improved supporter workflow a little

---
 dashboard-ui/addplugin.html           | 31 +++++++++++++++++++---
 dashboard-ui/plugincatalog.html       | 38 +--------------------------
 dashboard-ui/scripts/addpluginpage.js |  6 +++--
 dashboard-ui/support.html             |  7 +----
 dashboard-ui/supporter.html           | 21 +++++++--------
 5 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index 2994f02e68..f00dc4223a 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -26,15 +26,17 @@
                         </p>
 
                         <p id="btnInstallDiv" class="hide">
-                            <button id="btnInstall" type="submit"  data-icon="download" data-theme="b">Install</button>
+                            <button id="btnInstall" type="submit" data-icon="download" data-theme="b">Install</button>
                         </p>
-	                    <p id="nonServerMsg"></p>
+                        <p id="nonServerMsg"></p>
                     </div>
                 </form>
 
                 <form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-                    <div class="premiumPackage" data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em; display: none" >
+                    <div class="premiumPackage" data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em; display: none">
                         <h3>Registration</h3>
+                        <p id="pluginType">
+                        </p>
                         <p id="regStatus">
                         </p>
                         <p id="regInfo">
@@ -61,7 +63,7 @@
 
                     </div>
 
-                    <div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em;" >
+                    <div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em;">
                         <h3>Developer Info</h3>
                         <p id="developer"></p>
                         <p id="pViewWebsite" style="display: none;">
@@ -75,6 +77,27 @@
                     </div>
                 </form>
 
+                <div data-role="popup" class="ui-content" id="supporterPlugins" data-theme="e" data-overlay-theme="a">
+                    <a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
+                    <p>Supporter-Only plug-ins are free for anyone who is an <strong>MB3 Supporter</strong> (with a valid MB3 key who has donated the minimum amount to the overall project).</p>
+                    <p>
+                        Anyone can install them and enjoy a free trial period of 14 days in most instances.  The trial period may commence as soon as you install the plug-in.<p>
+                    <p>These plug-ins will appear in the catalog with a "Supporter" banner.</p>
+                </div>
+
+                <div data-role="popup" class="ui-content" id="premiumPlugins" data-theme="e" data-overlay-theme="a">
+                    <a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
+                    <p>
+                        Premium plug-ins are developed by third-parties and require that you be an <strong>MB3 Supporter <em>and</em> also register the plug-in with its creator.</strong>
+                        The cost of registering these plug-ins is set for each one by its creator and all revenues go to that person.
+                    </p>
+                    <p>Anyone can install them and enjoy a free trial period of 14 days in most instances.  The trial period may commence as soon as you install the plug-in.</p>
+                    <p>
+                        You should install premium plug-ins without registering them first to take advantage of this trial period.  Then, if you find the functionality useful,
+                                                                                                                                                                         you can register it via its detail page here in the catalog.
+                    </p>
+                    <p>These plug-ins will appear in the catalog with a "Premium" banner.</p>
+                </div>
             </div>
         </div>
         <script type="text/javascript">
diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html
index 1189c3202d..544bb4b97c 100644
--- a/dashboard-ui/plugincatalog.html
+++ b/dashboard-ui/plugincatalog.html
@@ -13,12 +13,7 @@
                     <a href="plugincatalog.html" data-role="button" class="ui-btn-active">Plugin Catalog</a>
                     <a href="pluginupdates.html" data-role="button">Automatic Updates</a>
                 </div>
-
-                <p style="margin: 2em 0;">
-                    <strong>Plugin types: <a data-rel="popup" data-position-to="origin" href="#freePlugins">Free</a>, 
-                        <a data-rel="popup" data-position-to="origin" href="#supporterPlugins">Supporter-Only</a>, and <a data-rel="popup" data-position-to="origin" href="#premiumPlugins">Premium</a>.</strong>
-                </p>
-
+                <br />
                 <div style="display: inline-block;">
                     <label for="selectTargetSystem">Show plugins for</label>
                 </div>
@@ -36,8 +31,6 @@
                     <label for="chkPremium">Show Free Only</label>
                 </div>
 
-
-
                 <div id="noPlugins" class="hide">
                     <div style="text-align: center; margin: 10px;">No available plugins</div>
                 </div>
@@ -47,35 +40,6 @@
             </div>
         </div>
 
-
-        <div data-role="popup" class="ui-content" id="freePlugins" data-theme="e" data-overlay-theme="a" style="max-width: 50%">
-            <a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
-            <p>
-                Free plug-ins can be installed and used by anyone for free. They will appear in the catalog without any banners.<p>
-        </div>
-
-        <div data-role="popup" class="ui-content" id="supporterPlugins" data-theme="e" data-overlay-theme="a" style="max-width: 50%">
-            <a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
-            <p>Supporter-Only plug-ins are free for anyone who is an <strong>MB3 Supporter</strong> (with a valid MB3 key who has donated the minimum amount to the overall project).</p>
-            <p>
-                Anyone can install them and enjoy a free trial period of 14 days in most instances.  The trial period may commence as soon as you install the plug-in.<p>
-            <p>These plug-ins will appear in the catalog with a "Supporter" banner.</p>
-        </div>
-
-        <div data-role="popup" class="ui-content" id="premiumPlugins" data-theme="e" data-overlay-theme="a" style="max-width: 50%">
-            <a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
-            <p>
-                Premium plug-ins are developed by third-parties and require that you be an <strong>MB3 Supporter <em>and</em> also register the plug-in with its creator.</strong>
-                The cost of registering these plug-ins is set for each one by its creator and all revenues go to that person.
-            </p>
-            <p>Anyone can install them and enjoy a free trial period of 14 days in most instances.  The trial period may commence as soon as you install the plug-in.</p>
-            <p>
-                You should install premium plug-ins without registering them first to take advantage of this trial period.  Then, if you find the functionality useful,
-                                                                                                                                                                         you can register it via its detail page here in the catalog.
-            </p>
-            <p>These plug-ins will appear in the catalog with a "Premium" banner.</p>
-        </div>
-
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
index d4ce424305..967bedff3b 100644
--- a/dashboard-ui/scripts/addpluginpage.js
+++ b/dashboard-ui/scripts/addpluginpage.js
@@ -112,7 +112,6 @@
                 regStatus += "You are currently registered for this feature";
             } else {
                 if (new Date(pkg.expDate).getTime() < new Date(1970, 1, 1).getTime()) {
-                    regStatus += "This feature has never been installed on this system";
                 } else {
                     if (new Date(pkg.expDate).getTime() <= new Date().getTime()) {
                         regStatus += "The trial period for this feature has expired";
@@ -149,7 +148,10 @@
                     $('.premiumHasPrice', page).hide();
                 }
             } else {
-                $('#regInfo', page).html("Please become a <a href='supporter.html'>Media Browser Supporter</a> in order to register this feature.").trigger('create');
+
+                var pluginTypeHtml = pkg.price ? 'This is a <a data-rel="popup" data-position-to="window" href="#premiumPlugins">premium</a> plugin.' : 'This is a <a data-rel="popup" data-position-to="window" href="#supporterPlugins">supporter-only</a> plugin.';
+
+                $('#regInfo', page).html(pluginTypeHtml + '<br/><br/>It will require a <a href="supporter.html">supporter key</a> in order to register after the trial expiration.').trigger('create');
                 $('#ppButton', page).hide();
             }
 
diff --git a/dashboard-ui/support.html b/dashboard-ui/support.html
index a5c5057fff..f27c377446 100644
--- a/dashboard-ui/support.html
+++ b/dashboard-ui/support.html
@@ -16,16 +16,11 @@
                         <a href="supporterkey.html" data-role="button">Supporter Key</a>
                         <a href="about.html" data-role="button">About</a>
                     </div>
-                    <h2>General Help</h2>
                     <p>
                         Media Browser has a thriving community of users and a vast knowledge base of information to help you get the most
                     out of your media collection.
                     </p>
-                    <p>
-                        The Community Tracker is a place where you can ask questions, post feature requests and report bugs and get timely
-                    <em>and friendly</em> help from a thriving community of users and developers.
-                    </p>
-                    <a data-role="button" data-icon="arrow-r" data-iconpos="right" href="http://community.mediabrowser.tv" target="_blank">Visit the Community Tracker</a>
+                    <a data-role="button" data-icon="arrow-r" data-iconpos="right" href="http://community.mediabrowser.tv" target="_blank">Visit the Community</a>
                     <p>
                         Also, within the tracker, there is a large Knowledge Base of information compiled from users and developers to help you get the 
                     most out of Media Browser.
diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html
index 8ce9c2e4e6..182ddf9ae7 100644
--- a/dashboard-ui/supporter.html
+++ b/dashboard-ui/supporter.html
@@ -16,25 +16,21 @@
                         <a href="supporterkey.html" data-role="button">Supporter Key</a>
                         <a href="about.html" data-role="button">About</a>
                     </div>
-                    <h2>Support the Media Browser Team</h2>
+                    <h3>Support the Media Browser Team</h3>
                     <p>
-                        By becoming a Media Browser Supporter, you ensure the continued development and support of this product <strong>and open up a whole new world of premium plug-ins.</strong>
+                        Help ensure the continued development and support of this product.
                     </p>
                     <p>
-                        A portion of all MB3 Supporter donations is also contributed to some of our metadata providers (<a href="http://themoviedb.org" target="_blank">The Movie Db</a>, 
-                        <a href="http://thetvdb.com" target="_blank">The TVdb</a>, and <a href="http://fanart.tv" target="_blank">FanArt.tv</a>)
-                    </p>
-                    <p>
-                        Premium plug-ins can be installed and used for their trial periods (14 days on any particular machine) but, to register them for use
-                        beyond that period, you also have to be a Media Browser Supporter.
-                    
+                        A portion of all donations will be contributed to other <a href="about.html">free tools</a> we depend on.
                     </p>
+
                     <p style="display: none; padding: 1em; border-radius: 5px; font-weight: normal;" class="ui-bar-e supporterOnly">
                         <strong>Thank You</strong> for your past support of the Media Browser Team.  Users like you make it possible for 
-                            Media Browser to exist and keep getting better and better.  You can always support us again if you feel you are getting maximum
-                            value from the product.  
+                        Media Browser to exist and keep getting better and better.  You can always support us again if you feel you are getting maximum
+                        value from the product.  
                         
                     </p>
+                    <br />
                     <form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr"
                         method="post">
                         <label for="donateAmt">Amount (USD)</label>
@@ -56,7 +52,8 @@
                         <a data-role="button" onclick="$(this).parents('form')[0].submit();">
                             <img src="css/images/supporter/donatepaypal.png" /></a>
                     </form>
-
+                    <br />
+                    <p>Once complete, please return and <a href="supporterkey.html">enter your supporter key</a>, which you will receive by email.</p>
                 </div>
             </div>
         </div>