From 36b2663f5031549a4a77aee15feb676de095e822 Mon Sep 17 00:00:00 2001 From: Ivan Tivonenko Date: Tue, 5 May 2015 23:11:59 +0300 Subject: [PATCH 1/2] [FIX] Trade: Show loading for orderbooks(RT-3402) Orderbook: Show loading instead of "no bids" --- src/templates/tabs/trade.jade | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/templates/tabs/trade.jade b/src/templates/tabs/trade.jade index d7cd9fec5..e5df46c91 100644 --- a/src/templates/tabs/trade.jade +++ b/src/templates/tabs/trade.jade @@ -652,7 +652,10 @@ section.col-xs-12.content(ng-controller="TradeCtrl") .col-xs-4.rpamount.price a(href="", ng-click="fill_widget('sell', order, true)", ng-bind="order.showPrice") - .message(ng-show='!bookShow.bids.length', l10n) There are currently no bids for this pair. + .message(ng-show='!bookShow.bids.length && book.ready', l10n) There are currently no bids for this pair. + .description(ng-show="!book.ready && !bookShow.bids.length") + img(src="img/button-s.png", class="loader") + span(class="loading_text", l10n) Loading... .asks.col-xs-12.col-lg-6 .title(l10n) Asks @@ -689,7 +692,11 @@ section.col-xs-12.content(ng-controller="TradeCtrl") ng-click="fill_widget('buy', order, true)") span(rp-bind-color-amount="order.showSum") - .message(ng-show='!bookShow.asks.length', l10n) There are currently no asks for this pair. + .message(ng-show='!bookShow.asks.length && book.ready', l10n) There are currently no asks for this pair. + .description(ng-show="!book.ready && !bookShow.asks.length") + img(src="img/button-s.png", class="loader") + span(class="loading_text", l10n) Loading... + .foot a.loadmore(ng-show="orderbookState=='ready' && (bookShow.asks.length || bookShow.bids.length)", href="", ng-click="loadMore()", l10n) Load more div(ng-show="orderbookState=='full'", l10n) No more orders From 3c20fd9a6a9adce84699c64a8b96f00040bdb557 Mon Sep 17 00:00:00 2001 From: Ivan Tivonenko Date: Wed, 6 May 2015 23:42:26 +0300 Subject: [PATCH 2/2] [FIX] center loading text (RT-3402) --- src/templates/tabs/trade.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/tabs/trade.jade b/src/templates/tabs/trade.jade index e5df46c91..40c186d56 100644 --- a/src/templates/tabs/trade.jade +++ b/src/templates/tabs/trade.jade @@ -653,7 +653,7 @@ section.col-xs-12.content(ng-controller="TradeCtrl") a(href="", ng-click="fill_widget('sell', order, true)", ng-bind="order.showPrice") .message(ng-show='!bookShow.bids.length && book.ready', l10n) There are currently no bids for this pair. - .description(ng-show="!book.ready && !bookShow.bids.length") + .message(ng-show="!book.ready && !bookShow.bids.length") img(src="img/button-s.png", class="loader") span(class="loading_text", l10n) Loading... @@ -693,7 +693,7 @@ section.col-xs-12.content(ng-controller="TradeCtrl") span(rp-bind-color-amount="order.showSum") .message(ng-show='!bookShow.asks.length && book.ready', l10n) There are currently no asks for this pair. - .description(ng-show="!book.ready && !bookShow.asks.length") + .message(ng-show="!book.ready && !bookShow.asks.length") img(src="img/button-s.png", class="loader") span(class="loading_text", l10n) Loading...