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

Merge pull request #3557 from poanetwork/vb-single-staking-menu

Browse Source 
Single Staking menu
pull/3558/head
Victor Baranov 4 years ago committed by GitHub
parent 0fa1504563 9db9b8e15b
commit b456ab11fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 24 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. 12
      apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
  3. 16
      apps/block_scout_web/priv/gettext/default.pot
  4. 16
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

1
CHANGELOG.md
Unescape View File

@ -8,6 +8,7 @@
- [#3551](https://github.com/poanetwork/blockscout/pull/3551) - Fix contract's method's output of tuple type - [#3551](https://github.com/poanetwork/blockscout/pull/3551) - Fix contract's method's output of tuple type
### Chore ### 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) - [#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)

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

@ -152,16 +152,8 @@
<div class="dropdown-menu" aria-labeledby="navbarAppsDropdown"> <div class="dropdown-menu" aria-labeledby="navbarAppsDropdown">
<%= if Application.get_env(:block_scout_web, BlockScoutWeb.Chain)[:staking_enabled] do %> <%= if Application.get_env(:block_scout_web, BlockScoutWeb.Chain)[:staking_enabled] do %>
<a class="dropdown-item <%= #{tab_status("validators", @conn.request_path)} %>" href="<%= validators_path(@conn, :index) %>"> <a class="dropdown-item <%= #{tab_status("validators", @conn.request_path)} %>" href="<%= validators_path(@conn, :index) %>">
<%= gettext("Validators") %> <%= gettext("Staking") %>
<span class="bs-label secondary right from-dropdown">Beta</span> <span class="bs-label secondary right from-dropdown">New</span>
</a>
<a class="dropdown-item <%= #{tab_status("active-pools", @conn.request_path)} %>" href="<%= active_pools_path(@conn, :index) %>">
<%= gettext("Active Pools") %>
<span class="bs-label secondary right from-dropdown">Beta</span>
</a>
<a class="dropdown-item <%= #{tab_status("inactive-pools", @conn.request_path)} %>" href="<%= inactive_pools_path(@conn, :index) %>">
<%= gettext("Inactive Pools") %>
<span class="bs-label secondary right from-dropdown">Beta</span>
</a> </a>
<% end %> <% end %>
<%= if Application.get_env(:block_scout_web, :apps_menu) == true do %> <%= if Application.get_env(:block_scout_web, :apps_menu) == true do %>

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

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

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

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

Write Preview
Loading…
Cancel
Save