login: add /login & /logout routes, rename 'sign in' to 'login'.
* Replace /session/new with /login and /session/sign_out with /logout. * Rename 'sign in' to 'login'. This changes are to make urls cleaner and terminology more consistent.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<menu id="main-menu" class="main">
|
||||
<% if CurrentUser.is_anonymous? %>
|
||||
<%= nav_link_to("Sign in", new_session_path) %>
|
||||
<%= nav_link_to("Login", login_path) %>
|
||||
<% else %>
|
||||
<%= nav_link_to("My Account #{CurrentUser.dmail_count}", profile_path) %>
|
||||
<% end %>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div id="c-sessions">
|
||||
<div id="a-new">
|
||||
<section>
|
||||
<h1>Sign in</h1>
|
||||
<h1>Login</h1>
|
||||
|
||||
<%= simple_form_for(:session, url: session_path) do |f| %>
|
||||
<%= f.input :url, as: :hidden, input_html: { value: params[:url] } %>
|
||||
@@ -17,7 +17,7 @@
|
||||
</div>
|
||||
|
||||
<% content_for(:page_title) do %>
|
||||
Sign in - <%= Danbooru.config.app_name %>
|
||||
Login - <%= Danbooru.config.app_name %>
|
||||
<% end %>
|
||||
|
||||
<%= render "secondary_links" %>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
You do not have permission to visit this page.
|
||||
|
||||
<% if CurrentUser.is_anonymous? %>
|
||||
Try <%= link_to "logging in", new_session_path(url: request.fullpath) %> or
|
||||
Try <%= link_to "logging in", login_path(url: request.fullpath) %> or
|
||||
<%= link_to "signing up", new_user_path %>.
|
||||
<% end %>
|
||||
</p>
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
<ul>
|
||||
<li><h1>Profile</h1></li>
|
||||
<% if CurrentUser.is_anonymous? %>
|
||||
<li><%= link_to "Sign in", new_session_path %></li>
|
||||
<li><%= link_to "Login", login_path %></li>
|
||||
<li><%= link_to "Sign up", new_user_path %></li>
|
||||
<% else %>
|
||||
<li><%= link_to "Profile", profile_path %></li>
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
<% if Danbooru.config.stripe_publishable_key %>
|
||||
<% if CurrentUser.is_anonymous? %>
|
||||
<p><%= link_to "Sign up", new_user_path %> or <%= link_to "login", new_session_path(url: new_user_upgrade_path) %> first to upgrade your account.</p>
|
||||
<p><%= link_to "Sign up", new_user_path %> or <%= link_to "login", login_path(url: new_user_upgrade_path) %> first to upgrade your account.</p>
|
||||
<% elsif CurrentUser.safe_mode? %>
|
||||
<%= render "stripe_payment" %>
|
||||
<% else %>
|
||||
|
||||
@@ -34,6 +34,6 @@
|
||||
<% end %>
|
||||
|
||||
<li>|</li>
|
||||
<%= subnav_link_to "Sign out", sign_out_session_path %>
|
||||
<%= subnav_link_to "Log out", logout_path %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user