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

View all button #144

apps/explorer_web/assets/css/components/_blocks.scss

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

apps/explorer_web/assets/css/components/_transactions.scss

@@ -3,14 +3,25 @@
 
   &__container {
     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,
   &__title {
     @include explorer-typography("title");
     color: explorer-color("slate", "900");
+    width: 90%;
   }
 
   &__title { margin: 0; }

apps/explorer_web/assets/css/explorer/_button.scss

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

apps/explorer_web/assets/css/explorer/_wrapper.scss

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

apps/explorer_web/lib/explorer_web/templates/chain/show.html.eex

@@ -56,6 +56,12 @@
     <div class="blocks container__subsection">
       <div class="blocks__container blocks__container--title">
         <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 class="blocks__container">
         <table class="blocks__table">
@@ -89,8 +95,11 @@
       </div>
     </div>
     <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>
+        <%= 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 class="transactions__container">
         <table class="transactions__table">

apps/explorer_web/lib/explorer_web/templates/layout/app.html.eex

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

apps/explorer_web/priv/gettext/default.pot

@@ -1,8 +1,8 @@
 #: lib/explorer_web/templates/address_transaction/index.html.eex:73
 #: lib/explorer_web/templates/block/index.html.eex:30
 #: 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:101
+#: lib/explorer_web/templates/chain/show.html.eex:71
+#: lib/explorer_web/templates/chain/show.html.eex:110
 #: lib/explorer_web/templates/transaction/index.html.eex:36
 #: lib/explorer_web/templates/transaction/overview.html.eex:37
 msgid "Age"
@@ -11,7 +11,7 @@ msgstr ""
 #: lib/explorer_web/templates/address_transaction/index.html.eex:72
 #: 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:100
+#: lib/explorer_web/templates/chain/show.html.eex:109
 #: lib/explorer_web/templates/transaction/index.html.eex:35
 msgid "Block"
 msgstr ""
@@ -27,21 +27,21 @@ msgstr ""
 
 #: lib/explorer_web/templates/block/index.html.eex:32
 #: 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"
 msgstr ""
 
 #: lib/explorer_web/templates/address_transaction/index.html.eex:71
 #: lib/explorer_web/templates/block/show.html.eex:40
 #: 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/transaction/index.html.eex:34
 msgid "Hash"
 msgstr ""
 
 #: 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"
 msgstr ""
 
@@ -55,8 +55,8 @@ msgstr ""
 #: lib/explorer_web/templates/block/show.html.eex:34
 #: 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:66
-#: lib/explorer_web/templates/chain/show.html.eex:93
+#: lib/explorer_web/templates/chain/show.html.eex:72
+#: lib/explorer_web/templates/chain/show.html.eex:99
 #: lib/explorer_web/templates/layout/app.html.eex:30
 #: lib/explorer_web/templates/pending_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/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/transaction/index.html.eex:39
 #: lib/explorer_web/templates/transaction/overview.html.eex:43
@@ -224,6 +224,7 @@ msgstr ""
 msgid "Showing %{count} Transactions"
 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:64
 #: 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:127
 #: 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/transaction/index.html.eex:84
 #: lib/explorer_web/templates/transaction/overview.html.eex:44
@@ -381,3 +382,7 @@ msgstr ""
 #: lib/explorer_web/templates/address_transaction/index.html.eex:77
 msgid "Fee"
 msgstr ""
+
+#: lib/explorer_web/templates/layout/app.html.eex:34
+msgid "Validated"
+msgstr ""

apps/explorer_web/priv/gettext/en/LC_MESSAGES/default.po

@@ -13,8 +13,8 @@ msgstr ""
 #: lib/explorer_web/templates/address_transaction/index.html.eex:73
 #: lib/explorer_web/templates/block/index.html.eex:30
 #: 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:101
+#: lib/explorer_web/templates/chain/show.html.eex:71
+#: lib/explorer_web/templates/chain/show.html.eex:110
 #: lib/explorer_web/templates/transaction/index.html.eex:36
 #: lib/explorer_web/templates/transaction/overview.html.eex:37
 msgid "Age"
@@ -23,7 +23,7 @@ msgstr "Age"
 #: lib/explorer_web/templates/address_transaction/index.html.eex:72
 #: 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:100
+#: lib/explorer_web/templates/chain/show.html.eex:109
 #: lib/explorer_web/templates/transaction/index.html.eex:35
 msgid "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/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"
 msgstr "Gas Used"
 
 #: lib/explorer_web/templates/address_transaction/index.html.eex:71
 #: lib/explorer_web/templates/block/show.html.eex:40
 #: 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/transaction/index.html.eex:34
 msgid "Hash"
 msgstr "Hash"
 
 #: 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"
 msgstr "Height"
 
@@ -67,8 +67,8 @@ msgstr "POA Network Explorer"
 #: lib/explorer_web/templates/block/show.html.eex:34
 #: 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:66
-#: lib/explorer_web/templates/chain/show.html.eex:93
+#: lib/explorer_web/templates/chain/show.html.eex:72
+#: lib/explorer_web/templates/chain/show.html.eex:99
 #: lib/explorer_web/templates/layout/app.html.eex:30
 #: lib/explorer_web/templates/pending_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/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/transaction/index.html.eex:39
 #: lib/explorer_web/templates/transaction/overview.html.eex:43
@@ -236,6 +236,7 @@ msgstr "Showing #%{start_block} to #%{end_block}"
 msgid "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:64
 #: 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:127
 #: 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/transaction/index.html.eex:84
 #: lib/explorer_web/templates/transaction/overview.html.eex:44
@@ -393,3 +394,7 @@ msgstr ""
 #: lib/explorer_web/templates/address_transaction/index.html.eex:77
 msgid "Fee"
 msgstr ""
+
+#: lib/explorer_web/templates/layout/app.html.eex:34
+msgid "Validated"
+msgstr ""