Allow counters in banner text.

diff --git a/src/annoy/models.py b/src/annoy/models.py
index 9ed724c..488fa87 100644 (file)
--- a/src/annoy/models.py
+++ b/src/annoy/models.py
@@ -1,6 +1,7 @@
 from django.apps import apps
 from django.conf import settings
 from django.db import models
 from django.apps import apps
 from django.conf import settings
 from django.db import models

+from django.template import Context, Template

 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
 from .places import PLACES, PLACE_CHOICES
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
 from .places import PLACES, PLACE_CHOICES


@@ -34,6 +35,9 @@ class Banner(models.Model):
     def __str__(self):
         return self.text
 
     def __str__(self):
         return self.text
 

+    def get_text(self):
+        return Template(self.text).render(Context())
+

     @classmethod
     def choice(cls, place, request):
         Membership = apps.get_model('club', 'Membership')
     @classmethod
     def choice(cls, place, request):
         Membership = apps.get_model('club', 'Membership')

diff --git a/src/annoy/templates/annoy/banner.html b/src/annoy/templates/annoy/banner.html
index 012be11..9d00168 100644 (file)
--- a/src/annoy/templates/annoy/banner.html
+++ b/src/annoy/templates/annoy/banner.html
@@ -17,7 +17,7 @@
         <img src="{{ banner.image.url }}">
       {% endif %}
       <div class="text">
         <img src="{{ banner.image.url }}">
       {% endif %}
       <div class="text">

-        {{ banner.text|safe|linebreaks }}
+        {{ banner.get_text|safe|linebreaks }}

       </div>
 
       {% if banner.action_label %}
       </div>
 
       {% if banner.action_label %}

diff --git a/src/club/templatetags/club.py b/src/club/templatetags/club.py
index b0ce868..42913fe 100644 (file)
--- a/src/club/templatetags/club.py
+++ b/src/club/templatetags/club.py
@@ -17,6 +17,10 @@ def active_schedule(user):
     return get_active_schedule(user)
 
 
     return get_active_schedule(user)
 
 

+@register.simple_tag
+def club_count_recurring():
+    return Schedule.objects.exclude(monthly=False, yearly=False).filter(expires_at__gt=now()).count()
+

 @register.simple_tag
 def club_active_monthly_count():
     return Schedule.objects.filter(
 @register.simple_tag
 def club_active_monthly_count():
     return Schedule.objects.filter(