Fixes to make django markdown work with the wiki
This commit is contained in:
parent
61ca8968ae
commit
c3f9a377c9
|
|
@ -369,6 +369,8 @@ AUTH_USER_MODEL = 'users.User'
|
|||
LOGIN_REDIRECT_URL = 'users:redirect'
|
||||
WIKI_ACCOUNT_HANDLING = False
|
||||
WIKI_EDITOR = 'wiki.editors.martor.Martor'
|
||||
WIKI_EDITOR_INCLUDE_JAVASCRIPT = False
|
||||
EDITOR_INCLUDE_JAVASCRIPT = False
|
||||
|
||||
|
||||
MARTOR_ENABLE_CONFIGS = {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ from .common import * # noqa
|
|||
# DEBUG
|
||||
# ------------------------------------------------------------------------------
|
||||
DEBUG = env.bool('DJANGO_DEBUG', default=True)
|
||||
DEBUG = False
|
||||
TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
|
||||
|
||||
# SECRET CONFIGURATION
|
||||
|
|
|
|||
|
|
@ -116,6 +116,8 @@ EMAIL_HOST_USER = env('EMAIL_USER')
|
|||
EMAIL_PORT = 587
|
||||
EMAIL_NOTIFY = False
|
||||
|
||||
MSG_PREFIX = 'MHS'
|
||||
|
||||
# Anymail with Mailgun
|
||||
#INSTALLED_APPS += ("anymail", )
|
||||
#ANYMAIL = {
|
||||
|
|
|
|||
|
|
@ -181,9 +181,10 @@
|
|||
{% block modal %}{% endblock modal %}
|
||||
|
||||
{% block javascript %}
|
||||
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"
|
||||
integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n"
|
||||
crossorigin="anonymous"></script>
|
||||
<script
|
||||
src="https://code.jquery.com/jquery-3.2.1.min.js"
|
||||
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
|
||||
crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"
|
||||
integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb"
|
||||
crossorigin="anonymous"></script>
|
||||
|
|
|
|||
|
|
@ -4,20 +4,20 @@
|
|||
{% block content %}
|
||||
<h2>Chat with us</h2>
|
||||
<p>
|
||||
Pop in and say hi, please be patient users tend to idle, but will likely respond given a chance. We have two main chat rooms one on hangouts and the other on IRC, there are various method of connecting below.
|
||||
Pop in and say hi, please wait around our users tend to idle, some one will likely respond given a chance.
|
||||
</p>
|
||||
<p>
|
||||
You can use the chat below or join directly using an IRC client or matrix.
|
||||
</p>
|
||||
<p>
|
||||
<a href="https://riot.im/app/#/room/#maidstone-hackspace:matrix.org">Join irc via matrix</a> or grab one of the <a href="https://matrix.org/docs/projects/try-matrix-now.html">mobile apps.</a><br />
|
||||
<a href="https://freenode.net/kb/answer/chat">Join via freenode website</a>
|
||||
<a href="https://riot.im/app/#/room/#maidstone-hackspace:matrix.org">Full screen Chat</a> or grab one of the <a target="_blank" href="https://matrix.org/docs/projects/try-matrix-now.html">mobile apps.
|
||||
</p>
|
||||
|
||||
<iframe src="https://riot.im/app/#/room/#maidstone-hackspace:matrix.org" style="width:100%;height:600px;"></iframe>
|
||||
|
||||
|
||||
<a target="_blank" href="https://riot.im/app/#/room/#maidstone-hackspace:matrix.org" style="width:100%;height:600px;">Full screen chat</a>
|
||||
|
||||
<p>
|
||||
Connect directly using irc.freenode.org and the #maidstone-hackspace channel via an irc client.
|
||||
</p>
|
||||
<iframe src="https://webchat.freenode.net?channels=%23maidstone-hackspace&uio=MTE9MjU207" style="width:100%;height:400px;"></iframe>
|
||||
|
||||
<a href="https://hangouts.google.com/group/oDcAL0nDfQYfO3qq1">Alternatively join us on Hangouts</a>
|
||||
<a href="https://hangouts.google.com/group/oDcAL0nDfQYfO3qq1">Alternatively join us on our legacy Hangouts chat</a>
|
||||
|
||||
{% endblock content %}
|
||||
|
|
|
|||
|
|
@ -55,9 +55,34 @@
|
|||
{% block wiki_footer_prepend %}{% endblock %}
|
||||
</footer>
|
||||
{% endblock wiki_body %}
|
||||
|
||||
|
||||
{% addtoblock "css" %}
|
||||
<link href="{% static 'plugins/css/ace.min.css' %}" type="text/css" media="all" rel="stylesheet" />
|
||||
<link href="{% static 'plugins/css/semantic.min.css' %}" type="text/css" media="all" rel="stylesheet" />
|
||||
<link href="{% static 'martor/css/martor.css' %}" type="text/css" media="all" rel="stylesheet" />
|
||||
{% endaddtoblock css %}
|
||||
|
||||
{% addtoblock "js" %}
|
||||
<script src='https://www.google.com/recaptcha/api.js'></script>
|
||||
<script type="text/javascript" src="{% static 'plugins/js/ace.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'plugins/js/semantic.min.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'plugins/js/mode-markdown.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'plugins/js/ext-language_tools.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'plugins/js/theme-github.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'plugins/js/highlight.min.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'plugins/js/resizable.min.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'plugins/js/emojis.min.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'wiki/js/editors/martor-patch.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'martor/js/martor.js' %}"></script>
|
||||
{% endaddtoblock %}
|
||||
|
||||
{% endblock content %}
|
||||
<!-- test includes -->
|
||||
{% include "partials/form.html" %}
|
||||
|
||||
{% block javascript %}
|
||||
{{ block.super }}
|
||||
<script src="{% static "wiki/js/core.js" %}"></script>
|
||||
{% endblock javascript %}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</label>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="wiki-control col-xs-9 col-lg-10">
|
||||
<div class="wiki-control col-xs-9 col-lg-12">
|
||||
{{ field|addcss:"form-control form-control-danger danger" }}
|
||||
{% if field.errors %}
|
||||
{% for error in field.errors %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue