From 6bedf06f1bbdabc0bc8fab9cffb4df4949dcc76c Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Sun, 12 Feb 2017 10:40:20 +0000
Subject: [PATCH] Some styling tweaks on homepage and member list page, spacing
 and layout

---
 .drone.yml                              |  2 ++
 mhackspace/templates/feeds/list.html    | 35 ++++++++++++++++---------
 mhackspace/templates/pages/about.html   | 10 ++++++-
 mhackspace/templates/pages/members.html | 10 ++++---
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4d36f3f..db29b8f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,6 +8,8 @@ pipeline:
       - DJANGO_SETTINGS_MODULE=config.settings.test
     commands:
       - cp -n env.example .env
+      - ls -la /drone/src/
+      - ls -la /drone/src/requirements/
       - pip install -r /drone/src/requirements/test.txt
       - python manage.py test mhackspace --verbosity 2
 
diff --git a/mhackspace/templates/feeds/list.html b/mhackspace/templates/feeds/list.html
index 30f498f..16f6cb1 100644
--- a/mhackspace/templates/feeds/list.html
+++ b/mhackspace/templates/feeds/list.html
@@ -1,18 +1,27 @@
 {% load static %}
 {% get_static_prefix as STATIC_PREFIX %}
+
+<h3 class="mb-1">See what our memberrs have been creating below.</h3>
+<br />
 <div class="card-columns" id="feeds">
-  {% for article in articles %}
-    <div class="card">
-      <a href="{{ article.url }}">
-        <img class="card-img-top img-fluid" alt="{{ article.title }}"
-             src="{% firstof article.image.home.url article.feed.image.home.url "static/images/card.png" %}">
-      </a>
-      <div class="card-block">
-        <a href="{{ article.url }}" class="card-link"><h4 class="card-title">{{ article.title }}</h4></a>
-        <p class="card-text">{{ article.feed.author }}</p>
-        <p class="card-text">{{ article.description|striptags|truncatewords:30 }}</p>
-        <a href="{{ article.url }}" class="card-link">View Original</a>
+  <div class="card-deck">
+    {% for article in articles %}
+      <div class="card">
+        <a href="{{ article.url }}">
+
+          {% if article.image %} 
+          <img class="card-img-top img-fluid" alt="{{ article.title }}" src="{{ article.image.url }}">
+          {% endif %}
+        </a>
+        <div class="card-block">
+          <a href="{{ article.url }}" class="card-link"><h4 class="card-title">{{ article.title }}</h4></a>
+          <p class="card-text">{{ article.feed.author }}</p>
+          <p class="card-text">{{ article.description|striptags|truncatewords:30 }}</p>
+          <a href="{{ article.url }}" class="card-link">View Original</a>
+        </div>
       </div>
-    </div>
-  {% endfor %}
+
+      {% if forloop.counter|divisibleby:3 %}</div><div class="card-deck">{% endif %}
+    {% endfor %}
+  </div>
 </div>
diff --git a/mhackspace/templates/pages/about.html b/mhackspace/templates/pages/about.html
index 63913c1..bc62be8 100644
--- a/mhackspace/templates/pages/about.html
+++ b/mhackspace/templates/pages/about.html
@@ -1 +1,9 @@
-{% extends "base.html" %}
\ No newline at end of file
+{% extends "base.html" %}
+
+{% block content %}
+
+<p>A hackspace also referred to as a makerspace is a community-operated, workspace where people with common interests, often in computers, machining, technology, science, digital art or electronic art, can meet, socialize and collaborate.<p>
+
+<p>Most people do no have the space knowleddge or finance required to create things at home, hackspaces get around this by poolng together for the bigger tools sharing of knowledge and helping out each other to create & build.</p>
+
+{% endblock content %}
diff --git a/mhackspace/templates/pages/members.html b/mhackspace/templates/pages/members.html
index 265c63a..d343596 100644
--- a/mhackspace/templates/pages/members.html
+++ b/mhackspace/templates/pages/members.html
@@ -1,14 +1,16 @@
 {% extends "base.html" %}
 {% block content %}
 
-Members feed
 
 <div class="row">
-  <div class="col">Users {{ paginator.count }}</div>
-  <div class="col">Members {{ total }}</div>
+  <div class="col-md-4">Hackspace Members</div>
+  <div class="col-md-4"><a href="#">Total Users <span class="badge badge-default">{{ paginator.count }}</span></a></div>
+  <div class="col-md-4"><a href="#">Total Members <span class="badge badge-success">{{ total }}</span></a></div>
 </div>
 
-<div class="card-deck-wrapper">
+<br />
+
+<div class="card-columns" id="feeds">
   <div class="card-deck">
     {% for member in members %}
       <div class="card">