diff --git a/app/assets/javascripts/kuroko2/job_instances.js b/app/assets/javascripts/kuroko2/job_instances.js index c3327f9c..9a9d205d 100644 --- a/app/assets/javascripts/kuroko2/job_instances.js +++ b/app/assets/javascripts/kuroko2/job_instances.js @@ -3,16 +3,13 @@ jQuery(function ($) { var logIntervalId; - var notifyIfNeeded = function (status, name) { + var notifyIfNeeded = function (status, name, image) { if (!('Notification' in window)) { return; } if (Notification.permission === 'granted' && Cookies.get('notification') === 'on') { - var notification = new Notification( - "[" + status + "] " + name, - {"icon": window.location.origin + "/assets/kuroko2/kuroko-logo-" + status.toLowerCase() + ".png"} - ); + var notification = new Notification("[" + status + "] " + name, {"icon": image[status.toLowerCase()]}); notification.onclick = function () { notification.close(); window.focus(); @@ -24,7 +21,7 @@ jQuery(function ($) { $.get(instancePath, function (data) { $('#instance').replaceWith(data); - notifyIfNeeded($('#instance-status').text(), $('#definition-name').text()); + notifyIfNeeded($('#instance-status').text(), $('#definition-name').text(), $('#notification').data()); }); }; var updateLogs = function () { diff --git a/app/views/layouts/kuroko2/application.html.slim b/app/views/layouts/kuroko2/application.html.slim index d02c80db..45201452 100644 --- a/app/views/layouts/kuroko2/application.html.slim +++ b/app/views/layouts/kuroko2/application.html.slim @@ -31,7 +31,7 @@ html img.img-circle src='#{current_user.image}' alt="#{current_user.name}" .pull-left.info p Hello, #{current_user.name} - p#notification + p#notification data-success='#{asset_url('kuroko2/kuroko-logo-success.png')}' data-error='#{asset_url('kuroko2/kuroko-logo-error.png')}' i.fa.fa-volume-off | Turn on notification ul.sidebar-menu diff --git a/lib/kuroko2/engine.rb b/lib/kuroko2/engine.rb index b38c0b09..10c1721e 100644 --- a/lib/kuroko2/engine.rb +++ b/lib/kuroko2/engine.rb @@ -50,6 +50,8 @@ class Engine < ::Rails::Engine config.action_mailer.smtp_settings = Kuroko2.config.action_mailer.smtp_settings.to_h.symbolize_keys || {} + app.config.assets.precompile += %w(kuroko2/kuroko-logo-success.png kuroko2/kuroko-logo-error.png) + if Kuroko2.config.extentions && Kuroko2.config.extentions.controller Kuroko2.config.extentions.controller.each do |extention| Kuroko2::ApplicationController.include(Module.const_get(extention, false))