zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'v2' of github.com:neocities/neocities into v2

Browse source
This commit is contained in:
Victoria Wang 2014-10-15 16:04:02 -07:00
commit c1939b5d72
9 changed files with 367 additions and 701 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app.rb
View file

@ -57,16 +57,6 @@ error do
end
# :nocov:
get '/newindex_mockup' do
if SimpleCache.expired?(:sites_count)
@sites_count = SimpleCache.store :sites_count, Site.count.roundup(100), 600 # 10 Minutes
else
@sites_count = SimpleCache.get :sites_count
end
erb :newindex_mockup, layout: false
end
get '/home_mockup' do
erb :'home_mockup'
end
@ -432,7 +422,7 @@ get '/browse/?' do
site_dataset.where! ['sites.is_nsfw = ?', (params[:is_nsfw] == 'true' ? true : false)]
if params[:tag]
site_dataset = site_dataset.association_join(:tags)
site_dataset = site_dataset.association_join(:tags).select_all(:sites)
site_dataset.where! ['tags.name = ?', params[:tag]]
site_dataset.where! ['tags.is_nsfw = ?', (params[:is_nsfw] == 'true' ? true : false)]
end

2
tests/acceptance/index_tests.rb
View file

@ -5,7 +5,7 @@ describe 'index' do
it 'goes to signup' do
Capybara.reset_sessions!
visit '/'
click_button 'Create My Website'
click_button 'Create My Site'
page.must_have_content('Create a New Website')
end
end

4
tests/acceptance/settings/site_tests.rb
View file

@ -203,7 +203,7 @@ describe 'site/settings' do
def visit_signup
visit '/'
click_button 'Create My Website'
click_button 'Create My Site'
end
def fill_in_valid
@ -220,7 +220,7 @@ describe 'site/settings' do
it 'does not allow bad usernames' do
visit '/'
click_button 'Create My Website'
click_button 'Create My Site'
fill_in_valid
click_button 'Create Home Page'
visit "/settings/#{@site[:username]}#username"

4
tests/acceptance/signin_tests.rb
View file

@ -39,7 +39,7 @@ describe 'signin' do
it 'signs in with proper credentials' do
visit '/'
click_button 'Create My Website'
click_button 'Create My Site'
fill_in_valid_signup
click_button 'Create Home Page'
Capybara.reset_sessions!
@ -53,7 +53,7 @@ describe 'signin' do
it 'signs in with email' do
visit '/'
click_button 'Create My Website'
click_button 'Create My Site'
fill_in_valid_signup
click_button 'Create Home Page'
Capybara.reset_sessions!

2
tests/acceptance/signup_tests.rb
View file

@ -12,7 +12,7 @@ describe 'signup' do
def visit_signup
visit '/'
click_button 'Create My Website'
click_button 'Create My Site'
end
before do

222
views/index.erb
View file

