From 74c083b0c341bc76d73cc1ecad361b32469232da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?netop=3A//=E3=82=A6=E3=82=A8=E3=83=8F?= <paul@webb.page>
Date: Thu, 8 Aug 2019 15:01:58 -0500
Subject: [PATCH] Closes #1089 and updates intro video on home/download pages

---
 view/template/download/_videoIntro.php |  2 +-
 view/template/download/get.php         | 58 +++++++++++++-------------
 view/template/mail/_settingsForm.php   |  4 +-
 web/scss/components/_notice.scss       |  5 ++-
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/view/template/download/_videoIntro.php b/view/template/download/_videoIntro.php
index b6baba3b..d19cc357 100644
--- a/view/template/download/_videoIntro.php
+++ b/view/template/download/_videoIntro.php
@@ -1,3 +1,3 @@
 <figure class="video">
-  <video src="https://spee.ch/@lbry:3f/hellolbry-forweb.mp4" poster="https://spee.ch/@thumbnails:e7b0620f6e5a56031cbfc8b9373b02d6ed63c39c/hellolbry-forweb-thumb.jpg" controls/>
+  <video src="https://spee.ch/@PremiumTrends:7/LBRYApp.mp4" poster="https://spee.ch/@thumbnails:e7b0620f6e5a56031cbfc8b9373b02d6ed63c39c/hellolbry-forweb-thumb.jpg" controls/>
 </figure>
diff --git a/view/template/download/get.php b/view/template/download/get.php
index e40b0719..c4bf1eaf 100644
--- a/view/template/download/get.php
+++ b/view/template/download/get.php
@@ -15,41 +15,43 @@
     <div class="inner-wrap">
       <?php if ($downloadUrl): ?>
 
-      <div style="margin-bottom: 2rem; text-align: center;">
-        <p>Securely download the LBRY app here, and see what all the fuss is about!</p>
-        <?php $metaHtml = $os !== OS::OS_ANDROID ? View::Render('download/_meta') : false ?>
-        <?php echo View::Render('download/_downloadButton', [
-          'buttonStyle' => 'primary'
-        ])?>
+        <div style="margin-bottom: 2rem; text-align: center;">
+          <p>Securely download the LBRY app here, and see what all the fuss is about!</p>
+          <?php $metaHtml = $os !== OS::OS_ANDROID ? View::Render('download/_meta') : false ?>
+          <?php echo View::Render('download/_downloadButton', [
+            'buttonStyle' => 'primary'
+          ])?>
 
-        <br/><br/>
+          <br/><br/>
 
-        <?php if ($metaHtml): ?>
-        <?php echo $metaHtml ?>
-        <?php endif ?>
-      </div>
-
-      <figure>
-        <img
-          alt="Screenshot of LBRY"
-          src="<?php echo $osScreenshotSrc ?>"
-          <?php if ($os === OS::OS_ANDROID): ?>
-          class="tall"
+          <?php if ($metaHtml): ?>
+          <?php echo $metaHtml ?>
           <?php endif ?>
-        />
-      </figure>
+        </div>
+
+        <?php if ($os === OS::OS_ANDROID): ?>
+          <figure>
+            <img
+              alt="Screenshot of LBRY"
+              class="tall"
+              src="<?php echo $osScreenshotSrc ?>"
+            />
+          </figure>
+        <?php else: ?>
+          <?php echo View::render('download/_videoIntro') ?>
+        <?php endif ?>
 
       <?php else: ?>
 
-      <p>{{download.unavailable}}</p>
+        <p>{{download.unavailable}}</p>
 
-      <?php echo View::render('mail/_subscribeForm', [
-        'tag' => $os,
-        'submitLabel' => 'Join List',
-        'hideDisclaimer' => true,
-        'largeInput' => true,
-        'btnClass' => 'btn-alt btn-large',
-      ]) ?>
+        <?php echo View::render('mail/_subscribeForm', [
+          'tag' => $os,
+          'submitLabel' => 'Join List',
+          'hideDisclaimer' => true,
+          'largeInput' => true,
+          'btnClass' => 'btn-alt btn-large',
+        ]) ?>
 
       <?php endif ?>
     </div>
diff --git a/view/template/mail/_settingsForm.php b/view/template/mail/_settingsForm.php
index 5bb67f72..0a9f7b0a 100644
--- a/view/template/mail/_settingsForm.php
+++ b/view/template/mail/_settingsForm.php
@@ -11,7 +11,7 @@
   <div class="notice notice-error spacer1"><?php echo $error ?></div>
 <?php else: ?>
   <form id="<?php echo $formId ?>" novalidate style="display: none">
-    <section class="email-section">
+    <section class="email-section" style="position: relative;">
       <h4><?php echo count($emails) > 1 ? 'Receiving Addresses' : 'Do You Want To Receive Mail?' ?></h4>
       <?php if (count($emails) > 1): ?>
         <div class="meta spacer-half">Uncheck all boxes if you want to receive no future messages.</div>
@@ -32,7 +32,7 @@
       <?php endforeach ?>
     </section>
 
-    <section class="tag-section spacer1">
+    <section class="tag-section spacer1" style="position: relative;">
       <h4>Fine-tune your Mail</h4>
       <div class="notice notice-error hide spacer-half"></div>
       <div class="notice notice-success hide spacer-half">Your email preferences have been updated.</div>
diff --git a/web/scss/components/_notice.scss b/web/scss/components/_notice.scss
index dbd07eb6..97af2fbd 100644
--- a/web/scss/components/_notice.scss
+++ b/web/scss/components/_notice.scss
@@ -9,10 +9,13 @@
 }
 
 .notice {
+  top: -0.5rem; right: 0;
+
   border: 1px solid var(--lbry-gray-1);
   font-size: 0.8rem;
-  margin-bottom: 0.5rem;
+  // margin-bottom: 0.5rem;
   padding: 0.5rem 0.75rem;
+  position: absolute;
 
   [href] {
     text-decoration: underline;