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/tables/edit.html.erb
View File

@@ -15,7 +15,7 @@
<li class="breadcrumb-item"><a href="<%= settings_zone_path(@zone) %>">Tables</a></li>
<li class="breadcrumb-item active">Edit</li>
<span class="float-right">
<%= link_to t('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %>
<%= link_to t('.back', :default => t("views.btn.back")), settings_zone_path(@zone) %>
</span>
</ol>
</div>

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

@@ -44,8 +44,7 @@
<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.delete"), settings_zone_table_path(@zone,@table), :class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %>
<%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,@table), :class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %>
</td>
</tr>
</tbody>