From b723924302827bcd151e5fa5a6e98229981dfc3c Mon Sep 17 00:00:00 2001
From: Atticus White <contact@atticuswhite.com>
Date: Tue, 22 Sep 2015 22:04:05 -0400
Subject: [PATCH 1/3] 2-column news feed

---
 assets/less/blog.less           | 11 +++++++++
 assets/less/main.less           |  1 +
 assets/less/page.less           |  3 ++-
 home.php                        | 44 ++++++++++++++++++++++++++++++++-
 lib/services/news/news_feed.php |  2 +-
 5 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 assets/less/blog.less

diff --git a/assets/less/blog.less b/assets/less/blog.less
new file mode 100644
index 0000000..4a1c7cf
--- /dev/null
+++ b/assets/less/blog.less
@@ -0,0 +1,11 @@
+.blog {
+  article {
+    h2 {
+      font-size: 20px;
+      margin-bottom: 0;
+    }
+    h4 {
+      margin-top: 0;
+    }
+  }
+}
diff --git a/assets/less/main.less b/assets/less/main.less
index d971933..2a89fcc 100644
--- a/assets/less/main.less
+++ b/assets/less/main.less
@@ -17,4 +17,5 @@
 @import 'events.less';
 @import 'rte.less';
 @import 'page.less';
+@import 'blog.less';
 @import 'forms.less';
diff --git a/assets/less/page.less b/assets/less/page.less
index e5052f7..4c85fd6 100644
--- a/assets/less/page.less
+++ b/assets/less/page.less
@@ -1,4 +1,4 @@
-.page-container {
+o.page-container {
   @media @desktop {
     width: 80%;
     margin: auto;
@@ -34,6 +34,7 @@ article {
   }
   h2 {
     margin-top: 0;
+    font-size: 20px;
   }
   // Add .com to "Bernie Sanders" link for more clarity
   p:last-child {
diff --git a/home.php b/home.php
index 7493923..42f3ed4 100644
--- a/home.php
+++ b/home.php
@@ -2,9 +2,12 @@
   get_header();
 
   use SandersForPresident\Wordpress\Services\News\NewsFeedService;
+  use SandersForPresident\Wordpress\Services\News\RemoteNewsFeedService;
 
   $newsFeedService = new NewsFeedService();
-  $news = $newsFeedService->getNewsFeed();
+  $remoteNewsFeedService = new RemoteNewsFeedService();
+  $localNews = $newsFeedService->getLocalNewsFeed();
+  $remoteNews = $remoteNewsFeedService->getFeed();
 ?>
 <div class="container blog list">
   <div class="page-container">
@@ -12,6 +15,44 @@
       <h2>News</h2>
     </div>
 
+    <div class="row">
+
+      <div class="col-md-6">
+        <h2>Local News</h2>
+        <?php foreach ($localNews as $item): ?>
+        <article>
+          <h2>
+            <a href="<?php echo $item->getLink(); ?>">
+              <?php echo $item->getTitle(); ?>
+            </a>
+          </h2>
+          <h4><?php echo $item->getFormattedDate(); ?></h4>
+          <div class="rte">
+            <?php echo $item->getContent(); ?>
+          </div>
+        </article>
+        <?php endforeach; ?>
+      </div>
+
+      <div class="col-md-6">
+        <h2>Campaign News</h2>
+        <?php foreach ($remoteNews as $item): ?>
+        <article>
+          <h2>
+            <a href="<?php echo $item->getLink(); ?>">
+              <?php echo $item->getTitle(); ?>
+            </a>
+          </h2>
+          <h4><?php echo $item->getFormattedDate(); ?></h4>
+          <div class="rte">
+            <?php echo $item->getContent(); ?>
+          </div>
+        </article>
+        <?php endforeach; ?>
+      </div>
+    </div>
+
+    <!--
     <?php foreach ($news as $item) : ?>
       <article<?php if ($item->isRemote()) : ?> class="official"<?php endif; ?>>
         <?php if ($item->isRemote()) : ?><h5>Campaign News</h5><?php endif; ?>
@@ -26,6 +67,7 @@
         </div>
       </article>
     <?php endforeach; ?>
+  -->
   </div>
 </div>
 <?php get_footer(); ?>
diff --git a/lib/services/news/news_feed.php b/lib/services/news/news_feed.php
index 241e2f4..2bced4c 100644
--- a/lib/services/news/news_feed.php
+++ b/lib/services/news/news_feed.php
@@ -14,7 +14,7 @@ public function __construct() {
    * Fetches the local news feed.
    * Note: currently MUST utilize The Loop
    */
-  private function getLocalNewsFeed() {
+  public function getLocalNewsFeed() {
     global $post;
     $articles = array();
     while (have_posts()) {

From efee5bdd83487d7b26d80e98fd2213d2494b67bb Mon Sep 17 00:00:00 2001
From: Atticus White <contact@atticuswhite.com>
Date: Tue, 22 Sep 2015 22:06:29 -0400
Subject: [PATCH 2/3] handing no local news

---
 assets/less/blog.less | 26 ++++++++++++++++++++------
 home.php              |  6 +++---
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/assets/less/blog.less b/assets/less/blog.less
index 4a1c7cf..be5d073 100644
--- a/assets/less/blog.less
+++ b/assets/less/blog.less
@@ -1,11 +1,25 @@
 .blog {
-  article {
-    h2 {
-      font-size: 20px;
-      margin-bottom: 0;
+  .news {
+    .local, .remote {
+      .make-md-column(6);
+
+      article {
+        h2 {
+          font-size: 20px;
+          margin-bottom: 0;
+        }
+        h4 {
+          margin-top: 0;
+        }
+      }
     }
-    h4 {
-      margin-top: 0;
+    &.no-local {
+      .local {
+        display: none;
+      }
+      .remote {
+        .make-md-column(12);
+      }
     }
   }
 }
diff --git a/home.php b/home.php
index 42f3ed4..1c9199d 100644
--- a/home.php
+++ b/home.php
@@ -15,9 +15,9 @@
       <h2>News</h2>
     </div>
 
-    <div class="row">
+    <div class="news <?php if (empty($localNews)) { echo 'no-local'; } ?>">
 
-      <div class="col-md-6">
+      <div class="local">
         <h2>Local News</h2>
         <?php foreach ($localNews as $item): ?>
         <article>
@@ -34,7 +34,7 @@
         <?php endforeach; ?>
       </div>
 
-      <div class="col-md-6">
+      <div class="remote">
         <h2>Campaign News</h2>
         <?php foreach ($remoteNews as $item): ?>
         <article>

From 3ea10b8d3d7042733baff27d34c6a300e4ea1ef9 Mon Sep 17 00:00:00 2001
From: Atticus White <contact@atticuswhite.com>
Date: Tue, 22 Sep 2015 22:20:52 -0400
Subject: [PATCH 3/3] typo

---
 assets/less/page.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/less/page.less b/assets/less/page.less
index 4c85fd6..f879f65 100644
--- a/assets/less/page.less
+++ b/assets/less/page.less
@@ -1,4 +1,4 @@
-o.page-container {
+.page-container {
   @media @desktop {
     width: 80%;
     margin: auto;