Browse Source

Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations

export_seznamu_prednasek
Anet 5 years ago
parent
commit
43c1ae9c14
  1. 3
      mamweb/settings_common.py
  2. 5
      mamweb/settings_local.py
  3. 21
      mamweb/templates/base.html
  4. 1
      requirements.txt

3
mamweb/settings_common.py

@ -74,6 +74,7 @@ TEMPLATES = [
'OPTIONS': { 'OPTIONS': {
'context_processors': ( 'context_processors': (
'django.contrib.auth.context_processors.auth', 'django.contrib.auth.context_processors.auth',
'django.template.context_processors.request',
'django.contrib.messages.context_processors.messages', 'django.contrib.messages.context_processors.messages',
'sekizai.context_processors.sekizai', 'sekizai.context_processors.sekizai',
'mamweb.context_processors.vzhled', 'mamweb.context_processors.vzhled',
@ -114,6 +115,8 @@ INSTALLED_APPS = (
'django.contrib.flatpages', 'django.contrib.flatpages',
'django.contrib.humanize', 'django.contrib.humanize',
'sitetree',
'imagekit', 'imagekit',
'polymorphic', 'polymorphic',

5
mamweb/settings_local.py

@ -72,6 +72,11 @@ LOGGING = {
}, },
}, },
'loggers': { 'loggers': {
'werkzeug': {
'handlers': ['console'],
'level': 'DEBUG',
'propagate': True,
},
'': { '': {
'handlers': ['console'], 'handlers': ['console'],
'level': 'DEBUG', 'level': 'DEBUG',

21
mamweb/templates/base.html

@ -1,4 +1,5 @@
{% load staticfiles sekizai_tags %} {% load staticfiles sekizai_tags %}
{% load sitetree %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang='cs'> <html lang='cs'>
<head> <head>
@ -96,6 +97,26 @@
</div> </div>
</div> </div>
<div class='row content'> <div class='row content'>
{% sitetree_menu from "main_menu" include "trunk" %}
{#
{% for item in menu_top %}
<li class="{% if item.selected %} active {% endif %}">
<a href="{{ item.url }}"> <i class="{{ item.icon_class }}"></i> {{ item.name }}</a>
</li>
{% if item.submenu %}
<ul>
{% for menu in item.submenu %}
<li class="{% if menu.selected %} active {% endif %}">
<a href="{{ menu.url }}">{{ menu.name }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% endfor %}
#}
<div class='col-md-12'> <div class='col-md-12'>
{% block content %} {% block content %}
{% endblock content %} {% endblock content %}

1
requirements.txt

@ -26,6 +26,7 @@ django-autocomplete-light
django-crispy-forms django-crispy-forms
django-imagekit django-imagekit
django-polymorphic django-polymorphic
django-sitetree
# Comments # Comments
akismet==1.0.1 akismet==1.0.1

Loading…
Cancel
Save