Merge remote-tracking branch 'origin/master' into blogs_are_dumb

controller/Controller.class.php

@@ -54,9 +54,9 @@ class Controller
       case '/dl/lbry_setup.sh':
         return static::redirect('https://raw.githubusercontent.com/lbryio/lbry-setup/master/lbry_setup.sh', 307);
       case '/lbry-osx-latest.dmg':
-        return static::redirect('https://s3.amazonaws.com/files.lbry.io/osx/lbry.0.2.1.dmg', 307);
+        return static::redirect('https://s3.amazonaws.com/files.lbry.io/osx/lbry.0.2.2.dmg', 307);
       case '/lbry-linux-latest.deb':
-        return static::redirect('https://s3.amazonaws.com/files.lbry.io/linux/lbry_0.2.1_amd64.deb', 307);
+        return static::redirect('https://s3.amazonaws.com/files.lbry.io/linux/lbry_0.2.2_amd64.deb', 307);
       default:
         $blogPattern = '#^/news(/|$)#';
         if (preg_match($blogPattern, $uri))

view/template/get/alphaNotice.php

@@ -1,4 +1,4 @@
-<div class="notice notice-info spacer1">
+<div class="spacer1">
-  <strong>This is a pre-release, alpha version of LBRY.</strong> It is only designed to show what LBRY makes possible.
+  <em>This is a pre-release, alpha version of LBRY.</em> It is only designed to show what LBRY makes possible.
           Future releases will involve a full network reboot.
 </div>

view/template/get/getSharedCli.php

@@ -1,31 +0,0 @@
-<?php NavActions::setNavUri('/get') ?>
-<?php echo View::render('nav/header', ['isDark' => false]) ?>
-
-<main class="column-fluid">
-  <div class="span6">
-    <div class="cover cover-light content">
-      <?php echo $installHtml ?>
-    </div>
-  </div>
-  <div class="span6">
-    <?php $reward = CreditApi::getCurrentTestCreditReward() ?>
-    <div class="cover cover-dark cover-dark-grad content content-dark">
-      <h1>Test and Earn</h1>
-      <?php echo View::render('get/feedback-prompt') ?>
-      <h3>Test Your Install</h3>
-      <ol>
-        <li>Run <code>lbrynet-console</code> from the command line</li>
-        <li>Enter <code>get wonderfullife</code></li>
-        <li>Continue to play as you desire</li>
-      </ol>
-      <h3>Feedback</h3>
-      <p>
-        In addition to <?php echo i18n::formatCredits($reward) ?>, your feedback will be personally read by the developers and help signal
-        interest in LBRY to investors.
-      </p>
-      <a href="/feedback" class="btn-alt">Provide Your Feedback</a>
-    </div>
-  </div>
-</main>
-
-<?php echo View::render('nav/footer') ?>

view/template/page/get.php

@@ -5,36 +5,19 @@
   <div class="span6">
     <div class="cover cover-dark cover-dark-grad">
       <div class="content content-dark">
-        <div class="meta meta-large">
-          <span class="icon-mobile"></span> <span class="icon-windows"></span> <span class="icon-android"></span>
-        </div>
-        <h1><?php echo __('I want LBRY for mobile, Windows, or shudder at the phrase "command line".') ?></h1>
-        <p class="pflow">LBRY is coming out on your favorite platform soon. Join our list to know when.</p>
-        <?php echo View::render('mail/joinList', [
-          'submitLabel' => 'Go',
-          'returnUrl' => '/get',
-          'listId' => Mailchimp::LIST_GENERAL_ID,
-          'mergeFields' => ['CLI' => 'No'],
-          'btnClass' => 'btn-alt'
-        ]) ?>
-      </div>
-    </div>
-  </div>
-  <div class="span6">
-    <div class="cover cover-light">
-      <div class="content">
         <div class="meta  meta-large">
           <span class="icon-linux"></span> <span class="icon-apple"></span>
         </div>