@ -117,22 +117,28 @@
<div class="header-Outro">
<div class="row header-Content content">
<ul class="col col-50 intro-List">
<li class="intro-Tools">
<span class="intro-Icon"></span>
<h2 class="delta">Create your own free website</h2>
<p class="tiny">
You get <%= Site::FREE_MAXIMUM.to_space_pretty %> of free web space to make whatever you’d like!
</p>
</li>
<div class="col col-50">
<h2 class="section-header">Introducing the New Neocities</h2>
<p class="intro-text">Now’s 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 you’d like.
</p>
<ul class="intro-List">
<li class="intro-Social">
<span class="intro-Icon"></span>
<h2 class="delta">Free web hosting goes social</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.
</p>
</li>
<li class="intro-Tools">
<span class="intro-Icon"></span>
<h2 class="delta">Making the web fun again</h2>
<p class="tiny">
We're a community of over <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites that are bringing back creative expression on the web. Anyone can make a site, only your imagination is required. Join us!
<p class="base">
We’ve 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!
</li>
</ul>
</div>
<div class="col col-50 signup-Area">
@ -154,11 +160,26 @@
<% else %>
<form action="/new" method="get" class="signup-Form">
<fieldset class="content">
<h2 class="gamma">Get Started Now</h2>
<h2 class="gamma">Sign up for free</h2>
<hr />
<input type="text" class="input-Area" id="create-Input" name="username" placeholder="website name" />
<label for="create-Input">.neocities.org</label>
<input type="submit" value="Create My Website" class="btn-Action float-Right" />
<label for="create-Input">Username</label>
<input type="text" class="input-Area" id="create-Input" name="username" placeholder="my-site-name" />
<label for="create-Input" id="domain-name">.neocities.org</label>
<label for="tags-input">Tags (your interests, site topics)</label>
<input type="text" class="input-Area" id="tags-input" name="tags" placeholder="art, videogames, food, music, programming, gardening, cats" />
<div class="col col-50" style="padding-left:0;">
<label for="password-input">Password</label>
<input type="text" class="input-Area" id="password-input" name="password" placeholder="password" />
</div>
<div class="col col-50">
<label for="email-input">Email</label>
<input type="text" class="input-Area" id="email-input" name="email" placeholder="me@example.com" />
</div>
<input type="submit" value="Create My Site" class="btn-Action float-Right" />
</fieldset>
</form>
@ -173,107 +194,79 @@
</header>
<main class="content-Base">
<div class="section featured-Websites">
<div class="nav prev"></div>
<ul class="website-Gallery hp-Gallery">
<li>
<a href="http://dragonquest.neocities.org/" title="The Quest of Dragons" target="_blank">
<img src="//neocities.org/site_screenshots/dragonquest/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of The Quest of Dragons" />
</a>
</li>
<li>
<a href="http://codeventurer.neocities.org/" title="codeventurer" target="_blank">
<img src="http://neocities.org/site_screenshots/codeventurer/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of codeventurer" />
</a>
</li>
<li>
<a href="http://clouds.neocities.org/" title="Cloud Quotes" target="_blank">
<img src="//neocities.org/site_screenshots/clouds/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Cloud Quotes" />
</a>
</li>
<li>
<a href="http://manatee.neocities.org/" title="Title of Website" target="_blank">
<img src="//neocities.org/site_screenshots/manatee/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of TITLE OF WEBSITE" />
</a>
</li>
<li>
<a href="http://suppilulemur.neocities.org/" title="Sokoban" target="_blank">
<img src="//neocities.org/site_screenshots/suppilulemur/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Sokoban" />
</a>
</li>
<li>
<a href="http://drawinglair.neocities.org/" title="Tomasz Zawadzki" target="_blank">
<img src="//neocities.org/site_screenshots/drawinglair/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Tomasz Zawadzki" />
</a>
</li>
</ul>
<div class="nav next"></div>
</div>
<div class="content">
<section class="section features">
<section class="featured-Websites clearfix">
<h2 class="delta">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus semper magna id euismod. Vivamus rutrum ultricies.</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>
<h2 class="delta">Featured Websites</h2>
<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>
</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>
</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.
<ul class="row website-Gallery hp-Gallery">
<li>
<a href="http://dragonquest.neocities.org/" title="The Quest of Dragons" target="_blank">
<img src="//neocities.org/site_screenshots/dragonquest/index.html.540x405.jpg" class="neo-SS" alt="Thumbnail of The Quest of Dragons" />
</a>
</li>
<li>
<a href="http://codeventurer.neocities.org/" title="codeventurer" target="_blank">
<img src="//neocities.org/site_screenshots/codeventurer/index.html.540x405.jpg" class="neo-SS" alt="Thumbnail of codeventurer" />
</a>
</li>
<li>
<a href="http://clouds.neocities.org/" title="Cloud Quotes" target="_blank">
<img src="//neocities.org/site_screenshots/clouds/index.html.540x405.jpg" class="neo-SS" alt="Thumbnail of Cloud Quotes" />
</a>
</li>
<li>
<a href="http://manatee.neocities.org/" title="Title of Website" target="_blank">
<img src="//neocities.org/site_screenshots/manatee/index.html.540x405.jpg" class="neo-SS" alt="Thumbnail of TITLE OF WEBSITE" />
</a>
</li>
<li>
<a href="http://suppilulemur.neocities.org/" title="Sokoban" target="_blank">
<img src="//neocities.org/site_screenshots/suppilulemur/index.html.540x405.jpg" class="neo-SS" alt="Thumbnail of Sokoban" />
</a>
</li>
<li>
<a href="http://drawinglair.neocities.org/" title="Tomasz Zawadzki" target="_blank">
<img src="//neocities.org/site_screenshots/drawinglair/index.html.540x405.jpg" class="neo-SS" alt="Thumbnail of Tomasz Zawadzki" />
</a>
</li>
<li>
<a href="http://rik.neocities.org/" title="Rock Im Kaff" target="_blank">
<img src="//neocities.org/site_screenshots/rik/index.html.540x405.jpg" class="neo-SS" alt="Thumbnail of Eleanor Holroyd's Website" />
</a>
</li>
<li>
<a href="http://cute-animation.neocities.org/" title="Cute Animation" target="_blank">
<img src="//neocities.org/site_screenshots/cute-animation/index.html.540x405.jpg" class="neo-SS" alt="Thumbnail of Cute Animation" />
</a>
</li>
</ul>
<div class="txt-Center" style="margin-top: 15px">
<a href="/browse" title="Browse all Neocities websites" class="btn-Action btn-Large">Browse All Websites</a>
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>
</section> <!-- end .featured-Websites -->
<hr />
<aside class="row">
<div class="col col-50">
<div class="content">
<h3 class="delta">Learn to Code</h3>
<p>
Don't know how to code a website? No problem!
We're working on a batch of tutorials that will show you the way.
</p>
<code>
<span class="code-Tag">&lt;h1&gt;</span>Welcome to my website!<span class="code-Tag">&lt;/h1&gt;</span><br />
<span class="code-Tag">&lt;a</span> href="<span class="code-Value">about.html</span>">About Me<span class="code-Tag">&lt;/a&gt;</span><br />
<span class="code-Tag">&lt;img</span> src="<span class="code-Value">me.jpg</span>" alt="<span class="code-Value">photo of me</span>" <span class="code-Tag">/&gt;</span>
</code>
</div>
</div> <!-- end .col-50 -->
<div class="col col-50">
<div class="content">
<h3 class="delta">What People Are Saying</h3>
<ul class="quote-Slider kill-List">
<li class="quote">
<blockquote>
Designed as a 21st century reincarnation of GeoCities, Neocities lets you make your own site for free. And it just might spark a renaissance of creativity online.
</blockquote>
<a href="http://web.appstorm.net/reviews/web-dev/neocities-the-free-place-to-code-your-own-site-from-scratch/" title="App Storm" class="action-Link">Source link</a>
</li>
</ul>
</div>
</div> <!-- end .col-50 -->
</aside> <!-- end .row -->
</div> <!-- end .content -->
</main>
<div class="press">
<a href="http://www.wired.com/2013/07/neocities/" class="logo wired"></a>
<a href="http://motherboard.vice.com/blog/neocities-is-recreating-the-garish-web-10-creativity-of-geocities" class="logo vice"></a>
<a href="http://arstechnica.com/tech-policy/2014/05/web-host-gives-fcc-a-28-8kbps-slow-lane-in-net-neutrality-protest/" class="logo ars"></a>
<a href="/press" class="more">See all press »</a>
</div>
</section>
<%== erb :'plan/_pricing' %>
</main>
<footer class="footer-Base">
<section class="footer-Intro">
@ -284,9 +277,10 @@
<span class="footer-icon"></span>
<h2 class="delta">Support Us</h2>
<p class="tiny">
Neocities is funded by our supporters and donations, <strong>not advertisers</strong>. Help us make the web fun again.
Neocities is funded by donations. If you’d like to contribute, you can help us
pay our server costs using Bitcoin or PayPal.
</p>
<a href="/plan" title="Donate to Neocities" class="action-Link">Become a Supporter</a>
<a href="/donate" title="Donate to Neocities" class="action-Link">Donate Today</a>
</div>
</div>
<div class="col col-33">
@ -321,4 +315,4 @@
<script src="/js/jquery-1.11.0.min.js"></script>
<script src="/js/app.min.js"></script>
</body>
</html>
</html>

