Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-01-19 16:07:23 +06:30
parent 3a21d85a4b 9de47cc5da
commit 3e35ba109b
8 changed files with 91 additions and 44 deletions
--- a/app/views/layouts/installation.html.erb
+++ b/app/views/layouts/installation.html.erb
@@ -29,9 +29,21 @@
  </head>

  <body class="page">
+    <% flash.each do |type, message| %>
+      <% if type == "notice" 
+           color = "alert-success"
+        elsif type == "error"
+            color = "alert-danger"
+        else
+            color = "bg-black"
+        end %>
+        
+        <p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
+            data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
+        </p>
+    <% end %>
    <div class="box">
      <%= yield %>
-
    </div>
  </body>
 </html>