From 81815316f395dbcc96711882efcbdc4a3a484244 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 25 Oct 2018 08:20:11 +0200
Subject: [PATCH] front page improvements

---
 rowers/templates/frontpage.html | 24 +++++++++++++-----------
 rowers/views.py                 | 10 +---------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html
index c97b38e2..ef972c0b 100644
--- a/rowers/templates/frontpage.html
+++ b/rowers/templates/frontpage.html
@@ -92,12 +92,6 @@
   <li class="grid_5">
     <p class="midden">and more</p>
   </li>
-  <li class="grid_5">
-    <div class="midden">
-      <img src="/static/img/horizontal_line.png"
-           alt="horizontal line">
-      </div>
-  </li>    
 </ul>
 <ul class="main-content" id="id_blogs">
 </ul>
@@ -158,17 +152,25 @@ $( document ).ready(function() {
 console.log('loading script');
 $.getJSON(window.location.protocol + '//'+window.location.host + '/getblogs', function(data) {
 var html = '';
-console.log(data);
+if (data.length != 0) {
+html +=  '<li class="grid_5"><div class="midden"><img src="/static/img/horizontal_line.png" alt="horizontal line"></div></li>    '
+html += '<li class="grid_5"><h2 class="midden">Recent articles on the Analytics blog</h2></li>';
+html += '<li></li>';
+};
 $.each(data, function(key, blog) {
 console.log(blog.title);
     html += '<li class="frontitem">';
+    html += '<a style="text-decoration: none; color: black;" href="'+blog.link+'">';
     html += '<h3 class="midden">'+blog.title+'</h3>';
-    html += '<a href="'+blog.link+'">';
     html += '<p class="midden"><img src="'+blog.image+'" height=150px;></p>';
-    html += '</a>';
-    html += blog.excerpt+'</li>';
-$("#id_blogs").html(html);
+    html += '<p>'+blog.excerpt+'</p>';
+      html += '</a>';
+    html += '</li>';
 });
+if (data.length != 0) {
+html += '<li></li>';
+};
+$("#id_blogs").html(html);
       });
 });
 </script>
diff --git a/rowers/views.py b/rowers/views.py
index 3c037728..8d6487f5 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -672,7 +672,7 @@ def get_blog_posts(request):
     blogposts = []
 
     
-    for postdata in blogs_json[0:5]:
+    for postdata in blogs_json[0:3]:
         try:
             featuredmedia = postdata['featured_media']
             url = 'https://analytics.rowsandall.com/wp-json/wp/v2/media/%d' % featuredmedia
@@ -713,14 +713,6 @@ def get_blog_posts(request):
         blogposts.append(thedict)
 
     return JSONResponse(blogposts)
-#    html = render_to_string('frontpageblogs.html',
-#                            {
-#                                'blogposts':blogposts,
-#                                }
-#                            )
-
-
-#    return JSONResponse({'html':html})