diff --git a/source/net/filebot/Settings.java b/source/net/filebot/Settings.java index 861ea833..156a1389 100644 --- a/source/net/filebot/Settings.java +++ b/source/net/filebot/Settings.java @@ -193,7 +193,7 @@ public final class Settings { } public static String getPurchaseURL() { - return getApplicationProperty("link.app.purchase"); + return getApplicationProperty("link.app.purchase") + '#' + getApplicationDeployment(); } public static String getEmbeddedHelpURL() { diff --git a/website/.htaccess b/website/.htaccess index ea0d0d92..22677020 100644 --- a/website/.htaccess +++ b/website/.htaccess @@ -9,6 +9,9 @@ redirect 302 /mac/purchase.html https://itunes.apple.com/us/app/filebot/id905384 # redirect donate page redirect 302 /donate.html https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=rednoah%40filebot%2enet&lc=US&item_name=FileBot%20Support¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted +# TODO: build purchase / checkout page +redirect 302 /purchase.html https://www.filebot.net/#purchase + # redirect to support pages redirect 302 /amc.html https://www.filebot.net/forums/viewtopic.php?f=4&t=215 redirect 302 /manual.html https://www.filebot.net/forums/viewtopic.php?f=3&t=7 @@ -19,6 +22,9 @@ redirect 302 /windows/support.html https://www.filebot.net/forums/viewforum.php? redirect 302 /mac/support.html https://www.filebot.net/forums/viewforum.php?f=12 redirect 302 /mac/subtitles.html https://www.filebot.net/forums/viewtopic.php?f=12&t=3350 redirect 302 /mac/brew.html https://www.filebot.net/forums/viewtopic.php?f=4&t=2049 +redirect 302 /linux/snap.html https://www.filebot.net/forums/viewtopic.php?f=11&t=5984 +redirect 302 /linux/docker.html https://hub.docker.com/r/rednoah/filebot/ +redirect 302 /linux/syno.html https://www.filebot.net/forums/viewtopic.php?f=13&t=1802 redirect 302 /syno/support.html https://www.filebot.net/forums/viewforum.php?f=13 redirect 302 /syno/manual.html https://www.filebot.net/forums/viewtopic.php?f=13&t=1802 redirect 302 /channel.html https://discord.gg/cKVvZ2S diff --git a/website/base.css b/website/base.css index 0203ece2..f933690e 100644 --- a/website/base.css +++ b/website/base.css @@ -252,9 +252,9 @@ div.screencast:hover .play { margin-top: 20px; } -.section.features, .section.download, .section.contact { +.section.features, .section.download, .section.purchase, .section.contact { clear: both; - margin-top: 40px; + margin-top: 45px; } .section .icon { @@ -450,24 +450,83 @@ div.screencast:hover .play { border-radius: 4px; } -#download li.macosx, #download li.windows { +#download li.macosx, #download li.windows, #purchase li.year { list-style: none; margin: 0.5em 1em 1em 1em; - padding: 0.5em 1em 0.5em 2.4em; + padding: 1.5em 1em 1.5em 3.6em; border-radius: 4px 4px 4px 4px; - background-color: #fcfbfa; display: inline-block; + background-color: #fcfbfa; box-shadow: 0px 0px 5px #2574ce; + background-repeat: no-repeat; + background-position: 0.8em center; + background-size: 32px 32px; } #download li.macosx { - background: url('images/apple.logo.svg') no-repeat 0.5em 0.27em; - background-size: 24px 24px; + background-image: url('images/apple.logo.svg'); } #download li.windows { - background: url('images/microsoft.logo.svg') no-repeat 0.5em 0.3em; - background-size: 24px 24px; + background-image: url('images/microsoft.logo.svg'); +} + +#purchase li.year { + background-image: url('images/purchase.license.png'); +} + +#purchase li.note { + list-style: none; + background: url('images/accept.png') left center no-repeat; + padding: 0.1em 1.7em; + margin-left: 1.5em; +} + +#download li.macappstore.note { + list-style: none; + text-align: right; + margin: 0em 0.5em 1.2em 0.5em; +} + +#download li.macappstore.note span:before { + content: "* "; +} + +#purchase li > small.price { + position: relative; + left: -0em; + top: 2.5em; + + padding: 0.5em 0.5em; + border: 0.1em solid rgba(255,255,255,0); + border-radius: 0.4em; + + text-shadow: 0 0.04em 0.04em rgba(0,0,0,0.35); + text-align:center; + + color: white; + background-color:#F14E4E; +} + +#purchase .price { + position: absolute; +} + +#purchase .price > * { + position: relative; + left: 10em; + top: 1.3em; + + padding: 0.3em; + border: 0.1em solid rgba(255,255,255,0); + border-radius: 0.4em; + + text-shadow: 0 0.04em 0.04em rgba(0,0,0,0.35); + text-align: center; + font-size: smaller; + + color: white; + background-color:#F14E4E; } /** diff --git a/website/images/accept.png b/website/images/accept.png new file mode 100644 index 00000000..ab7c378c Binary files /dev/null and b/website/images/accept.png differ diff --git a/website/images/coin.png b/website/images/coin.png new file mode 100644 index 00000000..6e1197e0 Binary files /dev/null and b/website/images/coin.png differ diff --git a/website/images/purchase.license.png b/website/images/purchase.license.png new file mode 100644 index 00000000..9236ad99 Binary files /dev/null and b/website/images/purchase.license.png differ diff --git a/website/images/money.png b/website/images/purchase.png similarity index 100% rename from website/images/money.png rename to website/images/purchase.png diff --git a/website/index.html b/website/index.html index 1ba64077..74355ced 100644 --- a/website/index.html +++ b/website/index.html @@ -23,9 +23,15 @@ - + + +
@@ -234,16 +240,26 @@ +
+ +
+ download + We work to better ourselves +

Buy License

+