diff --git a/config/settings/common.py b/config/settings/common.py index 95f4b1e..fb41ada 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -370,6 +370,16 @@ LOGIN_REDIRECT_URL = 'users:redirect' WIKI_ACCOUNT_HANDLING = False 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 AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify' diff --git a/mhackspace/static/sass/components/_footer.scss b/mhackspace/static/sass/components/_footer.scss index 8d94650..3e7e4f6 100644 --- a/mhackspace/static/sass/components/_footer.scss +++ b/mhackspace/static/sass/components/_footer.scss @@ -2,11 +2,7 @@ html { position: relative; min-height: 100%; } -body { - margin-bottom: 60px; -} .footer { - position: absolute; bottom: 0; width: 100%; height: 60px; diff --git a/mhackspace/static/sass/project.css b/mhackspace/static/sass/project.css old mode 100644 new mode 100755 index 1353500..bd3f9ed --- a/mhackspace/static/sass/project.css +++ b/mhackspace/static/sass/project.css @@ -6032,11 +6032,7 @@ html { position: relative; min-height: 100%; } -body { - margin-bottom: 60px; } - .footer { - position: absolute; bottom: 0; width: 100%; height: 60px; diff --git a/mhackspace/templates/base.html b/mhackspace/templates/base.html index d4b87dc..933030a 100644 --- a/mhackspace/templates/base.html +++ b/mhackspace/templates/base.html @@ -39,6 +39,7 @@ {% endblock head-open-graph %} + {% render_block "css" %} {% block css %}{% endblock %} {% block head-extra %} diff --git a/mhackspace/users/admin.py b/mhackspace/users/admin.py index ef57971..3d5fe20 100644 --- a/mhackspace/users/admin.py +++ b/mhackspace/users/admin.py @@ -61,7 +61,7 @@ class MembershipAdmin(ModelAdmin): return my_urls + urls def refresh_payments(self, request): - update_users_memebership_status() + update_users_memebership_status.apply_async() # for user in update_subscriptions(provider_name='gocardless'): # continue self.message_user(request, 'Successfully triggered user payment refresh')