Merge branch 'prod'

This commit is contained in:
Christopher Neugebauer 2017-11-13 20:03:51 -08:00
commit a2ced2495f
2 changed files with 34 additions and 2 deletions

View file

@ -220,11 +220,11 @@ INSTALLED_APPS = [
'django_nyt',
'mptt',
'sekizai',
'sorl.thumbnail',
#'sorl.thumbnail',
'wiki',
'wiki.plugins.attachments',
'wiki.plugins.notifications',
'wiki.plugins.images',
#'wiki.plugins.images',
'wiki.plugins.macros',
# stylesheets and js

View file

@ -0,0 +1,32 @@
{% extends "wiki/base_site.html" %}
{% load staticfiles %}
{% load compress %}
{% load sitetree %}
{% load sekizai_tags %}
{% block wiki_body %}
{% addtoblock "css" %}
{% compress css %}
<link rel="stylesheet" type="text/x-scss" href="{% static "scss/site.scss" %}">
{% endcompress %}
{% endaddtoblock %}
{{ block.super }}
{% endblock %}
{% block wiki_site_title %} - North Bay Python Wiki{% endblock %}
{% block wiki_header_branding %}
<a class="navbar-brand" href="/">North Bay Python</a>
{% endblock %}
{% block wiki_header_navlinks %}
<ul class="nav navbar-nav">
<li class="active"><a href="{% url 'wiki:root' %}">Wiki</a></li>
{% sitetree_menu from "main" include "trunk" template "sitetree/menu_bootstrap3.html" %}
</ul>
{% endblock %}
{% block wiki_footer_prepend %}
All contributions to this wiki page are licensed under a Creative Commons Attribution-ShareAlike 4.0 licence.
{% endblock %}