From 26038e431a706a0218efd7510f65d28201b286b2 Mon Sep 17 00:00:00 2001
From: Jeremy Kauffman <jeremy@lbry.io>
Date: Tue, 10 Mar 2020 16:45:37 -0400
Subject: [PATCH] rejigger header and some other things for lbry.tv

---
 data/redirect/permanent.yaml            |   2 +-
 view/template/content/news.php          |   1 +
 view/template/download/_downloadRow.php |   5 +
 view/template/nav/_footer.php           |   3 +-
 view/template/nav/_header.php           | 135 +++++++++++-------------
 view/template/page/home.php             |  14 +--
 view/template/page/publish.php          |  66 ------------
 web/scss/_layout.scss                   |   5 +
 web/scss/components/_header.scss        |   6 ++
 web/scss/pages/_news.scss               |   4 -
 10 files changed, 88 insertions(+), 153 deletions(-)
 create mode 100644 view/template/download/_downloadRow.php
 delete mode 100644 view/template/page/publish.php

diff --git a/data/redirect/permanent.yaml b/data/redirect/permanent.yaml
index 48f99e2f..837fc796 100644
--- a/data/redirect/permanent.yaml
+++ b/data/redirect/permanent.yaml
@@ -117,7 +117,7 @@
 /press-kit.zip:   /press-kit
 /news/tag/events: /roadmap
 /privacy: /privacypolicy
-# /publish:         /youtube
+/publish:  https://lbry.tv/$/publish
 
 # Images
 /img/lbry-ui.png:  /img/og-image.png
diff --git a/view/template/content/news.php b/view/template/content/news.php
index e0c10341..3be115ab 100644
--- a/view/template/content/news.php
+++ b/view/template/content/news.php
@@ -10,6 +10,7 @@
 
   <section>
     <div class="inner-wrap">
+      <div class="notice notice-info spacer1">For more regular updates, see <a href="https://open.lbry.com/@lbry">the official @lbry channel</a> on LBRY itself.</div>
       <ul class="news-items bulletless">
         <?php foreach ($posts as $post): ?>
         <li class="news-item">
diff --git a/view/template/download/_downloadRow.php b/view/template/download/_downloadRow.php
new file mode 100644
index 00000000..15bc8a41
--- /dev/null
+++ b/view/template/download/_downloadRow.php
@@ -0,0 +1,5 @@
+<div style="height: 40px; line-height: 40px;">
+  <?php echo View::render('download/_downloadButton', ['buttonStyle' => 'primary'])?>
+  <a href="https://lbry.tv" class="button button--inverse">Open in Browser</a>
+  <a href="/get?showall=1" class="button--link hide--mobile">show all platforms</a>
+</div>
\ No newline at end of file
diff --git a/view/template/nav/_footer.php b/view/template/nav/_footer.php
index 47763aff..a168e13f 100644
--- a/view/template/nav/_footer.php
+++ b/view/template/nav/_footer.php
@@ -11,7 +11,8 @@
     </ul>
 
     <ul>
-      <li>Download LBRY</li>
+      <li>Use LBRY</li>
+      <li><a href="https://lbry.tv" title="Try lbry.tv">lbry.tv</a></li>
       <li><a href="/android" title="Get LBRY on Android">Android</a></li>
       <li><a href="/linux" title="Get LBRY on Linux">Linux</a></li>
       <li><a href="/ios" title="Get LBRY on iOS">iOS</a></li>
diff --git a/view/template/nav/_header.php b/view/template/nav/_header.php
index 5f43997a..be62cea0 100644
--- a/view/template/nav/_header.php
+++ b/view/template/nav/_header.php
@@ -13,75 +13,22 @@
       <drawer-navigation>
         <drawer-section>
           <drawer-title>
-            Community
-            <drawer-navigation-helper/>
+            <a href="/get">Download</a>
           </drawer-title>
-
-          <drawer-wrap>
-            <drawer-children>
-              <drawer-child>
-                <a href="/get">
-                  <strong>Get LBRY</strong>
-                  <span>Use LBRY on your computer or phone</span>
-                </a>
-              </drawer-child>
-
-              <drawer-child>
-                <a href="/faq">
-                  <strong>Frequently Asked Questions</strong>
-                  <span>Got questions? We probably have answers!</span>
-                </a>
-              </drawer-child>
-
-              <drawer-child>
-                <a href="/news">
-                  <strong>News</strong>
-                  <span>The latest from the LBRY team and community</span>
-                </a>
-              </drawer-child>
-
-              <drawer-child class="drawer--no-border drawer--social">
-                <div>
-                  <strong>Social</strong>
-                  <span>
-                    <a href="https://www.facebook.com/lbryio"><span class="icon icon-facebook-square"></span></a>
-                    <a href="https://twitter.com/lbryio"><span class="icon icon-twitter"></span></a>
-                    <a href="https://reddit.com/r/lbry"><span class="icon icon-reddit"></span></a>
-                    <a href="https://t.me/lbryofficial"><span class="icon icon-telegram"></span></a>
-                  </span>
-                </div>
-              </drawer-child>
-
-              <drawer-child>
-                <a href="https://chat.lbry.com">
-                  <strong>Chat</strong>
-                  <span>Talk with LBRY fans and team members, right now</span>
-                </a>
-              </drawer-child>
-
-              <drawer-child>
-                <a href="https://explorer.lbry.com">
-                  <strong>Blockchain Explorer</strong>
-                  <span>Lookup transactions and claims on the LBRY blockchain</span>
-                </a>
-              </drawer-child>
-
-            </drawer-children>
-          </drawer-wrap>
         </drawer-section>
 
         <drawer-section>
           <drawer-title>
