Merge remote-tracking branch 'upstream/pull/4965'

[rails.git] / app / views / users / blocked.html.erb

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index 08ce4cc539454e02f3166332b3da6d02e3521bba..a3ef3429b9ff2372e5ba8e456171dd417c4d768f 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -1,10 +1,18 @@
+<% content_for :heading_class, "pb-0" %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t 'users.new.title' %></h1>
-  <div class='header-illustration new-user-main'></div>
-  <div class='header-illustration new-user-arm'></div>
+  <div class="header-illustration new-user-main">
+    <ul class="nav nav-tabs position-absolute bottom-0 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 %>
 
 <% end %>
 

-<div class="message">
-  <h1><%= t 'users.new.no_auto_account_create' %></h1>
-  <h2><%= raw t 'users.new.contact_webmaster', :webmaster => "mailto:#{Settings.support_email}" %></h2>
+<div>
+  <p><strong><%= t "users.new.no_auto_account_create" %></strong></p>
+  <p><%= t "users.new.please_contact_support_html", :support_link => mail_to(Settings.support_email, t("users.new.support")) %></p>

 </div>
 </div>