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-20 14:31:01 +06:30
parent 25bc6f1c26 9dac7198e9
commit ba39284f93
12 changed files with 140 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/views/layouts/_header.html.erb
View File

@@ -1,4 +1,4 @@
Search Bar -->
<!-- Search Bar -->
<!-- <div class="search-bar">
<div class="search-icon">
<i class="material-icons">search</i>
@@ -32,15 +32,12 @@ Search Bar -->
<ul class="dropdown-menu">
<li>
<%if current_login_employee.role !="waiter" %>
<%= link_to (t :logout),logout_path, method: :delete,"data-no-turbolink" => true, data: {confirm: 'Are you sure?'} %>
<p class="delete waves-effect waves-block" style="margin:0.5rem 1rem !important;" data-ref="<%=logout_path%>" data-method="delete">Logout</p>
<span class="hidden" id="delete_text">
<h6>Are you sure you want to Logout ?</h6>
<!-- <h6>This action can't be undo. </h6> -->
</span>
<%end%>
<p class="delete" style="" data-ref="<%=logout_path%>" data-method="delete">Logout</p>
<span class="hidden" id="delete_text">
<h6>Are you sure you want to Logout ?</h6>
<!-- <h6>This action can't be undo. </h6> -->
</span>
</li>
</ul>
<a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
@@ -48,10 +45,4 @@ Search Bar -->
</a>
</div>
</div>
</nav>
<!-- #Top Bar
<!-- <form action="<%=logout_path%>" method="DELETE">
<button type="text" class="delete" value="x" >DELETE</button>
</form> -->
<!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a>
</nav>