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

Merge pull request #146 from poanetwork/view-all-button-#144

Browse Source 
View all button #144
pull/140/head
katibest 7 years ago committed by GitHub
parent e44aece7d8 5bc813a87d
commit f823d78d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 66 additions and 36 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. 2
      apps/explorer_web/assets/css/components/_blocks.scss
  2. 15
      apps/explorer_web/assets/css/components/_transactions.scss
  3. 10
      apps/explorer_web/assets/css/explorer/_button.scss
  4. 2
      apps/explorer_web/assets/css/explorer/_wrapper.scss
  5. 11
      apps/explorer_web/lib/explorer_web/templates/chain/show.html.eex
  6. 12
      apps/explorer_web/lib/explorer_web/templates/layout/app.html.eex
  7. 25
      apps/explorer_web/priv/gettext/default.pot
  8. 25
      apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po

2
apps/explorer_web/assets/css/components/_blocks.scss
Unescape View File

@ -3,6 +3,7 @@
&__container { &__container {
padding: explorer-size(-1) explorer-size(0); padding: explorer-size(-1) explorer-size(0);
display: flex;
& + & { padding-top: 0; } & + & { padding-top: 0; }
&--title { padding-top: explorer-size(0); } &--title { padding-top: explorer-size(0); }
} }
@ -12,6 +13,7 @@
@include explorer-typography("title"); @include explorer-typography("title");
color: explorer-color("slate", "900"); color: explorer-color("slate", "900");
margin: 0; margin: 0;
width: 90%;
} }
&__headline-title { line-height: 18px; } &__headline-title { line-height: 18px; }

15
apps/explorer_web/assets/css/components/_transactions.scss
Unescape View File

@ -3,14 +3,25 @@
&__container { &__container {
padding: explorer-size(-1) explorer-size(0); padding: explorer-size(-1) explorer-size(0);
& + & { padding-top: 0; }
&--title { padding-top: explorer-size(0); } &__flex {
display: flex;
}
& + & {
padding-top: 0;
}
&--title {
padding-top: explorer-size(0);
}
} }
&__headline-title, &__headline-title,
&__title { &__title {
@include explorer-typography("title"); @include explorer-typography("title");
color: explorer-color("slate", "900"); color: explorer-color("slate", "900");
width: 90%;
} }
&__title { margin: 0; } &__title { margin: 0; }

10
apps/explorer_web/assets/css/explorer/_button.scss
Unescape View File

@ -28,9 +28,8 @@
} }
&--secondary { &--secondary {
background-color: $gray-300; border: 1px solid $gray-500;
color: $gray-800; color: $gray-600;
font-size: 13px;
-webkit-transition: background-color .25s; -webkit-transition: background-color .25s;
transition: background-color .25s; transition: background-color .25s;
font-weight: 400; font-weight: 400;
@ -58,13 +57,12 @@
} }
&--xsmall { &--xsmall {
max-width: 40px; font-size: 11px;
font-size: 1rem;
padding: 6px 9px 6px !important; padding: 6px 9px 6px !important;
} }
&--small { &--small {
font-size: 1.25rem; font-size: 12px;
padding: 10px 20px 10px; padding: 10px 20px 10px;
} }

2
apps/explorer_web/assets/css/explorer/_wrapper.scss
Unescape View File

@ -34,7 +34,7 @@
z-index: 1000; z-index: 1000;
@media (min-width: 768px){ @media (min-width: 768px){
position: fixed; position: absolute;
} }
} }

11
apps/explorer_web/lib/explorer_web/templates/chain/show.html.eex
Unescape View File

