sync
This commit is contained in:
albert
15
app/views/users/_secondary_nav_links.html.erb
Normal file
15
app/views/users/_secondary_nav_links.html.erb
Normal file
@@ -0,0 +1,15 @@
|
||||
<% content_for(:secondary_nav_links) do %>
|
||||
<menu>
|
||||
<li><%= link_to "Listing", users_path %></li>
|
||||
<li><%= link_to "Register", new_user_path %></li>
|
||||
<% if @user && !@user.new_record? %>
|
||||
<li>|</li>
|
||||
<li><%= link_to "Edit", edit_user_path(@user) %></li>
|
||||
<li><%= link_to "Profile", user_path(@user) %></li>
|
||||
<% end %>
|
||||
<% unless CurrentUser.user.is_anonymous? %>
|
||||
<li>|</li>
|
||||
<li><%= link_to "Logout", session_path(0), :method => :delete %></li>
|
||||
<% end %>
|
||||
</menu>
|
||||
<% end %>
|
||||
@@ -1,96 +1,100 @@
|
||||
<p><%= Danbooru.config.app_name %> is ad-sponsored and does not require an account to view. But in order to start uploading, editing, or creating content on this site, you will need to register. <em>Make sure you read and agree to the <%= link_to "terms of service", terms_of_service_path %> before registering. <strong>This site is open to web crawlers, therefore any name you choose will be public!</strong></em></p>
|
||||
<div id="users-new">
|
||||
<h1>Registration</h1>
|
||||
|
||||
<div id="p1">
|
||||
<p><%= Danbooru.config.app_name %> is ad-sponsored and does not require an account to view. But in order to start uploading, editing, or creating content on this site, you will need to register. <em>Make sure you read and agree to the <%= link_to "terms of service", terms_of_service_path %> before registering. <strong>This site is open to web crawlers, therefore any name you choose will be public!</strong></em></p>
|
||||
|
||||
<p>Registration for a basic account is free but comes with some limitations.</p>
|
||||
<p>Registration for a basic account is free but comes with some limitations.</p>
|
||||
|
||||
<div>
|
||||
<div>
|
||||
<h1>Basic</h1>
|
||||
<ul>
|
||||
<li>Free</li>
|
||||
<li>Create and edit posts, favorites, forums, comments, wiki pages, pools, artists, and dmails</li>
|
||||
<li>Search up to 2 tags at once</li>
|
||||
<li>Some hidden posts</li>
|
||||
<li>Ads visible</li>
|
||||
<li>Uploads limited</li>
|
||||
</ul>
|
||||
<div id="account-comparison">
|
||||
<section>
|
||||
<h1>Basic</h1>
|
||||
<ul>
|
||||
<li>Free</li>
|
||||
<li>Uploads limited</li>
|
||||
<li>Search up to 2 tags at once</li>
|
||||
<li>Some hidden posts</li>
|
||||
<li>Ads visible</li>
|
||||
<li>Create and edit posts, favorites, forum posts, comments, wiki pages, pools, artists, and dmails</li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h1>Privileged</h1>
|
||||
<ul>
|
||||
<li>One time $20 fee</li>
|
||||
<li>Uploads limited</li>
|
||||
<li>Search up to 6 tags at once</li>
|
||||
<li>No hidden posts</li>
|
||||
<li>No ads</li>
|
||||
<li>Tag subscriptions</li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h1>Contributor</h1>
|
||||
<ul>
|
||||
<li>Invitation only</li>
|
||||
<li>No upload limits</li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
|
||||
<footer class="nav-links">
|
||||
<%= link_to "Continue »".html_safe, new_user_path(:anchor => "p2") %>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h1>Privileged</h1>
|
||||
<div id="p2">
|
||||
<p>There are some restrictions on names:</p>
|
||||
|
||||
<ul>
|
||||
<li>One time $20 fee</li>
|
||||
<li>Search up to 6 tags at once</li>
|
||||
<li>No hidden posts</li>
|
||||
<li>No ads</li>
|
||||
<li>Uploads limited</li>
|
||||
<li>Tag subscriptions</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h1>Contributor</h1>
|
||||
<ul>
|
||||
<li>No upload limits</li>
|
||||
<li>By invitation only</li>
|
||||
<li><strong>Name</strong>: Your name must be at least 2 characters and at most 20 characters long. It cannot contain spaces, commas, colons, or semi-colons. All characters must be US-ASCII.</li>
|
||||
<li><strong>Password</strong>: Your password must be at least 5 characters long.</li>
|
||||
<li>
|
||||
<strong>Email</strong>:
|
||||
<% if Danbooru.config.enable_email_verification? %>
|
||||
You must enter a valid email address. You will need to verify your email address after registering.
|
||||
<% else %>
|
||||
You can optionally enter an email address. Although optional, you will not be able to reset your password without an email address.
|
||||
<% end %>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<% form_for(@user) do |f| %>
|
||||
<%= error_messages_for("user") %>
|
||||
|
||||
<table width="100%">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th width="15%"><%= f.label :name %></th>
|
||||
<td width="85%"><%= f.text_field :name %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><%= f.label :password %></th>
|
||||
<td><%= f.password_field :password %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><%= f.label :password_confirmation %></th>
|
||||
<td><%= f.password_field :password_confirmation %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><%= f.label :email %></th>
|
||||
<td><%= f.text_field :email %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td><%= submit_tag "Submit" %></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<% end %>
|
||||
|
||||
<footer class="nav-links">
|
||||
<%= link_to "« Back".html_safe, new_user_path(:anchor => "p1") %>
|
||||
</footer>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% form_tag(users_path) do %>
|
||||
<%= error_messages_for(@user) %>
|
||||
|
||||
<fieldset>
|
||||
<legend>Signup</legend>
|
||||
|
||||
<p>
|
||||
<%= label "user", "name" %>
|
||||
<%= text_field "user", "name" %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<%= label "user", "password" %>
|
||||
<%= password_field "user", "password" %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<%= label "user", "password_confirmation" %>
|
||||
<%= password_field "user", "password_confirmation" %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<%= label "user", "email" %>
|
||||
<%= text_field "user", "email" %>
|
||||
</p>
|
||||
|
||||
<%= submit_tag "Submit" %>
|
||||
</fieldset>
|
||||
<% end %>
|
||||
|
||||
<aside id="form-help">
|
||||
<section>
|
||||
Your name must be at least 2 characters and at most 20 characters long. It cannot contain spaces, commas, colons, or semi-colons.
|
||||
</section>
|
||||
|
||||
<section>
|
||||
Your password must be at least 5 characters long.
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<% if Danbooru.config.enable_email_verification? %>
|
||||
You must enter a valid email address. You will need to verify your email address after registering.
|
||||
<% else %>
|
||||
You can optionally enter an email address. Although optional, you will not be able to reset your password without an email address.
|
||||
<% end %>
|
||||
</section>
|
||||
</aside>
|
||||
|
||||
<script type="text/javascript" charset="utf-8">
|
||||
$(document).ready(function() {
|
||||
$("#user_name").focus(function() {
|
||||
$("#description").append("Your name must be between 2 and 20 characters, and cannot contain whitespace, commas, semicolons, or colons.");
|
||||
});
|
||||
$("#user_name").blur(function() {
|
||||
$("#description").empty();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@@ -1,10 +1 @@
|
||||
<nav>
|
||||
<ul>
|
||||
<li><%= link_to "Settings", edit_user_path(@user) %></li>
|
||||
<li><%= link_to "Log out", session_path(0), :method => :delete %></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<% content_for(:page_title) do %>
|
||||
/ Users / <%= @user.name %>
|
||||
<% end %>
|
||||
<%= render :partial => "secondary_nav_links" %>
|
||||
Reference in New Issue
Block a user