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

Merge branch 'settings_backend'

Browse Source
This commit is contained in:
Nweni
2017-06-01 17:14:57 +06:30
parent ad38a0a708 e200dcd438
commit 926c54c079
15 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
<nav class="navbar navbar-toggleable-md fixed-top navbar-light">
<nav class="navbar navbar-toggleable-md fixed-top navbar-light setting_nav">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="#">H</a>
<a class="navbar-brand" href="#" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="navbar-nav mr-auto dropdown">
@@ -24,7 +24,7 @@
</li>
<li class="navbar-nav mr-auto dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Transactions</a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Transactions</a>
<ul class="dropdown-menu">
<li><%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %></li>
<li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
@@ -39,7 +39,7 @@
<% if current_login_employee %>
<div class="right">
<ul class="navbar-nav mr-auto">
<li><%= current_login_employee.name %> </li>
<li style="color: #959595"><%= current_login_employee.name %> </li>
<li style="padding-right:10px;padding-left:10px"> | </li>
<li ><%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
</li>

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

@@ -10,6 +10,7 @@
<%= csrf_meta_tags %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>

2
app/views/settings/set_menu_items/edit.html.erb
View File

@@ -9,7 +9,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_items_path %>">Menu Items</a></li>
<li><a href="<%= settings_menu_category_set_menu_items_path(@cattegory) %>">Menu Category</a></li>
<li>Edit</li>
</ul>
</div>

3
app/views/settings/set_menu_items/index.html.erb
View File

@@ -1,7 +1,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>
<li>Menu Items</li>
<span style="float: right">
@@ -78,3 +78,4 @@
</div>
</div>
<%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %>

2
app/views/settings/set_menu_items/new.html.erb
View File

@@ -9,7 +9,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_items_path %>">Menu Items</a></li>
<li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
<li>New</li>
</ul>
</div>

4
app/views/settings/set_menu_items/show.html.erb
View File

@@ -2,8 +2,8 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li>Menu Item Option</li>
<li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
<li>Menu Item</li>
<span style="float: right">
</span>
</ul>

2
app/views/settings/simple_menu_items/edit.html.erb
View File

@@ -6,7 +6,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="">Menu Items</a></li>
<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
<li>Edit</li>
</ul>
</div>

4
app/views/settings/simple_menu_items/index.html.erb
View File

@@ -1,7 +1,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>
<li>Menu Items</li>
<span style="float: right">
@@ -46,7 +46,6 @@
<%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
</span></h4>
<h4 class="card-title"><%= @settings_menu_items.count %></h4>
<table class="table">
<thead>
<tr>
@@ -84,3 +83,4 @@
</div>
</div>
<%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %>

2
app/views/settings/simple_menu_items/new.html.erb
View File

@@ -9,7 +9,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><!-- <a href="<%= settings_menu_items_path %>"> -->Menu Items<!-- </a> --></li>
<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
<li>New</li>
</ul>
</div>

2
app/views/settings/simple_menu_items/show.html.erb
View File

@@ -2,7 +2,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
<li>Menu Item Option</li>
<span style="float: right">
</span>