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

merge with origin

Browse Source
This commit is contained in:
Yan
2017-10-26 17:58:43 +06:30
parent 0da1aeaeb9 89d2bc7b39
commit 4607321726
72 changed files with 1675 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/views/layouts/CRM.html.erb
View File

@@ -43,14 +43,22 @@
<!-- Main Content -->
<section class="content">
<% flash.each do |type, message| %>
<div class="alert-danger fade in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<% if !flash["errors"]%>
<%=message%>
<% end %>
</div>
<% flash.each do |type, message| %>
<% if !flash["errors"]%>
<%
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 %>
<% end %>
<%= yield %>
</section>

4
app/views/layouts/_left_sidebar.html.erb
View File

@@ -167,12 +167,12 @@
<span><%= t :payment_methods %></span>
</a>
</li>
<li>
<!-- <li>
<a href="<%= settings_accounts_path %>">
<i class="material-icons col-amber">donut_large</i>
<span><%= t :accounts %></span>
</a>
</li>
</li> -->
<li>
<a href="<%= settings_products_path %>">
<i class="material-icons col-brown">donut_large</i>

15
app/views/layouts/application.html.erb
View File

@@ -42,7 +42,20 @@
</section>
<!-- Main Content -->
<section class="content">
<section class="content">
<% 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 %>
<%= yield %>
</section>
</body>

20
app/views/layouts/origami.html.erb
View File

@@ -44,14 +44,18 @@
<!-- Main Content -->
<section class="content">
<% flash.each do |type, message| %>
<% if !flash["errors"]%>
<div class="alert fade in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<%=message%>
</div>
<% end %>
<% end %>
<% 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 %>
<%= yield %>
</section>
</body>