20
views/layout.erb
View file

@ -1,12 +1,12 @@
<!doctype html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%= title %></title>
<meta itemprop="name" content="Neocities.org">
<meta itemprop="description" content="Create your own free home page, and do whatever you want with it.">
<meta name="description" content="Neocities is the new Geocities. Create your own free home page, and do whatever you want with it.">
<meta name="keywords" content="free website, html, css, learn to code, free hosting, build a website, create a web page" >
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta itemprop="name" content="Neocities.org">
<meta itemprop="description" content="Create your own free home page, and do whatever you want with it.">
<meta name="description" content="Neocities is the new Geocities. Create your own free home page, and do whatever you want with it.">
<meta name="keywords" content="free website, html, css, learn to code, free hosting, build a website, create a web page">
<meta property="og:title" content="Neocities">
<meta property="og:site_name" content="Neocities | neocities.org">
<meta property="og:type" content="website">
@ -14,14 +14,14 @@
<meta property="og:url" content="https://www.neocities.org">
<meta property="og:description" content="Neocities is the new Geocities. Create your own free home page, and do whatever you want with it.">
<link href="/css/neo.css" rel="stylesheet" type="text/css" media="all"/>
<link href="/css/neo.css" rel="stylesheet" type="text/css" media="all">
<link rel="shortcut icon" type="image/ico" href="/favicon.ico" />
<link href="/favicon.ico" rel="shortcut icon" type="image/ico">
<!-- Mobile Meta -->
<meta name="HandheldFriendly" content="True" />
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1" />
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1">
<!--[if lt IE 9]>
<script type="text/javascript" src="/js/html5.min.js"></script>

