Fix for martor markdown display.

This commit is contained in:
Oliver Marks 2018-01-16 22:12:50 +00:00
parent 9d50b92f40
commit 67facc06f1
5 changed files with 12 additions and 9 deletions

View File

@ -370,6 +370,16 @@ LOGIN_REDIRECT_URL = 'users:redirect'
WIKI_ACCOUNT_HANDLING = False WIKI_ACCOUNT_HANDLING = False
WIKI_EDITOR = 'wiki.editors.martor.Martor' WIKI_EDITOR = 'wiki.editors.martor.Martor'
MARTOR_ENABLE_CONFIGS = {
'imgur': 'true', # to enable/disable imgur uploader/custom uploader.
'mention': 'true', # to enable/disable mention
'jquery': 'false', # to include/revoke jquery (require for admin default django)
}
MARTOR_UPLOAD_PATH = 'images/uploads/{}'.format(time.strftime("%Y/%m/%d/"))
MARTOR_UPLOAD_URL = '/api/uploader/' # change to local uploader
MAX_IMAGE_UPLOAD_SIZE = 10485760 # 10MB
# SLUGLIFIER # SLUGLIFIER
AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify' AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify'

View File

@ -2,11 +2,7 @@ html {
position: relative; position: relative;
min-height: 100%; min-height: 100%;
} }
body {
margin-bottom: 60px;
}
.footer { .footer {
position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 60px; height: 60px;

4
mhackspace/static/sass/project.css Normal file → Executable file
View File

@ -6032,11 +6032,7 @@ html {
position: relative; position: relative;
min-height: 100%; } min-height: 100%; }
body {
margin-bottom: 60px; }
.footer { .footer {
position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 60px; height: 60px;

View File

@ -39,6 +39,7 @@
<meta property="og:image" content="https://maidstone-hackspace.org.uk/static/images/android-chrome-192x192.png" /> <meta property="og:image" content="https://maidstone-hackspace.org.uk/static/images/android-chrome-192x192.png" />
{% endblock head-open-graph %} {% endblock head-open-graph %}
{% render_block "css" %}
{% block css %}{% endblock %} {% block css %}{% endblock %}
{% block head-extra %} {% block head-extra %}

View File

@ -61,7 +61,7 @@ class MembershipAdmin(ModelAdmin):
return my_urls + urls return my_urls + urls
def refresh_payments(self, request): def refresh_payments(self, request):
update_users_memebership_status() update_users_memebership_status.apply_async()
# for user in update_subscriptions(provider_name='gocardless'): # for user in update_subscriptions(provider_name='gocardless'):
# continue # continue
self.message_user(request, 'Successfully triggered user payment refresh') self.message_user(request, 'Successfully triggered user payment refresh')