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

remove conflict text

Browse Source
This commit is contained in:
phyusin
2017-10-25 16:53:22 +06:30
parent 193ddc2486 fa5b544416
commit 98334531b2
137 changed files with 1952 additions and 1463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/settings/tables/_form.html.erb
View File

@@ -1,9 +1,9 @@
<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,@zone,@settings_table]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
<div class="form-inputs p-l-15">
<%= f.input :name %>
<%= f.input :status %>
<%= f.input :seater %>
@@ -34,11 +34,11 @@
</div>
<div class="form-actions">
<%= f.submit "Create",:class => 'btn btn-primary btn-lg waves-effect' %>
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
</div>
<% end %>
</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="body">
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>

10
app/views/settings/tables/edit.html.erb
View File

@@ -1,13 +1,3 @@
<!-- <div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_zone_tables_path %>">Tables</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_table: @settings_table %>
</div> -->
<div class="page-header">
<ol class="breadcrumb">

8
app/views/settings/tables/index.html.erb
View File

@@ -9,7 +9,7 @@
</div>
<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">
<div class="m-b-10 clearfix">
<%= link_to t("views.btn.new"),new_settings_zone_table_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div>
@@ -43,7 +43,7 @@
<% end %>
<td><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td>
<%= link_to t("views.btn.show"), settings_zone_table_path(@zone,table),:class => 'btn btn-info btn-lg waves-effect' %>
<%= link_to t("views.btn.show"), settings_zone_table_path(@zone,table),:class => 'btn btn-info btn-sm waves-effect' %>
<%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,table),:class => "btn btn-info btn-sm waves-effect" %>
</td>
</tr>
@@ -51,8 +51,8 @@
</tbody>
</table>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
</div>
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card">
<div class="body">
<h5><i class="material-icons md-18">view_headline PAGE DETAIL</i></h5>

5
app/views/settings/tables/new.html.erb
View File

@@ -5,9 +5,8 @@
<li class="breadcrumb-item"><a href="<%= settings_zone_path(@zone) %>">Tables</a></li>
<li class="breadcrumb-item active">New</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_zone_path(@zone) %>
<%= link_to t('.back', :default => t("views.btn.back")), settings_zone_path(@zone) %>
</span>
</ol>
</div>
<%= render 'form', settings_table: @settings_table %>
<%= render 'form', settings_table: @settings_table %>

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

@@ -46,7 +46,7 @@
<% end %>
<td><%= @table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td>
<%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table),:class => 'btn btn-primary btn-lg waves-effect' %>
<%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table),:class => 'btn btn-primary btn-sm waves-effect' %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_zone_table_path(@table)%>" data-method="delete">
<%= t("views.btn.delete") %>
</button>