560
views/newindex_mockup.erb
View file

@ -1,560 +0,0 @@
<!doctype html>
<!--[if IE 8 ]><html lang="en" class="ieAll ie8"><![endif]-->
<!--[if IE 9 ]><html lang="en" class="ieAll ie9"><![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--><html lang="en"><!--<![endif]-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Neocities: Create your free website now!</title>
<meta itemprop="name" content="Neocities.org" />
<meta itemprop="description" content="Create your own free home page, and do whatever you want with it." />
<meta name="description" content="Neocities is the new Geocities. Create your own free home page, and do whatever you want with it." />
<meta name="keywords" content="free website, html, css, learn to code, free hosting, build a website, create a web page" />
<link rel="canonical" href="//neocities.org" />
<meta property="og:title" content="Neocities"/>
<meta property="og:site_name" content="Neocities | neocities.org"/>
<meta property="og:type" content="website"/>
<meta property="og:image" content=""/>
<meta property="og:url" content="//www.neocities.org"/>
<meta property="og:description" content="Neocities is the new Geocities. Create your own free home page, and do whatever you want with it."/>
<meta content="pBkqwF1U/KpuF2+f0ZhSf8BnpxYgeU0boCTdnB3joGc=" name="csrf-token" />
<link rel="shortcut icon" type="image/ico" href="/favicon.ico" />
<link rel="apple-touch-icon-precomposed" href="#apple-icon-144.png" />
<link rel="apple-touch-startup-image" href="#startup.png" />
<!-- Mobile Meta -->
<meta name="HandheldFriendly" content="True" />
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1" />
<link href="/css/neo.css" rel="stylesheet" type="text/css" media="all"/>
<!--[if lt IE 9]>
<script type="text/javascript" src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body class="hp">
<div class="page">
<header class="header-Base">
<nav class="header-Nav clearfix" role="navigation">
<a href="#!" title="show small screen nav" class="small-Nav">
<img src="/img/nav-Icon.png" alt="navigation icon" />
</a>
<ul class="h-Nav constant-Nav">
<li>
<a href="/" title="back to the start">Neocities</a>
</li>
<li>
<a href="/browse" title="Browse Neocities member websites">Websites</a>
</li>
<li>
<a href="/tutorials" title="Learn to code with these tutorials">Tutorials</a>
</li>
<li>
<a href="/api" title="Neocities Developers API">API</a>
</li>
<li>
<a href="/about" title="About Neocities">About</a>
</li>
<li>
<a href="/plan" title="Support Neocities">Support Us</a>
</li>
</ul>
<ul class="status-Nav">
<% if !signed_in? %>
<li>
<a href="/signin" class="sign-In" title="Sign into your account">Sign In</a>
</li>
<% else %>
<li>
<a href="/dashboard" class="sign-In">Dashboard</a>
</li>
<li>
<a href="/settings" class="sign-In">Settings</a>
</li>
<li>
<a href="/signout" class="sign-In">Signout</a>
</li>
<% end %>
</ul>
</nav>
<% if flash.keys.length > 0 %>
<div class="alert txt-Center">
<p style="padding:5px">
<% flash.keys.each do |key| %>
<%= flash[key] %>
<% end %>
</p>
</div>
<% end %>
<div class="int-Logo hp-Logo">
<a href="/" title="back to home">
<span class="hidden">Neocities.org</span>
<img src="/img/cat.png" alt="Neocities.org" />
</a>
</div>
<section class="header-Intro">
<h1 class="logo header-Content content">
<span class="hidden">Neocities.org</span>
<img src="/img/neocities-Logo.png" alt="Neocities.org" />
</h1>
</section>
<div class="header-Outro">
<div class="row header-Content content">
<div class="col col-50">
<h2 class="section-header">Introducing the New Neocities</h2>
<p class="intro-text">Now’s 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 you’d like.
</p>
<ul class="intro-List">
<li class="intro-Social">
<span class="intro-Icon"></span>
<h2 class="delta">Free web hosting goes social</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.
</p>
</li>
<li class="intro-Tools">
<span class="intro-Icon"></span>
<h2 class="delta">Making the web fun again</h2>
<p class="base">
We’ve 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!
</li>
</ul>
</div>
<div class="col col-50 signup-Area">
<% if signed_in? %>
<div class="signup-Form">
<div class="content">
<h2 class="gamma txt-Center">Build your Website!</h2>
</div>
<p class="txt-Center">
Go to your dashboard to<br> start editing your website!
</p>
<br />
<div class="txt-Center">
<a href="/dashboard" class="btn-Action">Get Started</a>
</div>
</div>
<% else %>
<form action="/new" method="get" class="signup-Form">
<fieldset class="content">
<h2 class="gamma">Sign up for free</h2>
<hr />
<label for="create-Input">Username</label>
<input type="text" class="input-Area" id="create-Input" name="username" placeholder="my-site-name" />
<label for="create-Input" id="domain-name">.neocities.org</label>
<label for="tags-input">Tags (your interests, site topics)</label>
<input type="text" class="input-Area" id="tags-input" name="tags" placeholder="art, videogames, food, music, programming, gardening, cats" />
<div class="col col-50" style="padding-left:0;">
<label for="password-input">Password</label>
<input type="text" class="input-Area" id="password-input" name="password" placeholder="password" />
</div>
<div class="col col-50">
<label for="email-input">Email</label>
<input type="text" class="input-Area" id="email-input" name="email" placeholder="me@example.com" />
</div>
<input type="submit" value="Create My Site" class="btn-Action float-Right" />
</fieldset>
</form>
<% end %>
</div> <!-- end .col-50 -->
</div> <!-- end .row -->
</div> <!-- end .header-Outro -->
</header>
<main class="content-Base">
<div class="section featured-Websites">
<div class="nav prev"></div>
<ul class="website-Gallery hp-Gallery">
<li>
<a href="http://dragonquest.neocities.org/" title="The Quest of Dragons" target="_blank">
<img src="//neocities.org/site_screenshots/dragonquest/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of The Quest of Dragons" />
</a>
</li>
<li>
<a href="http://codeventurer.neocities.org/" title="codeventurer" target="_blank">
<img src="http://neocities.org/site_screenshots/codeventurer/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of codeventurer" />
</a>
</li>
<li>
<a href="http://clouds.neocities.org/" title="Cloud Quotes" target="_blank">
<img src="//neocities.org/site_screenshots/clouds/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Cloud Quotes" />
</a>
</li>
<li>
<a href="http://manatee.neocities.org/" title="Title of Website" target="_blank">
<img src="//neocities.org/site_screenshots/manatee/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of TITLE OF WEBSITE" />
</a>
</li>
<li>
<a href="http://suppilulemur.neocities.org/" title="Sokoban" target="_blank">
<img src="//neocities.org/site_screenshots/suppilulemur/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Sokoban" />
</a>
</li>
<li>
<a href="http://drawinglair.neocities.org/" title="Tomasz Zawadzki" target="_blank">
<img src="//neocities.org/site_screenshots/drawinglair/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Tomasz Zawadzki" />
</a>
</li>
</ul>
<div class="nav next"></div>
</div>
<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>
<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>
</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>
</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>
</div>
<div class="press">
<a href="http://www.wired.com/2013/07/neocities/" class="logo wired"></a>
<a href="http://motherboard.vice.com/blog/neocities-is-recreating-the-garish-web-10-creativity-of-geocities" class="logo vice"></a>
<a href="http://arstechnica.com/tech-policy/2014/05/web-host-gives-fcc-a-28-8kbps-slow-lane-in-net-neutrality-protest/" class="logo ars"></a>
<a href="/press" class="more">See all press »</a>
</div>
</section>
<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>
<div class="plan-overview">
<div class="header">
<div class="col col-50 personal">
Personal
</div>
<div class="col col-50 professional">
Professional
</div>
</div>
<div class="body">
<div class="col col-25 free">
<div class="plan-image free"></div>
<h3>Free</h3>
<div class="price">$0</div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong>30 MB</strong> storage</li>
<li><strong>10 GB</strong> bandwidth</li>
</ul>
</div>
<div class="col col-25 supporter">
<div class="plan-image"></div>
<h3>Supporter</h3>
<div class="price">$5</div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong>1 GB</strong> storage</li>
<li><strong>100 GB</strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
<li>Global CDN Cache</li>
<li>DDoS mitigation</li>
</ul>
</div>
<div class="col col-25 catbus">
<div class="plan-image"></div>
<h3>Cat Bus</h3>
<div class="price">$20</div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong>10 GB</strong> storage</li>
<li><strong>500 GB</strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
<li>Global CDN Cache</li>
<li>DDoS mitigation</li>
<li>Custom SSL Certificates</li>
<li>No upload type restrictions</li>
<li>Coming Soon: Unlimited Sites</li>
</ul>
</div>
<div class="col col-25 fatcat">
<div class="plan-image"></div>
<h3>Fat Cat</h3>
<div class="price">$50</div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong>100 GB</strong> storage</li>
<li><strong>2 TB</strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
<li>Global CDN Cache</li>
<li>DDoS mitigation</li>
<li>Custom SSL Certificates</li>
<li>No upload type restrictions</li>
<li>Coming Soon: Unlimited Sites</li>
</ul>
</div>
</div>
</div>
<h2><a href="">Compare Plans <i class="fa fa-caret-down"></i></a></h2>
<table class="plan-chart">
<tr>
<th class="feature-column"></th>
<th>
<h3>Free</h3>
<p>$0/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th>
<h3>Supporter</h3>
<p>$5/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th class="professional">
<h3>Cat Bus</h3>
<p>$20/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th class="professional">
<h3>Fat Cat</h3>
<p>$50/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
</tr>
<tr>
<td class="feature-column">Storage</td>
<td>30 MB</td>
<td>1 GB</td>
<td>10 GB</td>
<td>100 GB</td>
</tr>
<tr>
<td class="feature-column">Bandwidth</td>
<td>10 GB</td>
<td>100 GB</td>
<td>500 GB</td>
<td>2 TB</td>
</tr>
<tr>
<td class="feature-column">No advertising, ever</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">WebDAV Uploading</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">Neocities.org Subdomain</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">One-Click Backups</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">Site Tags</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">RSS Feed</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">Follow Your Favorite Sites</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">Site Profile</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">Neocities Site Editor</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">Site Tipping (Coming Soon)</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">Custom Domains</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">High Performance Global CDN Cache</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">DDoS Mitigation</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">Unlimited Site Creation (Coming Soon)</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">Custom SSL Certificates</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">No File Upload Type Restrictions</td>
<td></td>
<td></td>
<td></td>
<td><i class="fa fa-check"></i></td>
</tr>
</table>
</section>
</main>
<footer class="footer-Base">
<section class="footer-Intro">
<div class="footer-Content">
<div class="row">
<div class="col col-33">
<div class="f-Col f-Col-1 clearfix">
<span class="footer-icon"></span>
<h2 class="delta">Support Us</h2>
<p class="tiny">
Neocities is funded by donations. If you’d like to contribute, you can help us
pay our server costs using Bitcoin or PayPal.
</p>
<a href="/donate" title="Donate to Neocities" class="action-Link">Donate Today</a>
</div>
</div>
<div class="col col-33">
<div class="f-Col f-Col-2 clearfix">
<span class="footer-icon"></span>
<h2 class="delta">About Us</h2>
<p class="tiny">
Neocities is here to bring back the creativity and
free expression to the world wide web that made it great.
</p>
<a href="/about" title="More about Neocities" class="action-Link">More About Us</a>
</div>
</div>
<div class="col col-33">
<div class="f-Col f-Col-3 clearfix">
<span class="footer-icon"></span>
<h2 class="delta">Latest News</h2>
<p class="tiny">
The latest news on Neocities can be found on our blog.
</p>
<a href="/blog" title="Read about Neocities news and updates" class="action-Link">Read More</a>
</div>
</div>
</div>
</div>
</section>
<%== erb :'_footer', layout: false%>
</footer>
</div>
<script src="/js/jquery-1.11.0.min.js"></script>
<script src="/js/app.min.js"></script>
</body>
</html>

242
views/plan/_pricing.erb Normal file
View file

@ -0,0 +1,242 @@
<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>
<div class="plan-overview">
<div class="header">
<div class="col col-50 personal">
Personal
</div>
<div class="col col-50 professional">
Professional
</div>
</div>
<div class="body">
<div class="col col-25 free">
<div class="plan-image free"></div>
<h3>Free</h3>
<div class="price">$0</div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong>30 MB</strong> storage</li>
<li><strong>10 GB</strong> bandwidth</li>
</ul>
</div>
<div class="col col-25 supporter">
<div class="plan-image"></div>
<h3>Supporter</h3>
<div class="price">$5</div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong>1 GB</strong> storage</li>
<li><strong>100 GB</strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
<li>Global CDN Cache</li>
<li>DDoS mitigation</li>
</ul>
</div>
<div class="col col-25 catbus">
<div class="plan-image"></div>
<h3>Cat Bus</h3>
<div class="price">$20</div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong>10 GB</strong> storage</li>
<li><strong>500 GB</strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
<li>Global CDN Cache</li>
<li>DDoS mitigation</li>
<li>Custom SSL Certificates</li>
<li>No upload type restrictions</li>
<li>Coming Soon: Unlimited Sites</li>
</ul>
</div>
<div class="col col-25 fatcat">
<div class="plan-image"></div>
<h3>Fat Cat</h3>
<div class="price">$50</div>
<div class="interval">per month</div>
<a href="/" class="btn-Action">Choose</a>
<ul>
<li><strong>100 GB</strong> storage</li>
<li><strong>2 TB</strong> bandwidth</li>
</ul>
<ul>
<li>Custom Domains</li>
<li>Global CDN Cache</li>
<li>DDoS mitigation</li>
<li>Custom SSL Certificates</li>
<li>No upload type restrictions</li>
<li>Coming Soon: Unlimited Sites</li>
</ul>
</div>
</div>
</div>
<h2><a href="">Compare Plans <i class="fa fa-caret-down"></i></a></h2>
<table class="plan-chart">
<tr>
<th class="feature-column"></th>
<th>
<h3>Free</h3>
<p>$0/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th>
<h3>Supporter</h3>
<p>$5/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th class="professional">
<h3>Cat Bus</h3>
<p>$20/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
<th class="professional">
<h3>Fat Cat</h3>
<p>$50/mo</p>
<a href="/" class="btn-Action">Choose</a>
</th>
</tr>
<tr>
<td class="feature-column">Storage</td>
<td>30 MB</td>
<td>1 GB</td>
<td>10 GB</td>
<td>100 GB</td>
</tr>
<tr>
<td class="feature-column">Bandwidth</td>
<td>10 GB</td>
<td>100 GB</td>
<td>500 GB</td>
<td>2 TB</td>
</tr>
<tr>
<td class="feature-column">No advertising, ever</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">WebDAV Uploading</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">Neocities.org Subdomain</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">One-Click Backups</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">Site Tags</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">RSS Feed</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">Follow Your Favorite Sites</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">Site Profile</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">Neocities Site Editor</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">Site Tipping (Coming Soon)</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">Custom Domains</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">High Performance Global CDN Cache</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">DDoS Mitigation</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">Unlimited Site Creation (Coming Soon)</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">Custom SSL Certificates</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">No File Upload Type Restrictions</td>
<td></td>
<td></td>
<td></td>
<td><i class="fa fa-check"></i></td>
</tr>
</table>
</section>