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

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

@@ -11,7 +11,7 @@
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="m-b-10 clearfix">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_table_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
<%= link_to t("views.btn.new"),new_settings_zone_table_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div>
<div class="card">
<table class="table table-striped">
@@ -24,7 +24,7 @@
<th>is Active</th>
<th>Created By</th>
<th>Created At</th>
<th>Action</th>
</tr>
</thead>
@@ -42,8 +42,10 @@
<td><%= table.created_by %></td>
<% 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) %></td>
<td><%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<td>
<%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,table) %>
<%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' } %>
</td>
</tr>
<% end %>
</tbody>

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

@@ -5,7 +5,7 @@
<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('.new', :default => t("views.btn.new")), settings_zone_path(@zone) %>
<%= link_to 'Back', settings_zone_path %>
</span>
</ol>
</div>

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

@@ -25,6 +25,7 @@
<th>is Active</th>
<th>Created By</th>
<th>Created At</th>
<th>Action</th>
</tr>
</thead>
@@ -41,8 +42,11 @@
<td><%= @table.created_by %></td>
<% 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) %></td>
<td><%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,@table), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<td>
<%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table) %>
<%= link_to t("views.btn.delete"), settings_zone_table_path(@zone,@table), method: :delete, data: { confirm: 'Are you sure?' } %>
</td>
</tr>
</tbody>
</table>