From 3b9cd3f46a7348a21ecd3385ebe6c8d6bf734147 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Fri, 8 Aug 2014 12:36:30 +1000
Subject: [PATCH] Make loading on BOM look more like BPE

---
 .../stylesheets/admin/openfoodnetwork.css.scss | 18 ++++++++++++++++++
 app/assets/stylesheets/admin/products.css.scss | 17 -----------------
 .../admin/orders/bulk_management.html.haml     |  7 ++++---
 .../spree/admin/products/bulk_edit.html.haml   |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
index 87983a6bc7..3281c8d116 100644
--- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss
+++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
@@ -140,6 +140,24 @@ table#listing_enterprise_groups {
   }
 }
 
+#no_results {
+  font-weight:bold;
+  color: #DA5354;
+}
+
+
+#loading {
+  text-align: center;
+  img.spinner {
+    width: 100px;
+    height: 100px;
+  }
+  h1 {
+    margin-top: 20px;
+    color: gray;
+  }
+}
+
 .ofn_drop_down {
 	padding: 7px 15px;
 	border-radius: 3px;
diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss
index 2fe37d1e14..bddc7f9e9e 100644
--- a/app/assets/stylesheets/admin/products.css.scss
+++ b/app/assets/stylesheets/admin/products.css.scss
@@ -28,23 +28,6 @@ th.left-actions, td.left-actions {
   font-weight: bold;
 }
 
-#no_products {
-  font-weight:bold;
-  color: #DA5354;
-}
-
-#loading {
-  text-align: center;
-  img.spinner {
-    width: 100px;
-    height: 100px; 
-  }
-  h1 {
-    margin-top: 20px;
-    color: gray;
-  }
-}
-
 table#listing_products.bulk {
   clear: both;
 
diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index a73c0cea07..08a05595c5 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -92,10 +92,11 @@
             %div.menu_item{ :class => "three columns alpha", 'ng-repeat' => "column in columns",  'ofn-toggle-column' => true }
               %span{ :class => 'one column alpha', :style => 'text-align: center'} {{ column.visible && "&#10003;" || !column.visible && "&nbsp;" }}
               %span{ :class => 'two columns omega' } {{column.name }}
-  %div.loading{ :class => "sixteen columns alpha", 'ng-show' => 'loading' }
-    %h4 Loading Line Items...
+  %div.sixteen.columns.alpha#loading{ 'ng-if' => 'loading' }
+    %img.spinner{ src: "/assets/loading.gif" }
+    %h1 LOADING ORDERS
   %div{ :class => "sixteen columns alpha", 'ng-show' => '!loading && filteredLineItems.length == 0'}
-    %h4{ :style => 'color:red;' } No matching line items found.
+    %h1#no_results No orders found.
   %div{ 'ng-hide' => 'loading || filteredLineItems.length == 0' }
     %table.index#listing_orders.bulk{ :class => "sixteen columns alpha" }
       %thead
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 522fcf9458..206a336a5e 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -54,7 +54,7 @@
     %img.spinner{ src: "/assets/loading.gif" }
     %h1 LOADING PRODUCTS
   %div.sixteen.columns.alpha{ 'ng-show' => '!loading && filteredProducts.length == 0' }
-    %h1#no_products No products found.
+    %h1#no_results No products found.
   %div.sixteen.columns.alpha{ 'ng-hide' => 'loading || filteredProducts.length == 0' }
     %table.index#listing_products.bulk{ "infinite-scroll" => "incrementLimit()", "infinite-scroll-distance" => "1" }
       %colgroup