From 9db9b8e15b0583a9d5965b992ad7fd1535ccc397 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 7 Jan 2021 13:09:18 +0300 Subject: [PATCH] Single Staking menu --- CHANGELOG.md | 1 + .../templates/layout/_topnav.html.eex | 12 ++---------- apps/block_scout_web/priv/gettext/default.pot | 16 +++++++++------- .../priv/gettext/en/LC_MESSAGES/default.po | 16 +++++++++------- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ff76585d7..2f98e4fd8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - [#3551](https://github.com/poanetwork/blockscout/pull/3551) - Fix contract's method's output of tuple type ### Chore +- [#3557](https://github.com/poanetwork/blockscout/pull/3557) - Single Staking menu - [#3540](https://github.com/poanetwork/blockscout/pull/3540), [#3545](https://github.com/poanetwork/blockscout/pull/3545) - Support different versions of DarkForest (0.4 - 0.5) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index 19d1828051..56565154d2 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -152,16 +152,8 @@
<%= if Application.get_env(:block_scout_web, BlockScoutWeb.Chain)[:staking_enabled] do %> " href="<%= validators_path(@conn, :index) %>"> - <%= gettext("Validators") %> - Beta - - " href="<%= active_pools_path(@conn, :index) %>"> - <%= gettext("Active Pools") %> - Beta - - " href="<%= inactive_pools_path(@conn, :index) %>"> - <%= gettext("Inactive Pools") %> - Beta + <%= gettext("Staking") %> + New <% end %> <%= if Application.get_env(:block_scout_web, :apps_menu) == true do %> diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index ab784e66b1..a7a634e362 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -1245,13 +1245,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:218 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:249 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:210 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:241 msgid "Search" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:212 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:204 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" @@ -1947,7 +1947,7 @@ msgid "Copy Raw Trace" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:216 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:208 msgid "Search by address, token symbol, name, transaction hash, or block number" msgstr "" @@ -2028,7 +2028,6 @@ msgid "

To become a candidate, your staking address must be funded with %{toke msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:159 #: lib/block_scout_web/templates/stakes/_stakes_tabs.html.eex:11 msgid "Active Pools" msgstr "" @@ -2201,7 +2200,6 @@ msgid "Inactive Pool Addresses. Current validator pools are specified by a check msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:163 #: lib/block_scout_web/templates/stakes/_stakes_tabs.html.eex:18 msgid "Inactive Pools" msgstr "" @@ -2523,7 +2521,6 @@ msgid "Validator pools can be banned for misbehavior (such as not revealing secr msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:155 #: lib/block_scout_web/templates/stakes/_stakes_tabs.html.eex:4 msgid "Validators" msgstr "" @@ -2657,3 +2654,8 @@ msgstr "" #: lib/block_scout_web/templates/smart_contract/_functions.html.eex:5 msgid "Contract is not verified. However, we found a verified contract with the same bytecode in Blockscout DB" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/layout/_topnav.html.eex:155 +msgid "Staking" +msgstr "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index ab784e66b1..a7a634e362 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -1245,13 +1245,13 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address_logs/index.html.eex:14 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:218 -#: lib/block_scout_web/templates/layout/_topnav.html.eex:249 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:210 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:241 msgid "Search" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:212 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:204 msgid "Search by address, token symbol name, transaction hash, or block number" msgstr "" @@ -1947,7 +1947,7 @@ msgid "Copy Raw Trace" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:216 +#: lib/block_scout_web/templates/layout/_topnav.html.eex:208 msgid "Search by address, token symbol, name, transaction hash, or block number" msgstr "" @@ -2028,7 +2028,6 @@ msgid "

To become a candidate, your staking address must be funded with %{toke msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:159 #: lib/block_scout_web/templates/stakes/_stakes_tabs.html.eex:11 msgid "Active Pools" msgstr "" @@ -2201,7 +2200,6 @@ msgid "Inactive Pool Addresses. Current validator pools are specified by a check msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:163 #: lib/block_scout_web/templates/stakes/_stakes_tabs.html.eex:18 msgid "Inactive Pools" msgstr "" @@ -2523,7 +2521,6 @@ msgid "Validator pools can be banned for misbehavior (such as not revealing secr msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/_topnav.html.eex:155 #: lib/block_scout_web/templates/stakes/_stakes_tabs.html.eex:4 msgid "Validators" msgstr "" @@ -2657,3 +2654,8 @@ msgstr "" #: lib/block_scout_web/templates/smart_contract/_functions.html.eex:5 msgid "Contract is not verified. However, we found a verified contract with the same bytecode in Blockscout DB" msgstr "" + +#, elixir-format +#: lib/block_scout_web/templates/layout/_topnav.html.eex:155 +msgid "Staking" +msgstr ""