From c6b2c89e1d7d0fac71f7934d054d46ce899e4c9c Mon Sep 17 00:00:00 2001
From: kauffj <jeremy@usetopscore.com>
Date: Thu, 3 Dec 2015 11:38:17 -0500
Subject: [PATCH] v2 features ready for master

---
 model/CreditApi.class.php |  4 ++-
 view/nav/globalItems.php  |  7 ++--
 view/nav/learnFooter.php  | 17 +++++++---
 view/page/fund.php        |  1 +
 view/page/home-new.php    | 71 +++++++++++++++++++++++++++++++++++++++
 view/page/home.php        | 19 ++---------
 6 files changed, 92 insertions(+), 27 deletions(-)
 create mode 100644 view/page/home-new.php

diff --git a/model/CreditApi.class.php b/model/CreditApi.class.php
index cd0ea598..504c228d 100644
--- a/model/CreditApi.class.php
+++ b/model/CreditApi.class.php
@@ -14,7 +14,9 @@ class CreditApi
 
   public static function getTotalPeople()
   {
-    return 573;
+    $rawJSON = file_get_contents('https://spreadsheets.google.com/feeds/cells/1iOC1o5jq_4ySwRzsy2tZPPltw6Tbky2e3lDFdsWV8dU/okf1n52/public/full/R1C1?alt=json');
+    $json = $rawJSON ? json_decode($rawJSON, true) : [];
+    return isset($json['entry']) && isset($json['entry']['content']) ? $json['entry']['content']['$t'] : -1;
   }
 
   public static function getCreditsPerDollar($days)
diff --git a/view/nav/globalItems.php b/view/nav/globalItems.php
index 7579476e..405aa62b 100644
--- a/view/nav/globalItems.php
+++ b/view/nav/globalItems.php
@@ -1,11 +1,8 @@
 <?php foreach([
-    '/fund' => __('Fund'),
+//    '/fund' => __('Fund'),
     '/get' => __('Get'),
     '//blog.lbry.io' => __('News'),
-    '/learn' => __('Learn'),
-//    '/what' => __('What'),
-//    '/why' => __('Why'),
-//    '/team' => __('Team')
+    '/learn' => __('Learn')
 ] as $url => $label): ?>
   <div class="control-item">
     <a href="<?php echo $url ?>" <?php echo $selectedItem === $url ? 'class="nav-active"' : ''?>><?php echo $label ?></a>
diff --git a/view/nav/learnFooter.php b/view/nav/learnFooter.php
index ae057aef..87918c43 100644
--- a/view/nav/learnFooter.php
+++ b/view/nav/learnFooter.php
@@ -4,6 +4,7 @@
       <div class="span6">
         <h3><?php echo __('Sounds Great. What\'s Next?') ?></h3>
         <table class="table-layout">
+          <?php /*
           <tr>
             <td>
               <a href="/fund" class="btn-alt btn-full-width"><?php echo __('Buy') ?></a>
@@ -11,18 +12,25 @@
             <td>
               <?php echo __('Pre-buy credits and support LBRY.') ?>
             </td>
-          </tr>
+          </tr>*/ ?>
           <tr>
             <td>
               <a href="/get" class="btn-alt btn-full-width"><?php echo __('Test') ?></a>
             </td>
             <td>
-              <?php echo __('Test a LBRY pre-release and earn credits.') ?>
+              <?php echo __('Test LBRY and earn credits.') ?>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <a href="/join-list" class="btn-alt btn-full-width"><?php echo __('Subscribe') ?></a>
+            </td>
+            <td>
+              <?php echo __('Know when LBRY launches.') ?>
             </td>
           </tr>
         </table>
         <ul>
-          <li><a href="/join-list" class="link-primary">Join our email list.</a></li>
           <li>Join us on <a href="//twitter.com/lbryio" class="link-primary"><span class="btn-label">Twitter</span><span class="icon icon-twitter"></span></a>,
             <a href="//facebook.com/lbryio" class="link-primary"><span class="btn-label">Facebook</span><span class="icon icon-facebook"></span></a>,
                 or <a href="//reddit.com/r/lbry" class="link-primary"><span class="btn-label">Reddit</span><span class="icon icon-reddit"></span></a>.</li>
@@ -40,6 +48,7 @@
           <?php if ($_SERVER['REQUEST_URI'] != '/team'): ?>
             <li>Find out about <a href="/team" class="link-primary">the team behind LBRY</a>.</li>
           <?php endif ?>
+          <?php /*
           <li>Access our
             <a href="https://docs.google.com/document/u/1/d/1F2kcuWa8ccGdDZwAyPs3tddvATjN9rcq3iKkyJp9SYM/edit?usp=drive_web"
                class="link-primary">business plan</a>.
@@ -47,7 +56,7 @@
           <li>Watch our
             <a href="https://docs.google.com/presentation/u/1/d/1zaAPzh9cqvwVD5X7Ewn7_vuBWlJcjNPIfYuUg1rVhRo/present?noreplica=1&slide=id.p"
                class="link-primary">pitch deck</a>.
-          </li>
+          </li>*/ ?>
         </ul>
       </div>
     </div>
