Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use an icon as missing image placeholder #1760

Merged
merged 2 commits into from
Mar 9, 2017
Merged

Use an icon as missing image placeholder #1760

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79bb558
Use an icon as missing image placeholder
jhawthorn Mar 8, 2017
97bafba
Add missing placeholder to cart page
jhawthorn Mar 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tes/stock_transfers/transfer_item.hbs.erb → ...mplates/stock_transfers/transfer_item.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{#if variantImageURL }}
<img alt="{{variantName}}" src="{{variantImageURL}}">
{{ else }}
<img alt='{{variant.name}}' src='<%= image_path("noimage/small.png") %>' />
<span class="image-placeholder small"></span>
{{/if}}
</div>
<div class='variant-details'>
Expand Down
4 changes: 2 additions & 2 deletions ...d/templates/variants/autocomplete.hbs.erb → ...ckend/templates/variants/autocomplete.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="variant-autocomplete-item media">
<div class="media-left">
{{#if variant.image }}
{{#if image }}
<img class="media-object" src='{{variant.image}}' />
{{ else }}
<img class="media-object" src='<%= image_path("noimage/mini.png") %>' />
<span class="image-placeholder mini"></span>
{{/if}}
</div>

Expand Down
7 changes: 5 additions & 2 deletions backend/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
variantTemplate = HandlebarsTemplates["variants/autocomplete"]

formatVariantResult = (variant) ->
variant.image = variant.images[0].mini_url if variant["images"][0] isnt undefined and variant["images"][0].mini_url isnt undefined
variantTemplate variant: variant
image = variant.images[0].mini_url if variant["images"][0] isnt undefined and variant["images"][0].mini_url isnt undefined
variantTemplate(
variant: variant
image: image
)

$.fn.variantAutocomplete = (searchOptions = {}) ->
@select2
Expand Down
24 changes: 24 additions & 0 deletions backend/app/assets/stylesheets/spree/backend/components/_image_placeholder.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.image-placeholder {
&.mini {
width: 50px;
height: 50px;
line-height: 48px;
}

&.small {
width: 102px;
height: 102px;
line-height: 100px;
}

display: inline-block;
margin: auto;
text-align: center;
border: 1px solid #ddd;
color: #aaa;

&:before {
font: normal normal normal 14px/1 FontAwesome;
content: "\f03e"; /* fa-picture-o */
}
}
1 change: 1 addition & 0 deletions backend/app/assets/stylesheets/spree/backend/spree_admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@import 'spree/backend/components/breadcrumb';
@import 'spree/backend/components/date-picker';
@import 'spree/backend/components/hint';
@import 'spree/backend/components/image_placeholder';
@import 'spree/backend/components/list_group';
@import 'spree/backend/components/messages';
@import 'spree/backend/components/progress';
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/cancellations/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<% @inventory_units.each do |inventory_unit| %>
<tr class="inventory-unit">
<td class="inventory-unit-image">
<%= image_tag inventory_unit.variant.display_image.attachment(:mini) %>
<%= render 'spree/admin/shared/image', image: inventory_unit.variant.display_image, size: :mini %>
</td>
<td class="inventory-unit-name">
<%= inventory_unit.variant.product.name %><br><%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>
Expand Down
4 changes: 3 additions & 1 deletion backend/app/views/spree/admin/images/_image_row.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<% end %>
</td>
<td>
<%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
<%= link_to image.attachment.url(:product) do %>
<%= render 'spree/admin/shared/image', image: image, size: :mini %>
<% end %>
</td>
<% if @product.has_variants? %>
<td><%= options_text_for(image) %></td>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/orders/_carton_manifest.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<% carton.manifest_for_order(order).each do |item| %>
<tr class="stock-item" data-item-quantity="<%= item.quantity %>">
<td class="item-image">
<%= image_tag item.variant.display_image.attachment(:mini) %>
<%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
</td>
<td class="item-name">
<%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/orders/_shipment_manifest.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
data-variant-id="<%= item.variant.id %>"
>
<td class="item-image">
<%= image_tag item.variant.display_image.attachment(:mini) %>
<%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
</td>
<td class="item-name">
<%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<% shipment.manifest.each do |item| %>
<tr class="stock-item" data-item-quantity="<%= item.quantity %>">
<td class="item-image">
<%= image_tag item.variant.display_image.attachment(:mini) %>
<%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
</td>
<td class="item-name">
<%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/products/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<% @collection.each do |product| %>
<tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
<td class="align-center"><%= product.sku %></td>
<td class="align-center"><%= image_tag product.display_image.attachment(:mini) %></td>
<td class="align-center"><%= render 'spree/admin/shared/image', image: product.display_image, size: :mini %></td>
<td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
<td class="align-center"><%= product.display_price.to_html %></td>
<td class="actions" data-hook="admin_products_index_row_actions">
Expand Down
7 changes: 7 additions & 0 deletions backend/app/views/spree/admin/shared/_image.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<% size ||= :mini %>

<% if image && image.attachment? %>
<%= image_tag image.attachment(size) %>
<% else %>
<span class="image-placeholder <%= size %>"></span>
<% end %>
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/stock_items/_stock_management.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<td class="align-center no-padding" rowspan="<%= row_count %>">
<div class='variant-container'>
<div class='variant-image'>
<%= image_tag(variant.display_image(fallback: false).attachment(:small)) %>
<%= render 'spree/admin/shared/image', image: variant.display_image(fallback: false), size: :small %>
</div>
<div class='variant-details'>
<table class='stock-variant-field-table'>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<td class="align-center no-padding">
<div class='variant-container' data-variant-id="<%= variant.id %>">
<div class='variant-image'>
<%= image_tag(variant.display_image(fallback: false).attachment(:small)) %>
<%= render 'spree/admin/shared/image', image: variant.display_image(fallback: false), size: :small %>
</div>
<div class='variant-details'>

Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/users/items.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<tr class="stock-item" data-item-quantity="<%= item.quantity %>">
<td class="align-center order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
<td class="item-image">
<%= image_tag item.variant.display_image.attachment(:mini) %>
<%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
</td>
<td class="item-name">
<%= item.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
Expand Down