From 18bc81cfe91bd0d0beac0a73ef32ce48fe79f0dd Mon Sep 17 00:00:00 2001 From: katibest Date: Tue, 17 Jul 2018 10:12:14 -0400 Subject: [PATCH] Added tile status styles to the missed transaction tiles & updated gettext ether to appropriate spots --- .../address_transaction/_transaction.html.eex | 6 ++++-- .../templates/chain/_transactions.html.eex | 10 +++++----- .../templates/pending_transaction/index.html.eex | 2 +- .../explorer_web/templates/transaction/index.html.eex | 10 +++++----- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/apps/explorer_web/lib/explorer_web/templates/address_transaction/_transaction.html.eex b/apps/explorer_web/lib/explorer_web/templates/address_transaction/_transaction.html.eex index 3e25c27b78..c3d1281fa3 100644 --- a/apps/explorer_web/lib/explorer_web/templates/address_transaction/_transaction.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/address_transaction/_transaction.html.eex @@ -4,7 +4,9 @@ <%= ExplorerWeb.TransactionView.transaction_display_type(@transaction) %> -
<%= formatted_status(@transaction) %>
+
+ <%= formatted_status(@transaction) %> +
<%= render ExplorerWeb.TransactionView, "_link.html", locale: @locale, transaction_hash: @transaction.hash %> @@ -39,7 +41,7 @@
- <%= ExplorerWeb.TransactionView.value(@transaction, include_label: false) %> POA + <%= ExplorerWeb.TransactionView.value(@transaction, include_label: false) %> <%= gettext "Ether" %> <%= ExplorerWeb.TransactionView.formatted_fee(@transaction, denomination: :ether) %> <%= gettext "Fee" %>
diff --git a/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex b/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex index 1d77c1b21e..751c699e95 100644 --- a/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex +++ b/apps/explorer_web/lib/explorer_web/templates/chain/_transactions.html.eex @@ -3,12 +3,12 @@ <%= link(gettext("View All Transactions →"), to: transaction_path(@conn, :index, Gettext.get_locale), class: "button button--secondary button--xsmall float-right") %>

<%= gettext "Transactions" %>

<%= for transaction <- @chain.transactions do %> -
+
-
+
- <%= ExplorerWeb.TransactionView.transaction_display_type(transaction) %> -
<%= formatted_status(transaction) %>
+ <%= ExplorerWeb.TransactionView.transaction_display_type(transaction) %> +
<%= formatted_status(transaction) %>
@@ -30,7 +30,7 @@
- <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> POA + <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> <%= gettext "Ether" %> <%= ExplorerWeb.TransactionView.formatted_fee(transaction, denomination: :ether) %> <%= gettext "Fee" %>
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 792e157126..c17a64c3c6 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 @@ -44,7 +44,7 @@ <%= gettext("Contract Address Pending") %> <% end %> - <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> POA + <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> <%= gettext "Ether" %>
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 62d0777e77..544dbc58ce 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 @@ -25,12 +25,12 @@

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

<%= for transaction <- @transactions do %> -
+
-
+
- <%= ExplorerWeb.TransactionView.transaction_display_type(transaction) %> -
<%= formatted_status(transaction) %>
+ <%= ExplorerWeb.TransactionView.transaction_display_type(transaction) %> +
<%= formatted_status(transaction) %>
@@ -51,7 +51,7 @@
- <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> POA + <%= ExplorerWeb.TransactionView.value(transaction, include_label: false) %> <%= gettext "Ether" %> <%= ExplorerWeb.TransactionView.formatted_fee(transaction, denomination: :ether) %> <%= gettext "Fee" %>