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

This commit is contained in:
Victoria Wang 2014-10-13 17:33:24 -07:00
commit 4713c99041
3 changed files with 4 additions and 4 deletions

View file

@ -700,7 +700,7 @@ class Site < Sequel::Model
end
if new? && !parent? && account_sites_dataset.count >= CHILD_SITES_MAX
errors.add :child_site_id, "Cannot add child site, exceeds #{CHILD_SITES_MAX} limit."
errors.add :child_site_id, "For spam prevention reasons, we've capped site creation to #{CHILD_SITES_MAX} sites. Please contact Neocities support to raise your site limit."
end
end

View file

@ -14,8 +14,8 @@
<section>
<h2>How to Donate</h2>
<h3>Gittip:</h3>
<script data-gittip-username="kyledrake" src="https://www.gittip.com/assets/widgets/0002.js"></script>
<h3>Gratipay:</h3>
<script data-gratipay-username="neocities" src="//gttp.co/v1.js"></script>
<h3>Bitcoin:</h3>
<p><img src="/img/bitcoin.png"></p>

View file

@ -18,7 +18,7 @@
<h3>Create New Site</h3>
<p>You can now create new sites that are linked to this account! Sites will share the free space you have available. You have <strong><%= Site::CHILD_SITES_MAX - current_site.account_sites_dataset.count %></strong> new sites remaining.</p>
<p>You can now create new sites that are linked to this account! All of your sites will share the free space you have available.</p>
<form action="/settings/create_child" method="POST">
<%== csrf_token_input_html %>