@ -56,6 +56,12 @@
<div class="blocks container__subsection"> <div class="blocks container__subsection">
<div class="blocks__container blocks__container--title"> <div class="blocks__container blocks__container--title">
<h2 class="blocks__title"><%= gettext "Blocks" %></h2> <h2 class="blocks__title"><%= gettext "Blocks" %></h2>
<%= link to: block_path(@conn, :index, Gettext.get_locale), class: "header__link" do %>
<div class="button button--secondary button--xsmall u-float-right">View All</div>
<% end %>
</div>
<div>
</div> </div>
<div class="blocks__container"> <div class="blocks__container">
<table class="blocks__table"> <table class="blocks__table">
@ -89,8 +95,11 @@
</div> </div>
</div> </div>
<div class="transactions container__subsection"> <div class="transactions container__subsection">
<div class="transactions__container transactions__container--title"> <div class="transactions__container transactions__container__flex transactions__container--title">
<h2 class="transactions__title"><%= gettext "Transactions" %></h2> <h2 class="transactions__title"><%= gettext "Transactions" %></h2>
<%= link to: transaction_path(@conn, :index, Gettext.get_locale), class: "header__link" do %>
<div class="button button--secondary button--xsmall u-float-right">View All</div>
<% end %>
</div> </div>
<div class="transactions__container"> <div class="transactions__container">
<table class="transactions__table"> <table class="transactions__table">

12
apps/explorer_web/lib/explorer_web/templates/layout/app.html.eex
Unescape View File

@ -13,17 +13,17 @@
<!-- Sidebar Holder --> <!-- Sidebar Holder -->
<nav id="sidebar" class="sticky fixed-top"> <nav id="sidebar" class="sticky fixed-top">
<div class="sidebar-header"> <div class="sidebar-header">
<a href="<%= chain_path(@conn, :show) %>" data-test="header_logo" > <%= link to: chain_path(@conn, :show), "data-test": "header_logo" do %>
<img class="" src="<%= static_path(@conn, "/images/logo.svg") %>" /> <img class="" src="<%= static_path(@conn, "/images/logo.svg") %>" />
</a> <% end %>
</div> </div>
<div class="menu-items"> <div class="menu-items">
<a href="<%= block_path(@conn, :index, Gettext.get_locale) %>" class="header__link"> <%= link to: block_path(@conn, :index, Gettext.get_locale), class: "header__link" do %>
<div tabindex="0" class="icon-locate"> <div tabindex="0" class="icon-locate">
<img class="" src="<%= static_path(@conn, "/images/block.svg") %>" /> <img class="" src="<%= static_path(@conn, "/images/block.svg") %>" />
<%= gettext("Blocks") %> <%= gettext("Blocks") %>
</div> </div>
</a> <% end %>
<div tabindex="0" class="icon-locate"> <div tabindex="0" class="icon-locate">
<a href="#pageSubmenu" data-toggle="collapse" aria-expanded="false"> <a href="#pageSubmenu" data-toggle="collapse" aria-expanded="false">
<img class="" src="<%= static_path(@conn, "/images/transaction.svg") %>" /> <img class="" src="<%= static_path(@conn, "/images/transaction.svg") %>" />
@ -31,8 +31,8 @@
<i class="fa fa-caret-down"></i> <i class="fa fa-caret-down"></i>
</a> </a>
<ul class="collapse list-unstyled" id="pageSubmenu"> <ul class="collapse list-unstyled" id="pageSubmenu">
<li><a href="<%= transaction_path(@conn, :index, Gettext.get_locale) %>">Validated</a></li> <li><%= link(gettext("Validated"), to: transaction_path(@conn, :index, Gettext.get_locale)) %></li>
<li><a href="<%= pending_transaction_path(@conn, :index, Gettext.get_locale) %>">Pending</a></li> <li><%= link(gettext("Pending"), to: pending_transaction_path(@conn, :index, Gettext.get_locale)) %></li>
</ul> </ul>
</div> </div>
</div> </div>

25
apps/explorer_web/priv/gettext/default.pot
Unescape View File