-            Creators
+            Community ⌄
             <drawer-navigation-helper/>
           </drawer-title>
 
           <drawer-wrap>
             <drawer-children>
               <drawer-child>
-                <a href="/publish">
-                  <strong>Publish to LBRY</strong>
-                  <span>Make your content available to everyone using LBRY</span>
+                <a href="https://lbry.org">
+                  <strong>lbry.org</strong>
+                  <span>Meet, chat, and party in the heart of the LBRY community.</span>
                 </a>
               </drawer-child>
 
@@ -93,31 +40,54 @@
               </drawer-child>
 
               <drawer-child>
-                <a href="/faq?category=publisher">
-                  <strong>Creator Questions</strong>
-                  <span>Frequently asked questions and answers for creators</span>
+                <a href="/faq">
+                  <strong>Frequently Asked Questions</strong>
+                  <span>Got questions? We probably have answers!</span>
                 </a>
               </drawer-child>
 
-              <drawer-child>
-                <a href="https://lbry.fund/creator">
-                  <strong>lbry.fund Content Funding</strong>
-                  <span>Get support for your latest creation</span>
-                </a>
+
+
+              <drawer-child class="drawer--no-border drawer--social">
+                <div>
+                  <strong>Social</strong>
+                  <span>
+                    <a href="https://twitter.com/lbryio"><span class="icon icon-twitter"></span></a>
+                    <a href="https://reddit.com/r/lbry"><span class="icon icon-reddit"></span></a>
+                    <a href="https://www.facebook.com/lbryio"><span class="icon icon-facebook-square"></span></a>
+                    <a href="https://t.me/lbryofficial"><span class="icon icon-telegram"></span></a>
+                  </span>
+                </div>
               </drawer-child>
+
+
             </drawer-children>
           </drawer-wrap>
         </drawer-section>
 
         <drawer-section>
           <drawer-title>
-            Company
+            Company ⌄
             <drawer-navigation-helper/>
           </drawer-title>
 
           <drawer-wrap>
             <drawer-children>
-              <drawer-child>
+                <drawer-child>
+                    <a href="https://open.lbry.com/@lbry">
+                        <strong>@lbry on LBRY</strong>
+                        <span>Everything about LBRY, from LBRY, on LBRY</span>
+                    </a>
+                </drawer-child>
+
+                <drawer-child>
+                    <a href="/news">
+                        <strong>Company News</strong>
+                        <span>The latest from the LBRY team</span>
+                    </a>
+                </drawer-child>
+
+                <drawer-child>
                 <a href="/team">
                   <strong>The Team</strong>
                   <span>Meet the people building LBRY and why they're doing it</span>
@@ -133,6 +103,13 @@
               </drawer-child>
               /-->
 
+              <drawer-child>
+                <a href="/news">
+                  <strong>Roadmap</strong>
+                  <span>The next steps in our journey</span>
+                </a>
+              </drawer-child>
+
               <drawer-child>
                 <a href="/contact">
                   <strong>Contact</strong>
@@ -143,7 +120,7 @@
               <drawer-child>
                 <a href="/credit-reports">
                   <strong>Credit Reports</strong>
-                  <span>Quarterly reports on LBRY's funds</span>
+                  <span>Quarterly reports on LBRY's blockchain assets</span>
                 </a>
               </drawer-child>
             </drawer-children>
@@ -152,19 +129,27 @@
 
         <drawer-section>
           <drawer-title>
-            Developers
+            Developers ⌄
             <drawer-navigation-helper/>
           </drawer-title>
 
           <drawer-wrap>
             <drawer-children>
+                <drawer-child>
+                    <a href="https://lbry.tech">
+                        <strong>LBRY.tech</strong>
+                        <span>Find a technical overview, specification, APIs, and more</span>
+                    </a>
+                </drawer-child>
+
               <drawer-child>
-                <a href="https://lbry.tech">
-                  <strong>LBRY.tech</strong>
-                  <span>Find a technical overview, specification, APIs, and more</span>
-                </a>
+                  <a href="open.lbry.com/@lbrytech">
+                      <strong>Follow @lbrytech on LBRY</strong>
+                      <span>From the devs, for the devs.</span>
+                  </a>
               </drawer-child>
 
+
             <drawer-child>
               <a href="https://lbry.tech/spec">
                 <strong>The Spec</strong>
@@ -253,7 +238,7 @@
       <?php js_end() ?>
 
       <span class="header__download">
-        <?php echo View::render('download/_downloadButton', ['buttonStyle' => 'primary'])?>
+        <a href="https://open.lbry.com" class="button button--primary">Open LBRY</a>
       </span>
     </div>
   </header>
