Merge branch 'master' into feature/youtube_onboarding_stage2

content/faq/exchanges.md

@@ -12,3 +12,4 @@ We are listed on several exchanges. You can buy or sell credits at one of these:
 - [BitSquare](https://bitsquare.io/)
 - [Cryptopia](https://www.cryptopia.co.nz/Exchange/?market=LBC_BTC)
 - [Upbit](https://upbit.com/exchange?code=CRIX.UPBIT.BTC-LBC)
+- [Coinspot](https://www.coinspot.com.au/buy/lbc)

content/faq/mining-pools.md

@@ -11,3 +11,4 @@ While we try to work with reliable pool operators, LBRY does not officially run
 - [SuprNova](https://lbry.suprnova.cc/index.php?page=gettingstarted)
 - [CoinMine](https://www2.coinmine.pl/lbc/index.php?page=gettingstarted)
 - [NiceHash](https://www.nicehash.com/marketplace/lbry)
+- [Luxor](https://mining.luxor.tech/)

content/faq/naming.md

@@ -48,7 +48,7 @@ LBRY supports several types of URL resolution:
 
 1. **Names aren’t bought, only reserved – no credits are lost, only put on deposit.** If you win the auction for a name, your credits are held with that name until you decide to withdraw them (at any time you wish). You aren’t buying the name from anyone and no one profits off of the transfer of names. It’s just a test of who is willing to deposit the most credits toward a name. The only cost is that you can’t spend the credits on content or cash them out while they are reserving a name.
 
-2. **The longer a community name is held, the longer it sticks.** Community-controlled URLs don't change instantly if more credits are designated – especially if you’ve held it for awhile. The time for resolution to change scales up to over 1 week.
+2. **The longer a community name is held, the longer it sticks.** Community-controlled URLs don't change instantly if more credits are designated – especially if you’ve held it for awhile. For every month a name is controlled, 1 day is added to the waiting period, for a maximum of 7 days (after 7 months). 
 
 3. **Everyone has a say.** If you claim lbry://bestmovieever and your film lives up to the hype, user tips and purchases are a strong force keeping your content there. If the community feels a URL resolution is incorrect, they can band together to change it any time. This is a powerful force keeping bad actors at bay that has already proved useful.
 

content/press-kit.md

@@ -16,7 +16,7 @@ On July 29th, 2017 the Pop-up Open Beta Was Announced.
 
 ### FAQ
 
-- [LBRY in 100 Seconds (Video)](https://www.youtube.com/watch?v=qkUA0vTWM7g)
+- [LBRY in 100 Seconds (Video)](https://www.youtube.com/watch?v=DjouYBEkQPY)
 - [How Does LBRY Work, Exactly?](https://lbry.io/news/introducing-lbry-the-bitcoin-of-content)
 - [Why Doesn't LBRY Just Use Bitcoin?](https://lbry.io/news/why-doesnt-lbry-just-use-bitcoin)
 - [More F.A.Q's](https://lbry.io/faq)

controller/Controller.class.php

@@ -120,6 +120,7 @@ class Controller
     $router->any('/dmca', 'ReportActions::executeDmca');
 
     $router->any('/youtube/thanks', 'AcquisitionActions::executeThanks');
+    $router->any('/youtube/status/{token}?', 'AcquisitionActions::executeThanks');
     $router->any('/youtube/sub', 'AcquisitionActions::executeYouTubeSub');
     $router->any('/youtube', 'AcquisitionActions::executeYT2');
     $router->post('/youtube/edit', 'AcquisitionActions::executeYoutubeEdit');

controller/action/ContentActions.class.php

@@ -353,7 +353,10 @@ class ContentActions extends Actions
     return [
       'authorName'    => $post->getAuthorName(),
       'photoImgSrc'   => $post->getAuthorPhoto(),
-      'authorBioHtml' => $post->getAuthorBioHtml()
+      'authorBioHtml' => $post->getAuthorBioHtml(),
+      'authorGithub' => $post->getAuthorGithubID(),
+      'authorTwitter' => $post->getAuthorTwitterID(),
+      'authorEmail' => $post->getAuthorPostEmail()
     ];
   }
 

model/Post.class.php

@@ -156,6 +156,30 @@ class Post
     return $this->author;
   }
 
+  public function getAuthorGithubID()
+  {
+   $post = ContentActions::prepareBioPartial(['person' =>$this->author]);
+   if(array_key_exists("github", $post)){
+    return $post["github"];
+   }
+  }
+
+public function getAuthorTwitterID()
+{
+   $post = ContentActions::prepareBioPartial(['person' =>$this->author]);
+    if(array_key_exists("twitter", $post)){
+      return $post["twitter"];
+    }
+}
+
+public function getAuthorEmail()
+{
+    $post = ContentActions::prepareBioPartial(['person' =>$this->author]);
+    if(array_key_exists("email", $post)){
+      return $post["email"];
+    }
+}
+
   public function getDate()
   {
     return $this->date;
@@ -232,7 +256,7 @@ class Post
     return $post["name"];
   }
 
-  public function getAuthorEmail()
+  public function getAuthorPostEmail()
   {
     $post = ContentActions::prepareBioPartial(['person' =>$this->author]);
 

view/template/content/_postAuthor.php

@@ -6,9 +6,17 @@
       </div>
       <div class="span9">
         <div class="meta">{{news.author}}</div>
-        <h3><?php echo $authorName ?></h3>
+        <h3><?php echo $authorName ?>
+       <?php if (isset($authorEmail)): ?>
+          <a href="mailto:<?php echo $authorEmail ?>" class="link-primary"><span class="icon icon-envelope"></span></a>
+        <?php endif ?>
+        <?php if (isset ($authorGithub)): ?>
+          <a href="https://github.com/<?php echo $authorGithub ?>" class="link-primary"><span class="icon icon-github"></span></a>
+        <?php endif ?>
+        <?php if (isset($authorTwitter)): ?>
+          <a href="https://www.twitter.com/<?php echo $authorTwitter?>" class="link-primary"><span class="icon icon-twitter"></span></a>
+        <?php endif ?></h3>
         <?php echo $authorBioHtml ?>
     </div>
   </div>
-  </div>
 </div>

view/template/page/press-kit.php

@@ -42,7 +42,13 @@
           <h4>
             <?php echo $metadata['name'] ?>
             <?php if (isset($metadata['email'])): ?>
-              <a href="mailto:<?php echo $metadata['email'] ?>" class="link-primary"><?php echo $metadata['email'] ?></a>
+              <a href="mailto:<?php echo $metadata['email'] ?>" class="link-primary"><span class="icon icon-envelope"></span></a>
+           <?php endif ?>        
+           <?php if (isset($metadata['github'])): ?>
+              <a href="https://github.com/<?php echo $metadata['github'] ?>" class="link-primary"><span class="icon icon-github"></span></a>
+          <?php endif ?> 
+          <?php if (isset($metadata['twitter'])): ?>
+              <a href="https://www.twitter.com/<?php echo $metadata['twitter'] ?>" class="link-primary"><span class="icon icon-twitter"></span></a>
           <?php endif ?>
           </h4>
           <div class="meta spacer1"><?php echo $metadata['role'] ?></div>

web/scss/_blog.scss

@@ -203,5 +203,5 @@
 
 .post-author-spotlight
 {
-  h3 { text-transform: uppercase; margin-top: $spacing-vertical / 4 !important; }
+  h3 { text-transform: uppercase; margin-top: $spacing-vertical / 4 !important; margin-bottom: 0;}
 }