Changeset - a2ced2495fc9
[Not reviewed]
Merge
0 1 1
Christopher Neugebauer - 3 years ago 2017-11-14 04:03:51
chrisjrn@gmail.com
Merge branch 'prod'
2 files changed with 34 insertions and 2 deletions:
0 comments (0 inline, 0 general)
pinaxcon/settings.py
Show inline comments
...
 
@@ -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
pinaxcon/templates/wiki/base.html
Show inline comments
 
new file 100644
 
{% 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 %}
0 comments (0 inline, 0 general)