diff --git a/view/template/page/home.php b/view/template/page/home.php
index 68bed5d4..a99df8f4 100644
--- a/view/template/page/home.php
+++ b/view/template/page/home.php
@@ -6,12 +6,7 @@
     <div class="inner-wrap">
       <aside class="home__cta">
         <h1>Your Favorite Content</h1>
-
-        <div>
-          <?php echo View::render('download/_downloadButton', ['buttonStyle' => 'primary'])?>
-          <a href="https://lbry.tv" class="button button--inverse">Open in Browser</a>
-          <a href="/get?showall=1" class="button--link">show all platforms</a>
-        </div>
+          <?php echo View::render('download/_downloadRow') ?>
       </aside>
 
       <figure class="home__preview">
@@ -42,6 +37,13 @@
     </div>
   </section>
 
+    <section class="home__cta">
+        <div class="inner-wrap">
+            <aside class="home__cta"><h2>Available on desktop, mobile, and in your browser.</h2></aside>
+          <?php echo View::render('download/_downloadRow') ?>
+        </div>
+    </section>
+
   <section class="home__sites">
     <div class="inner-wrap">
       <aside class="home__site home__site--tech">
diff --git a/view/template/page/publish.php b/view/template/page/publish.php
deleted file mode 100644
index 9c586eb8..00000000
--- a/view/template/page/publish.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php Response::setMetaDescription('Why should you publish to LBRY?') ?>
-<?php Response::setMetaTitle(__('LBRY &middot; Why publish your content here?')) ?>
-
-<main class="ancillary">
-  <section class="hero hero--half-height">
-    <div class="inner-wrap inner-wrap--center-hero">
-      <h1>Why publish to LBRY?</h1>
-    </div>
-  </section>
-
-  <section>
-    <div class="inner-wrap">
-      <div class="inline-image-and-text">
-        <img
-          alt="two-minute proposal"
-          class="inline-image"
-          src="/img/icon--clock.svg"
-        />
-
-        <p>What follows is our <strong>two-minute proposal</strong>. Quite frankly, we're a breath of fresh air. Why <em>not</em> try LBRY and see if it works (for you)?</p>
-      </div>
-
-      <div class="inline-image-and-text">
-        <p>You might've done some research and rolled your eyes because we're yet <em>another</em> startup using Blockchain&trade; within our tech stack. Why should you care about that? Well, <strong>utilizing a blockchain allows us to be censorship resistant</strong>.</p>
-
-        <img
-          alt="censorship resistant"
-          class="inline-image"
-          src="/img/icon--cctv.svg"
-        />
-      </div>
-
-      <div class="inline-image-and-text">
-        <img
-          alt="open-source"
-          class="inline-image"
-          src="/img/icon--fork.svg"
-        />
-
-        <p>The benefits of blockchain + the freedom to be yourself. No middleman required. Honest! <strong>Our tech is open-source</strong> so if you want to self-host, you can easily do so.</p>
-      </div>
-
-      <div class="inline-image-and-text">
-        <p>As long as servers exist, so will your content. So, <em>forever</em>. The only thing you have to worry about is content creation and keeping your fans happy.</p>
-
-        <img
-          alt="keep your fans happy"
-          class="inline-image"
-          src="/img/icon--smile.svg"
-        />
-      </div>
-
-      <hr/>
-
-      <div style="margin-top: 2rem; margin-bottom: 3rem; text-align: center;">
-        <p>LBRY was created for and <em>continues</em> to be created for you, the creator.<br/>If this sounds good to you, download our app!</p>
-
-        <a
-          class="button button--primary"
-          href="/get"
-          title="Download our app"
-        >Get LBRY</a>
-      </div>
-    </div>
-  </section>
-</main>
diff --git a/web/scss/_layout.scss b/web/scss/_layout.scss
index d8ef5a1a..d50540ba 100644
--- a/web/scss/_layout.scss
+++ b/web/scss/_layout.scss
@@ -186,6 +186,11 @@ input::placeholder {
 .hide {
   display: none;
 }
+.hide--mobile {
+  @media (max-width: 800px) {
+    display: none;
+  }
+}
 
 .align-text--center {
   text-align: center;
diff --git a/web/scss/components/_header.scss b/web/scss/components/_header.scss
index a29a42b9..c1a62bc3 100644
--- a/web/scss/components/_header.scss
+++ b/web/scss/components/_header.scss
@@ -314,6 +314,12 @@ drawer-title {
     }
   }
 
+  > a {
+    &:hover {
+      color: var(--lbry-teal-4);
+    }
+  }
+
   &::after {
     bottom: 0;
   }
diff --git a/web/scss/pages/_news.scss b/web/scss/pages/_news.scss
index 8beb85cc..5463e8f2 100644
--- a/web/scss/pages/_news.scss
+++ b/web/scss/pages/_news.scss
@@ -1,7 +1,3 @@
-.news-items {
-  padding-left: 1.5rem;
-}
-
 .news-item {
   &:not(:last-of-type) {
     margin-bottom: 1.5rem;