From 0906b753cf528d45e225a4c196b3ed4ba7059f5c Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 10 Nov 2016 14:46:45 +0100 Subject: [PATCH] more changes for olimpiada --- edumed/templates/base.html | 35 +++++++++++++++++++++++++---------- edumed/urls.py | 4 ++-- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/edumed/templates/base.html b/edumed/templates/base.html index 96641ad..dd798dd 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -1,24 +1,39 @@ {% extends "base_super.html" %} +{% load textile_pl from fnp_markup %} {% load sponsor_tags %} {% load compressed %} +{% load static %} +{% block full_title %}Olimpiada cyfrowa{% endblock %} -{% block tagline %}Scenariusze zajęć, ćwiczenia, materiały{% endblock %} +{% block og_site_name %}Olimpiada cyfrowa{% endblock %} + +{% block ogurl %}https://olimpiadacyfrowa.pl{% endblock %} + +{% block og_image %}http://olimpiadacyfrowa.pl/media/chunks/attachment/olimpiada_cyfrowa_logo.png{% endblock %} + +{% block logo %}Olimpiada cyfrowa{% endblock %} + +{% block searchbox %}{% endblock %} {% block top_navigation %} -
  • Lekcje
  • - {% comment %}
  • Współpraca
  • {% endcomment %} -
  • Kompetencje
  • -
  • Olimpiada
  • -
  • Dla trenera
  • -
  • Wesprzyj nas
  • -
  • O projekcie
  • +
  • Regulamin
  • +
  • Program
  • +
  • Literatura
  • +
  • Harmonogram
  • +
  • Rada i komitet
  • +
  • Kontakt
  • +{% endblock %} + +{% block copyrights %} +
    Ikonki w menu: + Designed by Freepik and distributed by Flaticon {% endblock %} {% block sponsors %} - {% sponsor_page "footer" %} + {% sponsor_page "footer_olimpiada" %} {% endblock %} {% block extra_script %} {% compressed_js 'base' %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/edumed/urls.py b/edumed/urls.py index b2dc8c1..26646bb 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -14,7 +14,7 @@ urlpatterns = patterns( # url(r'^info/(?P.*)$', flatpage, name="info"), # url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'), # url(r'^olimpiada/(?P.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'), - # url(r'^szukaj/', include('haystack.urls')), + url(r'^szukaj/', include('haystack.urls')), # url(r'^olimpiada-teaser/(?P.*)$', # lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'), @@ -55,7 +55,7 @@ if 'django_cas' in settings.INSTALLED_APPS: urlpatterns += ( url(r'^(?P[^/]*/|)$', - lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html')), + lambda request, url: flatpage(request, 'turniej/' + url)), ) if settings.DEBUG: -- 2.20.1