git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update call waiter

Browse Source
This commit is contained in:
Aung Myo
2017-12-14 11:06:06 +06:30
parent f497957a56
commit 4baa273f8e
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/channels/call_waiter.js
View File

@@ -25,13 +25,13 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
if (animateEnter === null || animateEnter === '') { animateEnter = 'animated fadeInDown'; } if (animateEnter === null || animateEnter === '') { animateEnter = 'animated fadeInDown'; }
if (animateExit === null || animateExit === '') { animateExit = 'animated fadeOutUp'; } if (animateExit === null || animateExit === '') { animateExit = 'animated fadeOutUp'; }
var allowDismiss = true; var allowDismiss = true;
$.notify({ $.notify({
message: text message: text
}, },
{ {
type: colorName, type: colorName,
allow_dismiss: allowDismiss, allow_dismiss: allowDismiss,
newest_on_top: true,
timer: 200000000000000, timer: 200000000000000,
placement: { placement: {
from: placementFrom, from: placementFrom,
@@ -41,8 +41,8 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
enter: animateEnter, enter: animateEnter,
exit: animateExit exit: animateExit
}, },
template: '<div data-notify="container" style="max-width: 180px !important;" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' + template: '<div data-notify="container" style="width:180px !important;" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
'<button type="button" aria-hidden="true" class="close float-right m-l-20 m-t--5" data-notify="dismiss" style="right: -5px;">×</button>' + '<button type="button" aria-hidden="true" class="close notify-close float-right m-l-5 m-t--5" data-notify="dismiss" style="right: -5px;">×</button>' +
'<span data-notify="icon"></span> ' + '<span data-notify="icon"></span> ' +
'<span data-notify="title">{1}</span> ' + '<span data-notify="title">{1}</span> ' +
'<span data-notify="message">{2}</span>' + '<span data-notify="message">{2}</span>' +

21
app/assets/stylesheets/origami.scss
View File

@@ -367,3 +367,24 @@ i.logout_icon{
position: relative; position: relative;
top: 5px; top: 5px;
} }
[data-notify="container"] {
margin-bottom: 5px !important;
margin-left:5px !important;
position:relative !important;
top: 25% !important;
width: 100% !important;
}
/*
.bootstrap-notify-container {
position: !important;
margin:10px 10px 10px 10px !important;
float:left !important;
display:block !important;
z-index: 9999999;
opacity: 1;
}
.notify-close{
position:initial !important;
}
*/

1
app/models/dining_facility.rb
View File

@@ -96,4 +96,5 @@ class DiningFacility < ApplicationRecord
end end
end end
end end
end end