big updates to text on index

This commit is contained in:
Kyle Drake 2014-10-17 15:53:28 -07:00
parent edb2da5f50
commit 6448cc2363
3 changed files with 95 additions and 73 deletions

View file

@ -78,8 +78,9 @@ class Site < Sequel::Model
PLAN_FEATURES = {
fatcat: {
name: 'Fat Cat',
space: Filesize.from('100GB').to_i,
bandwidth: Filesize.from('2TB').to_i,
space: Filesize.from('50GB').to_i,
bandwidth: Filesize.from('3TB').to_i,
price: 10,
custom_domains: true,
custom_ssl_certificates: true,
global_cdn: true,
@ -97,13 +98,15 @@ class Site < Sequel::Model
PLAN_FEATURES[:catbus] = PLAN_FEATURES[:fatcat].merge(
name: 'Cat Bus',
space: Filesize.from('10GB').to_i,
bandwidth: Filesize.from('500GB').to_i
bandwidth: Filesize.from('1TB').to_i,
price: 5
)
PLAN_FEATURES[:supporter] = PLAN_FEATURES[:catbus].merge(
name: 'Supporter',
space: Filesize.from('1GB').to_i,
bandwidth: Filesize.from('100GB').to_i,
bandwidth: Filesize.from('0.5TB').to_i,
price: 2,
unlimited_site_creation: false,
custom_ssl_certificates: false,
no_file_restrictions: false
@ -111,8 +114,9 @@ class Site < Sequel::Model
PLAN_FEATURES[:free] = PLAN_FEATURES[:supporter].merge(
name: 'Free',
space: Filesize.from('30MB').to_i,
bandwidth: Filesize.from('10GB').to_i,
space: Filesize.from('20MB').to_i,
bandwidth: Filesize.from('100GB').to_i,
price: 0,
custom_domains: false,
global_cdn: false,
ddos_mitigation: false,

View file

@ -120,24 +120,23 @@
<div class="row header-Content content">
<div class="col col-50">
<h2 class="section-header">Introducing the New Neocities</h2>
<p class="intro-text">Nows a great time to join our community of over
<a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites</a>!
You get <%= Site::FREE_MAXIMUM.to_space_pretty %> of free web space to make whatever youd like.
<h2 class="section-header">Make your own web site, and discover new ones.</h2>
<p class="intro-text">
Neocities is a community of over <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites</a> that are bringing back creative expression on the web. Anyone can make a site, only your imagination is required. You get <%= Site::FREE_MAXIMUM.to_space_pretty %> of free web space to make whatever youd like. Join us!
</p>
<ul class="intro-List">
<li class="intro-Social">
<span class="intro-Icon"></span>
<h2 class="delta">Free web hosting goes social</h2>
<h2 class="delta">Share your web site creation with the world</h2>
<p class="base">
Follow your favorite Neocities sites to keep up with all the latest updates! You can also now discover new websites related to your interests, comment on them, and share them.
Follow your favorite Neocities sites to keep up with all the latest updates. Discover new websites related to your interests, comment on them, and share them. Unlimited creativity and zero ads. You'll never think of social networks the same way again.
</p>
</li>
<li class="intro-Tools">
<span class="intro-Icon"></span>
<h2 class="delta">Making the web fun again</h2>
<h2 class="delta">Powerful new features to help you build</h2>
<p class="base">
Weve been working to make it easier to build your website and explore other sites. Neocities now has folders, tag browsing (our take on webrings), WebDAV uploading, RSS subscriptions, and more!
Weve been working to make it easier to build your website and explore other sites. Neocities has custom domain support, tag browsing (webrings, but better), faster site performance, easy file uploading, RSS, subdirectory support, and much more.
</li>
</ul>
</div>
@ -236,26 +235,39 @@
<section class="section features">
<h2 class="delta">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus semper magna id euismod. Vivamus rutrum ultricies.</h2>
<h2 class="delta">Forget throwaway social network apps. Let's make the internet fun again. It's time to bring back web surfing!</h2>
<div class="row">
<div class="col col-33">
<h3><i class="fa fa-home"></i>You own your own site</h3>
<p>We support custom domains (yoursite.com) for free. This means you always control the content on your site, and you can move it to/from Neocities whenever you want. And of course, all sites still get a subdomain (sitename.neocities.org) for free.</p>
<h3><i class="fa fa-wrench"></i>Developer tools</h3>
<p>We now have powerful APIs for developers building applications, and support for remote file uploading via command line tools. Using WebDAV, you can now mount your site to your computer, just like Dropbox.</p>
<h3><i class="fa fa-home"></i>You own your site</h3>
<p>Sites hosted by Neocities are owned by you, not us. And we support custom domains (yoursite.com) for free. This means you always control the content on your site, and you can move it to/from Neocities whenever you want. And of course, all sites still get a subdomain (sitename.neocities.org) for free.</p>
</div>
<div class="col col-33">
<h3><i class="fa fa-tachometer"></i>More space, more performance</h3>
<p>Neocities now uses a distributed, globally-cached file system in tier-1 datacenters to serve your sites. It's a system that took us a year to build - and it's ready to serve your site with blazing speed, whether it's your personal home page, or your professional site. Go ahead, put your site on Neocities. We can handle it.</p>
<h3><i class="fa fa-tachometer"></i>More space, more performance</h3>
<p>Neocities now uses distributed, globally-cached web servers in datacenters all over the world to serve your site. It's a advanced system that took us a year to build - and it's ready to serve your site with blazing speed, whether it's your personal home page, or your professional site. Go ahead, put your site on Neocities. We can handle it.</p>
</div>
<div class="col col-33">
<h3><i class="fa fa-lock"></i>Encrypted everything</h3>
<p>Neocities now secures serving all your content with Snowden-grade cryptography, <em>by default</em>, preventing snoops, whether they are hackers or rogue government agencies, from seeing what you browse. And we're working on letting you use your own SSL (HTTPS) certificates for custom domains.
Until January, Neocities will donate 5% of all Supporter plan proceeds to the Courage Foundation, an international organization that supports those who risk life or liberty to disclose privacy abuses online.</p>
<div class="col col-33">
<h3><i class="fa fa-lock"></i>SSL encryption support</h3>
<p>Neocities now serves all your content with Snowden-grade SSL cryptography, <em>by default</em>, preventing snoops from seeing what you browse.
Until January, Neocities will donate 5% of all Supporter plan proceeds to the Courage Foundation, an international organization that supports those who risk life or liberty to disclose privacy abuses online.</p>
</div>
</div>
<div class="row">
<div class="col col-33">
<h3><i class="fa fa-wrench"></i>Developer tools</h3>
<p>We now have powerful APIs for developers building applications, and support for remote file uploading via command line tools. Using our new WebDAV support, you can mount your site to your computer, just like Dropbox.</p>
</div>
<div class="col col-33">
<h3><i class="fa fa-university"></i>Open Source, Open Company, Open Ethics</h3>
<p>Neocities is a member of the <a href="https://opencompany.org" target="_blank">Open Company Initative</a>, working to help improve trust in tech startups. We <a href="https://github.com/neocities" target="_blank">publish</a> the code that powers the site, and keep open records for everyone to inspect. And if someone sends a bad takedown request, we fight it. We want to win your trust - not lock you in.</p>
</div>
<div class="col col-33">
<h3><i class="fa fa-eye-slash"></i>No marketing or advertising, ever</h3>
<p>Neocities does not sell your personal data, or put ads on your site. In fact, we're prohibited from doing that in our own Terms of Service. We want to make a living the old fashioned way - by helping you be awesome.</p>
</div>
</div>
@ -268,6 +280,10 @@
</section>
<%== erb :'plan/_pricing' %>
<section class="section">
<h1>What are you waiting for? <a href="#new">Start building your web site!</a></h1>
</section>
</main>
<footer class="footer-Base">

View file

@ -1,13 +1,13 @@
<section class="section plans">
<h2>All Neocities plans include a neocities.org subdomain, WebDAV uploading, one-click backups, and all our social features. We'll never show ads on your site.</h2>
<h2>Need more power? We've got you covered.<br>Upgrading gives you more space, bandwidth, features, <strong>and helps us keep the free sites free, forever.</strong></h2>
<div class="plan-overview">
<div class="header">
<div class="col col-50 personal">
<div class="col col-25 personal">
Personal
</div>
<div class="col col-50 professional">
Professional
<div class="col col-75 professional">
Supporters
</div>
</div>
@ -15,30 +15,32 @@
<div class="col col-25 free">
<div class="plan-image free" data-original-title="Pick me!">
</div>
<h3>Free</h3>
<div class="price">$0</div>
<h3>Free!</h3>
<div class="price">$<%= Site::PLAN_FEATURES[:free][:price] %></div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong><%= Site::PLAN_FEATURES[:free][:space].to_space_pretty %></strong> storage</li>
<li><strong>10 GB</strong> bandwidth</li>
<li><strong><%= Site::PLAN_FEATURES[:free][:bandwidth].to_space_pretty %></strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
</ul>
</div>
<div class="col col-25 supporter">
<div class="plan-image" data-original-title="No no, pick me!"></div>
<h3>Supporter</h3>
<div class="price">$5</div>
<div class="interval">per month</div>
<div class="price">$<%= Site::PLAN_FEATURES[:supporter][:price] %></div>
<div class="interval">per month, billed annually</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong><%= Site::PLAN_FEATURES[:supporter][:space].to_space_pretty %></strong> storage</li>
<li><strong>100 GB</strong> bandwidth</li>
<li><strong><%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_space_pretty %></strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
<li>Global CDN Cache</li>
<li>DDoS mitigation</li>
<li>High Performance</li>
</ul>
</div>
@ -46,12 +48,12 @@
<div class="plan-image" data-original-title="VROOOOOOM!"></div>
<h3>Cat Bus</h3>
<div class="price">$20</div>
<div class="price">$<%= Site::PLAN_FEATURES[:catbus][:price] %></div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong><%= Site::PLAN_FEATURES[:catbus][:space].to_space_pretty %></strong> storage</li>
<li><strong>500 GB</strong> bandwidth</li>
<li><strong><%= Site::PLAN_FEATURES[:catbus][:bandwidth].to_space_pretty %></strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
@ -59,19 +61,19 @@
<li>DDoS mitigation</li>
<li>Custom SSL Certificates</li>
<li>No upload type restrictions</li>
<li>Unlimited Site Creation</li>
<li>Unlimited Sites</li>
</ul>
</div>
<div class="col col-25 fatcat">
<div class="plan-image" data-original-title="Jolly good."></div>
<h3>Fat Cat</h3>
<div class="price">$50</div>
<div class="price">$<%= Site::PLAN_FEATURES[:fatcat][:price] %></div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong><%= Site::PLAN_FEATURES[:fatcat][:space].to_space_pretty %></strong> storage</li>
<li><strong>2 TB</strong> bandwidth</li>
<li><strong><%= Site::PLAN_FEATURES[:fatcat][:bandwidth].to_space_pretty %></strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
@ -79,7 +81,7 @@
<li>DDoS mitigation</li>
<li>Custom SSL Certificates</li>
<li>No upload type restrictions</li>
<li>Coming Soon: Unlimited Sites</li>
<li>Unlimited Sites</li>
</ul>
</div>
@ -95,22 +97,22 @@
<th class="feature-column"></th>
<th>
<h3>Free</h3>
<p>$0/mo</p>
<p>$<%= Site::PLAN_FEATURES[:free][:price] %>/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th>
<h3>Supporter</h3>
<p>$5/mo</p>
<p>$<%= Site::PLAN_FEATURES[:supporter][:price] %>/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th class="professional">
<h3>Cat Bus</h3>
<p>$20/mo</p>
<p>$<%= Site::PLAN_FEATURES[:catbus][:price] %>/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th class="professional">
<h3>Fat Cat</h3>
<p>$50/mo</p>
<p>$<%= Site::PLAN_FEATURES[:fatcat][:price] %>/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
</tr>
@ -125,7 +127,7 @@
</tr>
<tr>
<td class="feature-column">
<span data-original-title="How much content you can serve in one month. Don't worry - these are soft limits, and we won't take your site down automatically. We'll contact you and see if we can figure something out. We're reasonable.">Bandwidth</span>
<span data-original-title="* How much content you can serve in one month. Don't worry - these are very soft limits, temporary surges are fine, we won't take your site down automatically, and we're very flexible.">Bandwidth</span>
</td>
<td><%= Site::PLAN_FEATURES[:free][:bandwidth].to_bytes_pretty %></td>
<td><%= Site::PLAN_FEATURES[:supporter][:bandwidth].to_bytes_pretty %></td>
@ -143,7 +145,7 @@
</tr>
<tr>
<td class="feature-column">
<span data-original-title="You can mount your Neocities site to your computer as a hard drive, making it easy to update with your favorite HTML editor.">WebDAV Uploading</span>
<span data-original-title="Our worldwide network of CDN servers cache your web site regionally, making your site load fast - no matter where your users are. 頑張る, 日本!">Global CDN Site Cache</span>
</td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
@ -152,7 +154,25 @@
</tr>
<tr>
<td class="feature-column">
<span data-original-title="Each site comes with a free Neocities address (yoursitename.neocities.org).">Neocities.org Subdomain</span>
<span data-original-title="Each site comes with a free Neocities address (yoursitename.neocities.org).">Free Site Subdomain</span>
</td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
</tr>
<tr>
<td class="feature-column">
<span data-original-title="Add your domain name (yoursite.com) to your site!">Custom Domains</span>
</td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
</tr>
<tr>
<td class="feature-column">
<span data-original-title="You can mount your Neocities site to your computer as a hard drive, making it easy to update with your favorite HTML editor.">WebDAV Uploading</span>
</td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
@ -224,31 +244,13 @@
-->
<tr>
<td class="feature-column">
<span data-original-title="Add your domain name to your site!">Custom Domains</span>
<span data-original-title="Make as many sites as you want, with one account.">Unlimited Site Creation</span>
</td>
<td></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
</tr>
<tr>
<td class="feature-column">
<span data-original-title="Our worldwide network of CDN servers cache your web site regionally, making your site load fast - no matter where your users are. Surfs up, Japan!">High Performance</span>
</td>
<td></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
</tr>
<tr>
<td class="feature-column">
<span data-original-title="Make as many sites as you want, with one login.">Unlimited Site Creation</span>
</td>
<td></td>
<td></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
</tr>
<tr>
<td class="feature-column">
<span data-original-title="Upload your SSL certificate for your domain name, preventing snoops from seeing your user's traffic.">Custom SSL Certificates</span>
@ -264,7 +266,7 @@
</td>
<td></td>
<td></td>
<td></td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
</tr>
</table>