CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4707 from blockscout/np-move-addresses-tab

Browse Source 
Top navigation: Move Accounts to Tokens
np-change-nonce-field-type
Victor Baranov 3 years ago committed by GitHub
parent 8f630da83a 3a7efb1946
commit ef6b4017b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 55 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 2
      apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex
  3. 34
      apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
  4. 38
      apps/block_scout_web/priv/gettext/default.pot
  5. 38
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

1
CHANGELOG.md
Unescape View File

@ -33,6 +33,7 @@
- [#4582](https://github.com/blockscout/blockscout/pull/4582) - Fix NaN input on write contract page - [#4582](https://github.com/blockscout/blockscout/pull/4582) - Fix NaN input on write contract page
### Chore ### Chore
- [#4707](https://github.com/blockscout/blockscout/pull/4707) - Top navigation: Move Accounts tab to Tokens
- [#4704](https://github.com/blockscout/blockscout/pull/4704) - Update to Erlang/OTP 24 - [#4704](https://github.com/blockscout/blockscout/pull/4704) - Update to Erlang/OTP 24
- [#4682](https://github.com/blockscout/blockscout/pull/4682) - Update all possible outdated mix dependencies - [#4682](https://github.com/blockscout/blockscout/pull/4682) - Update all possible outdated mix dependencies
- [#4663](https://github.com/blockscout/blockscout/pull/4663) - Migrate to Elixir 1.12.x - [#4663](https://github.com/blockscout/blockscout/pull/4663) - Migrate to Elixir 1.12.x

2
apps/block_scout_web/lib/block_scout_web/templates/address/index.html.eex
Unescape View File

@ -2,7 +2,7 @@
<%= render BlockScoutWeb.Advertisement.TextAdView, "index.html", conn: @conn %> <%= render BlockScoutWeb.Advertisement.TextAdView, "index.html", conn: @conn %>
<div class="card"> <div class="card">
<div class="card-body" data-async-load data-async-listing="<%= @current_path %>"> <div class="card-body" data-async-load data-async-listing="<%= @current_path %>">
<h1 class="card-title list-title-description"><%= gettext "Addresses" %></h1> <h1 class="card-title list-title-description"><%= gettext "Ether" %> <%= gettext "Addresses" %></h1>
<div class="list-top-pagination-container-wrapper"> <div class="list-top-pagination-container-wrapper">
<%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "top", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %> <%= render BlockScoutWeb.CommonComponentsView, "_pagination_container.html", position: "top", cur_page_number: "1", show_pagination_limit: true, data_next_page_button: true, data_prev_page_button: true %>

34
apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
Unescape View File

@ -58,14 +58,6 @@
<% end %> <% end %>
</div> </div>
</li> </li>
<li class="nav-item">
<%= link to: address_path(@conn, :index), class: "nav-link topnav-nav-link #{tab_status("accounts", @conn.request_path)}" do %>
<span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_accounts_icon.html" %>
</span>
<%= gettext("Accounts") %>
<% end %>
</li>
<%= if Chain.bridged_tokens_enabled?() do %> <%= if Chain.bridged_tokens_enabled?() do %>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a href="#" role="button" id="navbarTokensDropdown" class="nav-link topnav-nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a href="#" role="button" id="navbarTokensDropdown" class="nav-link topnav-nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -83,23 +75,41 @@
<%= link( <%= link(
gettext("Bridged from Ethereum"), gettext("Bridged from Ethereum"),
class: "dropdown-item #{tab_status("bridged-tokens/eth", @conn.request_path)}", class: "dropdown-item #{tab_status("bridged-tokens/eth", @conn.request_path)}",
to: bridged_tokens_path(@conn, :show, :eth) to: bridged_tokens_path(@conn, :show, :eth),
style: "white-space: nowrap;"
) %> ) %>
<%= link( <%= link(
gettext("Bridged from BSC"), gettext("Bridged from BSC"),
class: "dropdown-item #{tab_status("bridged-tokens/bsc", @conn.request_path)}", class: "dropdown-item #{tab_status("bridged-tokens/bsc", @conn.request_path)}",
to: bridged_tokens_path(@conn, :show, :bsc) to: bridged_tokens_path(@conn, :show, :bsc)
) %> ) %>
<%= link(
gettext("Ether"),
class: "dropdown-item #{tab_status("accounts", @conn.request_path)}",
to: address_path(@conn, :index)
) %>
</div> </div>
</li> </li>
<% else %> <% else %>
<li class="nav-item"> <li class="nav-item dropdown">
<%= link to: tokens_path(@conn, :index), class: "nav-link topnav-nav-link #{tab_status("tokens", @conn.request_path)}" do %> <a href="#" role="button" id="navbarTokensDropdown" class="nav-link topnav-nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="nav-link-icon"> <span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_tokens_icon.html" %> <%= render BlockScoutWeb.IconsView, "_tokens_icon.html" %>
</span> </span>
<%= gettext("Tokens") %> <%= gettext("Tokens") %>
<% end %> </a>
<div class="dropdown-menu" aria-labeledby="navbarTransactionsDropdown">
<%= link(
gettext("All"),
class: "dropdown-item #{tab_status("tokens", @conn.request_path)}",
to: tokens_path(@conn, :index)
) %>
<%= link(
gettext("Ether"),
class: "dropdown-item #{tab_status("accounts", @conn.request_path)}",
to: address_path(@conn, :index)
) %>
</div>
</li> </li>
<% end %> <% end %>
<% end %> <% end %>

38
apps/block_scout_web/priv/gettext/default.pot
Unescape View File

@ -144,7 +144,7 @@ msgid "API for the %{subnetwork} - BlockScout"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:112 #: lib/block_scout_web/templates/layout/_topnav.html.eex:122
msgid "APIs" msgid "APIs"
msgstr "" msgstr ""
@ -158,11 +158,6 @@ msgstr ""
msgid "APY & Predicted Reward" msgid "APY & Predicted Reward"
msgstr "" msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:66
msgid "Accounts"
msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:69 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:69
msgid "Action" msgid "Action"
@ -197,9 +192,9 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:30 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:30
#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:28 lib/block_scout_web/templates/address_transaction/index.html.eex:26 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:28 lib/block_scout_web/templates/address_transaction/index.html.eex:26
#: lib/block_scout_web/templates/layout/_network_selector.html.eex:21 lib/block_scout_web/templates/layout/_topnav.html.eex:79 #: lib/block_scout_web/templates/layout/_network_selector.html.eex:21 lib/block_scout_web/templates/layout/_topnav.html.eex:71
#: lib/block_scout_web/views/address_internal_transaction_view.ex:10 lib/block_scout_web/views/address_token_transfer_view.ex:10 #: lib/block_scout_web/templates/layout/_topnav.html.eex:103 lib/block_scout_web/views/address_internal_transaction_view.ex:10
#: lib/block_scout_web/views/address_transaction_view.ex:10 #: lib/block_scout_web/views/address_token_transfer_view.ex:10 lib/block_scout_web/views/address_transaction_view.ex:10
msgid "All" msgid "All"
msgstr "" msgstr ""
@ -260,7 +255,7 @@ msgid "Approximate Current Annual Percentage Yield. If you see N/A, please wait
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:140 #: lib/block_scout_web/templates/layout/_topnav.html.eex:150
msgid "Apps" msgid "Apps"
msgstr "" msgstr ""
@ -418,12 +413,12 @@ msgid "Bridged Tokens from "
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:89 #: lib/block_scout_web/templates/layout/_topnav.html.eex:82
msgid "Bridged from BSC" msgid "Bridged from BSC"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:84 #: lib/block_scout_web/templates/layout/_topnav.html.eex:76
msgid "Bridged from Ethereum" msgid "Bridged from Ethereum"
msgstr "" msgstr ""
@ -1025,15 +1020,16 @@ msgid "Error: Could not determine contract creator."
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:126 #: lib/block_scout_web/templates/layout/_topnav.html.eex:136
msgid "Eth RPC" msgid "Eth RPC"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address/_balance_card.html.eex:18 #: lib/block_scout_web/templates/address/_balance_card.html.eex:18
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20 lib/block_scout_web/templates/layout/app.html.eex:45 #: lib/block_scout_web/templates/address/index.html.eex:5 lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20
#: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 lib/block_scout_web/templates/transaction/_tile.html.eex:37 #: lib/block_scout_web/templates/layout/_topnav.html.eex:87 lib/block_scout_web/templates/layout/_topnav.html.eex:108
#: lib/block_scout_web/views/wei_helpers.ex:78 #: lib/block_scout_web/templates/layout/app.html.eex:45 lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
#: lib/block_scout_web/templates/transaction/_tile.html.eex:37 lib/block_scout_web/views/wei_helpers.ex:78
msgid "Ether" msgid "Ether"
msgstr "" msgstr ""
@ -1136,7 +1132,7 @@ msgid "Github"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:116 #: lib/block_scout_web/templates/layout/_topnav.html.eex:126
msgid "GraphQL" msgid "GraphQL"
msgstr "" msgstr ""
@ -1723,7 +1719,7 @@ msgid "Query"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:121 #: lib/block_scout_web/templates/layout/_topnav.html.eex:131
msgid "RPC" msgid "RPC"
msgstr "" msgstr ""
@ -1994,7 +1990,7 @@ msgid "Staker's Address"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:142 #: lib/block_scout_web/templates/layout/_topnav.html.eex:152
msgid "Stakes" msgid "Stakes"
msgstr "" msgstr ""
@ -2005,7 +2001,7 @@ msgid "Stakes Ratio"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:148 #: lib/block_scout_web/templates/layout/_topnav.html.eex:158
msgid "Staking" msgid "Staking"
msgstr "" msgstr ""
@ -2408,7 +2404,7 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address/_tabs.html.eex:21 #: lib/block_scout_web/templates/address/_tabs.html.eex:21
#: lib/block_scout_web/templates/address_token/index.html.eex:10 lib/block_scout_web/templates/address_token_transfer/index.html.eex:13 #: lib/block_scout_web/templates/address_token/index.html.eex:10 lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
#: lib/block_scout_web/templates/layout/_topnav.html.eex:75 lib/block_scout_web/templates/layout/_topnav.html.eex:101 #: lib/block_scout_web/templates/layout/_topnav.html.eex:67 lib/block_scout_web/templates/layout/_topnav.html.eex:99
#: lib/block_scout_web/templates/tokens/index.html.eex:10 lib/block_scout_web/views/address_view.ex:345 #: lib/block_scout_web/templates/tokens/index.html.eex:10 lib/block_scout_web/views/address_view.ex:345
msgid "Tokens" msgid "Tokens"
msgstr "" msgstr ""

38
apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
Unescape View File

@ -144,7 +144,7 @@ msgid "API for the %{subnetwork} - BlockScout"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:112 #: lib/block_scout_web/templates/layout/_topnav.html.eex:122
msgid "APIs" msgid "APIs"
msgstr "" msgstr ""
@ -158,11 +158,6 @@ msgstr ""
msgid "APY & Predicted Reward" msgid "APY & Predicted Reward"
msgstr "" msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:66
msgid "Accounts"
msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:69 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:69
msgid "Action" msgid "Action"
@ -197,9 +192,9 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:30 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:30
#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:28 lib/block_scout_web/templates/address_transaction/index.html.eex:26 #: lib/block_scout_web/templates/address_token_transfer/index.html.eex:28 lib/block_scout_web/templates/address_transaction/index.html.eex:26
#: lib/block_scout_web/templates/layout/_network_selector.html.eex:21 lib/block_scout_web/templates/layout/_topnav.html.eex:79 #: lib/block_scout_web/templates/layout/_network_selector.html.eex:21 lib/block_scout_web/templates/layout/_topnav.html.eex:71
#: lib/block_scout_web/views/address_internal_transaction_view.ex:10 lib/block_scout_web/views/address_token_transfer_view.ex:10 #: lib/block_scout_web/templates/layout/_topnav.html.eex:103 lib/block_scout_web/views/address_internal_transaction_view.ex:10
#: lib/block_scout_web/views/address_transaction_view.ex:10 #: lib/block_scout_web/views/address_token_transfer_view.ex:10 lib/block_scout_web/views/address_transaction_view.ex:10
msgid "All" msgid "All"
msgstr "" msgstr ""
@ -260,7 +255,7 @@ msgid "Approximate Current Annual Percentage Yield. If you see N/A, please wait
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:140 #: lib/block_scout_web/templates/layout/_topnav.html.eex:150
msgid "Apps" msgid "Apps"
msgstr "" msgstr ""
@ -418,12 +413,12 @@ msgid "Bridged Tokens from "
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:89 #: lib/block_scout_web/templates/layout/_topnav.html.eex:82
msgid "Bridged from BSC" msgid "Bridged from BSC"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:84 #: lib/block_scout_web/templates/layout/_topnav.html.eex:76
msgid "Bridged from Ethereum" msgid "Bridged from Ethereum"
msgstr "" msgstr ""
@ -1025,15 +1020,16 @@ msgid "Error: Could not determine contract creator."
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:126 #: lib/block_scout_web/templates/layout/_topnav.html.eex:136
msgid "Eth RPC" msgid "Eth RPC"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address/_balance_card.html.eex:18 #: lib/block_scout_web/templates/address/_balance_card.html.eex:18
#: lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20 lib/block_scout_web/templates/layout/app.html.eex:45 #: lib/block_scout_web/templates/address/index.html.eex:5 lib/block_scout_web/templates/internal_transaction/_tile.html.eex:20
#: lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20 lib/block_scout_web/templates/transaction/_tile.html.eex:37 #: lib/block_scout_web/templates/layout/_topnav.html.eex:87 lib/block_scout_web/templates/layout/_topnav.html.eex:108
#: lib/block_scout_web/views/wei_helpers.ex:78 #: lib/block_scout_web/templates/layout/app.html.eex:45 lib/block_scout_web/templates/transaction/_pending_tile.html.eex:20
#: lib/block_scout_web/templates/transaction/_tile.html.eex:37 lib/block_scout_web/views/wei_helpers.ex:78
msgid "Ether" msgid "Ether"
msgstr "" msgstr ""
@ -1136,7 +1132,7 @@ msgid "Github"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:116 #: lib/block_scout_web/templates/layout/_topnav.html.eex:126
msgid "GraphQL" msgid "GraphQL"
msgstr "" msgstr ""
@ -1723,7 +1719,7 @@ msgid "Query"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:121 #: lib/block_scout_web/templates/layout/_topnav.html.eex:131
msgid "RPC" msgid "RPC"
msgstr "" msgstr ""
@ -1994,7 +1990,7 @@ msgid "Staker's Address"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:142 #: lib/block_scout_web/templates/layout/_topnav.html.eex:152
msgid "Stakes" msgid "Stakes"
msgstr "" msgstr ""
@ -2005,7 +2001,7 @@ msgid "Stakes Ratio"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/layout/_topnav.html.eex:148 #: lib/block_scout_web/templates/layout/_topnav.html.eex:158
msgid "Staking" msgid "Staking"
msgstr "" msgstr ""
@ -2408,7 +2404,7 @@ msgstr ""
#, elixir-format #, elixir-format
#: lib/block_scout_web/templates/address/_tabs.html.eex:21 #: lib/block_scout_web/templates/address/_tabs.html.eex:21
#: lib/block_scout_web/templates/address_token/index.html.eex:10 lib/block_scout_web/templates/address_token_transfer/index.html.eex:13 #: lib/block_scout_web/templates/address_token/index.html.eex:10 lib/block_scout_web/templates/address_token_transfer/index.html.eex:13
#: lib/block_scout_web/templates/layout/_topnav.html.eex:75 lib/block_scout_web/templates/layout/_topnav.html.eex:101 #: lib/block_scout_web/templates/layout/_topnav.html.eex:67 lib/block_scout_web/templates/layout/_topnav.html.eex:99
#: lib/block_scout_web/templates/tokens/index.html.eex:10 lib/block_scout_web/views/address_view.ex:345 #: lib/block_scout_web/templates/tokens/index.html.eex:10 lib/block_scout_web/views/address_view.ex:345
msgid "Tokens" msgid "Tokens"
msgstr "" msgstr ""

Write Preview
Loading…
Cancel
Save