@ -1,8 +1,8 @@
#: lib/explorer_web/templates/address_transaction/index.html.eex:73 #: lib/explorer_web/templates/address_transaction/index.html.eex:73
#: lib/explorer_web/templates/block/index.html.eex:30 #: lib/explorer_web/templates/block/index.html.eex:30
#: lib/explorer_web/templates/block_transaction/index.html.eex:43 #: lib/explorer_web/templates/block_transaction/index.html.eex:43
#: lib/explorer_web/templates/chain/show.html.eex:65 #: lib/explorer_web/templates/chain/show.html.eex:71
#: lib/explorer_web/templates/chain/show.html.eex:101 #: lib/explorer_web/templates/chain/show.html.eex:110
#: lib/explorer_web/templates/transaction/index.html.eex:36 #: lib/explorer_web/templates/transaction/index.html.eex:36
#: lib/explorer_web/templates/transaction/overview.html.eex:37 #: lib/explorer_web/templates/transaction/overview.html.eex:37
msgid "Age" msgid "Age"
@ -11,7 +11,7 @@ msgstr ""
#: lib/explorer_web/templates/address_transaction/index.html.eex:72 #: lib/explorer_web/templates/address_transaction/index.html.eex:72
#: lib/explorer_web/templates/block_transaction/index.html.eex:42 #: lib/explorer_web/templates/block_transaction/index.html.eex:42
#: lib/explorer_web/templates/chain/show.html.eex:28 #: lib/explorer_web/templates/chain/show.html.eex:28
#: lib/explorer_web/templates/chain/show.html.eex:100 #: lib/explorer_web/templates/chain/show.html.eex:109
#: lib/explorer_web/templates/transaction/index.html.eex:35 #: lib/explorer_web/templates/transaction/index.html.eex:35
msgid "Block" msgid "Block"
msgstr "" msgstr ""
@ -27,21 +27,21 @@ msgstr ""
#: lib/explorer_web/templates/block/index.html.eex:32 #: lib/explorer_web/templates/block/index.html.eex:32
#: lib/explorer_web/templates/block/show.html.eex:77 #: lib/explorer_web/templates/block/show.html.eex:77
#: lib/explorer_web/templates/chain/show.html.eex:67 #: lib/explorer_web/templates/chain/show.html.eex:73
msgid "Gas Used" msgid "Gas Used"
msgstr "" msgstr ""
#: lib/explorer_web/templates/address_transaction/index.html.eex:71 #: lib/explorer_web/templates/address_transaction/index.html.eex:71
#: lib/explorer_web/templates/block/show.html.eex:40 #: lib/explorer_web/templates/block/show.html.eex:40
#: lib/explorer_web/templates/block_transaction/index.html.eex:41 #: lib/explorer_web/templates/block_transaction/index.html.eex:41
#: lib/explorer_web/templates/chain/show.html.eex:99 #: lib/explorer_web/templates/chain/show.html.eex:108
#: lib/explorer_web/templates/pending_transaction/index.html.eex:34 #: lib/explorer_web/templates/pending_transaction/index.html.eex:34
#: lib/explorer_web/templates/transaction/index.html.eex:34 #: lib/explorer_web/templates/transaction/index.html.eex:34
msgid "Hash" msgid "Hash"
msgstr "" msgstr ""
#: lib/explorer_web/templates/block/index.html.eex:29 #: lib/explorer_web/templates/block/index.html.eex:29
#: lib/explorer_web/templates/chain/show.html.eex:64 #: lib/explorer_web/templates/chain/show.html.eex:70
msgid "Height" msgid "Height"
msgstr "" msgstr ""
@ -55,8 +55,8 @@ msgstr ""
#: lib/explorer_web/templates/block/show.html.eex:34 #: lib/explorer_web/templates/block/show.html.eex:34
#: lib/explorer_web/templates/block_transaction/index.html.eex:28 #: lib/explorer_web/templates/block_transaction/index.html.eex:28
#: lib/explorer_web/templates/chain/show.html.eex:45 #: lib/explorer_web/templates/chain/show.html.eex:45
#: lib/explorer_web/templates/chain/show.html.eex:66 #: lib/explorer_web/templates/chain/show.html.eex:72
#: lib/explorer_web/templates/chain/show.html.eex:93 #: lib/explorer_web/templates/chain/show.html.eex:99
#: lib/explorer_web/templates/layout/app.html.eex:30 #: lib/explorer_web/templates/layout/app.html.eex:30
#: lib/explorer_web/templates/pending_transaction/index.html.eex:12 #: lib/explorer_web/templates/pending_transaction/index.html.eex:12
#: lib/explorer_web/templates/transaction/index.html.eex:12 #: lib/explorer_web/templates/transaction/index.html.eex:12
@ -65,7 +65,7 @@ msgstr ""
#: lib/explorer_web/templates/address_transaction/index.html.eex:76 #: lib/explorer_web/templates/address_transaction/index.html.eex:76
#: lib/explorer_web/templates/block_transaction/index.html.eex:46 #: lib/explorer_web/templates/block_transaction/index.html.eex:46
#: lib/explorer_web/templates/chain/show.html.eex:102 #: lib/explorer_web/templates/chain/show.html.eex:111
#: lib/explorer_web/templates/pending_transaction/index.html.eex:38 #: lib/explorer_web/templates/pending_transaction/index.html.eex:38
#: lib/explorer_web/templates/transaction/index.html.eex:39 #: lib/explorer_web/templates/transaction/index.html.eex:39
#: lib/explorer_web/templates/transaction/overview.html.eex:43 #: lib/explorer_web/templates/transaction/overview.html.eex:43
@ -224,6 +224,7 @@ msgstr ""
msgid "Showing %{count} Transactions" msgid "Showing %{count} Transactions"
msgstr "" msgstr ""
#: lib/explorer_web/templates/layout/app.html.eex:35
#: lib/explorer_web/templates/pending_transaction/index.html.eex:19 #: lib/explorer_web/templates/pending_transaction/index.html.eex:19
#: lib/explorer_web/templates/pending_transaction/index.html.eex:64 #: lib/explorer_web/templates/pending_transaction/index.html.eex:64
#: lib/explorer_web/templates/pending_transaction/index.html.eex:76 #: lib/explorer_web/templates/pending_transaction/index.html.eex:76
@ -323,7 +324,7 @@ msgstr ""
#: lib/explorer_web/templates/address_transaction/index.html.eex:124 #: lib/explorer_web/templates/address_transaction/index.html.eex:124
#: lib/explorer_web/templates/address_transaction/index.html.eex:127 #: lib/explorer_web/templates/address_transaction/index.html.eex:127
#: lib/explorer_web/templates/block_transaction/index.html.eex:90 #: lib/explorer_web/templates/block_transaction/index.html.eex:90
#: lib/explorer_web/templates/chain/show.html.eex:128 #: lib/explorer_web/templates/chain/show.html.eex:137
#: lib/explorer_web/templates/pending_transaction/index.html.eex:80 #: lib/explorer_web/templates/pending_transaction/index.html.eex:80
#: lib/explorer_web/templates/transaction/index.html.eex:84 #: lib/explorer_web/templates/transaction/index.html.eex:84
#: lib/explorer_web/templates/transaction/overview.html.eex:44 #: lib/explorer_web/templates/transaction/overview.html.eex:44
@ -381,3 +382,7 @@ msgstr ""
#: lib/explorer_web/templates/address_transaction/index.html.eex:77 #: lib/explorer_web/templates/address_transaction/index.html.eex:77
msgid "Fee" msgid "Fee"
msgstr "" msgstr ""
#: lib/explorer_web/templates/layout/app.html.eex:34
msgid "Validated"
msgstr ""

