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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-09-10 10:31:07 +06:30
parent 7dfcff5af5 5e8f08315c
commit b730da7a75
184 changed files with 2672 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/settings/zones/edit.html.erb
View File

@@ -1,3 +1,13 @@
<div class="span12">
<%= render 'form', settings_zone: @settings_zone %>
<div class="page-header">
<ul class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_zones_path %>"><%= t("en.zones") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
<span class="float-right">
<%= link_to t("views.btn.back"), settings_zones_path %>
</span>
</ul>
</div>
<%= render 'form', settings_zone: @settings_zone %>
</div>

16
app/views/settings/zones/index.html.erb
View File

@@ -1,11 +1,19 @@
<% breadcrumb_add t('zones'), "", dashboard_path %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t("en.zones") %></li>
<span class="float-right">
<%= link_to t("views.btn.back"), root_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="m-b-10 clearfix">
<%= link_to t('.new', :default => t("views.btn.new")),new_settings_zone_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div><br>
<div class="card">
<div class="card">
<table class="table table-striped">
<thead>
<tr>
@@ -40,7 +48,7 @@
<div class="card">
<div class="body">
<h5>
<i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i>
<i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i>
</h5>
<p>
1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
@@ -60,6 +68,6 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>

15
app/views/settings/zones/show.html.erb
View File

@@ -1,4 +1,13 @@
<% breadcrumb_add t('zones'), settings_zones_path, settings_zones_path, t('details') %>
<div class="page-header">
<ul class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_zones_path %>"><%= t("en.zones") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">
<%= link_to t("views.btn.back"), settings_zones_path %>
</span>
</ul>
</div>
<br/>
@@ -34,7 +43,7 @@
<span class="hidden" id="delete_text">
<h6>Are you sure you want to delete this row ?</h6>
<h6>This action can't be undo. </h6>
<h6>This action can't be undo. </h6>
</span>
</td>
</tr>
@@ -141,6 +150,6 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>