From: Aleksander Łukasz Date: Tue, 15 Oct 2013 08:07:19 +0000 (+0200) Subject: Extend mil base from super_base template X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/3ddfdd9baf3266c0e19ada023cc2de2acc53ad85?ds=sidebyside;hp=aca7f25034a7db679c5f8e02c9d12833d70cc152 Extend mil base from super_base template --- diff --git a/edumed/settings.d/30-apps.py b/edumed/settings.d/30-apps.py index 6a8d656..f5d04e7 100644 --- a/edumed/settings.d/30-apps.py +++ b/edumed/settings.d/30-apps.py @@ -2,6 +2,7 @@ INSTALLED_APPS = ( 'edumed', 'curriculum', 'catalogue', + 'mil', 'fnpdjango', 'south', @@ -19,6 +20,7 @@ INSTALLED_APPS = ( 'pybb', 'django_libravatar', 'sorl.thumbnail', + 'subdomains', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/edumed/templates/base.html b/edumed/templates/base.html index 1c8f434..6b825e6 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -1,105 +1,14 @@ - -{% load i18n static %} -{% load fnp_common fnp_share fnp_lang macros %} -{% load compressed static %} -{% load sponsor_tags %} +{% extends "base_super.html" %} -{% macro title %}{% block title %}{% endblock %}{% endmacro %} -{% macro site_name %}Edukacja medialna{% endmacro %} - - - {% block full_title %}{% usemacro title %} :: {% usemacro site_name %}{% endblock %} - - {% compressed_css 'base' %} +{% block tagline %}Scenariusze zajęć, ćwiczenia, materiały{% endblock %} - - - - - - - - - - - -
-
- - {% if request.user.is_authenticated %} - Wyloguj - {% endif %} -
- -
- Projekt prowadzi:
- - Fundacja Nowoczesna Polska - -
- -
- -
Scenariusze zajęć, ćwiczenia, materiały
- -
-
-
- -
{% block body %}{% endblock %}
- - - - - {% compressed_js 'base' %} - {% block extra_script %}{% endblock %} - {{ piwik_tag|safe }} - - +{% block top_navigation %} +
  • Lekcje
    • +
  • Kompetencje
    • +
  • Współpraca
    • +
  • Turniej
    • +
  • Wesprzyj nas
    • +
  • O nas
    • +
  • Kontakt
    • +{% endblock %} diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html new file mode 100644 index 0000000..ac9f600 --- /dev/null +++ b/edumed/templates/base_super.html @@ -0,0 +1,100 @@ + +{% load i18n static %} +{% load fnp_common fnp_share fnp_lang macros %} +{% load compressed static %} +{% load sponsor_tags %} + +{% macro title %}{% block title %}{% endblock %}{% endmacro %} +{% macro site_name %}Edukacja medialna{% endmacro %} + + + + {% block full_title %}{% usemacro title %} :: {% usemacro site_name %}{% endblock %} + + {% compressed_css 'base' %} + + + + + + + + + + + + +
    +
    + + {% if request.user.is_authenticated %} + Wyloguj + {% endif %} +
    + +
    + Projekt prowadzi:
    + + Fundacja Nowoczesna Polska + +
    + +
    + +
    {% block tagline %}{% endblock %}
    + +
    +
    +
    + +
    {% block body %}{% endblock %}
    + + + + + {% compressed_js 'base' %} + {% block extra_script %}{% endblock %} + {{ piwik_tag|safe }} + + diff --git a/mil/templates/mil/base.html b/mil/templates/mil/base.html new file mode 100644 index 0000000..41d0717 --- /dev/null +++ b/mil/templates/mil/base.html @@ -0,0 +1,14 @@ +{% extends "base_super.html" %} +{% load subdomainurls %} + + {% block top_navigation %} +
  • Konsultacje
    • +
  • Kompetencje
    • +
  • Weź udział
    • +
  • Materiały edukacyjne
    • +
  • Kontakt
    • +{% endblock %} + +{% block body %} +mil +{% endblock %} \ No newline at end of file diff --git a/mil/views.py b/mil/views.py index 5d7fcbf..b72a8d9 100644 --- a/mil/views.py +++ b/mil/views.py @@ -1,5 +1,6 @@ from django.http import HttpResponse +from django.shortcuts import render def root(request): - return HttpResponse('mil') \ No newline at end of file + return render(request, 'mil/base.html')