Merge branch 'master' into license

This commit is contained in:
Yan
2017-11-28 17:07:58 +06:30
67 changed files with 538 additions and 397 deletions

View File

@@ -30,9 +30,9 @@
<ul class="dropdown-menu">
<li>
<%if current_login_employee.role !="waiter" %>
<p class="delete waves-effect waves-block p-l-30 m-t-15" data-ref="<%=logout_path%>" data-method="delete">
<i class="material-icons">exit_to_app</i>
<span class="font-18 m-b-5">Logout</span>
<p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
<i class="material-icons font-10 logout_icon">exit_to_app</i>
<span class="font-18">Logout</span>
</p>
<span class="hidden" id="delete_text">
<h6>Are you sure you want to Logout ?</h6>