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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2017-10-26 10:23:38 +06:30
parent 805ca6709f fe6d8a4be0
commit 645d9b3f94
6 changed files with 127 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/settings/accounts/_form.html.erb
View File

@@ -3,8 +3,8 @@
<%= simple_form_for([:settings,@settings_account]) do |f| %> <%= simple_form_for([:settings,@settings_account]) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs p-l-10"> <div class="form-inputs p-l-10">
<%= f.input :title %> <%= f.input :title ,:input_html=>{:class=>"col-md-10"}%>
<%= f.input :account_type, :collection => Lookup.collection_of("account_type") %> <%= f.input :account_type, :collection => Lookup.collection_of("account_type"),:input_html=>{:class=>"col-md-10"} %>
<%= f.input :discount %> <%= f.input :discount %>
<%= f.input :point %> <%= f.input :point %>
<%= f.input :bonus %> <%= f.input :bonus %>

2
app/views/settings/employees/_form.html.erb
View File

@@ -12,7 +12,7 @@
</div> </div>
<div class="form-actions p-l-15"> <div class="form-actions p-l-15">
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> <%= f.submit t('views.btn.submit'),:class => 'btn btn-primary btn-lg waves-effect' %>
</div> </div>
<% end %> <% end %>
</div> </div>

16
app/views/settings/menu_item_attributes/_form.html.erb
View File

@@ -1,20 +1,20 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9"> <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
<%= simple_form_for([:settings, @settings_menu_item_attribute]) do |f| %> <%= simple_form_for([:settings, @settings_menu_item_attribute]) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <div class="form-inputs p-l-15">
<%= f.input :attribute_type %> <%= f.input :attribute_type,:input_html => { :class => "col-md-9" } %>
<%= f.input :name %> <%= f.input :name,:input_html => { :class => "col-md-9" } %>
<%= f.input :value %> <%= f.input :value,:input_html => { :class => "col-md-9" } %>
</div> </div>
<div class="form-actions"> <div class="form-actions p-l-15">
<%= f.button :submit %> <%= f.submit t('views.btn.submit'),:class => 'btn btn-primary btn-lg waves-effect' %>
</div> </div>
<% end %> <% end %>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3"> <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card"> <div class="card">
<div class="body"> <div class="body">
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5> <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>

32
app/views/settings/menu_item_attributes/show.html.erb
View File

@@ -1,16 +1,18 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ol class="breadcrumb">
<li><a href="<%= %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li><a href="<%= settings_menu_item_attributes_path %>">Menu Item Attributes</a></li> <li class="breadcrumb-item"><a href="<%= settings_menu_item_attributes_path %>">Menu Item Attributes</a></li>
<li>Menu Item Attribute</li> <li class="breadcrumb-item active">Details</li>
<span style="float: right"> <span class="float-right">
<%= link_to 'Back', settings_menu_item_attributes_path %>
</span> </span>
</ul> </ol>
</div> </div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<h4 class="card-title">Menu Item Attribute</h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
@@ -26,7 +28,7 @@
<td><%= @settings_menu_item_attribute.name %></td> <td><%= @settings_menu_item_attribute.name %></td>
<td><%= @settings_menu_item_attribute.value rescue "-" %></td> <td><%= @settings_menu_item_attribute.value rescue "-" %></td>
<td><%=l @settings_menu_item_attribute.created_at, format: :short %></td> <td><%=l @settings_menu_item_attribute.created_at, format: :short %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute) %> <td><%= link_to t("views.btn.edit"), edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute),:class=>"btn btn-info btn-sm waves-effect" %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_menu_item_attribute_path(@settings_menu_item_attribute)%>" data-method="delete"> <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_menu_item_attribute_path(@settings_menu_item_attribute)%>" data-method="delete">
<%= t("views.btn.delete") %> <%= t("views.btn.delete") %>
</button> </button>
@@ -41,5 +43,15 @@
</table> </table>
</div> </div>
</div> </div>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="card">
<div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
</div>
</div>
</div>
</div> </div>

14
app/views/settings/menu_item_options/_form.html.erb
View File

@@ -1,21 +1,21 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9"> <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
<%= simple_form_for([:settings, @settings_menu_item_option]) do |f| %> <%= simple_form_for([:settings, @settings_menu_item_option]) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <div class="form-inputs p-l-15">
<%= f.input :option_type %> <%= f.input :option_type,:input_html=>{:class=>"col-md-10"} %>
<%= f.input :name,:required => true %> <%= f.input :name,:required => true,:input_html=>{:class=>"col-md-10"} %>
<%= f.input :value,:required => true %> <%= f.input :value,:required => true,:input_html=>{:class=>"col-md-10"} %>
</div> </div>
<div class="form-actions"> <div class="form-actions p-l-15">
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
</div> </div>
<% end %> <% end %>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3"> <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card"> <div class="card">
<div class="body"> <div class="body">
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5> <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>

33
app/views/settings/menu_item_options/show.html.erb
View File

@@ -1,12 +1,17 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ol class="breadcrumb">
<li><a href="<%= %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li><a href="<%= settings_menu_item_options_path %>">Menu Item Options</a></li> <li class="breadcrumb-item"><a href="<%= settings_menu_item_options_path %>">Menu Item Options</a></li>
<span style="float: right"> <li class="breadcrumb-item active">Details</li>
<span class="float-right">
<%= link_to 'Back', settings_menu_item_options_path %>
</span> </span>
</ul> </ol>
</div> </div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<h4 class="card-title">Menu Item Option</h4> <h4 class="card-title">Menu Item Option</h4>
@@ -28,10 +33,10 @@
<td><%= @settings_menu_item_option.value rescue "-" %></td> <td><%= @settings_menu_item_option.value rescue "-" %></td>
<td><%=l @settings_menu_item_option.created_at, format: :short %></td> <td><%=l @settings_menu_item_option.created_at, format: :short %></td>
<td> <td>
<%= link_to t("views.btn.edit"), edit_settings_menu_item_option_path(@settings_menu_item_option, @settings_menu_item_option) %> <%= link_to t("views.btn.edit"), edit_settings_menu_item_option_path(@settings_menu_item_option, @settings_menu_item_option),:class=>"btn btn-info btn-sm waves-effect"%>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_menu_item_option_path(@settings_menu_item_option)%>" data-method="delete"> <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_menu_item_option_path(@settings_menu_item_option)%>" data-method="delete">
<%= t("views.btn.delete") %> <%= t("views.btn.delete") %>
</button> --> </button>
<!-- Start Delete confirrm text !--> <!-- Start Delete confirrm text !-->
<span class="hidden" id="delete_text"> <span class="hidden" id="delete_text">
<h6>Are you sure you want to delete this row ?</h6> <h6>Are you sure you want to delete this row ?</h6>
@@ -43,5 +48,17 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card">
<div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
</div>
</div>
</div>
</div>