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

5 years ago · 43c1ae9c14
4 changed files with 30 additions and 0 deletions
--- a/mamweb/settings_common.py
+++ b/mamweb/settings_common.py
@ -74,6 +74,7 @@ TEMPLATES = [
        'OPTIONS': {
            'context_processors': (
                'django.contrib.auth.context_processors.auth',
 		'django.template.context_processors.request',
                'django.contrib.messages.context_processors.messages',
                'sekizai.context_processors.sekizai',
                'mamweb.context_processors.vzhled',
@ -114,6 +115,8 @@ INSTALLED_APPS = (
    'django.contrib.flatpages',
    'django.contrib.humanize',
    'sitetree',
    'imagekit',
    'polymorphic',
--- a/mamweb/settings_local.py
+++ b/mamweb/settings_local.py
@ -72,6 +72,11 @@ LOGGING = {
        },
    },
    'loggers': {
        'werkzeug': {
        	'handlers': ['console'],
        	'level': 'DEBUG',
        	'propagate': True,
    	},
        '': {
            'handlers': ['console'],
            'level': 'DEBUG',
--- a/mamweb/templates/base.html
+++ b/mamweb/templates/base.html
@ -1,4 +1,5 @@
 {% load staticfiles sekizai_tags %}
 {% load sitetree %}
 <!DOCTYPE html>
 <html lang='cs'>
  <head>
@ -96,6 +97,26 @@
 	    </div>
 	  </div>
 	<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'>
 	    {% block content %}
 	    {% endblock content %}
--- a/requirements.txt
+++ b/requirements.txt
@ -26,6 +26,7 @@ django-autocomplete-light
 django-crispy-forms
 django-imagekit
 django-polymorphic
 django-sitetree
 # Comments
 akismet==1.0.1