mirror of
https://github.com/neocities/neocities.git
synced 2025-04-24 17:22:35 +02:00
Merge branch 'v2' of github.com:neocities/neocities into v2
This commit is contained in:
Victoria Wang
commit
eb40d888ad
6 changed files with 92 additions and 84 deletions
|
|
@ -1,12 +1,12 @@
|
|||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>About Neocities</h1>
|
||||
<h3 class="subtitle"></h3>
|
||||
<h3 class="subtitle">Neocities wants to make the web creative and fun again.</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page">
|
||||
<h2>Help us keep the creative, independent Internet alive!</h2>
|
||||
<h3></h3>
|
||||
<blockquote class="twitter-tweet">
|
||||
<p>I want to make another Geocities. Free web hosting, static HTML only, 10MB limit, anonymous, uncensored.</p>— Kyle Drake (@kyledrake)
|
||||
<a href="https://twitter.com/kyledrake/statuses/337706291801763841">May 23, 2013</a>
|
||||
|
|
@ -14,35 +14,35 @@
|
|||
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
|
||||
|
||||
<article>
|
||||
<h3>My goal with Neocities is to help bring back the creativity and free expression to the world wide web that made it great. I need your help.</h3>
|
||||
<h6>Neocities is bringing back the creativity and free expression that made the web great.</h6>
|
||||
|
||||
<p>
|
||||
I am tired of living in an online world where people are isolated from each other in
|
||||
<b>boring, spied-on gated communities</b>, and are given generic templates which define what people are
|
||||
supposed to know about each other. It's time we took back our personalities from these sterilized, lifeless,
|
||||
We are tired of living in an online world where people are isolated from each other in
|
||||
boring social networks, generic templates which define what people are
|
||||
supposed to know or communicate with each other. It's time we took back our personalities from these sterilized, lifeless,
|
||||
monetized, monitored entities and let our creativity flourish again.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
That's where Neocities comes in. I want to provide a canvas for people to make any web site they want.
|
||||
That's where Neocities comes in. We provide a canvas for people to make any web site they want.
|
||||
Whether it be a web site about something they're good at, something they love, something they hate, or
|
||||
their own custom "Profile" where they can introduce themselves in a way that actually matters to them.
|
||||
their own custom "Profile" where they can introduce themselves in a way that actually matters to them.
|
||||
And we can do this without selling out to the marketing industry.
|
||||
</p>
|
||||
<p>
|
||||
It's a big project (to make small sites), and I have a lot of work to do.
|
||||
<b>But I can't do it without your help</b>.
|
||||
It's a big project (to make small sites), and we have a lot of work to do.
|
||||
</p>
|
||||
<p>
|
||||
The technology has become affordable enough where we can provide this creative space without requiring a business
|
||||
plan that involves selling people out to the marketing industry. But it still costs money, especially since server
|
||||
demand is so high right now. And there are some possible surprise costs I haven't figured out yet (bandwidth estimates are difficult).
|
||||
<b>But if Neocities can get enough donations, Neocities can survive!</b>
|
||||
Together, we can prevent
|
||||
<a target="_blank" href="http://www.business-standard.com/article/technology/yahoo-writes-geocities-obituary-109042500035_1.html" title="What did happen to GeoCities?">what happened to GeoCities</a> from happening again.
|
||||
Neocities is just getting started, and we've got a lot of amazing things in store. Thanks for believing in us. We'll try very hard to not let you down.
|
||||
</p>
|
||||
<p>
|
||||
Our creativity is too important to be commercialized. <a href="/donate">Help keep this idea alive by donating!</a> $100, $20, $5, a
|
||||
free round of beers at your pub, speaking invites so we can spread the word, free server hosting, anything helps. Thank you!
|
||||
Love,
|
||||
</p>
|
||||
<p>
|
||||
-Kyle
|
||||
</p>
|
||||
<p>
|
||||
PS: What are you waiting for? <a href="/new">Go make your web site!</a>
|
||||
</p>
|
||||
</article>
|
||||
<hr />
|
||||
|
|
|
|||
|
|
@ -4,54 +4,51 @@
|
|||
};
|
||||
</script>
|
||||
|
||||
<main class="content-Base">
|
||||
<div class="row content">
|
||||
<div class="col col-80">
|
||||
|
||||
<% if !@errors.nil? && !@errors.empty? %>
|
||||
<div class="row">
|
||||
<div class="col col-100">
|
||||
<div class="alert alert-block alert-error">
|
||||
<% @errors.each do |error| %>
|
||||
<p><%= error%></p>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<h2>Contact Us</h2>
|
||||
<h6>Please Note Before Contacting:</h6>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
For security reasons, we cannot reset your password if you did not enter an e-mail for your site. You will have to make a new site (don't worry, it's free!). If you didn't get an e-mail from the password reset form, you didn't enter an e-mail (or it's in your spam folder). Again you will have to make a new site, we cannot help you for security reasons.
|
||||
</li>
|
||||
<li>
|
||||
We do not support FTP or GIT uploading, and have no plans to. SFTP possibly, if we can find the time.
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<form action="/contact" method="POST" class="content">
|
||||
<input name="csrf_token" type="hidden" value="<%= csrf_token %>">
|
||||
<fieldset class="col col-80">
|
||||
<label>Email address</label>
|
||||
<input type="email" name="email" placeholder="Your Email" style="width: 300px" value="<%= params[:email] %>">
|
||||
|
||||
<label>Subject</label>
|
||||
<input type="text" name="subject" placeholder="Subject" style="width: 400px" value="<%= params[:subject] %>">
|
||||
|
||||
<label>Comments</label>
|
||||
<textarea name="body" style="width: 600px" rows="10"><%= params[:body] %></textarea>
|
||||
|
||||
<label>Fill out captcha so we know you're not a robot:</label>
|
||||
<div class="recaptcha">
|
||||
<%== recaptcha_tag :challenge, ssl: request.ssl? %>
|
||||
</div>
|
||||
|
||||
<input class="btn-Action" type="submit" value="Send">
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>Contact Us</h1>
|
||||
<h3 class="subtitle"></h3>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page">
|
||||
<% if !@errors.nil? && !@errors.empty? %>
|
||||
<div class="alert alert-block alert-error">
|
||||
<% @errors.each do |error| %>
|
||||
<p><%= error%></p>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<h6>Please Note Before Contacting:</h6>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
For security reasons, we cannot reset your password if you did not enter an e-mail for your site. You will have to make a new site (don't worry, it's free!). If you didn't get an e-mail from the password reset form, you didn't enter an e-mail (or it's in your spam folder). Again you will have to make a new site, we cannot help you for security reasons.
|
||||
</li>
|
||||
<li>
|
||||
We do not support FTP or GIT uploading, and have no plans to. SFTP possibly, if we can find the time.
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<form action="/contact" method="POST" class="content">
|
||||
<input name="csrf_token" type="hidden" value="<%= csrf_token %>">
|
||||
<fieldset>
|
||||
<label>Email address</label>
|
||||
<input type="email" name="email" placeholder="Your Email" style="width: 300px" value="<%= params[:email] %>">
|
||||
|
||||
<label>Subject</label>
|
||||
<input type="text" name="subject" placeholder="Subject" style="width: 400px" value="<%= params[:subject] %>">
|
||||
|
||||
<label>Comments</label>
|
||||
<textarea name="body" style="width: 600px" rows="10"><%= params[:body] %></textarea>
|
||||
|
||||
<label>Fill out captcha so we know you're not a robot:</label>
|
||||
<div class="recaptcha">
|
||||
<%== recaptcha_tag :challenge, ssl: request.ssl? %>
|
||||
</div>
|
||||
|
||||
<input class="btn-Action" type="submit" value="Send">
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -154,7 +154,8 @@
|
|||
</div>
|
||||
|
||||
<div class="site-actions">
|
||||
<a href="/site_files/<%= current_site.username %>.zip">Allowed file types</a> | <a href="/site_files/<%= current_site.username %>.zip">Download entire site</a>
|
||||
<!-- <a href="/site_files/<%= current_site.username %>.zip">Allowed file types</a> | -->
|
||||
<a href="/site_files/<%= current_site.username %>.zip">Download entire site</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,14 @@
|
|||
<main class="content-Base">
|
||||
<div class="row content">
|
||||
<h2 class="col">Privacy</h2>
|
||||
<div class="col col-100">
|
||||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>Neocities Privacy Policy</h1>
|
||||
<h3 class="subtitle"></h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page">
|
||||
<h3></h3>
|
||||
<p><strong>Note: This was generated by a robot on the internet or something. It probably sucks. It's probably not good for us. For all I know it says the NSA owns your content and you are now the property of Lord Skeletor from He-Man. We will be finding a bored/affordable lawyer to make this actually make sense for our goals (and your site) soon. In the interim, please bear with us. Thanks. -Kyle</strong></p>
|
||||
|
||||
<p>Our Privacy Policy was last updated and posted on June 3, 2013. It governs the privacy terms of our Website, located at http://neocities.org. Any capitalized terms not defined in our Privacy Policy, have the meaning as specified in our Terms of Service.</p>
|
||||
|
||||
<p><strong>Your Privacy</strong><br />Neocities follows all legal requirements to protect your privacy. Our Privacy Policy is a legal statement that explains how we may collect information from you, how we may share your information, and how you can limit our sharing of your information. You will see terms in our Privacy Policy that are capitalized. These terms have meanings as described in the Definitions section below.</p>
|
||||
|
|
@ -43,6 +50,4 @@
|
|||
<p><strong>Privacy Policy Updates</strong><br />We reserve the right to modify this Privacy Policy at any time. You should review this Privacy Policy frequently. If we make material changes to this policy, we may notify you on our Website, by a blog post, by email, or by any method we determine. The method we chose is at our sole discretion. We will also change the "Last Updated" date at the beginning of this Privacy Policy. Any changes we make to our Privacy Policy are effective as of this Last Updated date and replace any prior Privacy Policies.</p>
|
||||
|
||||
<p><strong>Questions About Our Privacy Practices or This Privacy Policy</strong><br />If you have any questions about our Privacy Practices or this Policy, please contact us.</p>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
|
@ -1,7 +1,13 @@
|
|||
<main class="content-Base">
|
||||
<div class="row content">
|
||||
<h2 class="col">Terms of Service</h2>
|
||||
<div class="col col-100">
|
||||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>Neocities Terms of Service</h1>
|
||||
<h3 class="subtitle"></h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page">
|
||||
<h3></h3>
|
||||
<p><strong>Note: This was generated by a robot on the internet or something. It probably sucks. It's probably not good for us. We will be finding a bored/affordable lawyer to make this actually make sense for our goals (and retaining the creative ownership of your sites) soon. In the interim, please bear with us. Thanks. -Kyle</strong></p>
|
||||
<p>This web page represents a legal document that serves as our Terms of Service and it governs the legal terms of our website, http://neocities.org, sub-domains, and any associated web-based and mobile applications (collectively, "Website"), as owned and operated by Neocities.</p>
|
||||
<p>Capitalized terms, unless otherwise defined, have the meaning specified within the Definitions section below. This Terms of Service, along with our Privacy Policy, any mobile license agreement, and other posted guidelines within our Website, collectively "Legal Terms", constitute the entire and only agreement between you and Neocities, and supersede all other agreements, representations, warranties and understandings with respect to our Website and the subject matter contained herein. We may amend our Legal Terms at any time without specific notice to you. The latest copies of our Legal Terms will be posted on our Website, and you should review all Legal Terms prior to using our Website. After any revisions to our Legal Terms are posted, you agree to be bound to any such changes to them. Therefore, it is important for you to periodically review our Legal Terms to make sure you still agree to them.</p>
|
||||
<p>By using our Website, you agree to fully comply with and be bound by our Legal Terms. Please review them carefully. If you do not accept our Legal Terms, do not access and use our Website. If you have already accessed our Website and do not accept our Legal Terms, you should immediately discontinue use of our Website.</p>
|
||||
|
|
@ -21,6 +27,4 @@
|
|||
<p><strong>Links to Other Websites</strong><br />Our Website may contain links to third party websites. These links are provided solely as a convenience to you. By linking to these websites, we do not create or have an affiliation with, or sponsor such third party websites. The inclusion of links within our Website does not constitute any endorsement, guarantee, warranty, or recommendation of such third party websites. Neocities has no control over the legal documents and privacy practices of third party websites; as such, you access any such third party websites at your own risk.</p>
|
||||
|
||||
<p><strong>General Terms</strong><br />Our Legal Terms shall be treated as though it were executed and performed in Oregon, United States, and shall be governed by and construed in accordance with the laws of Oregon, United States, without regard to conflict of law principles. In addition, you agree to submit to the personal jurisdiction and venue of such courts. Any cause of action by you with respect to our Website, must be instituted within one (1) year after the cause of action arose or be forever waived and barred. Should any part of our Legal Terms be held invalid or unenforceable, that portion shall be construed consistent with applicable law and the remaining portions shall remain in full force and effect. To the extent that any Content in our Website conflicts or is inconsistent with our Legal Terms, our Legal Terms shall take precedence. Our failure to enforce any provision of our Legal Terms shall not be deemed a waiver of such provision nor of the right to enforce such provision. The rights of Neocities under our Legal Terms shall survive the termination of our Legal Terms.</p>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
|
@ -5,7 +5,8 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col">
|
||||
<div class="content single-Col misc-page">
|
||||
<h3></h3>
|
||||
<p>Learning how to make web sites is one of the most important things you can learn. It allows you to create any content you want, arrange that content in any way you like, and share that content with the world. Be it an <a href="http://sheldonbrown.com" target="_blank">information portal for teaching people how to repair bikes</a>, or an interesting graphics project, or your poetry. These are things you can't do with traditional social networks, but that you can do with HTML.</p>
|
||||
|
||||
<p class="delta">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue