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

Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-06-01 16:43:28 +06:30
parent 4a94620346 e0785c5cad
commit 250db4db87
5 changed files with 82 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/views/settings/shops/_form.html.erb
View File

@@ -41,20 +41,40 @@
</div>
<div class="card">
<div class="card-block">
<label class="card-title">Shop Images</label>
<div class="card-block">
<label class="card-title">Shop Images</label>
<div class="panel padding-10">
<div class="form-group">
<div class="menu-item-img">
<%= f.fields_for :display_images do |p| %>
<% if p.object.name.nil? %>
<%= image_tag "#{p.object.image}", :class => "img-thumbnail second-display", :size => "150x185"%>
<%= link_to '<i class="material-icons">delete</i>'.html_safe, settings_shop_display_image_path(p.object), method: :delete %>
<% end %>
<% end %>
</div>
</div>
</div>
</div>
<%= f.file_field :image, :multiple => true, name: "display_images[image][]" %>
</div>
<div class="card">
<div class="card-block">
<label class="card-title">Audio File</label>
<div class="panel padding-10">
<div class="form-group">
<div class="menu-item-img">
<%= f.fields_for :display_images do |p| %>
<% if !p.object.name.nil? %>
<%= "#{p.object.image}"%>
<% end %>
<% end %>
</div>
</div>
</div>
<%= f.file_field :image, :multiple => true, name: "display_images[image][]" %>
</div>
</div>
<%= f.file_field :image, :multiple => false, name: "display_images[image][]", accept: 'audio/mp3', :class => "order" %>
</div>
<div class="form-actions p-l-15">

14
app/views/settings/shops/show.html.erb
View File

@@ -103,7 +103,19 @@
<td style="width:20%">Shop Images</td>
<td>
<% @display_images.each do |p| %>
<%= image_tag "#{p.image}", :class => "img-thumbnail second-display", :size => "155x185"%>
<% if p.name.nil? %>
<%= image_tag "#{p.image}", :class => "img-thumbnail second-display", :size => "155x185"%>
<% end %>
<% end %>
</td>
</tr>
<tr>
<td style="width:20%">Order Audio</td>
<td>
<% @display_images.each do |p| %>
<% if !p.name.nil? %>
<%= image_tag "#{p.image}", :class => "img-thumbnail second-display", :size => "155x185"%>
<% end %>
<% end %>
</td>
</tr>