diff --git a/app/assets/stylesheets/admin/appstack.sass b/app/assets/stylesheets/admin/appstack.sass
index 7052fdc00adc7eb634bff82a9c0f2f48ed6a99ce..c73c3015d3aad8392ea78193c7849a3363a30272 100644
--- a/app/assets/stylesheets/admin/appstack.sass
+++ b/app/assets/stylesheets/admin/appstack.sass
@@ -1,12 +1,17 @@
main.content
padding-bottom: 65px
+.sidebar.collapsed + .footer.fixed
+ left: 0
+ transition: left .35s ease-in-out
+
.footer.fixed
bottom: 0
left: 260px
padding: .5rem
position: fixed
right: 0
+ z-index: 1
table.table-striped
tbody
diff --git a/app/controllers/server/application_controller.rb b/app/controllers/server/application_controller.rb
index b85c0802f779691a2dcf4eb5036c2126bbffb43d..27a10785887c028276c72960d7f64955c18a837a 100644
--- a/app/controllers/server/application_controller.rb
+++ b/app/controllers/server/application_controller.rb
@@ -1,5 +1,5 @@
class Server::ApplicationController < ApplicationController
- layout 'server/layouts/application'
+ layout 'admin/layouts/application'
before_action :authenticate_user!, :ensure_user_if_server_admin
diff --git a/app/views/admin/layouts/application.html.erb b/app/views/admin/layouts/application.html.erb
index 9f49453feef6018e7215150193661e3d93e166ea..d172d693c50099f27df8cd4d8be8bcdbdf072bd5 100644
--- a/app/views/admin/layouts/application.html.erb
+++ b/app/views/admin/layouts/application.html.erb
@@ -26,6 +26,7 @@
</div>
<div class="wrapper">
<%= render 'admin/application/nav' %>
+ <%= render 'admin/application/footer' %>
<div class="main">
<%= render 'admin/application/top' %>
<main class="content">
@@ -37,7 +38,6 @@
<%= yield %>
</div>
</main>
- <%= render 'admin/application/footer' %>
</div>
</div>
<%= javascript_include_tag 'admin' %>
diff --git a/app/views/server/languages/_form.html.erb b/app/views/server/languages/_form.html.erb
index 17a932c39d4287ca2f2b7996327b203c9281097f..480d192ef0b53986cff07a7ef2081005fe2464bf 100644
--- a/app/views/server/languages/_form.html.erb
+++ b/app/views/server/languages/_form.html.erb
@@ -8,7 +8,7 @@
</div>
</div>
- <% content_for :buttons do %>
+ <% content_for :action_bar_right do %>
<%= submit f %>
<% end %>
<% end %>
diff --git a/app/views/server/languages/show.html.erb b/app/views/server/languages/show.html.erb
index 56a8fc02806c5c28ab452d711669c59651dcbf6a..3e164e5c40a04a9bdb09a6d47d96fb69eda90fdd 100644
--- a/app/views/server/languages/show.html.erb
+++ b/app/views/server/languages/show.html.erb
@@ -5,6 +5,6 @@
<%= @language.iso_code %>
</p>
-<% content_for :buttons do %>
+<% content_for :action_bar_right do %>
<%= link_to t('edit'), edit_server_language_path(@language), class: button_classes %>
<% end %>
diff --git a/app/views/server/layouts/application.html.erb b/app/views/server/layouts/application.html.erb
deleted file mode 100644
index c0488b30998df1ac195aac62ccf9566008543954..0000000000000000000000000000000000000000
--- a/app/views/server/layouts/application.html.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <title><%= content_for?(:title) ? raw("#{yield(:title)} ∙ Osuny")
- : 'Osuny' %></title>
- <%= csrf_meta_tags %>
- <%= csp_meta_tag %>
- <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500&display=swap" rel="stylesheet">
- <%= stylesheet_link_tag 'admin', media: 'all' %>
- <%= favicon_link_tag 'favicon.png' %>
- </head>
-
- <body data-theme="default" data-layout="fluid" data-sidebar-position="left" data-sidebar-behavior="sticky">
- <div class="wrapper">
- <nav id="sidebar" class="sidebar">
- <div class="sidebar-content js-simplebar">
- <%= link_to server_root_path, class: 'sidebar-brand' do %>
- <%= image_tag 'osuny-white.svg', class: 'img-fluid' %>
- <% end %>
- <%= render_navigation context: :server %>
- </div>
- </nav>
- <div class="main">
- <%= render 'admin/application/top' %>
- <main class="content">
- <div class="container-fluid p-0">
- <h1><%= yield :title %></h1>
- <%= yield %>
- </div>
- </main>
- <%= render 'admin/application/footer' %>
- </div>
- </div>
- <%= javascript_include_tag 'admin' %>
- </body>
-</html>