Merge pull request #542 from poanetwork/ln-token-details-link-on-address-page

Include a link to the token page on the address page, and show token type on the token page
pull/545/head
Luke Imhoff 6 years ago committed by GitHub
commit 0d546bdd5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      apps/block_scout_web/lib/block_scout_web/templates/address_transaction/_transaction.html.eex
  2. 2
      apps/block_scout_web/lib/block_scout_web/templates/address_transaction/index.html.eex
  3. 1
      apps/block_scout_web/lib/block_scout_web/templates/token/show.html.eex
  4. 24
      apps/block_scout_web/priv/gettext/default.pot
  5. 24
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

@ -77,7 +77,8 @@
</span> </span>
</span> </span>
<span class="tile-title"> <span class="tile-title">
<%= token_transfer_amount(token_transfer) %> <%= token_symbol(token_transfer.token) %> <%= token_transfer_amount(token_transfer) %>
<%= link(token_symbol(token_transfer.token), to: token_path(@conn, :show, @locale, token_transfer.token.contract_address_hash)) %>
</span> </span>
</div> </div>
<div class="col-md-3 col-lg-2 d-flex flex-row flex-md-column align-items-end"> <div class="col-md-3 col-lg-2 d-flex flex-row flex-md-column align-items-end">

@ -131,7 +131,7 @@
<h2 class="card-title"><%= gettext "Transactions" %></h2> <h2 class="card-title"><%= gettext "Transactions" %></h2>
<span data-selector="transactions-list"> <span data-selector="transactions-list">
<%= for transaction <- @transactions do %> <%= for transaction <- @transactions do %>
<%= render("_transaction.html", locale: @locale, address: @address, transaction: transaction) %> <%= render("_transaction.html", locale: @locale, address: @address, transaction: transaction, conn: @conn) %>
<% end %> <% end %>
</span> </span>
<% else %> <% else %>

@ -15,6 +15,7 @@
<h3><%= to_string(@token.contract_address_hash) %></h3> <h3><%= to_string(@token.contract_address_hash) %></h3>
<div class="d-flex flex-row justify-content-start text-muted"> <div class="d-flex flex-row justify-content-start text-muted">
<span class="mr-4"><%= @token.type %></span>
<span class="mr-4"><%= @total_address_in_token_transfers %> <%= gettext "addresses" %></span> <span class="mr-4"><%= @total_address_in_token_transfers %> <%= gettext "addresses" %></span>
<span class="mr-4"><%= @total_token_transfers %> <%= gettext "Transfers" %></span> <span class="mr-4"><%= @total_token_transfers %> <%= gettext "Transfers" %></span>
<%= if decimals?(@token) do %> <%= if decimals?(@token) do %>

@ -474,7 +474,7 @@ msgstr ""
#: lib/block_scout_web/templates/block/index.html.eex:15 #: lib/block_scout_web/templates/block/index.html.eex:15
#: lib/block_scout_web/templates/block_transaction/index.html.eex:51 #: lib/block_scout_web/templates/block_transaction/index.html.eex:51
#: lib/block_scout_web/templates/pending_transaction/index.html.eex:78 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:78
#: lib/block_scout_web/templates/token/show.html.eex:101 #: lib/block_scout_web/templates/token/show.html.eex:102
#: lib/block_scout_web/templates/transaction/index.html.eex:66 #: lib/block_scout_web/templates/transaction/index.html.eex:66
msgid "Older" msgid "Older"
msgstr "" msgstr ""
@ -638,7 +638,7 @@ msgstr ""
#: #:
#: lib/block_scout_web/templates/address_internal_transaction/_internal_transaction.html.eex:29 #: lib/block_scout_web/templates/address_internal_transaction/_internal_transaction.html.eex:29
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:54 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:54
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:91 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:92
msgid "IN" msgid "IN"
msgstr "" msgstr ""
@ -646,7 +646,7 @@ msgstr ""
#: #:
#: lib/block_scout_web/templates/address_internal_transaction/_internal_transaction.html.eex:27 #: lib/block_scout_web/templates/address_internal_transaction/_internal_transaction.html.eex:27
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:50 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:50
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:87 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:88
msgid "OUT" msgid "OUT"
msgstr "" msgstr ""
@ -722,7 +722,7 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:64 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:64
#: lib/block_scout_web/templates/token/show.html.eex:19 #: lib/block_scout_web/templates/token/show.html.eex:20
msgid "Transfers" msgid "Transfers"
msgstr "" msgstr ""
@ -750,7 +750,7 @@ msgstr ""
msgid "Validated Transactions" msgid "Validated Transactions"
msgstr "" msgstr ""
#: lib/block_scout_web/templates/token/show.html.eex:94 #: lib/block_scout_web/templates/token/show.html.eex:95
msgid "There are no transfers for this Token." msgid "There are no transfers for this Token."
msgstr "" msgstr ""
@ -760,24 +760,24 @@ msgid "Token Details"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/token/show.html.eex:62 #: lib/block_scout_web/templates/token/show.html.eex:63
#: lib/block_scout_web/templates/token/show.html.eex:72 #: lib/block_scout_web/templates/token/show.html.eex:73
#: lib/block_scout_web/templates/token/show.html.eex:75 #: lib/block_scout_web/templates/token/show.html.eex:76
#: lib/block_scout_web/templates/token/show.html.eex:85 #: lib/block_scout_web/templates/token/show.html.eex:86
msgid "Token Transfers" msgid "Token Transfers"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/token/show.html.eex:18 #: lib/block_scout_web/templates/token/show.html.eex:19
msgid "addresses" msgid "addresses"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/token/show.html.eex:21 #: lib/block_scout_web/templates/token/show.html.eex:22
msgid "decimals" msgid "decimals"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/token/show.html.eex:32 #: lib/block_scout_web/templates/token/show.html.eex:33
msgid "Total Supply" msgid "Total Supply"
msgstr "" msgstr ""

