From 6a008535541967196c1612e9f0a5e02d445d4210 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 15 Mar 2019 07:57:00 +0100
Subject: [PATCH] fiddling with style & layout

---
 rowers/templatetags/rowerfilters.py | 17 ++++++++++++++++-
 static/css/rowsandall2.css          | 14 ++++++++++++++
 static/css/styles2.css              | 13 +++++++++++--
 templates/newbase.html              | 23 ++++++++++++++++++++---
 4 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 547f13b6..3bff8112 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -11,7 +11,7 @@ from rowers.utils import calculate_age
 from rowers.models import (
     course_length,WorkoutComment,
     TrainingMacroCycle,TrainingMesoCycle, TrainingMicroCycle,
-    Rower,Workout
+    Rower,Workout,SiteAnnouncement
     )
 from rowers.plannedsessions import (
     race_can_register, race_can_submit,race_rower_status
@@ -33,6 +33,12 @@ import arrow
 
 from six import string_types
 
+@register.filter
+def nogoals(user):
+    targets = TrainingTarget.objects.filter(rowers=user.rower,
+                                            date__gte=datetime.date.today())
+    return len(targets)==0
+
 def strfdelta(tdelta):
     minutes,seconds = divmod(tdelta.seconds,60)
     tenths = int(tdelta.microseconds/1e5)
@@ -333,6 +339,15 @@ def user_teams(user):
 
     return teams
 
+@register.filter
+def announcements(request):
+    announcements = SiteAnnouncement.objects.filter(
+        expires__gte=datetime.date.today()).order_by(
+            "-created",
+            "-id"
+            )
+
+    return announcements[0:4]
 
 @register.filter
 def has_teams(user):
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index 388f56eb..2493cdd4 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -240,6 +240,7 @@ th.rotate > div > span {
     padding: .2em .5em .2em 0em;
 }
 
+
 .site-announcement {
     font: 1.0em/1.2em sans-serif;
     text-decoration: none;
@@ -253,6 +254,19 @@ th.rotate > div > span {
     border: solid 1px #333;
 }
 
+.site-announcement-white {
+    font: 1.0em/1.2em sans-serif;
+    text-decoration: none;
+    display: block;
+    padding: .2em .5em .2em .5em; 
+    zoom: 1;
+/*    border-radius: .5em; */
+/*    -moz-border-radius: .5em; */
+/*    -webkit-border-radius: .5em; */
+    text-align: left;
+    border: solid 1px #fff;
+}
+
 
 
 .contentli {
diff --git a/static/css/styles2.css b/static/css/styles2.css
index e3dc143f..d7d23e7d 100644
--- a/static/css/styles2.css
+++ b/static/css/styles2.css
@@ -80,6 +80,15 @@
         padding: 15px;
     }
 
+    ad h1 {
+        font-weight: bold;
+        text-align: left;
+        font-size: 1.4em;
+        /* color: #dddddd; */
+        color: #f8f8ff;
+        padding: 15px;
+    }
+
     aside h1 a {
         font-weight: bold;
         text-align: left;
@@ -647,8 +656,8 @@
         "side-nav nav  nav"
         "sidebar content content"
         "sidebar     content content"
-        "sidebar     content content"
-        "sidebar  footer footer"
+        "ad     content content"
+        "ad  footer footer"
         "ad  footer footer"
    }
 
diff --git a/templates/newbase.html b/templates/newbase.html
index 5ae54c80..87661000 100644
--- a/templates/newbase.html
+++ b/templates/newbase.html
@@ -309,10 +309,27 @@
       </aside>
       
       <ad class="ad">
+        {% if request|announcements %}
+        <h1>What's New?</h1>
+        {% for a in request|announcements %}
+        <div class="site-announcement-box">
+          <div class="site-announcement-white">
+            <em>{{ a.created }}:</em>
+            {{ a.announcement|urlize }}
+          </div>
+        </div>
+
+        {% endfor %}
+        {% endif %}
+        {% if user|nogoals %}
+        <p>
+          <a href="/rowers/createplan/">Create a Training Target!</a>
+        </p>
+        {% endif %}
         {% block ad %}
-        <a href="https://pryglrowing.com">
-          <img src="/static/img/prygl.jpg">
-          <p style="text-align: center">Prygl Rowing Camps</p>
+          <a href="https://pryglrowing.com">
+            <img src="/static/img/prygl.jpg">
+            <p style="text-align: center">Prygl Rowing Camps</p>
           </a>
         {% endblock %}
       </ad>