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

merge with origin and add localize

Browse Source
This commit is contained in:
Yan
2017-10-13 17:07:17 +06:30
parent 1ba68cd152
commit bfe3727e7d
41 changed files with 91 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/settings/menus/index.html.erb
View File

@@ -22,7 +22,7 @@
</div>
<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
<div class="m-b-10 clearfix">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
<%= link_to t("views.btn.new"),new_settings_menu_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div>
<div class="card">
<table class="table table-striped">
@@ -49,8 +49,8 @@
<!-- <td><%= settings_menu.created_by %></td> -->
<!-- <td><%=l settings_menu.created_at, format: :short %></td> -->
<!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
<td><%= link_to 'Edit', edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-lg waves-effect' %>
<%= link_to 'Destroy', settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-lg waves-effect' %>
<%= link_to t("views.btn.delete"), settings_menu_path(settings_menu), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
</tr>
<% end %>
</tbody>

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

@@ -55,7 +55,7 @@
<div class="card-block">
<h4 class="card-title">Menu Categories
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_menu_category_path(@settings_menu),:class => 'btn btn-primary btn-sm' %>
<%= link_to t("views.btn.new"),new_settings_menu_menu_category_path(@settings_menu),:class => 'btn btn-primary btn-sm' %>
</span>
</h4>
@@ -79,7 +79,7 @@
<td><%= category.menu_items.count %></td>
<td><%= category.order_by %></td>
<td><%= category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %></td>
</tr>
<% end %>
</tbody>