From 20dcdb57308e2eb130370b098a834ec487ecc01a Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 22 Mar 2016 13:24:50 +0100 Subject: [PATCH] add featured events in slider, add edito, fix dropdown spaces, add /styles/ --- app/festival/templatetags/festival_tags.py | 27 ++++++--- app/sandbox/urls.py | 1 + app/templates/base.html | 21 +++---- app/templates/index.html | 10 ++-- app/templates/pages/menus/dropdown.html | 67 +++++++++------------- app/templates/styles.html | 10 ++++ 6 files changed, 70 insertions(+), 66 deletions(-) create mode 100644 app/templates/styles.html diff --git a/app/festival/templatetags/festival_tags.py b/app/festival/templatetags/festival_tags.py index 4060361e..32351dab 100644 --- a/app/festival/templatetags/festival_tags.py +++ b/app/festival/templatetags/festival_tags.py @@ -1,13 +1,26 @@ # -*- coding: utf-8 -*- from mezzanine.pages.models import Page -from django import template +from mezzanine.template import Library +from mezzanine_agenda.models import Event +from festival.models import Artist -register = template.Library() +register = Library() -@register.simple_tag -def edito(): - qs = Page.objects.filter(title="Edito") +@register.as_tag +def festival_edito(*args): + qs = Page.objects.filter(slug="edito") if qs: - return qs[0].content + return qs[0].get_content_model() else: - return '' + return None + +@register.as_tag +def festival_event_featured(*args): + models = [Event,] + featured = [] + for model in models: + objs = model.objects.filter(featured=True) + for obj in objs: + if hasattr(obj, 'featured_image_header'): + featured.append(obj) + return featured diff --git a/app/sandbox/urls.py b/app/sandbox/urls.py index d253e00b..f952c637 100644 --- a/app/sandbox/urls.py +++ b/app/sandbox/urls.py @@ -40,6 +40,7 @@ urlpatterns += [ # one homepage pattern, so if you use a different one, comment this # one out. + url("^styles/$", direct_to_template, {"template": "styles.html"}, name="styles"), url("^$", direct_to_template, {"template": "index.html"}, name="home"), # HOMEPAGE AS AN EDITABLE PAGE IN THE PAGE TREE diff --git a/app/templates/base.html b/app/templates/base.html index 3b7e0ef3..c7a05cc1 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -1,6 +1,6 @@ -{% load pages_tags mezzanine_tags i18n staticfiles keyword_tags event_tags %} +{% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags festival_tags %} {% get_language_info_list for LANGUAGES as languages %} @@ -86,20 +86,17 @@ - {% if on_home %}
{% endif %} diff --git a/app/templates/index.html b/app/templates/index.html index 0837c48a..fc38f65d 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2,16 +2,14 @@ {% load i18n festival_tags %} {% block meta_title %}{% trans "Home" %}{% endblock %} -{% block title %}{% trans "Home" %}{% endblock %} {% block breadcrumb_menu %}
  • {% trans "Home" %}
    • {% endblock %} -{% block main %} -

    {% trans "Edito" %}

    -{% edito %} +{% block title %}{% trans "Edito" %}{% endblock %} -
    -{% include "includes/html_styleguide.html" %} +{% block main %} +{% festival_edito as edito %} +{{ edito.content|safe }} {% endblock %} diff --git a/app/templates/pages/menus/dropdown.html b/app/templates/pages/menus/dropdown.html index 3fed1183..8d9c3cff 100644 --- a/app/templates/pages/menus/dropdown.html +++ b/app/templates/pages/menus/dropdown.html @@ -3,48 +3,33 @@ {% spaceless %} {% if page_branch_in_menu %} - -{% if branch_level == 0 %} - -{% endif %} - {% endif %} {% endspaceless %} diff --git a/app/templates/styles.html b/app/templates/styles.html new file mode 100644 index 00000000..0d2f875f --- /dev/null +++ b/app/templates/styles.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% load i18n festival_tags %} + +{% block meta_title %}{% trans "Styles" %}{% endblock %} + +{% block title %}{% trans "Styles" %}{% endblock %} + +{% block main %} +{% include "includes/html_styleguide.html" %} +{% endblock %} -- 2.39.5