-        <h1><?php echo __('I am a Linux or OS X user comfortable from the command line.') ?></h1>
+        <h1><?php echo __('I use OS X or Linux and am prepared to have my world rocked.') ?></h1>
-        <p class="pflow">Earn early adopter rewards and interact directly with developers via our Alpha client.</p>
+        <p class="pflow">Earn early adopter rewards for downloading our Alpha client.</p>
         <div class="spacer1">
           <?php echo View::render('mail/joinList', [
             'submitLabel' => 'Go',
             'listId' => Mailchimp::LIST_GENERAL_ID,
             'mergeFields' => ['CLI' => 'Yes'],
             'fbEvent' => 'Alpha',
-            'returnUrl' => '/get?email=1'
+            'returnUrl' => '/get?email=1',
+            'btnClass' => 'btn-alt'
           ]) ?>
         </div>
         <?php if (!$isSubscribed): ?>
@@ -56,5 +39,22 @@
       </div>
     </div>
   </div>
+  <div class="span6">
+    <div class="cover cover-light">
+      <div class="content">
+        <div class="meta meta-large">
+          <span class="icon-mobile"></span> <span class="icon-windows"></span> <span class="icon-android"></span>
+        </div>
+        <h1><?php echo __('I want LBRY for mobile or Windows and would like my world-rocking at the earliest possible convenience.') ?></h1>
+        <p class="pflow">LBRY is coming out on your favorite platform soon. Join our list to know when.</p>
+        <?php echo View::render('mail/joinList', [
+          'submitLabel' => 'Go',
+          'returnUrl' => '/get',
+          'listId' => Mailchimp::LIST_GENERAL_ID,
+          'mergeFields' => ['CLI' => 'No'],
+        ]) ?>
+      </div>
+    </div>
+  </div>
 </main>
 <?php echo View::render('nav/footer') ?>

view/template/page/linux.php

@@ -2,16 +2,16 @@
 <?php ob_start() ?>
   <h1>Install LBRY on Linux <span class="icon-linux"></span></h1>
   <?php echo View::render('get/alphaNotice') ?>
-  <div class="meta spacer1 text-center">Choose an install option.</div>
+  <div class="meta text-center">Choose your install level.</div>
   <div class="row-fluid">
     <div class="span6">
-      <h3>For the Efficient and Lazy</h3>
+      <h3>Casuals</h3>
       <p>
-        <a class="btn-primary" download href="//lbry.io/lbry-linux-latest.deb">Download</a>
+        <a class="btn-primary" download href="//lbry.io/lbry-linux-latest.deb">Download .deb</a>
       </p>
     </div>
     <div class="span6">
-      <h3>For the Shrewd and Frivolous</h3>
+      <h3><strike>Masochists</strike> Professionals</h3>
       <ol>
         <li>Clone and follow the build steps for <a href="https://github.com/lbryio/lbryum" class="link-primary">lbryum</a>, a lightweight client for LBRY.</li>
         <li>Clone and follow the build steps for <a href="https://github.com/lbryio/lbry"  class="link-primary">lbry</a>, a console based application for using the LBRY protocol.</li>
@@ -19,4 +19,4 @@
     </div>
   </div>
 <?php $html = ob_get_clean() ?>
-<?php echo View::render('get/getSharedCli', ['installHtml' => $html]) ?>
+<?php echo View::render('get/getSharedApp', ['installHtml' => $html]) ?>

view/template/page/osx.php

@@ -1,6 +1,6 @@
 <?php Response::setMetaDescription('Download/install the latest version of LBRY for OS X.') ?>
 <?php ob_start() ?>
-  <h1>Install LBRY on OS X <span class="icon-apple"></span> (command line)</h1>
+  <h1>Install LBRY on OS X <span class="icon-apple"></span></h1>
   <?php echo View::render('get/alphaNotice') ?>
   <p>
     <a class="btn-primary" href="//lbry.io/lbry-osx-latest.dmg">Download for OS X</a>