From c537e00a5f96d9e2b5041c5ca5fe3ec1d1594972 Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Mon, 18 Oct 2021 16:19:25 +0200
Subject: [PATCH] server layout
---
.../server/application_controller.rb | 2 +-
app/views/admin/layouts/application.html.erb | 3 --
app/views/server/layouts/application.html.erb | 50 +++++++++++++++++++
3 files changed, 51 insertions(+), 4 deletions(-)
create mode 100644 app/views/server/layouts/application.html.erb
diff --git a/app/controllers/server/application_controller.rb b/app/controllers/server/application_controller.rb
index 27a107858..b85c0802f 100644
--- a/app/controllers/server/application_controller.rb
+++ b/app/controllers/server/application_controller.rb
@@ -1,5 +1,5 @@
class Server::ApplicationController < ApplicationController
- layout 'admin/layouts/application'
+ layout 'server/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 d172d693c..2f86440c2 100644
--- a/app/views/admin/layouts/application.html.erb
+++ b/app/views/admin/layouts/application.html.erb
@@ -31,9 +31,6 @@
<%= render 'admin/application/top' %>
<main class="content">
<div class="container-fluid p-0">
- <div class="float-end">
- <%= yield :buttons %>
- </div>
<h1><%= yield :title %></h1>
<%= yield %>
</div>
diff --git a/app/views/server/layouts/application.html.erb b/app/views/server/layouts/application.html.erb
new file mode 100644
index 000000000..cafd14698
--- /dev/null
+++ b/app/views/server/layouts/application.html.erb
@@ -0,0 +1,50 @@
+<!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="toasts-container" style="position: fixed; top: 20px; right: 20px; z-index: 100000;">
+ <% unless notice.nil? %>
+ <div class="js-notyf-notice d-none">
+ <%= notice %>
+ </div>
+ <% end %>
+ <% unless alert.nil? %>
+ <div class="js-notyf-alert d-none">
+ <%= alert %>
+ </div>
+ <% end %>
+ </div>
+ <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>
+ <%= render 'admin/application/footer' %>
+ <div class="main">
+ <%= render 'admin/application/top' %>
+ <main class="content">
+ <div class="container-fluid p-0">
+ <h1><%= yield :title %></h1>
+ <%= yield %>
+ </div>
+ </main>
+ </div>
+ </div>
+ <%= javascript_include_tag 'admin' %>
+ <%= render 'bugsnag' %>
+ </body>
+</html>
--
GitLab