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

merge with origin

Browse Source
This commit is contained in:
Yan
2017-10-16 18:33:29 +06:30
parent a7ad3e2476 98bc14c83d
commit d0e3a2205f
78 changed files with 1170 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
<li class="breadcrumb-item"><a href="<%= settings_item_sets_path %>">Item Sets</a></li>
<li class="breadcrumb-item active">New</li>
<span class="float-right">
<%= link_to t('.new', :default => t("views.btn.new")), settings_item_sets_path %>
<%= link_to t('.back', :default => t("views.btn.back")), settings_item_sets_path %>
</span>
</ol>
</div>

49
app/views/settings/item_sets/index.html.erb
View File

@@ -8,15 +8,14 @@
</span>
</ol>
</div>
<br>
<div class="m-b-10 clearfix">
<%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="card">
<div class="m-b-10 clearfix">
<%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div>
<div class="card">
<table class="table table-striped">
<thead>
<tr>
@@ -30,30 +29,30 @@
<tbody>
<% @settings_item_sets.each do |item| %>
<tr>
<td><%= item.name %></td>
<td><%= item.alt_name %></td>
<td><%= item.min_selectable_qty %></td>
<td><%= item.max_selectable_qty %></td>
<td><%= link_to t("views.btn.show"), settings_item_set_path(item),:class=>'btn btn-sm btn-success' %>
<tr>
<td><%= item.name %></td>
<td><%= item.alt_name %></td>
<td><%= item.min_selectable_qty %></td>
<td><%= item.max_selectable_qty %></td>
<td><%= link_to t("views.btn.show"), settings_item_set_path(item),:class=>'btn btn-sm btn-success' %>
<%= link_to t("views.btn.edit"), edit_settings_item_set_path(item),:class=>'btn btn-sm btn-primary' %>
<%= link_to t("views.btn.delete"), settings_item_set_path(item), method: :delete, data: { confirm: 'Are you sure?' } ,:class=>'btn btn-danger btn-sm'%></td>
</tr>
<% end %>
</tbody>
<% end %>
</tbody>
</table>
</table>
</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 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>

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

@@ -4,7 +4,7 @@
<li class="breadcrumb-item"><a href="<%= settings_item_sets_path %>">Item Sets</a></li>
<li class="breadcrumb-item active">New</li>
<span class="float-right">
<%= link_to t('.new', :default => t("views.btn.new")), settings_item_sets_path %>
<%= link_to t('.back', :default => t("views.btn.back")), settings_item_sets_path %>
</span>
</ol>
</div>