diff options
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/addPlugin.html | 31 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/css/images/supporterflag.png | bin | 0 -> 2002 bytes | |||
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/scripts/AddPluginPage.js | 40 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js | 6 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 1 |
5 files changed, 46 insertions, 32 deletions
diff --git a/MediaBrowser.WebDashboard/Html/addPlugin.html b/MediaBrowser.WebDashboard/Html/addPlugin.html index 820319091..2244d5c14 100644 --- a/MediaBrowser.WebDashboard/Html/addPlugin.html +++ b/MediaBrowser.WebDashboard/Html/addPlugin.html @@ -39,20 +39,23 @@ </p> <p id="regInfo"> </p> - <p id="regPrice"> - </p> - <input type="hidden" name="cmd" value="_xclick"> - <input type="hidden" id="payPalEmail" name="business" value="mb_1358534950_biz@reedsplace.com"> - <input type="hidden" name="currency_code" value="USD"> - <input type="hidden" id="featureName" name="item_name" value="MBSupporter"> - <input type="hidden" id="amount" name="amount" value="10"> - <input type="hidden" id="featureId" name="item_number" value="MBSupporter"> - <input type="hidden" name="notify_url" value="http://mb3admin.com/admin/service/services/ppipn.php"> - <input type="hidden" name="return" id ="paypalReturnUrl" value="#"> - <a data-role="button" id="ppButton" onclick="_xclick.submit();"><img src="css/images/registerpp.png"/></a> - <p id="noEmail" style="display: none"><strong>This developer has not provided a PayPal email. Please see their - website for registration information.</strong> - </p> + <div class="premiumHasPrice" style="display: none"> + <p id="regPrice"> + </p> + <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" id="payPalEmail" name="business" value="mb_1358534950_biz@reedsplace.com"> + <input type="hidden" name="currency_code" value="USD"> + <input type="hidden" id="featureName" name="item_name" value="MBSupporter"> + <input type="hidden" id="amount" name="amount" value="10"> + <input type="hidden" id="featureId" name="item_number" value="MBSupporter"> + <input type="hidden" name="notify_url" value="http://mb3admin.com/admin/service/services/ppipn.php"> + <input type="hidden" name="return" id ="paypalReturnUrl" value="#"> + <a data-role="button" id="ppButton" onclick="_xclick.submit();"><img src="css/images/registerpp.png"/></a> + <p id="noEmail" style="display: none"><strong>This developer has not provided a PayPal email. Please see their + website for registration information.</strong> + </p> + + </div> </div> diff --git a/MediaBrowser.WebDashboard/Html/css/images/supporterflag.png b/MediaBrowser.WebDashboard/Html/css/images/supporterflag.png Binary files differnew file mode 100644 index 000000000..880d434d5 --- /dev/null +++ b/MediaBrowser.WebDashboard/Html/css/images/supporterflag.png diff --git a/MediaBrowser.WebDashboard/Html/scripts/AddPluginPage.js b/MediaBrowser.WebDashboard/Html/scripts/AddPluginPage.js index e8cf82e86..8b45747bb 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("<h2>Price: $" + pkg.price.toFixed(2) + " (USD)</h2>"); - 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("<h2>Price: $" + pkg.price.toFixed(2) + " (USD)</h2>"); + 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("<h3>You must be a <a href='supporter.html'>Media Browser Supporter</a> in order to register this feature.</h3>"); + $('#regInfo', page).html("<h3>You must be a <a href='supporter.html'>Media Browser Supporter</a> in order to gain access to this feature.</h3>"); $('#ppButton', page).hide(); } diff --git a/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js b/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js index 5b6dc982e..cde6be9d4 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/PluginCatalogPage.js @@ -47,7 +47,11 @@ } if (plugin.isPremium) { - html += "<div class='premiumBanner'><img src='css/images/premiumflag.png' /></div>"; + if (plugin.price > 0) { + html += "<div class='premiumBanner'><img src='css/images/premiumflag.png' /></div>"; + } else { + html += "<div class='premiumBanner'><img src='css/images/supporterflag.png' /></div>"; + } } var color = plugin.tileColor || Dashboard.getRandomMetroColor(); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index e57d7ad2f..188c18722 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -385,6 +385,7 @@ <EmbeddedResource Include="Html\scripts\ItemDetailPage.js" />
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="Html\css\images\supporterflag.png" />
<EmbeddedResource Include="Html\scripts\ItemListPage.js" />
<EmbeddedResource Include="Html\itemList.html" />
<EmbeddedResource Include="Html\scripts\WizardFinishPage.js" />
|
