diff --git a/MediaBrowser.WebDashboard/Html/addPlugin.html b/MediaBrowser.WebDashboard/Html/addPlugin.html index 820319091e..2244d5c147 100644 --- a/MediaBrowser.WebDashboard/Html/addPlugin.html +++ b/MediaBrowser.WebDashboard/Html/addPlugin.html @@ -39,20 +39,23 @@

-

-

- - - - - - - - - - + diff --git a/MediaBrowser.WebDashboard/Html/css/images/supporterflag.png b/MediaBrowser.WebDashboard/Html/css/images/supporterflag.png new file mode 100644 index 0000000000..880d434d56 Binary files /dev/null and b/MediaBrowser.WebDashboard/Html/css/images/supporterflag.png differ diff --git a/MediaBrowser.WebDashboard/Html/scripts/AddPluginPage.js b/MediaBrowser.WebDashboard/Html/scripts/AddPluginPage.js index e8cf82e869..8b45747bbf 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/AddPluginPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/AddPluginPage.js @@ -50,7 +50,7 @@ regStatus += "You are currently registered for this feature"; } else { if (new Date(pkg.expDate).getTime() < new Date(1970, 1, 1).getTime()) { - regStatus += "You have never installed this feature"; + regStatus += "This feature has no registration information"; } else { if (pkg.expDate <= new Date().getTime()) { regStatus += "The trial period for this feature has expired on this machine"; @@ -65,23 +65,29 @@ if (pluginSecurityInfo.IsMBSupporter) { $('#regInfo', page).html(pkg.regInfo || ""); - // Fill in PayPal info - $('#featureId', page).val(pkg.featureId); - $('#featureName', page).val(pkg.name); - $('#amount', page).val(pkg.price); - $('#regPrice', page).html("

Price: $" + pkg.price.toFixed(2) + " (USD)

"); - var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner; - $.getJSON(url).done(function (dev) { - if (dev.payPalEmail) { - $('#payPalEmail', page).val(dev.payPalEmail); - - } else { - $('#ppButton', page).hide(); - $('#noEmail', page).show(); - } - }); + if (pkg.price > 0) { + // Fill in PayPal info + $('premiumHasPrice', page).show(); + $('#featureId', page).val(pkg.featureId); + $('#featureName', page).val(pkg.name); + $('#amount', page).val(pkg.price); + $('#regPrice', page).html("

Price: $" + pkg.price.toFixed(2) + " (USD)

"); + var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner; + $.getJSON(url).done(function(dev) { + if (dev.payPalEmail) { + $('#payPalEmail', page).val(dev.payPalEmail); + + } else { + $('#ppButton', page).hide(); + $('#noEmail', page).show(); + } + }); + } else { + // Supporter-only feature + $('premiumHasPrice', page).hide(); + } } else { - $('#regInfo', page).html("

You must be a Media Browser Supporter in order to register this feature.

"); + $('#regInfo', page).html("

You must be a Media Browser Supporter in order to gain access to this feature.

"); $('#ppButton', page).hide(); } diff --git a/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js b/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js index 5b6dc982e4..cde6be9d4e 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js @@ -47,7 +47,11 @@ } if (plugin.isPremium) { - html += "
"; + if (plugin.price > 0) { + html += "
"; + } else { + html += "
"; + } } var color = plugin.tileColor || Dashboard.getRandomMetroColor(); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index e57d7ad2fd..188c187226 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -385,6 +385,7 @@ +