fixed conflic
This commit is contained in:
@@ -38,7 +38,23 @@
|
||||
<p>Please wait...</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% flash.each do |type, message| %>
|
||||
<%
|
||||
if type == "notice"
|
||||
color = "alert-success"
|
||||
elsif type == "error"
|
||||
color = "alert-danger"
|
||||
elsif type == "warning"
|
||||
color = "alert-warning"
|
||||
else
|
||||
color = "bg-black"
|
||||
end %>
|
||||
|
||||
<p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
|
||||
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
|
||||
</p>
|
||||
<% end %>
|
||||
|
||||
<!-- #END# Page Loader -->
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
@@ -140,7 +156,7 @@
|
||||
</html>
|
||||
|
||||
<script>
|
||||
$(document).on('turbolinks:load', function () {
|
||||
$(document).ready(function () {
|
||||
|
||||
// for Notificaiotn message
|
||||
|
||||
|
||||
Reference in New Issue
Block a user