merge with origin and add localize

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

View File

@@ -4,13 +4,13 @@
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item active">Item Set</li>
<span class="float-right">
<%= link_to t('.new', :default => t("views.btn.new")), dashboard_path %>
<%= link_to t("views.btn.back"), dashboard_path %>
</span>
</ol>
</div>
<br>
<div class="m-b-10 clearfix">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
<%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div>