From 9f4fd398c2cb3da56bf15e9b6487147b7ed918e2 Mon Sep 17 00:00:00 2001 From: katibest Date: Mon, 9 Jul 2018 10:25:46 -0400 Subject: [PATCH] Added tabs and new style to pending transactions --- .../pending_transaction/index.html.eex | 102 +++++++----------- .../templates/transaction/index.html.eex | 22 +++- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex index 4a79a67a24..4c045018f6 100644 --- a/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/pending_transaction/index.html.eex @@ -1,14 +1,7 @@ -
-

- Transactions -

-

- <%= gettext("Showing %{count} Pending Transactions", count: @pending_transaction_count) %> -

- +
-
- - - - - - - - - - - - - <%= for transaction <- @transactions do %> - - - - - - - - - <% end %> - -
- <%= gettext "Status" %> - <%= gettext "Hash" %><%= gettext "Last Seen" %><%= gettext "From" %><%= gettext "To" %><%= gettext "Value" %> (<%= gettext "Ether" %>)
-
-
- <%= render ExplorerWeb.TransactionView, "_link.html", locale: @locale, transaction_hash: transaction.hash %> - - <%= render ExplorerWeb.AddressView, "_link.html", locale: @locale, contract: ExplorerWeb.AddressView.contract?(transaction.from_address), address_hash: transaction.from_address_hash %> - - <%= if transaction.to_address_hash != nil do %> - <%= render ExplorerWeb.AddressView, "_link.html", locale: @locale, contract: ExplorerWeb.AddressView.contract?(transaction.to_address), address_hash: transaction.to_address_hash %> - <% else %> - <%= gettext "Contract Creation" %> - <% end %> - - <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> -
+

<%= gettext "Transactions" %>

+

<%= gettext("Showing %{count} Pending Transactions", count: @pending_transaction_count) %>

+ + <%= for transaction <- @transactions do %> +
+
+
+ <%= ExplorerWeb.TransactionView.transaction_display_type(transaction) %> +
+
+ <%= render ExplorerWeb.TransactionView, "_link.html", locale: @locale, transaction_hash: transaction.hash %> + + <%= render ExplorerWeb.AddressView, "_link.html", locale: @locale, contract: ExplorerWeb.AddressView.contract?(transaction.from_address), address_hash: transaction.from_address_hash %> + → + <%= render ExplorerWeb.AddressView, "_link.html", address_hash: ExplorerWeb.TransactionView.to_address_hash(transaction), locale: @locale, contract: ExplorerWeb.AddressView.contract?(transaction.to_address) %> + + <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> POA +
+
+ +
+
+
+ <% end %> + <%= if @next_page_params do %> + <%= link( + gettext("Older"), + class: "button button--secondary button--sm float-right mt-3", + to: pending_transaction_path( + @conn, + :index, + @conn.assigns.locale, + @next_page_params + ) + ) %> + <% end %>
+
- <%= if @next_page_params do %> - <%= link( - gettext("Older"), - class: "button button--secondary button--sm float-right mt-3", - to: pending_transaction_path( - @conn, - :index, - @conn.assigns.locale, - @next_page_params - ) - ) %> - <% end %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex b/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex index d1b59c83b1..af9de70d4b 100644 --- a/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/transaction/index.html.eex @@ -1,5 +1,25 @@ -
+
+
+ + +

<%= gettext "Transactions" %>

<%= gettext("Showing %{count} Validated Transactions", count: Cldr.Number.to_string!(@transaction_estimated_count, format: "#,###")) %>