diff --git a/view/page/fund.php b/view/page/fund.php
index 7df6d08e..c57cc254 100644
--- a/view/page/fund.php
+++ b/view/page/fund.php
@@ -6,6 +6,7 @@
     <div class="row-fluid">
       <div class="span9 spacer2">
         <?php echo View::render('fund/header') ?>
+        <h2>TEST TEST TEST TEST TEST - You probably don't want to be here</h2>
         <h3>Current Goal</h3>
         <div class="content content-dark">
           <?php echo View::render('fund/currentGoal') ?>
diff --git a/view/page/home-new.php b/view/page/home-new.php
new file mode 100644
index 00000000..6c367deb
--- /dev/null
+++ b/view/page/home-new.php
@@ -0,0 +1,71 @@
+<div class="bg-image-full" style="background-image: url(/img/cover-home2.jpg)"></div>
+<?php Response::setMetaTitle(__('LBRY - Watch, Share, Earn')) ?>
+<?php Response::setMetaDescription(__('Learn about LBRY, a peer-to-peer, decentralized content marketplace.')) ?>
+<?php echo View::render('nav/header', ['isDark' => true]) ?>
+<main class="column-fluid">
+  <div class="span12">
+    <div class="cover cover-dark">
+      <div class="content content-wide content-dark">
+        <div class="text-center">
+          <h1 class="cover-title">Stream, Share, Earn.</h1>
+        </div>
+        <?php $labels = [
+            __('making history'),
+            __('empowering artists'),
+            __('spreading knowledge'),
+            __('sharing sustainably'),
+            __('protecting speech'),
+            __('building tomorrow'),
+            __('eliminating middlemen'),
+            __('furthering education'),
+        ] ?>
+        <?php shuffle($labels) ?>
+        <div class="sale-call ">
+          <span class="sale-call-verb"><?php echo __('Join') ?></span>
+          <span class="sale-call-total-people"><?php echo $totalPeople ?></span>
+          <span class="sale-call-prep">others in</span>
+          <span class="sale-ctas label-cycle"  data-cycle-interval="5000">
+            <span class="sale-cta"><?php echo implode('</span><span class="sale-cta">', $labels) ?></span>
+          </span>
+        </div>
+        <div class="control-group spacer2 text-center">
+          <div class="control-item">
+            <a href="/fund" class="btn-primary">Fund LBRY</a>
+          </div>
+          <div class="control-item">
+            <a href="/learn" class="btn-alt">Learn More</a>
+          </div>
+        </div>
+        <div class="video" style="margin-bottom: 80px">
+          <iframe width="560" height="315" src="https://www.youtube.com/embed/qMUbq3sbG-o?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
+        </div>
+        <div class="row-fluid content-constrained">
+          <div class="span6 text-center">
+            <div class="fb-page" data-href="https://www.facebook.com/lbryio" data-height="300" data-small-header="false" data-width="400"
+                 data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true" data-show-posts="true">
+              <div class="fb-xfbml-parse-ignore"><blockquote cite="https://www.facebook.com/lbryio"><a href="https://www.facebook.com/lbryio">LBRY</a></blockquote></div>
+            </div>
+          </div>
+          <div class="span6 text-center">
+            <a width="400" class="twitter-timeline" href="https://twitter.com/LBRYio" data-widget-id="671104143034073088">Tweets by @LBRYio</a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>
+
+<?php /*
+ * <h1>Stream, Share, Earn.</h1>
+            <div class="text-center">
+              <h3 class="cover-subtitle">Join a fully distributed network that makes information open to everyone.</h3>
+              <div class="control-group spacer1">
+                <div class="control-item">
+                  <a href="/get" class="btn-primary">Get LBRY</a>
+                </div>
+                <div class="control-item">
+                  <a href="/what" class="btn-alt">Learn More</a>
+                </div>
+              </div>
+            </div>
+ */ ?>
\ No newline at end of file
diff --git a/view/page/home.php b/view/page/home.php
index 6c367deb..b30031e2 100644
--- a/view/page/home.php
+++ b/view/page/home.php
@@ -30,7 +30,7 @@
         </div>
         <div class="control-group spacer2 text-center">
           <div class="control-item">
-            <a href="/fund" class="btn-primary">Fund LBRY</a>
+            <a href="/get" class="btn-primary">Get LBRY</a>
           </div>
           <div class="control-item">
             <a href="/learn" class="btn-alt">Learn More</a>
@@ -53,19 +53,4 @@
       </div>
     </div>
   </div>
-</main>
-
-<?php /*
- * <h1>Stream, Share, Earn.</h1>
-            <div class="text-center">
-              <h3 class="cover-subtitle">Join a fully distributed network that makes information open to everyone.</h3>
-              <div class="control-group spacer1">
-                <div class="control-item">
-                  <a href="/get" class="btn-primary">Get LBRY</a>
-                </div>
-                <div class="control-item">
-                  <a href="/what" class="btn-alt">Learn More</a>
-                </div>
-              </div>
-            </div>
- */ ?>
\ No newline at end of file
+</main>
\ No newline at end of file