raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-04 07:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6813 from jibees/6795-missing-cases-for-loading-spinner

Browse Source 
Make loading spinner visible
This commit is contained in:
Andy Brett
2021-02-11 10:55:05 -08:00
committed by GitHub
parent b5e9c935e9 7aef8a609e
commit 7c2febdd78
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/templates/admin/modals/bulk_invoice.html.haml
View File

@@ -6,7 +6,7 @@
%p.error{ ng: { show: 'error' } }
{{error}}
%img.spinner{ src: "/assets/spinning-circles.svg", ng: { show: "loading" } }
%img.spinner{ src: image_path("spinning-circles.svg"), ng: { show: "loading" } }
%p{ ng: { show: "loading" } }
= t('js.admin.orders.index.please_wait')

2
app/assets/javascripts/templates/admin/modals/image_upload.html.haml
View File

@@ -3,7 +3,7 @@
%form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, ng: { controller: "ProductImageCtrl" } }
%div.image-preview
%img.spinner{ src: "/assets/spinning-circles.svg", ng: { hide: "!imageUploader.isUploading" }}
%img.spinner{ src: image_path("spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
%img.preview{ng: {src: "{{imagePreview}}", class: "{'faded': imageUploader.isUploading}"}}
%label{for: 'image-upload', class: 'button'} {{ 'admin.products.index.upload_an_image' | t }}

2
app/assets/javascripts/templates/admin/panels/exchange_products_panel_footer.html.haml
View File

@@ -6,6 +6,6 @@
.sixteen.columns.alpha#loading{ 'ng-show' => 'productsLoading()' }
%br
%img.spinner{ src: "/assets/spinning-circles.svg" }
%img.spinner{ src: image_path("spinning-circles.svg")}
%h1
{{ 'js.admin.panels.exchange_products.loading_variants' | t }}

2
app/views/spree/admin/orders/index.html.haml
View File

@@ -81,7 +81,7 @@
%span{'ng-bind-html' => 'order.display_total'}
%td.actions
%div.row-loading-icons
%span{ng: {show: 'rowStatus[order.id] == "loading"', cloak: true}}
%div{ng: {show: 'rowStatus[order.id] == "loading"', cloak: true}, style: "width: 30px; height: 30px;"}
= render partial: "components/spinner"
%i.success.icon-ok-sign{ng: {show: 'rowStatus[order.id] == "success"'} }
%i.error.icon-remove-sign.with-tip{ng: {show: 'rowStatus[order.id] == "error"'}, 'ofn-with-tip' => t('.order_not_updated')}