kosmos/akkounts
kosmos/akkounts
8
1
Fork 0
Code Issues 19 Pull Requests 1 Actions Packages Releases 12 Activity

Improve devise views
Some checks failed
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is failing
Details

Browse Source
This commit is contained in:
Basti 2022-02-23 18:16:14 -06:00
parent f36f6866a7
commit 5a784b5fa6
Signed by untrusted user: basti
GPG Key ID: 9F88009D31D99C72
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/devise/confirmations/new.html.erb
View File

@ -6,14 +6,15 @@
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= render "devise/shared/error_messages", resource: resource %> <%= render "devise/shared/error_messages", resource: resource %>
<p> <p>
<%= f.label :email, 'Email address', class: 'block mb-1' %> <%= f.label :email, 'Email address', class: 'block mb-1 w-full' %>
<%= f.email_field :email, <%= f.email_field :email,
required: true, autofocus: true, autocomplete: "email", required: true, autofocus: true, autocomplete: "email",
value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email),
class: "w-full sm:w-4/5" %> class: "w-full" %>
</p> </p>
<p class="mt-8"> <p class="mt-8">
<%= f.submit "Resend confirmation instructions", class: 'btn-md btn-blue' %> <%= f.submit "Resend confirmation link",
class: 'btn-md btn-blue w-full md:w-auto' %>
</p> </p>
<% end %> <% end %>

9
app/views/devise/passwords/new.html.erb
View File

@ -7,14 +7,17 @@
<%= render "devise/shared/error_messages", resource: resource %> <%= render "devise/shared/error_messages", resource: resource %>
<p> <p>
<%= f.label :cn, 'User', class: 'block' %> <%= f.label :cn, 'User', class: 'block' %>
<%= f.text_field :cn, autofocus: true, autocomplete: "username", required: true %> @ kosmos.org <%= f.text_field :cn, autofocus: true, autocomplete: "username",
required: true, class: "w-full md:w-3/5"%>
<span class="ml-1 text-gray-500">@ kosmos.org</span>
</p> </p>
<p> <p>
<%= f.label :email, 'Email address', class: 'block' %> <%= f.label :email, 'Email address', class: 'block' %>
<%= f.email_field :email, autocomplete: "email", required: true %> <%= f.email_field :email, autocomplete: "email", required: true,
class: "w-full md:w-3/5"%>
</p> </p>
<p class="mt-8"> <p class="mt-8">
<%= f.submit "Send me a reset link", class: 'btn-md btn-blue' %> <%= f.submit "Send me a reset link", class: 'btn-md btn-blue w-full md:w-auto' %>
</p> </p>
<% end %> <% end %>

9
app/views/devise/sessions/new.html.erb
View File

@ -5,14 +5,17 @@
<%= render "devise/shared/error_messages", resource: resource %> <%= render "devise/shared/error_messages", resource: resource %>
<p> <p>
<%= f.label :cn, 'User', class: 'block' %> <%= f.label :cn, 'User', class: 'block' %>
<%= f.text_field :cn, autofocus: true, autocomplete: "username" %> @ kosmos.org <%= f.text_field :cn, autofocus: true, autocomplete: "username",
class: "w-full md:w-3/5"%>
<span class="ml-1 text-gray-500">@ kosmos.org</span>
</p> </p>
<p> <p>
<%= f.label :password, class: 'block' %> <%= f.label :password, class: 'block' %>
<%= f.password_field :password, autocomplete: "current-password" %> <%= f.password_field :password, autocomplete: "current-password",
class: "w-full md:w-3/5"%>
</p> </p>
<p class="mt-8"> <p class="mt-8">
<%= f.submit "Log in", class: 'btn-md btn-blue' %> <%= f.submit "Log in", class: 'btn-md btn-blue w-full md:w-auto' %>
</p> </p>
<% end %> <% end %>

32
app/views/layouts/application.html.erb
View File

@ -45,21 +45,23 @@
<% end %> <% end %>
</div> </div>
<div class="-mr-2 flex md:hidden"> <div class="-mr-2 flex md:hidden">
<button type="button" id="toggle-mobile-nav" <% if user_signed_in? && current_user.confirmed? %>
data-action="topbar#toggleMobileNav" <button type="button" id="toggle-mobile-nav"
class="bg-gray-900/50 inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white" aria-controls="mobile-menu" aria-expanded="false"> data-action="topbar#toggleMobileNav"
<span class="sr-only">Open main menu</span> class="bg-gray-900/50 inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white" aria-controls="mobile-menu" aria-expanded="false">
<!-- Heroicon name: outline/menu --> <span class="sr-only">Open main menu</span>
<svg data-topbar-target="iconMobileMenuOpen" class="block h-6 w-6" <!-- Heroicon name: outline/menu -->
xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true"> <svg data-topbar-target="iconMobileMenuOpen" class="block h-6 w-6"
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" /> xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
</svg> <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
<!-- Heroicon name: outline/x --> </svg>
<svg data-topbar-target="iconMobileMenuClose" class="hidden h-6 w-6" <!-- Heroicon name: outline/x -->
xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true"> <svg data-topbar-target="iconMobileMenuClose" class="hidden h-6 w-6"
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" /> xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
</svg> <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
</button> </svg>
</button>
<% end %>
</div> </div>
</div> </div>
</div> </div>