From 3f8167dc17fe427d12d060585b3a481138e293e6 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 16 Sep 2014 22:09:25 -0700 Subject: [PATCH 1/2] OMG IT ROFLSCALES NOW --- environment.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/environment.rb b/environment.rb index 4345f221..e5fb61d4 100644 --- a/environment.rb +++ b/environment.rb @@ -61,7 +61,9 @@ if ENV['RACK_ENV'] == 'development' module Worker module ClassMethods def perform_async(*args) - self.new.perform *args + Thread.new { + self.new.perform *args + } end end end From 45168341de754c2201324454e15f314691d18c44 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 16 Sep 2014 22:57:41 -0700 Subject: [PATCH 2/2] spiff up the settings page a lil' bit --- views/settings.erb | 158 ++++++++++++------------------- views/settings/custom_domain.erb | 4 + views/settings/email.erb | 12 +++ views/settings/nsfw.erb | 20 ++++ views/settings/password.erb | 15 +++ views/settings/plan.erb | 11 +++ views/settings/profile.erb | 14 +++ views/settings/username.erb | 19 ++++ 8 files changed, 153 insertions(+), 100 deletions(-) create mode 100644 views/settings/custom_domain.erb create mode 100644 views/settings/email.erb create mode 100644 views/settings/nsfw.erb create mode 100644 views/settings/password.erb create mode 100644 views/settings/plan.erb create mode 100644 views/settings/profile.erb create mode 100644 views/settings/username.erb diff --git a/views/settings.erb b/views/settings.erb index deaa5499..a5ad2212 100644 --- a/views/settings.erb +++ b/views/settings.erb @@ -22,109 +22,67 @@ <% end %> + -

Neocities Plan

- <% if current_site.supporter? && !current_site.plan_ended %> -

You currently have the Supporter Plan (<%= current_site.maximum_space_in_megabytes %>MB). Thank you! We love you. -

- Manage Plan - <% else %> -

- You currently have the Free Plan (<%= current_site.maximum_space_in_megabytes %>MB).
Want to get more space and help Neocities? Become a supporter! -

- Supporter Info - <% end %> - -

Site Profile

-
-
- <%== csrf_token_input_html %> -

- - checked<% end %> - > Turn off profile comments -

- - -
+
+ +
+
+ <%== erb :'settings/plan' %> +
+
+ <%== erb :'settings/profile' %> +
+
+ <%== erb :'settings/custom_domain' %> +
+
+ <%== erb :'settings/password' %> +
+
+ <%== erb :'settings/email' %> +
+
+ <%== erb :'settings/username' %> +
+
+ <%== erb :'settings/nsfw' %> +
+
-

Custom Domain

-

- You can configure a custom domain for your Neocities site! Click Here for more information. -

- -

Change Password

-
- <%== csrf_token_input_html %> - -

Current Password:

- - -

New Password:

- - -

Confirm New Password:

- - - -
- -

Change Email

-
- <%== csrf_token_input_html %> - -

Current Email: <%= current_site.email %>

-

New Email:

- - -
- -
-
- -

Change Site (User) Name

-
- <%== csrf_token_input_html %> -

- It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ - -

- -

- Current Name: - <%= current_site.username %> -

- -

- New name: - -

- - -
- - -

18+ Content

- -

- If your site contains objectionable (18+) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines 18+ content yet, but basically it's just pornography and lewd/sick/gross images. Thanks for your patience and understanding as we try to find a way to balance out the needs of everyone. -

- -
- <%== csrf_token_input_html %> - -

- - My page has 18+ content:    - checked<% end %> - > - -

- - -