mirror of
https://github.com/neocities/neocities.git
synced 2025-04-24 09:12:35 +02:00
copy changes, fix links
This commit is contained in:
Kyle Drake
parent
fa3eba3a22
commit
e774deb5ca
8 changed files with 51 additions and 105 deletions
4
app.rb
4
app.rb
|
|
@ -22,7 +22,7 @@ before do
|
|||
end
|
||||
|
||||
not_found do
|
||||
slim :'not_found'
|
||||
erb :'not_found'
|
||||
end
|
||||
|
||||
error do
|
||||
|
|
@ -39,7 +39,7 @@ error do
|
|||
api_error 500, 'server_error', 'there has been an unknown server error, please try again later', 500
|
||||
end
|
||||
|
||||
slim :'error'
|
||||
erb :'error'
|
||||
end
|
||||
|
||||
get '/home_mockup' do
|
||||
|
|
|
|||
|
|
@ -63,28 +63,32 @@
|
|||
|
||||
<div class="row txt-Center">
|
||||
<div class="col col-33">
|
||||
<a href="https://twitter.com/kyledrake" title="Kyle Drake">
|
||||
<a href="https://kyledrake.neocities.org" title="Visit Kyle's Website">
|
||||
<img src="https://0.gravatar.com/avatar/62a43048a3c2c688654274abdc0ecb9c?d=https%3A%2F%2Fidenticons.github.com%2Ffde07ba82b25f95afa9d080819f95717.png&r=x&s=440" alt="kyle drake" class="pic-Rounded" />
|
||||
</a>
|
||||
<br />
|
||||
<a href="https://twitter.com/kyledrake" title="Kyle Drake" class="eps">Kyle Drake</a>
|
||||
<a href="https://kyledrake.neocities.org" title="Kyle Drake" class="eps">Kyle Drake</a>
|
||||
</div>
|
||||
<div class="col col-33">
|
||||
<a href="https://twitter.com/violasong" title="Visit Victoria's Website">
|
||||
<a href="https://victoria.neocities.org" title="Visit Victoria's Website">
|
||||
<img src="https://1.gravatar.com/avatar/2b577f8b3e5ab79bc927ed5185c0eae0?d=https%3A%2F%2Fidenticons.github.com%2Fe03006819f4a835afa237716f6701c95.png&r=x&s=440" alt="Victoria Wang" class="pic-Rounded" />
|
||||
</a>
|
||||
<br />
|
||||
<a href="https://twitter.com/violasong" title="Follow me on Twitter" class="eps">Victoria Wang</a>
|
||||
<a href="https://victoria.neocities.org" title="Visit Victoria's Website" class="eps">Victoria Wang</a>
|
||||
</div>
|
||||
<div class="col col-33">
|
||||
<a href="http://scottohara.me/" title="Visit Scott's Website">
|
||||
<a href="http://scottohara.neocities.org" title="Visit Scott's Website">
|
||||
<img src="https://0.gravatar.com/avatar/6ade16e6184b3efb573ee91255ff7abe?d=https%3A%2F%2Fidenticons.github.com%2Fa6362986538cdcb93a8b04f6c3f66b5e.png&r=x&s=440" alt="Scott O'Hara" class="pic-Rounded" />
|
||||
</a>
|
||||
<br />
|
||||
<a href="https://twitter.com/scottohara" title="Follow me on Twitter" class="eps">Scott O'Hara</a>
|
||||
<a href="http://scottohara.neocities.org" title="Visit Scott's Website" class="eps">Scott O'Hara</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
<hr />
|
||||
<section>
|
||||
<h3 class="txt-Center"><a href="https://twitter.com/neocitiesweb">Follow us on Twitter</a></h3>
|
||||
</section>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
15
views/error.erb
Normal file
15
views/error.erb
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>Site Error</h1>
|
||||
<h3 class="subtitle">There has been an error performing your requested action.</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page">
|
||||
<article>
|
||||
<h3>We have automatically been notified of the problem.</h3>
|
||||
<p>
|
||||
If you need to add any special information or if this error has not been resolved after a few days, <a href="/contact" title="contact us">contact us</a> and report the problem. Thank you, and our apologies for the inconvenience.
|
||||
</p>
|
||||
</article>
|
||||
</div>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
.page
|
||||
.content-Base.txt-Center.col-60 style="margin:0 auto"
|
||||
h2 Site Error
|
||||
p.eps There has been an error performing the requested action.
|
||||
<br />
|
||||
br
|
||||
h4 We have been notified of the problem.
|
||||
p.tiny If you need to add any special information or if this error has not been resolved in a while, <a href="/contact" title="let us know!">contact us</a> and report the problem. Thank you!
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
javascript:
|
||||
var RecaptchaOptions = {
|
||||
theme : 'clean'
|
||||
};
|
||||
|
||||
- if !@site.errors.empty?
|
||||
.row
|
||||
.span8.offset2
|
||||
.alert.alert-block.alert-error
|
||||
p There were errors creating your home page:
|
||||
- @site.errors.each do |error|
|
||||
p = error.last.first
|
||||
|
||||
.page
|
||||
.content-Base
|
||||
.row.content style="padding-top:0"
|
||||
form method="POST" action="/create"
|
||||
input name="csrf_token" type="hidden" value="#{csrf_token}"
|
||||
h2.txt-Center Create a New Home Page
|
||||
|
||||
.col.col-50 style="margin:0 auto; float:none"
|
||||
hr
|
||||
p.tiny First, enter a username. This will also be used as your site name.<br><b>Do not forget this, it will be used to sign in to and manage your home page.</b> It can only contain letters, numbers, underscores and hyphens, and can only be 32 characters long.
|
||||
br
|
||||
h5 Username
|
||||
p.tiny <input class="input-Area" name="username" type="text" placeholder="yourusername" value="#{@site.username}" autocapitalize="off" autocorrect="off">.neocities.org
|
||||
hr
|
||||
p.tiny Next, enter a password. This will be used to allow you to login. Minimum 5 characters. If you don't make it a good password, Dade Murphy from the movie Hackers will come in and steal your "garbage files".
|
||||
|
||||
|
||||
h5 Password
|
||||
input class="input-Area" name="password" type="password"
|
||||
|
||||
br
|
||||
hr
|
||||
p.tiny Now you can enter an e-mail address. Your e-mail address is private and we will not show it to anyone for any reason. You don't have to provide one, but <b>we will not be able to reset your password without it, so don't lose your username and password if you leave this blank!</b>
|
||||
|
||||
|
||||
h5 Email
|
||||
input class="input-Area" name="email" type="email" placeholder="youremail@example.com" value="#{@site.email}"
|
||||
|
||||
br
|
||||
hr
|
||||
|
||||
p.tiny You can optionally enter some tags! Tags will allow others to find your site based on your interests, or your site's theme. <b>Separate multiple tags with commas</b>. Don't think too hard about this, you can change them later. You can have a maximum of ten tags, and there is a two word per tag maximum (extra words in a tag will be removed).
|
||||
|
||||
h5 Tags
|
||||
p: input class="input-Area" name="tags" type="text" style="width: 400px; max-width:100%" placeholder="pokemon, video games, bulbasaur" value="#{params[:tags]}" autocapitalize="off" autocorrect="off"
|
||||
|
||||
hr
|
||||
input name="is_nsfw" type="hidden" value="false"
|
||||
p If your page will contain objectionable (adult) content, check this box: <input name="is_nsfw" type="checkbox" value="true" style="margin-top:0">
|
||||
|
||||
hr
|
||||
p.tiny <b>Last thing!</b> Enter these two words correctly (with spaces) so we know you're not a robot (don't worry robots, we still love you).
|
||||
div style="background:#fff; width:100%; overflow:auto"
|
||||
== recaptcha_tag :challenge, ssl: true
|
||||
br
|
||||
|
||||
h3 You're done. Just click the button below!
|
||||
.txt-Center
|
||||
input.btn-Action type="submit" value="Create Home Page"
|
||||
23
views/not_found.erb
Normal file
23
views/not_found.erb
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>Page Not Found (404)</h1>
|
||||
<h3 class="subtitle"></h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page">
|
||||
<h3></h3>
|
||||
<article>
|
||||
<div class="txt-Center"><img src="/assets/img/cat-larger.png"></div>
|
||||
<p>
|
||||
Penelope the Neocities Cat tried very hard to locate the page you were looking for, but she couldn't find it. She's an awesome sysadmin. If she couldn't find it, it's probably not there.
|
||||
</p>
|
||||
<p>
|
||||
If you believe this to be in error, please <a href="/contact" title="contact us">contact us</a> and report the problem. Thank you!
|
||||
</p>
|
||||
|
||||
<% if request.referer %>
|
||||
<a class="btn-Action" href="#{request.referer}">Go Back</a>
|
||||
<% end %>
|
||||
</article>
|
||||
</div>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
.page
|
||||
.content-Base.txt-Center.col-60 style="margin:0 auto"
|
||||
h2 Not Found
|
||||
br
|
||||
h4 Sorry but we could not find the requested page.
|
||||
|
||||
p It you believe this to be in error, please <a href="/contact" title="get in touch with us">contact us</a> and report the problem. Thank you!
|
||||
- if request.referer
|
||||
a class="btn-Action" href="#{request.referer}" Go Back
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
.txt-Center.content-Base
|
||||
|
||||
h1 Reset Password
|
||||
|
||||
h5 If you provided your e-mail you can reset your password.
|
||||
h6 If you didn't, you will not be able to reset your password.
|
||||
p You will need to create a new account.
|
||||
p We will not change a password without an email entered, no exceptions.
|
||||
|
||||
form method="POST" action="/send_password_reset"
|
||||
|
||||
input name="csrf_token" type="hidden" value="#{csrf_token}"
|
||||
|
||||
fieldset
|
||||
input name="email" type="email" class="input-Area" placeholder="Your email"
|
||||
<br />
|
||||
button class="btn-Action" href="#" style="margin-top: 10px" Send Password Reset
|
||||
Loading…
Add table
Reference in a new issue