diff --git a/app/assets/javascripts/admin/plugins/notyf.js b/app/assets/javascripts/application/plugins/notyf.js similarity index 100% rename from app/assets/javascripts/admin/plugins/notyf.js rename to app/assets/javascripts/application/plugins/notyf.js diff --git a/app/assets/javascripts/extranet.js b/app/assets/javascripts/extranet.js index 1bb3ee541721c56a5c7d12ec8380345569d8f078..3c9f58a03895bb50778a8ac9d5bc527d2eb3d50b 100644 --- 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 diff --git a/app/assets/stylesheets/extranet.sass b/app/assets/stylesheets/extranet.sass index f502e046a4e4422e45379503f399721372a9a218..4d696cd0e819e943695caf8ddc58b633c692dc65 100644 --- 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/*' diff --git a/app/views/admin/layouts/themes/_appstack.html.erb b/app/views/admin/layouts/themes/_appstack.html.erb index 8ca84d7862310d69fdd76292152b3f3e87b8a25b..331f7b38364abd8c6d9a9b7a46c14fb087a0b5b0 100644 --- a/app/views/admin/layouts/themes/_appstack.html.erb +++ b/app/views/admin/layouts/themes/_appstack.html.erb @@ -1,5 +1,5 @@ <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" %> diff --git a/app/views/admin/layouts/themes/_pure.html.erb b/app/views/admin/layouts/themes/_pure.html.erb index b5bfe97af04e6dd935348c68a86227b3b57ac607..965029888465752746d75e9336121af843a8d2e2 100644 --- a/app/views/admin/layouts/themes/_pure.html.erb +++ b/app/views/admin/layouts/themes/_pure.html.erb @@ -1,7 +1,7 @@ <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"> diff --git a/app/views/admin/application/_notice.html.erb b/app/views/application/_notice.html.erb similarity index 100% rename from app/views/admin/application/_notice.html.erb rename to app/views/application/_notice.html.erb diff --git a/app/views/extranet/layouts/application.html.erb b/app/views/extranet/layouts/application.html.erb index 4d8ed5a4adf866000f9ead78fa6f98c6f8e20cb1..b72cd0a1427c0965e103acf0702e982701dead7d 100644 --- 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"> diff --git a/app/views/server/layouts/application.html.erb b/app/views/server/layouts/application.html.erb index fd3d6120b03f44e903b0d070519faffa5cdae7c9..11b3a9e841fad85e728205ea3838967cb332f502 100644 --- 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">