From e8c5cd121901187f90f0fa7512823192c55e7445 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 14 Dec 2017 11:51:44 +0630
Subject: [PATCH] call waiter css

---
 .../javascripts/channels/call_waiter.js       |  8 +++--
 app/assets/stylesheets/origami.scss           | 30 ++++++++++---------
 app/views/layouts/origami.html.erb            |  4 +++
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/channels/call_waiter.js b/app/assets/javascripts/channels/call_waiter.js
index f45748a9..941a6359 100644
--- a/app/assets/javascripts/channels/call_waiter.js
+++ b/app/assets/javascripts/channels/call_waiter.js
@@ -9,6 +9,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
    table = data.table
    
     // for Notificaiotn message
+    var element        = "#notify-wrapper"
     var placementFrom  = "top";
     var placementAlign = "center";
     var animateEnter   = "";
@@ -17,10 +18,10 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
     var text           = " Calling Waiter <br>  "+table.name ;
 
     if (text != null || colorName != null){
-     showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
+     showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
    }
 
-   function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
+   function showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
     if (colorName === null || colorName === '') { colorName = 'bg-black'; }
     if (animateEnter === null || animateEnter === '') { animateEnter = 'animated fadeInDown'; }
     if (animateExit === null || animateExit === '') { animateExit = 'animated fadeOutUp'; }
@@ -30,6 +31,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
       message: text
     },
     {
+      element: element,
       type: colorName,
       allow_dismiss: allowDismiss,
       timer: 200000000000000,
@@ -42,7 +44,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
         exit: animateExit
       },
       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 notify-close float-right m-l-5 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">×</button>' +
       '<span data-notify="icon"></span> ' +
       '<span data-notify="title">{1}</span> ' +
       '<span data-notify="message">{2}</span>' +
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 38ee8def..30d8a090 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -362,11 +362,25 @@ tr.discount-item-row:hover {
 
 /* End Payment Page */
 
-/*Logout Icon*/
+/* Logout Icon */
+
 i.logout_icon{
   position: relative;
   top: 5px;
 }
+
+/* End Logout Icon */
+
+/* Notify */
+
+#notify-wrapper {
+	position: absolute;
+	top: 55px;
+	left: 10px;
+	z-index: 9999;
+	opacity: 0.8;
+}
+
 [data-notify="container"] {
 	margin-bottom: 5px !important;
 	margin-left:5px !important;
@@ -374,17 +388,5 @@ i.logout_icon{
 	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;
-}
-*/
\ No newline at end of file
+/* End Notify */
diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb
index 9f175511..744ab87a 100755
--- a/app/views/layouts/origami.html.erb
+++ b/app/views/layouts/origami.html.erb
@@ -41,6 +41,10 @@
         <%= render 'layouts/right_sidebar' %>  
     </section>
 
+    <!-- Notify -->
+    <div id="notify-wrapper"></div>
+    <!-- Notify -->
+
     <!-- Main Content -->
     <section class="content"> 
       <% flash.each do |type, message| %>