From f4063597cee9c2bc14d1fa84418b798bcddf7df9 Mon Sep 17 00:00:00 2001
From: YULIUS KURNIAWAN KRISTIANTO <yuliuskristianto9@gmail.com>
Date: Tue, 22 May 2018 17:22:19 +0700
Subject: [PATCH 1/4] add LBRY Shop ito footer

---
 view/template/nav/_globalItems.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/view/template/nav/_globalItems.php b/view/template/nav/_globalItems.php
index 8871cfa3..53075545 100644
--- a/view/template/nav/_globalItems.php
+++ b/view/template/nav/_globalItems.php
@@ -7,6 +7,9 @@
     <a href="<?php echo $url ?>" <?php echo $selectedItem === $url ? 'class="nav-active"' : ''?>><?php echo $label ?></a>
   </div>
 <?php endforeach ?>
+<div class="control-item no-label-desktop">
+  <a href="https://shop.lbry.io" target="_blank"><span class="btn-label">LBRY Shop</span> <span class="icon-fw icon-shopping-cart"></span></a>
+</div>
 <div class="control-item no-label-desktop">
   <a href="https://twitter.com/lbryio" target="_blank"><span class="btn-label">Twitter</span> <span class="icon-fw icon-twitter"></span></a>
 </div>

From 00f0591dcb6ce928aa8ccb8f54b759879b527eb8 Mon Sep 17 00:00:00 2001
From: YULIUS KURNIAWAN KRISTIANTO <yuliuskristianto9@gmail.com>
Date: Tue, 22 May 2018 22:57:05 +0700
Subject: [PATCH 2/4] Update _globalItems.php

delete shop lbry io on _globalitems.php and moved to _footer.php
---
 view/template/nav/_globalItems.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/view/template/nav/_globalItems.php b/view/template/nav/_globalItems.php
index 53075545..8871cfa3 100644
--- a/view/template/nav/_globalItems.php
+++ b/view/template/nav/_globalItems.php
@@ -7,9 +7,6 @@
     <a href="<?php echo $url ?>" <?php echo $selectedItem === $url ? 'class="nav-active"' : ''?>><?php echo $label ?></a>
   </div>
 <?php endforeach ?>
-<div class="control-item no-label-desktop">
-  <a href="https://shop.lbry.io" target="_blank"><span class="btn-label">LBRY Shop</span> <span class="icon-fw icon-shopping-cart"></span></a>
-</div>
 <div class="control-item no-label-desktop">
   <a href="https://twitter.com/lbryio" target="_blank"><span class="btn-label">Twitter</span> <span class="icon-fw icon-twitter"></span></a>
 </div>

From cea70b863f1c7a3491e668e87ed9f1191d5c0270 Mon Sep 17 00:00:00 2001
From: YULIUS KURNIAWAN KRISTIANTO <yuliuskristianto9@gmail.com>
Date: Tue, 22 May 2018 23:00:11 +0700
Subject: [PATCH 3/4] add LBRY Shop Icon

---
 view/template/nav/_footer.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/view/template/nav/_footer.php b/view/template/nav/_footer.php
index 828efd9e..fea61557 100644
--- a/view/template/nav/_footer.php
+++ b/view/template/nav/_footer.php
@@ -10,6 +10,9 @@
           <a href="/"><?php echo __('nav.home') ?></a>
         </div>
         <?php echo View::render('nav/_globalItems') ?>
+        <div class="control-item no-label-desktop">
+        <a href="https://shop.lbry.io" target="_blank"><span class="btn-label">LBRY Shop</span> <span class="icon-fw icon-shopping-cart"></span></a>
+         </div>
         <div class="control-item">
           <a href="https://en.wikipedia.org/wiki/Free_Speech_Flag" class="footer-img-link">
             <img src="/img/Free-speech-flag.svg" alt="Free Speech Flag" height="30"/>

From 1296c6f2a45f91a743ce42cce4dcb13833707e2b Mon Sep 17 00:00:00 2001
From: YULIUS KURNIAWAN KRISTIANTO <yuliuskristianto9@gmail.com>
Date: Tue, 22 May 2018 23:01:39 +0700
Subject: [PATCH 4/4] add LBRY Merchandise Shop on learn

---
 view/template/page/learn.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/view/template/page/learn.php b/view/template/page/learn.php
index ff623649..9eea5b53 100644
--- a/view/template/page/learn.php
+++ b/view/template/page/learn.php
@@ -39,6 +39,9 @@
         <div class="spacer1">
           <a href="/credit-reports" class="link-primary">Credit Reports</a>
         </div>
+        <div class="spacer1">
+          <a href="https://shop.lbry.io" class="link-primary">LBRY Merchandise Shop</a>
+        </div>
       </div>
     </div>
   </div>
@@ -51,7 +54,6 @@
       </div>
     </div>
   </div>
-
   <div class="span4">
     <div class="cover cover-dark cover-dark-grad">
       <div class="content content-dark content-tile">
@@ -61,7 +63,6 @@
         <?php echo View::render('mail/_contact-us') ?>
       </div>
     </div>
-  </div>
-      
+  </div>     
        </main>
 <?php echo View::render('nav/_footer') ?>