Add tabbed navigation for signup/login screens

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index b64801e16ae991195bc7064ab75506d596b0dc96..90611f214c595b8ff410417ab098e96c66829856 100644 (file)
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -7,8 +7,15 @@
 
 <% content_for :heading do %>
   <div class="header-illustration new-user-main auth-container mx-auto">
 
 <% content_for :heading do %>
   <div class="header-illustration new-user-main auth-container mx-auto">

-    <h1 class="pt-3"><%= t ".heading" %></h1>
-  <div>
+    <ul class="nav nav-tabs position-absolute bottom-0 px-3 fs-6 w-100">
+      <li class="nav-item">
+        <%= link_to t("sessions.new.tab_title"), "#", :class => "nav-link active" %>
+      </li>
+      <li class="nav-item">
+        <%= link_to t("users.new.tab_title"), url_for(:action => :new, :controller => :users), :class => "nav-link" %>
+      </li>
+    </ul>
+  </div>

 <% end %>
 
 <div id="login_login" class="auth-container mx-auto my-0">
 <% end %>
 
 <div id="login_login" class="auth-container mx-auto my-0">

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index 0decb13c0160448ca4e9339e75fcf2db5c16089d..a97d9ba8d120b6660658a09931c756c8e6f01045 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -1,7 +1,14 @@
 <% content_for :heading_class, "p-0 mw-100" %>
 <% content_for :heading do %>
   <div class="header-illustration new-user-main auth-container mx-auto">
 <% content_for :heading_class, "p-0 mw-100" %>
 <% content_for :heading do %>
   <div class="header-illustration new-user-main auth-container mx-auto">

-    <h1><%= t "users.new.title" %></h1>
+    <ul class="nav nav-tabs position-absolute bottom-0 px-3 fs-6 w-100">
+      <li class="nav-item">
+        <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions), :class => "nav-link" %>
+      </li>
+      <li class="nav-item">
+        <%= link_to t("users.new.tab_title"), "#", :class => "nav-link active" %>
+      </li>
+    </ul>

   </div>
 <% end %>
 
   </div>
 <% end %>
 

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 918b315e8aca21de45a1bfe95a2ca62d69cd7881..c3020180ca47266ba1e6311eb5d15a2bb5b02efc 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -7,7 +7,14 @@
 
 <% content_for :heading do %>
   <div class="header-illustration new-user-main auth-container mx-auto">
 
 <% content_for :heading do %>
   <div class="header-illustration new-user-main auth-container mx-auto">

-    <h1 class="pt-3"><%= t ".title" %></h1>
+    <ul class="nav nav-tabs position-absolute bottom-0 px-3 fs-6 w-100">
+      <li class="nav-item">
+        <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions), :class => "nav-link" %>
+      </li>
+      <li class="nav-item">
+        <%= link_to t("users.new.tab_title"), "#", :class => "nav-link active" %>
+      </li>
+    </ul>

   </div>
 <% end %>
 
   </div>
 <% end %>
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4046b8068024812675b63a7241b770e303981d60..677ff618cfa32235c1dcbe1851ba49f2147c63fb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1847,6 +1847,7 @@ en:
   sessions:
     new:
       title: "Log in"
   sessions:
     new:
       title: "Log in"

+      tab_title: "Log in"

       heading: "Log in"
       email or username: "Email Address or Username"
       password: "Password"
       heading: "Log in"
       email or username: "Email Address or Username"
       password: "Password"


@@ -2728,6 +2729,7 @@ en:
   users:
     new:
       title: "Sign Up"
   users:
     new:
       title: "Sign Up"

+      tab_title: "Sign up"

       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
       support: support
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
       support: support