From 98b1a61af1505cb55a4fa7db77a4c9ae2c3ee455 Mon Sep 17 00:00:00 2001 From: Jaap Joris Vens Date: Sat, 21 Mar 2020 20:24:07 +0100 Subject: [PATCH] New template tag: {% edit %} which generates a simple edit link for the current section --- cms/static/cms/cms.scss | 0 cms/static/cms/cms.scss.css | 2 -- cms/static/cms/cms.scss.css.map | 9 ----- cms/templates/cms/base.html | 2 -- cms/templates/cms/page.html | 1 + cms/templatetags/cms.py | 36 ++++++++++++++++--- cms/templatetags/eval.py | 20 ----------- .../app/static/app}/hamburgers.css | 0 example/app/static/app/main1.scss | 12 ++----- example/app/static/app/main1.scss.css | 28 ++++++++++----- example/app/static/app/main1.scss.css.map | 2 +- .../app/templates/app/sections/contact.html | 6 ++-- .../app/templates/app/sections/images.html | 6 ++-- example/app/templates/app/sections/text.html | 6 ++-- example/app/templates/app/sections/video.html | 6 ++-- example/app/templates/base.html | 1 + 16 files changed, 65 insertions(+), 72 deletions(-) delete mode 100644 cms/static/cms/cms.scss delete mode 100644 cms/static/cms/cms.scss.css delete mode 100644 cms/static/cms/cms.scss.css.map delete mode 100644 cms/templatetags/eval.py rename {cms/static/cms => example/app/static/app}/hamburgers.css (100%) diff --git a/cms/static/cms/cms.scss b/cms/static/cms/cms.scss deleted file mode 100644 index e69de29..0000000 diff --git a/cms/static/cms/cms.scss.css b/cms/static/cms/cms.scss.css deleted file mode 100644 index 41d5f46..0000000 --- a/cms/static/cms/cms.scss.css +++ /dev/null @@ -1,2 +0,0 @@ - -/*# sourceMappingURL=cms.scss.css.map */ \ No newline at end of file diff --git a/cms/static/cms/cms.scss.css.map b/cms/static/cms/cms.scss.css.map deleted file mode 100644 index b5590bb..0000000 --- a/cms/static/cms/cms.scss.css.map +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": 3, - "file": "cms.css", - "sources": [ - "cms.scss" - ], - "names": [], - "mappings": "" -} \ No newline at end of file diff --git a/cms/templates/cms/base.html b/cms/templates/cms/base.html index aeed746..dcfcdee 100644 --- a/cms/templates/cms/base.html +++ b/cms/templates/cms/base.html @@ -7,8 +7,6 @@ {% block title %}{% endblock %} - - {% block extrahead %}{% endblock %} diff --git a/cms/templates/cms/page.html b/cms/templates/cms/page.html index e701bd7..706c495 100644 --- a/cms/templates/cms/page.html +++ b/cms/templates/cms/page.html @@ -5,6 +5,7 @@ {% block content %} {% for section in sections %} +
{% include_section section %} {% endfor %} diff --git a/cms/templatetags/cms.py b/cms/templatetags/cms.py index fc6d1c3..ede2ed2 100644 --- a/cms/templatetags/cms.py +++ b/cms/templatetags/cms.py @@ -1,12 +1,40 @@ -from django import template +from markdown import markdown as md +from django import template +from django.shortcuts import reverse +from django.utils.safestring import mark_safe +from django.utils.translation import gettext_lazy as _ + +MARKDOWN_EXTENSIONS = ['extra', 'smarty'] register = template.Library() +@register.simple_tag(takes_context=True) +def eval(context, expr): + '''USE WITH CAUTION!!! + + This template tag runs its argument through Django's templating + system using the current context, placing all power into the + hands of the content editors. + + Also, it applies Markdown. + + ''' + result = template.Template(expr).render(context) + return mark_safe(md(result, extensions=MARKDOWN_EXTENSIONS)) + +@register.simple_tag(takes_context=True) +def edit(context): + '''Renders a simple link to edit the current section''' + if context['request'].user.has_perms('cms_section_change'): + slug = context['section'].page.slug + number = context['section'].number + url = reverse('cms:updatesection', args=[slug, number]) if slug else reverse('cms:updatesection', args=[number]) + return mark_safe(f'{_("edit")}') + return '' + @register.tag('include_section') def do_include(parser, token): - '''Renders the section with its own context - - ''' + '''Renders the section with its own context''' _, section = token.split_contents() return IncludeSectionNode(section) diff --git a/cms/templatetags/eval.py b/cms/templatetags/eval.py deleted file mode 100644 index 9790a0a..0000000 --- a/cms/templatetags/eval.py +++ /dev/null @@ -1,20 +0,0 @@ -from markdown import markdown as md -from django import template -from django.utils.safestring import mark_safe - -MARKDOWN_EXTENSIONS = ['extra', 'smarty'] -register = template.Library() - -@register.simple_tag(takes_context=True) -def eval(context, expr): - '''USE WITH CAUTION!!! - - This template tag runs its argument through Django's templating - system using the current context, placing all power into the - hands of the content editors. - - Also, it applies Markdown. - - ''' - result = template.Template(expr).render(context) - return mark_safe(md(result, extensions=MARKDOWN_EXTENSIONS)) diff --git a/cms/static/cms/hamburgers.css b/example/app/static/app/hamburgers.css similarity index 100% rename from cms/static/cms/hamburgers.css rename to example/app/static/app/hamburgers.css diff --git a/example/app/static/app/main1.scss b/example/app/static/app/main1.scss index 570235d..e126acf 100644 --- a/example/app/static/app/main1.scss +++ b/example/app/static/app/main1.scss @@ -22,7 +22,7 @@ a { a.button, button.button { cursor: pointer; - font-family: $titlefont + font-family: $titlefont; font-size: 1.5em; line-height: 1.25; border-radius: 5px; @@ -60,7 +60,7 @@ a.edit { section a.edit { position: absolute; bottom: 0; - right: 1em; + left: 1em; } table { @@ -199,16 +199,8 @@ div.edit { right: 1em; bottom: 1em; z-index: 1000; - - button { - padding: 0; - outline: none; - background: none; - border: none; - } img { width: 75px; - height: auto; } } diff --git a/example/app/static/app/main1.scss.css b/example/app/static/app/main1.scss.css index fe44c41..b3827e1 100644 --- a/example/app/static/app/main1.scss.css +++ b/example/app/static/app/main1.scss.css @@ -10,6 +10,24 @@ a { a:hover { text-decoration: underline; } +a.button, button.button { + cursor: pointer; + font-family: sans-serif; + font-size: 1.5em; + line-height: 1.25; + border-radius: 5px; + display: inline-block; + text-decoration: none; + border: none; + padding: 5px 20px; + background: #3573a8; + color: white; + box-sizing: border-box; } + a.button:hover, button.button:hover { + color: #3573a8; + background: white; + box-shadow: inset 0 0 0 2px #3573a8; } + h1, h2, h3, h4, h5, h6 { margin: .5em 0; font-family: sans-serif; } @@ -39,7 +57,7 @@ a.edit { section a.edit { position: absolute; bottom: 0; - right: 1em; } + left: 1em; } table { border-collapse: collapse; } @@ -145,14 +163,8 @@ div.edit { right: 1em; bottom: 1em; z-index: 1000; } - div.edit button { - padding: 0; - outline: none; - background: none; - border: none; } div.edit img { - width: 75px; - height: auto; } + width: 75px; } section { clear: both; diff --git a/example/app/static/app/main1.scss.css.map b/example/app/static/app/main1.scss.css.map index fe213a4..4086f0f 100644 --- a/example/app/static/app/main1.scss.css.map +++ b/example/app/static/app/main1.scss.css.map @@ -5,5 +5,5 @@ "main1.scss" ], "names": [], - "mappings": "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" + "mappings": "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" } \ No newline at end of file diff --git a/example/app/templates/app/sections/contact.html b/example/app/templates/app/sections/contact.html index 18e5774..e7bc20d 100644 --- a/example/app/templates/app/sections/contact.html +++ b/example/app/templates/app/sections/contact.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load i18n cms %}
@@ -16,7 +16,5 @@
- {% if perms.cms_section_change %} - {% trans 'edit' %}
- {% endif %} + {% edit %}
diff --git a/example/app/templates/app/sections/images.html b/example/app/templates/app/sections/images.html index 517d3e6..2d327cf 100644 --- a/example/app/templates/app/sections/images.html +++ b/example/app/templates/app/sections/images.html @@ -1,4 +1,4 @@ -{% load thumbnail i18n %} +{% load thumbnail i18n cms %}
@@ -9,7 +9,5 @@ {% endfor %}
- {% if perms.cms_section_change %} - {% trans 'edit' %}
- {% endif %} + {% edit %}
diff --git a/example/app/templates/app/sections/text.html b/example/app/templates/app/sections/text.html index 4747ed4..7b0e428 100644 --- a/example/app/templates/app/sections/text.html +++ b/example/app/templates/app/sections/text.html @@ -1,4 +1,4 @@ -{% load eval i18n %} +{% load i18n cms %}
@@ -13,7 +13,5 @@
- {% if perms.cms_section_change %} - {% trans 'edit' %}
- {% endif %} + {% edit %}
diff --git a/example/app/templates/app/sections/video.html b/example/app/templates/app/sections/video.html index 851e9ef..aefabe3 100644 --- a/example/app/templates/app/sections/video.html +++ b/example/app/templates/app/sections/video.html @@ -1,4 +1,4 @@ -{% load embed_video_tags i18n %} +{% load embed_video_tags i18n cms %}
{% if section.video %} @@ -9,7 +9,5 @@ {% endif %} - {% if perms.cms_section_change %} - {% trans 'edit' %}
- {% endif %} + {% edit %}
diff --git a/example/app/templates/base.html b/example/app/templates/base.html index 109ceda..db51408 100644 --- a/example/app/templates/base.html +++ b/example/app/templates/base.html @@ -4,6 +4,7 @@ {% block title %}Awesome Website{% endblock %} {% block extrahead %} + {% endblock %}