@ -486,7 +486,7 @@ msgstr ""
#: lib/block_scout_web/templates/block/index.html.eex:15 #: lib/block_scout_web/templates/block/index.html.eex:15
#: lib/block_scout_web/templates/block_transaction/index.html.eex:51 #: lib/block_scout_web/templates/block_transaction/index.html.eex:51
#: lib/block_scout_web/templates/pending_transaction/index.html.eex:78 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:78
#: lib/block_scout_web/templates/token/show.html.eex:101 #: lib/block_scout_web/templates/token/show.html.eex:102
#: lib/block_scout_web/templates/transaction/index.html.eex:66 #: lib/block_scout_web/templates/transaction/index.html.eex:66
msgid "Older" msgid "Older"
msgstr "" msgstr ""
@ -650,7 +650,7 @@ msgstr ""
#: #:
#: lib/block_scout_web/templates/address_internal_transaction/_internal_transaction.html.eex:29 #: lib/block_scout_web/templates/address_internal_transaction/_internal_transaction.html.eex:29
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:54 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:54
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:91 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:92
msgid "IN" msgid "IN"
msgstr "" msgstr ""
@ -658,7 +658,7 @@ msgstr ""
#: #:
#: lib/block_scout_web/templates/address_internal_transaction/_internal_transaction.html.eex:27 #: lib/block_scout_web/templates/address_internal_transaction/_internal_transaction.html.eex:27
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:50 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:50
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:87 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:88
msgid "OUT" msgid "OUT"
msgstr "" msgstr ""
@ -734,7 +734,7 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:64 #: lib/block_scout_web/templates/address_transaction/_transaction.html.eex:64
#: lib/block_scout_web/templates/token/show.html.eex:19 #: lib/block_scout_web/templates/token/show.html.eex:20
msgid "Transfers" msgid "Transfers"
msgstr "" msgstr ""
@ -762,7 +762,7 @@ msgstr ""
msgid "Validated Transactions" msgid "Validated Transactions"
msgstr "" msgstr ""
#: lib/block_scout_web/templates/token/show.html.eex:94 #: lib/block_scout_web/templates/token/show.html.eex:95
msgid "There are no transfers for this Token." msgid "There are no transfers for this Token."
msgstr "" msgstr ""
@ -772,24 +772,24 @@ msgid "Token Details"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/token/show.html.eex:62 #: lib/block_scout_web/templates/token/show.html.eex:63
#: lib/block_scout_web/templates/token/show.html.eex:72 #: lib/block_scout_web/templates/token/show.html.eex:73
#: lib/block_scout_web/templates/token/show.html.eex:75 #: lib/block_scout_web/templates/token/show.html.eex:76
#: lib/block_scout_web/templates/token/show.html.eex:85 #: lib/block_scout_web/templates/token/show.html.eex:86
msgid "Token Transfers" msgid "Token Transfers"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/token/show.html.eex:18 #: lib/block_scout_web/templates/token/show.html.eex:19
msgid "addresses" msgid "addresses"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/token/show.html.eex:21 #: lib/block_scout_web/templates/token/show.html.eex:22
msgid "decimals" msgid "decimals"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/token/show.html.eex:32 #: lib/block_scout_web/templates/token/show.html.eex:33
msgid "Total Supply" msgid "Total Supply"
msgstr "" msgstr ""

Loading…
Cancel
Save