From e774deb5ca14225f5777301943fcc6f7c118614d Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 22 Apr 2014 15:03:29 -0700 Subject: [PATCH] copy changes, fix links --- app.rb | 4 +-- views/about.erb | 18 +++++++----- views/error.erb | 15 ++++++++++ views/error.slim | 8 ----- views/new.slim | 62 --------------------------------------- views/not_found.erb | 23 +++++++++++++++ views/not_found.slim | 9 ------ views/password_reset.slim | 17 ----------- 8 files changed, 51 insertions(+), 105 deletions(-) create mode 100644 views/error.erb delete mode 100644 views/error.slim delete mode 100644 views/new.slim create mode 100644 views/not_found.erb delete mode 100644 views/not_found.slim delete mode 100644 views/password_reset.slim diff --git a/app.rb b/app.rb index caf4ebea..ed71b688 100644 --- a/app.rb +++ b/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 diff --git a/views/about.erb b/views/about.erb index cd07be48..76bf86d3 100644 --- a/views/about.erb +++ b/views/about.erb @@ -63,28 +63,32 @@
- + kyle drake
- Kyle Drake + Kyle Drake
- + Victoria Wang
- Victoria Wang + Victoria Wang
- + Scott O'Hara
- Scott O'Hara + Scott O'Hara
- + + +
+
+

Follow us on Twitter

diff --git a/views/error.erb b/views/error.erb new file mode 100644 index 00000000..8d3deceb --- /dev/null +++ b/views/error.erb @@ -0,0 +1,15 @@ +
+
+

Site Error

+

There has been an error performing your requested action.

+
+
+ +
+
+

We have automatically been notified of the problem.

+

+ If you need to add any special information or if this error has not been resolved after a few days, contact us and report the problem. Thank you, and our apologies for the inconvenience. +

+
+
\ No newline at end of file diff --git a/views/error.slim b/views/error.slim deleted file mode 100644 index 23e2869b..00000000 --- a/views/error.slim +++ /dev/null @@ -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 - 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, contact us and report the problem. Thank you! diff --git a/views/new.slim b/views/new.slim deleted file mode 100644 index 4ea6758e..00000000 --- a/views/new.slim +++ /dev/null @@ -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.
Do not forget this, it will be used to sign in to and manage your home page. It can only contain letters, numbers, underscores and hyphens, and can only be 32 characters long. - br - h5 Username - p.tiny .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 we will not be able to reset your password without it, so don't lose your username and password if you leave this blank! - - - 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. Separate multiple tags with commas. 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:    - - hr - p.tiny Last thing! 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" diff --git a/views/not_found.erb b/views/not_found.erb new file mode 100644 index 00000000..8f461c4b --- /dev/null +++ b/views/not_found.erb @@ -0,0 +1,23 @@ +
+
+

Page Not Found (404)

+

+
+
+ +
+

+
+
+

+ 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. +

+

+ If you believe this to be in error, please contact us and report the problem. Thank you! +

+ + <% if request.referer %> + Go Back + <% end %> +
+
\ No newline at end of file diff --git a/views/not_found.slim b/views/not_found.slim deleted file mode 100644 index 1bd7282c..00000000 --- a/views/not_found.slim +++ /dev/null @@ -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 contact us and report the problem. Thank you! - - if request.referer - a class="btn-Action" href="#{request.referer}" Go Back diff --git a/views/password_reset.slim b/views/password_reset.slim deleted file mode 100644 index 8e8752c6..00000000 --- a/views/password_reset.slim +++ /dev/null @@ -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" -
- button class="btn-Action" href="#" style="margin-top: 10px" Send Password Reset \ No newline at end of file