(Small) (layout) improvements
Some checks failed
/ Run tests (push) Successful in 1m30s
/ Run system tests (push) Failing after 1m39s
/ Build, push and deploy image (push) Successful in 1m33s

This commit is contained in:
david 2024-09-23 00:14:33 +02:00
parent a78d15d4da
commit b88ac28c9b
6 changed files with 41 additions and 32 deletions

View file

@ -1,6 +1,6 @@
<div class="col-auto px-0"> <div class="col-auto px-0">
<div id="sidebar" class="collapse collapse-horizontal show border-0"> <div id="sidebar" class="collapse collapse-horizontal show border-0">
<div id="sidebar-nav" class="list-group border-0 rounded-0 text-sm-start min-vh-100"> <div id="sidebar-nav" class="list-group border-0 rounded-0 text-sm-start" style="min-height: 90vh">
<% if @sidebar_items %> <% if @sidebar_items %>
<% @sidebar_items.each do |sidebar_item| %> <% @sidebar_items.each do |sidebar_item| %>
<% if sidebar_item[:method].present? && sidebar_item[:method] != :get %> <% if sidebar_item[:method].present? && sidebar_item[:method] != :get %>

View file

@ -11,20 +11,21 @@
<%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %> <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
</head> </head>
<body class="d-flex flex-column min-vh-100"> <body class="">
<%= render partial: "layouts/navigation" %> <%= render partial: "layouts/navigation" %>
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-nowrap"> <div class="row">
<%= render partial: "layouts/sidebar" %> <%= render partial: "layouts/sidebar" %>
<main class="col ps-md-2 pt-2 <%= "border-start" if sidebar? %>"> <main class="col ps-md-2 pt-2 <%= "border-start" if sidebar? %>">
<%= render partial: "layouts/flash" %> <%= render partial: "layouts/flash" %>
<% if false && sidebar? %> <% if false && sidebar? %>
<a href="#" data-bs-target="#sidebar" data-bs-toggle="collapse" class="p-1 text-decoration-none"><i class="bi bi-list bi-lg py-2 p-1"></i> Menu</a> <a href="#" data-bs-target="#sidebar" data-bs-toggle="collapse" class="p-1 text-decoration-none"><i class="bi bi-list bi-lg py-2 p-1"></i> Menu</a>
<% end %> <% end %>
<%= yield %> <%= yield %>
</main> </main>
</div> </div>
</div> </div>
<footer class="container-fluid mt-auto"><%= Rails.configuration.build_version && "Version: #{Rails.configuration.build_version}" %> <footer class="container-fluid mt-auto border-top"><%= Rails.configuration.build_version && "Version: #{Rails.configuration.build_version}" %>
</body> </body>
</html> </html>

View file

@ -1,5 +1,7 @@
<h1>Passwort ändern</h1> <h1>Passwort ändern</h1>
<%= form_with url: rodauth.change_password_path, method: :post, data: { turbo: false } do |form| %> <div class="row">
<div class="col-md-4">
<%= form_with url: rodauth.change_password_path, method: :post, data: { turbo: false } do |form| %>
<% if rodauth.change_password_requires_password? %> <% if rodauth.change_password_requires_password? %>
<div class="form-group mb-3"> <div class="form-group mb-3">
<%= form.label "password", rodauth.password_label, class: "form-label" %> <%= form.label "password", rodauth.password_label, class: "form-label" %>
@ -25,4 +27,6 @@
<div class="form-group mb-3"> <div class="form-group mb-3">
<%= form.submit rodauth.change_password_button, class: "btn btn-primary" %> <%= form.submit rodauth.change_password_button, class: "btn btn-primary" %>
</div> </div>
<% end %> <% end %>
</div>
</div>

View file

@ -1,3 +1,7 @@
<%== rodauth.login_form_header %> <%== rodauth.login_form_header %>
<%= render "login_form" %> <div class="row">
<div class="col-md-3">
<%= render "login_form" %>
</div>
</div>
<%== rodauth.login_form_footer %> <%== rodauth.login_form_footer %>

View file

@ -1,3 +1,4 @@
<h1>Adieu</h1>
<%= form_with url: rodauth.logout_path, method: :post, data: { turbo: false } do |form| %> <%= form_with url: rodauth.logout_path, method: :post, data: { turbo: false } do |form| %>
<% if rodauth.features.include?(:active_sessions) %> <% if rodauth.features.include?(:active_sessions) %>
<div class="form-group mb-3"> <div class="form-group mb-3">
@ -7,7 +8,6 @@
</div> </div>
</div> </div>
<% end %> <% end %>
<div class="form-group mb-3"> <div class="form-group mb-3">
<%= form.submit "Log out", class: "btn btn-warning" %> <%= form.submit "Log out", class: "btn btn-warning" %>
</div> </div>