25
apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po
Unescape View File

@ -13,8 +13,8 @@ msgstr ""
#: lib/explorer_web/templates/address_transaction/index.html.eex:73 #: lib/explorer_web/templates/address_transaction/index.html.eex:73
#: lib/explorer_web/templates/block/index.html.eex:30 #: lib/explorer_web/templates/block/index.html.eex:30
#: lib/explorer_web/templates/block_transaction/index.html.eex:43 #: lib/explorer_web/templates/block_transaction/index.html.eex:43
#: lib/explorer_web/templates/chain/show.html.eex:65 #: lib/explorer_web/templates/chain/show.html.eex:71
#: lib/explorer_web/templates/chain/show.html.eex:101 #: lib/explorer_web/templates/chain/show.html.eex:110
#: lib/explorer_web/templates/transaction/index.html.eex:36 #: lib/explorer_web/templates/transaction/index.html.eex:36
#: lib/explorer_web/templates/transaction/overview.html.eex:37 #: lib/explorer_web/templates/transaction/overview.html.eex:37
msgid "Age" msgid "Age"
@ -23,7 +23,7 @@ msgstr "Age"
#: lib/explorer_web/templates/address_transaction/index.html.eex:72 #: lib/explorer_web/templates/address_transaction/index.html.eex:72
#: lib/explorer_web/templates/block_transaction/index.html.eex:42 #: lib/explorer_web/templates/block_transaction/index.html.eex:42
#: lib/explorer_web/templates/chain/show.html.eex:28 #: lib/explorer_web/templates/chain/show.html.eex:28
#: lib/explorer_web/templates/chain/show.html.eex:100 #: lib/explorer_web/templates/chain/show.html.eex:109
#: lib/explorer_web/templates/transaction/index.html.eex:35 #: lib/explorer_web/templates/transaction/index.html.eex:35
msgid "Block" msgid "Block"
msgstr "Block" msgstr "Block"
@ -39,21 +39,21 @@ msgstr "%{year} POA Network Ltd. All rights reserved"
#: lib/explorer_web/templates/block/index.html.eex:32 #: lib/explorer_web/templates/block/index.html.eex:32
#: lib/explorer_web/templates/block/show.html.eex:77 #: lib/explorer_web/templates/block/show.html.eex:77
#: lib/explorer_web/templates/chain/show.html.eex:67 #: lib/explorer_web/templates/chain/show.html.eex:73
msgid "Gas Used" msgid "Gas Used"
msgstr "Gas Used" msgstr "Gas Used"
#: lib/explorer_web/templates/address_transaction/index.html.eex:71 #: lib/explorer_web/templates/address_transaction/index.html.eex:71
#: lib/explorer_web/templates/block/show.html.eex:40 #: lib/explorer_web/templates/block/show.html.eex:40
#: lib/explorer_web/templates/block_transaction/index.html.eex:41 #: lib/explorer_web/templates/block_transaction/index.html.eex:41
#: lib/explorer_web/templates/chain/show.html.eex:99 #: lib/explorer_web/templates/chain/show.html.eex:108
#: lib/explorer_web/templates/pending_transaction/index.html.eex:34 #: lib/explorer_web/templates/pending_transaction/index.html.eex:34
#: lib/explorer_web/templates/transaction/index.html.eex:34 #: lib/explorer_web/templates/transaction/index.html.eex:34
msgid "Hash" msgid "Hash"
msgstr "Hash" msgstr "Hash"
#: lib/explorer_web/templates/block/index.html.eex:29 #: lib/explorer_web/templates/block/index.html.eex:29
#: lib/explorer_web/templates/chain/show.html.eex:64 #: lib/explorer_web/templates/chain/show.html.eex:70
msgid "Height" msgid "Height"
msgstr "Height" msgstr "Height"
@ -67,8 +67,8 @@ msgstr "POA Network Explorer"
#: lib/explorer_web/templates/block/show.html.eex:34 #: lib/explorer_web/templates/block/show.html.eex:34
#: lib/explorer_web/templates/block_transaction/index.html.eex:28 #: lib/explorer_web/templates/block_transaction/index.html.eex:28
#: lib/explorer_web/templates/chain/show.html.eex:45 #: lib/explorer_web/templates/chain/show.html.eex:45
#: lib/explorer_web/templates/chain/show.html.eex:66 #: lib/explorer_web/templates/chain/show.html.eex:72
#: lib/explorer_web/templates/chain/show.html.eex:93 #: lib/explorer_web/templates/chain/show.html.eex:99
#: lib/explorer_web/templates/layout/app.html.eex:30 #: lib/explorer_web/templates/layout/app.html.eex:30
#: lib/explorer_web/templates/pending_transaction/index.html.eex:12 #: lib/explorer_web/templates/pending_transaction/index.html.eex:12
#: lib/explorer_web/templates/transaction/index.html.eex:12 #: lib/explorer_web/templates/transaction/index.html.eex:12
@ -77,7 +77,7 @@ msgstr "Transactions"
#: lib/explorer_web/templates/address_transaction/index.html.eex:76 #: lib/explorer_web/templates/address_transaction/index.html.eex:76
#: lib/explorer_web/templates/block_transaction/index.html.eex:46 #: lib/explorer_web/templates/block_transaction/index.html.eex:46
#: lib/explorer_web/templates/chain/show.html.eex:102 #: lib/explorer_web/templates/chain/show.html.eex:111
#: lib/explorer_web/templates/pending_transaction/index.html.eex:38 #: lib/explorer_web/templates/pending_transaction/index.html.eex:38
#: lib/explorer_web/templates/transaction/index.html.eex:39 #: lib/explorer_web/templates/transaction/index.html.eex:39
#: lib/explorer_web/templates/transaction/overview.html.eex:43 #: lib/explorer_web/templates/transaction/overview.html.eex:43
@ -236,6 +236,7 @@ msgstr "Showing #%{start_block} to #%{end_block}"
msgid "Showing %{count} Transactions" msgid "Showing %{count} Transactions"
msgstr "Showing %{count} Transactions" msgstr "Showing %{count} Transactions"
#: lib/explorer_web/templates/layout/app.html.eex:35
#: lib/explorer_web/templates/pending_transaction/index.html.eex:19 #: lib/explorer_web/templates/pending_transaction/index.html.eex:19
#: lib/explorer_web/templates/pending_transaction/index.html.eex:64 #: lib/explorer_web/templates/pending_transaction/index.html.eex:64
#: lib/explorer_web/templates/pending_transaction/index.html.eex:76 #: lib/explorer_web/templates/pending_transaction/index.html.eex:76
@ -335,7 +336,7 @@ msgstr ""
#: lib/explorer_web/templates/address_transaction/index.html.eex:124 #: lib/explorer_web/templates/address_transaction/index.html.eex:124
#: lib/explorer_web/templates/address_transaction/index.html.eex:127 #: lib/explorer_web/templates/address_transaction/index.html.eex:127
#: lib/explorer_web/templates/block_transaction/index.html.eex:90 #: lib/explorer_web/templates/block_transaction/index.html.eex:90
#: lib/explorer_web/templates/chain/show.html.eex:128 #: lib/explorer_web/templates/chain/show.html.eex:137
#: lib/explorer_web/templates/pending_transaction/index.html.eex:80 #: lib/explorer_web/templates/pending_transaction/index.html.eex:80
#: lib/explorer_web/templates/transaction/index.html.eex:84 #: lib/explorer_web/templates/transaction/index.html.eex:84
#: lib/explorer_web/templates/transaction/overview.html.eex:44 #: lib/explorer_web/templates/transaction/overview.html.eex:44
@ -393,3 +394,7 @@ msgstr ""
#: lib/explorer_web/templates/address_transaction/index.html.eex:77 #: lib/explorer_web/templates/address_transaction/index.html.eex:77
msgid "Fee" msgid "Fee"
msgstr "" msgstr ""
#: lib/explorer_web/templates/layout/app.html.eex:34
msgid "Validated"
msgstr ""

Write Preview
Loading…
Cancel
Save