Merge pull request #897 from noesya/extranet_notyf

Ajout des alertes/notifs aux extranets

Merge pull request #897 from noesya/extranet_notyf
aa9adf6e · Pierre-André Boissinot · GitHub · 599b48f8 · 4f66511c · aa9adf6e
Unverified Commit aa9adf6e authored 2 years ago by Pierre-André Boissinot Committed by GitHub 2 years ago
--- a/app/assets/javascripts/admin/plugins/notyf.js
+++ b/app/assets/javascripts/admin/plugins/notyf.js
--- a/app/assets/javascripts/extranet.js
+++ b/app/assets/javascripts/extranet.js
@@ -6,6 +6,7 @@
 //= require jquery_ujs
 //= require cropperjs/dist/cropper
 //= require jquery-cropper/dist/jquery-cropper
+//= require notyf/notyf.min
 //= require simple_form_password_with_hints
 //= require simple_form_bs5_file_input
 //= require summernote/summernote-bs5

--- a/app/assets/stylesheets/extranet.sass
+++ b/app/assets/stylesheets/extranet.sass
@@ -11,6 +11,7 @@
 @import 'commons/summernote'
 @import 'commons/bootstrap-icons'
 @import 'leaflet'
+@import 'notyf/notyf.min'

 // Default
 @import 'extranet/layout/*'

--- a/app/views/admin/layouts/themes/_appstack.html.erb
+++ b/app/views/admin/layouts/themes/_appstack.html.erb
 <body class="<%= body_classes %>" data-layout="fluid" data-sidebar-position="left">
-  <%= render 'admin/application/notice' %>
+  <%= render 'application/notice' %>
  <div class="wrapper">
    <%= render "admin/layouts/themes/appstack/nav" %>
    <%= render "admin/layouts/themes/appstack/footer" %>

--- a/app/views/admin/layouts/themes/_pure.html.erb
+++ b/app/views/admin/layouts/themes/_pure.html.erb
 <body class="<%= body_classes %>">
  <%= render "admin/layouts/themes/pure/nav" %>
  <%= render "admin/layouts/themes/pure/hero" %>
-  <%= render 'admin/application/notice' %>
+  <%= render 'application/notice' %>
  <main class="container-fluid">
    <% unless current_user.confirmed? %>
      <div class="alert alert-warning">

--- a/app/views/admin/application/_notice.html.erb
+++ b/app/views/admin/application/_notice.html.erb
--- a/app/views/extranet/layouts/application.html.erb
+++ b/app/views/extranet/layouts/application.html.erb
@@ -4,6 +4,7 @@
    <%= render 'extranet/application/head' %>
  </head>
  <body class="extranet <%= body_classes %>">
+    <%= render 'application/notice' %>
    <%= render 'extranet/application/nav' %>
    <%= render 'extranet/application/header' %>
    <main class="container">

--- a/app/views/server/layouts/application.html.erb
+++ b/app/views/server/layouts/application.html.erb
@@ -15,7 +15,7 @@
  <body class="<%= body_classes %>">
    <%= render "admin/layouts/themes/pure/nav", context: :server %>
    <%= render "admin/layouts/themes/pure/hero" %>
-    <%= render 'admin/application/notice' %>
+    <%= render 'application/notice' %>
    <main class="container-fluid">
      <% unless current_user.confirmed? %>
        <div class="alert alert-warning">