mirror of
https://github.com/neocities/neocities.git
synced 2025-08-05 17:18:02 +02:00
separate site and account settings context
This commit is contained in:
Kyle Drake
parent
7e36dc83f8
commit
d0970cdf9e
16 changed files with 515 additions and 443 deletions
|
|
@ -1,80 +0,0 @@
|
|||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>Custom Domain</h1>
|
||||
<h3 class="subtitle">Add your own domain name to your Neocities site!</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page">
|
||||
<h3></h3>
|
||||
<article>
|
||||
|
||||
<% if flash.keys.length > 0 %>
|
||||
<div class="alert alert-block alert-success">
|
||||
<% flash.keys.each do |key| %>
|
||||
<%== flash[key] %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<p>
|
||||
Adding a custom domain allows you to have a domain name attached to your web site. So if you had a domain like <strong>catsknitting.com</strong>, you could have it point to your Neocities site!
|
||||
</p>
|
||||
|
||||
<p>
|
||||
You will have to purchase a domain name from a registrar like <a href="https://www.namecheap.com/?aff=53678" target="_blank">Namecheap</a>, and then add an A record to point your domain (catsknitting.com) to the following IP address:
|
||||
</p>
|
||||
|
||||
<p><code>198.27.81.179</code></p>
|
||||
|
||||
<p>
|
||||
If you want to add a <strong>www</strong> subdomain, or use a wildcard that will answer to everything (<strong>*</strong>), you will have to make a CNAME pointing to <strong>catsknitting.com</strong> for <strong>www</strong> and/or <strong>*</strong>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
After that, you can add the domain to the box below (just the <strong>catsknitting.com</strong>, don't add any subdomains), and your domain should come online within 5 minutes:
|
||||
</p>
|
||||
|
||||
<form method="POST" action="/custom_domain">
|
||||
<%== csrf_token_input_html %>
|
||||
<input name="domain" type="text" placeholder="catsknitting.com" value="<%= current_site.domain %>">
|
||||
<br>
|
||||
<input class="btn-Action" type="submit" value="Update Domain">
|
||||
</form>
|
||||
</article>
|
||||
|
||||
<article>
|
||||
<h2>Add SSL Certificate</h2>
|
||||
<p>
|
||||
This allows you to add an SSL key and certificate for your domain, enabling encryption for your site (https). It can take up to 5-30 minutes for the changes to go live, so please be patient. All files must be in PEM format. If your certificate is not bundled with the root and intermediate certificates, ask your certificate provider for help on how to do that.
|
||||
</p>
|
||||
|
||||
<% if current_site.domain.nil? || current_site.domain.empty? %>
|
||||
<p><strong>Cannot upload SSL certificate until domain is added.</strong></p>
|
||||
<% else %>
|
||||
|
||||
<form method="POST" action="/settings/ssl" enctype="multipart/form-data">
|
||||
<%== csrf_token_input_html %>
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
Status: <%= current_site.ssl_installed? ? 'Installed' : 'Inactive' %>
|
||||
</strong>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
SSL Key (yourdomain.com.key):
|
||||
<input name="key" type="file">
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Bundled Certificates (yourdomain.com-bundle.crt):
|
||||
<input name="cert" type="file">
|
||||
</p>
|
||||
|
||||
<input class="btn-Action" type="submit" value="Upload SSL Key and Certificate">
|
||||
|
||||
</form>
|
||||
<% end %>
|
||||
</article>
|
||||
</div>
|
||||
|
|
@ -1,61 +1,45 @@
|
|||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>Settings</h1>
|
||||
<h3 class="subtitle">Manage your account</h3>
|
||||
<h1>Account Settings</h1>
|
||||
<h3 class="subtitle">Manage the account for your sites</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page txt-Center">
|
||||
<article>
|
||||
<section>
|
||||
<div class="txt-Center">
|
||||
<% if flash[:success] %>
|
||||
<div class="alert alert-block alert-success" style="margin-top: 20px">
|
||||
<%== flash[:success] %>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="txt-Center">
|
||||
<% if flash[:success] %>
|
||||
<div class="alert alert-block alert-success" style="margin-top: 20px">
|
||||
<%== flash[:success] %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<% if flash[:error] %>
|
||||
<div class="alert alert-block alert-error" style="margin-top: 20px">
|
||||
<%== flash[:error] %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tabbable" style="margin-top: 20px"> <!-- Only required for left/right tabs -->
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a href="#plan" data-toggle="tab">Plan</a></li>
|
||||
<li><a href="#sites" data-toggle="tab">Sites</a></li>
|
||||
<li><a href="#profile" data-toggle="tab">Profile</a></li>
|
||||
<li><a href="#customdomain" data-toggle="tab">Custom Domain</a></li>
|
||||
<li><a href="#password" data-toggle="tab">Password</a></li>
|
||||
<li><a href="#email" data-toggle="tab">Email</a></li>
|
||||
<li><a href="#username" data-toggle="tab">Username</a></li>
|
||||
<li><a href="#nsfw" data-toggle="tab">18+</a></li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="plan">
|
||||
<%== erb :'settings/plan' %>
|
||||
<%== erb :'settings/account/plan' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="sites">
|
||||
<%== erb :'settings/sites' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="profile">
|
||||
<%== erb :'settings/profile' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="customdomain">
|
||||
<%== erb :'settings/custom_domain' %>
|
||||
<%== erb :'settings/account/sites' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="password">
|
||||
<%== erb :'settings/password' %>
|
||||
<%== erb :'settings/account/password' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="email">
|
||||
<%== erb :'settings/email' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="username">
|
||||
<%== erb :'settings/username' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="nsfw">
|
||||
<%== erb :'settings/nsfw' %>
|
||||
<%== erb :'settings/account/email' %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<h2>Change Email</h2>
|
||||
<form method="POST" action="/change_email">
|
||||
<form method="POST" action="/settings/change_email">
|
||||
<%== csrf_token_input_html %>
|
||||
|
||||
<p>Current Email: <strong><%= current_site.email %></strong></p>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<h2>Change Password</h2>
|
||||
<form method="POST" action="/change_password">
|
||||
<form method="POST" action="/settings/change_password">
|
||||
<%== csrf_token_input_html %>
|
||||
|
||||
<p>Current Password:</p>
|
||||
|
|
@ -4,21 +4,16 @@
|
|||
<h6>No other sites are currently linked to this account.</h6>
|
||||
<% else %>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<td>
|
||||
<a href="//<%= current_site.host %>"><strong><%= current_site.title %></strong></a> (primary)
|
||||
</td>
|
||||
<td>
|
||||
Manage this site
|
||||
</td>
|
||||
</tr>
|
||||
<% current_site.children.each do |site| %>
|
||||
<% current_site.owner.account_sites.each do |site| %>
|
||||
<tr>
|
||||
<td>
|
||||
<a href="//<%= site.host %>" target="_blank"><%= site.title %></a>
|
||||
<% if site.parent? %>
|
||||
<strong>(parent account)</strong>
|
||||
<% end %>
|
||||
</td>
|
||||
<td>
|
||||
<a href="#">Manage this site</a>
|
||||
<a href="/settings/<%= site.username %>">Settings</a>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
|
@ -29,7 +24,7 @@
|
|||
|
||||
<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.children_dataset.count %></strong> new sites remaining.</p>
|
||||
|
||||
<form action="/site/create_child" method="POST">
|
||||
<form action="/settings/create_child" method="POST">
|
||||
<%== csrf_token_input_html %>
|
||||
|
||||
<p>Site Name:</p>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
<h2>Custom Domain</h2>
|
||||
<p>
|
||||
You can configure a custom domain for your Neocities site! <strong><a href="/custom_domain">Click Here</a></strong> for more information.
|
||||
</p>
|
||||
89
views/settings/site.erb
Normal file
89
views/settings/site.erb
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
<div class="header-Outro">
|
||||
<div class="row content single-Col">
|
||||
<h1>Site Settings</h1>
|
||||
<h3 class="subtitle"><strong><%= @site.username %></strong></h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content single-Col misc-page txt-Center">
|
||||
<article>
|
||||
<section>
|
||||
<div class="txt-Center">
|
||||
<% if flash[:success] %>
|
||||
<div class="alert alert-block alert-success" style="margin-top: 20px">
|
||||
<%== flash[:success] %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<% if flash[:error] %>
|
||||
<div class="alert alert-block alert-error" style="margin-top: 20px">
|
||||
<%== flash[:error] %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="tabbable" style="margin-top: 20px"> <!-- Only required for left/right tabs -->
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a href="#profile" data-toggle="tab">Profile</a></li>
|
||||
<li><a href="#custom_domain" data-toggle="tab">Custom Domain</a></li>
|
||||
<li><a href="#username" data-toggle="tab">Username</a></li>
|
||||
<li><a href="#nsfw" data-toggle="tab">18+</a></li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="profile">
|
||||
<%== erb :'settings/site/profile' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="custom_domain">
|
||||
<%== erb :'settings/site/custom_domain' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="username">
|
||||
<%== erb :'settings/site/username' %>
|
||||
</div>
|
||||
<div class="tab-pane" id="nsfw">
|
||||
<%== erb :'settings/site/nsfw' %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<h2>Delete Site</h2>
|
||||
<p class="tiny">
|
||||
If you want to delete your account, you can do that here. We're sorry to see you go, but we understand if Neocities isn't right for you. If there's any specific reason you're leaving, it would be great if you <a href="/contact">let us know</a> so we can try to make your experience better in the future.
|
||||
</p>
|
||||
|
||||
<div>
|
||||
<a href="#deleteSite" data-toggle="modal" class="btn">Delete Site</a>
|
||||
</div>
|
||||
-->
|
||||
</section>
|
||||
</article>
|
||||
</div>
|
||||
|
||||
<div class="modal hide fade" id="deleteSite" tabindex="-1" role="dialog" aria-labelledby="deleteSiteLabel" aria-hidden="true">
|
||||
<form method="POST" action="/site/delete">
|
||||
<%== csrf_token_input_html %>
|
||||
<div class="modal-header">
|
||||
<button class="close" type="button" data-dismiss="modal" aria-hidden="true">x</button>
|
||||
<h3 id="deleteSiteLabel">Permanently Delete Site</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<strong style="color: red">WARNING: This will permanently delete your web site and Neocities account. There is no undo!</strong>
|
||||
|
||||
<p>Delete Site Name: <strong><%= current_site.username %></strong></p>
|
||||
<p>Confirm your site name by typing it here:</p>
|
||||
<input class="input-Area" name="username" type="text">
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
|
||||
<button type="submit" class="btn btn-Action">Permanently Delete Site</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
if (location.hash !== '') $('a[href="' + location.hash + '"]').tab('show');
|
||||
return $('a[data-toggle="tab"]').on('shown', function(e) {
|
||||
return location.hash = $(e.target).attr('href').substr(1);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
60
views/settings/site/custom_domain.erb
Normal file
60
views/settings/site/custom_domain.erb
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
<h2>Custom Domain</h2>
|
||||
<h3 class="subtitle">Add your own domain name to your Neocities site!</h3>
|
||||
|
||||
<p>
|
||||
Adding a custom domain allows you to have a domain name attached to your web site. So if you had a domain like <strong>catsknitting.com</strong>, you could have it point to your Neocities site!
|
||||
</p>
|
||||
|
||||
<p>
|
||||
You will have to purchase a domain name from a registrar like <a href="https://www.namecheap.com/?aff=53678" target="_blank">Namecheap</a>, and then add an A record to point your domain (catsknitting.com) to the following IP address:
|
||||
</p>
|
||||
|
||||
<p><code>198.27.81.179</code></p>
|
||||
|
||||
<p>
|
||||
If you want to add a <strong>www</strong> subdomain, or use a wildcard that will answer to everything (<strong>*</strong>), you will have to make a CNAME pointing to <strong>catsknitting.com</strong> for <strong>www</strong> and/or <strong>*</strong>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
After that, you can add the domain to the box below (just the <strong>catsknitting.com</strong>, don't add any subdomains), and your domain should come online within 5 minutes:
|
||||
</p>
|
||||
|
||||
<form method="POST" action="/settings/<%= @site.username %>/custom_domain">
|
||||
<%== csrf_token_input_html %>
|
||||
<input name="domain" type="text" placeholder="catsknitting.com" value="<%= @site.domain %>">
|
||||
<br>
|
||||
<input class="btn-Action" type="submit" value="Update Domain">
|
||||
</form>
|
||||
|
||||
<h2>Add SSL Certificate</h2>
|
||||
<p>
|
||||
This allows you to add an SSL key and certificate for your domain, enabling encryption for your site (https). It can take up to 5-30 minutes for the changes to go live, so please be patient. All files must be in PEM format. If your certificate is not bundled with the root and intermediate certificates, ask your certificate provider for help on how to do that.
|
||||
</p>
|
||||
|
||||
<% if @site.domain.nil? || @site.domain.empty? %>
|
||||
<p><strong>Cannot upload SSL certificate until domain is added.</strong></p>
|
||||
<% else %>
|
||||
|
||||
<form method="POST" action="/settings/<%= @site.username %>/ssl" enctype="multipart/form-data">
|
||||
<%== csrf_token_input_html %>
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
Status: <%= @site.ssl_installed? ? 'Installed' : 'Inactive' %>
|
||||
</strong>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
SSL Key (yourdomain.com.key):
|
||||
<input name="key" type="file">
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Bundled Certificates (yourdomain.com-bundle.crt):
|
||||
<input name="cert" type="file">
|
||||
</p>
|
||||
|
||||
<input class="btn-Action" type="submit" value="Upload SSL Key and Certificate">
|
||||
|
||||
</form>
|
||||
<% end %>
|
||||
|
|
@ -4,14 +4,14 @@
|
|||
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.
|
||||
</p>
|
||||
|
||||
<form method="POST" action="/change_nsfw">
|
||||
<form method="POST" action="/settings/<%= @site.username %>/change_nsfw">
|
||||
<%== csrf_token_input_html %>
|
||||
<input name="is_nsfw" type="hidden" value="false">
|
||||
<p>
|
||||
<strong>
|
||||
My page has 18+ content:
|
||||
<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px"
|
||||
<% if current_site.is_nsfw %>checked<% end %>
|
||||
<% if @site.is_nsfw %>checked<% end %>
|
||||
>
|
||||
</strong>
|
||||
</p>
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
<h2>Site Profile</h2>
|
||||
<div>
|
||||
<form method="POST" action="/settings/profile">
|
||||
<form method="POST" action="/settings/<%= @site.username %>/profile">
|
||||
<%== csrf_token_input_html %>
|
||||
<p>
|
||||
<input name="site[profile_comments_enabled]" type="hidden" value="true">
|
||||
<input name="site[profile_comments_enabled]" type="checkbox" value="false"
|
||||
<% if current_site.profile_comments_enabled == false %>checked<% end %>
|
||||
<% if @site.profile_comments_enabled == false %>checked<% end %>
|
||||
> Turn off profile comments
|
||||
</p>
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<h2>Change Site (User) Name</h2>
|
||||
<form method="POST" action="/change_name">
|
||||
<form method="POST" action="/settings/<%= @site.username %>/change_name">
|
||||
<%== csrf_token_input_html %>
|
||||
<p class="tiny">
|
||||
It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<p>
|
||||
Current Name:
|
||||
<span style="color: green"><strong><%= current_site.username %></strong></span>
|
||||
<span style="color: green"><strong><%= @site.username %></strong></span>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Loading…
Add table
Add a link
Reference in a new issue