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

update logout 3 times

Browse Source
This commit is contained in:
Aung Myo
2017-10-12 16:04:45 +06:30
parent 990ecddded
commit 1fa23c01d7
4 changed files with 238 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,12 +21,13 @@
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
<!-- JS -->
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<!-- oqs -->
<%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %>
<!-- <%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %> -->
<!-- crm -->
<%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %>
<!-- <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %>-->
<!-- JS -->
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>

2
app/views/origami/addorders/detail.html.erb
View File

@@ -4,7 +4,7 @@
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" >
<% @menu.each do |menu| %>
<li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
<li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id %>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>