From 830f6e2201cf13077646ff98e1c64424b45bb9ab Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Thu, 7 Mar 2013 14:03:23 -0500 Subject: [PATCH] Add concept of Supporter-only plug-ins (premium with price = 0) --- MediaBrowser.WebDashboard/Html/addPlugin.html | 31 ++++++++------ .../Html/css/images/supporterflag.png | Bin 0 -> 2002 bytes .../Html/scripts/AddPluginPage.js | 40 ++++++++++-------- .../Html/scripts/PluginCatalogPage.js | 6 ++- .../MediaBrowser.WebDashboard.csproj | 1 + 5 files changed, 46 insertions(+), 32 deletions(-) create mode 100644 MediaBrowser.WebDashboard/Html/css/images/supporterflag.png 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 0000000000000000000000000000000000000000..880d434d56433279d2a752183eb9066469b6f5ab GIT binary patch literal 2002 zcmV;@2QB!CP)002t}1^@s6I8J)%00004XF*Lt006O% z3;baP00009a7bBm000ic000ic0Tn1pfB*mh8gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^4L^m3s900&MO zXKat{PNk^P#PP(xoOAB+@r_vby>MC|W(J}KWd=njF~57;&n+-BFfltj>$Jekv3_cS z8Dh=M%oKsu0y9|X1poQLcJ18$YuGhx@`!N8KNL>+W3%62*zX_K`6O19U=yDUXYg6! zw2umB?M1@ry*9mI6|5-07*RvpvE+6LCx5nZ`tKG__r>_wm`<>xu!3N7b36WMB!njp zA(F09Sd6I2?}Rh@2H?&?v~5iv*a|Ek*pFN#8wD%erm*^M6b|vm-WE>BI^hiO0^Z?t zfvt+=f^`Aw2V1bQ1Hu`3Wf`IP0I=Fnv&K;5-&3!TzmEueGhI-!gRk`utE4s97!cY@ zZsee5aRux=4$(9LphZLzUTY+^oB6#pvFeF1MofN#a0Z@MFpQ?$X#gw&a85x@dKkYUmCjVKR_ z^{xNj3}gAhh^DJyglQ`vCHDa9Bj9aQ5fy|Qo=+}X-I3+H0hbYG0>)Lc?Aq}vG0@e-IKCb#mMxf!sJy}|ZBbFgR)Z6X z{26ML!;U`=2$S~+9m@rq))jp(^>T=)-m3wGRgf^lJB8D8h3fj{80TB07i?2Cu)*h4jbf9^)Z;XjQwgSC{wxL6zX>ILY83k?lv6(NpW(kz(n%UX2dftQB z(qn2;!PJwtL4e{yz=tASIlC^vqA&&2hvNZ@9ZLrmyeH%=zqA=e9k)mvQxl5Q*UsY= z7?0=Yag2DHg5`p3M8W^vr06r{*xB=crYCV^k^e%y=5_p0KVEAZmJ7DQ6wE8~Oi4~9 z2vxZ~Lf6k|<7ydY{c0*!5NzqKyZ)|qvE_rRab-%%e$0(F-bdz6S1BqVzu~wj(3*~A z3nq&`#y3N=>Vr`218Py=jvbD7daqMYj=}~@1ePrrTMG7ItX+KE)_c8*CJ&0^YNjg} z2M;WaC*g^~@`3%vqOVIyHmlqYz|`Z06F*eXl~_R^M{1q~uxHSZ0g`k7MmN(X3d;ps z53FBIz+{0(jq*bk?pWS*LZq(qRFrWP#7Jvo+d$&5f?x+0H~*t6`m9k*Jwh?kyyM65 z@RqOfYjP6X;FF_7V%dVR=UM@UDFtgA=Vsh(DChe~$wrEPVzF$&INqs56z&&2C{A5D zALEU`yox9fiv1W1Jm>t3uGO|^9@#Gr>7p+2ST0y)ufDd1 zA%a-Yd6UgPj8I%P+03>NsS!0(vYtLH6<9&AeS5dmEc%>Gbd=S0OwRGyO5hxFYQZrO zM?Bo1GW?=lN~Q)Y2)4Lq`rle2)``_!!wBdX_ewYPQX1qI04BR(k6rJn!mslu`a zV=?EGByQ7WM9Ez{0Ap0KVP${D9X{;GOwdw?Wedhg;%yOO7*Pb{y(EW*Y*0C=;I{Mr zd-Pzb#PWg3z52S8WFN+xZ$=nbN)8eEw8(?v6t?SJeIJ%uEElY@^;`$Wm620b)+wf^ zABy#i(^zf_X5>{%$y8$n!4~GX{#UE^us*Ss@Iw`DRS!kvaB&HrV-IX*v24LOd0>rV z>JiF&)FvBRU^exMbX=k9|7#FkgmK$>5Gu2)VYOd?3wD@AUkB!G0yaVNj*06RAM5*g zf82n-%B@+$Y@m2-tQQgIn?(T@=g%MedxZ@a`vt`Ph5%b&4GSYBO!Z5iQfK}ZXtZOAq&Y!ts>IKUjgy{v<17>>eOde+omPrJg zi?RW;Id5im@2Lis`3tZ2 k0#^g8_gu%s_XWZJ2l<%M>}38KBme*a07*qoM6N<$f}zv4`v3p{ literal 0 HcmV?d00001 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 @@ +