From e47d35a5782b51b8906ab72bc2e43e30b88ec4d0 Mon Sep 17 00:00:00 2001 From: Jaap Joris Vens Date: Tue, 10 Mar 2020 15:17:46 +0100 Subject: [PATCH] Alright, this is much better! Client side javascript much cleaner, plus the templates are now truly recursive! Moving on to implementing the server side code. --- cms/static/cms/cms.scss | 28 ++--- cms/static/cms/cms.scss.css | 198 +++++++++++++++++--------------- cms/static/cms/cms.scss.css.map | 2 +- cms/templates/cms/edit.html | 110 +++++++----------- cms/templates/cms/form.html | 21 ++++ cms/views.py | 2 +- 6 files changed, 188 insertions(+), 173 deletions(-) create mode 100644 cms/templates/cms/form.html diff --git a/cms/static/cms/cms.scss b/cms/static/cms/cms.scss index 5857443..b96e49d 100644 --- a/cms/static/cms/cms.scss +++ b/cms/static/cms/cms.scss @@ -262,24 +262,26 @@ section.contact { /* Form elements */ form.cms { - margin-bottom: 3em; - div.wrapper { - overflow: hidden; - } + //margin: 0.5em auto; - section { - margin-top: 3em; + div.wrapper { + margin: 0 auto; + padding: 0 0.5em; } fieldset { - padding: 2em; - margin-bottom: 2em; - border: 0.5px solid black; - border-radius: 3px; + border: 0.5px solid #ccc; + clear: both; + margin: 0.5em 0em; + padding: 0.5em; + border-radius: 0.25em; + } - legend { - font-size: 1.15em; - } + img { + display: block; + clear: both; + width: 50px; + cursor: pointer; } div.formfield { diff --git a/cms/static/cms/cms.scss.css b/cms/static/cms/cms.scss.css index 161ed82..4f262e7 100644 --- a/cms/static/cms/cms.scss.css +++ b/cms/static/cms/cms.scss.css @@ -183,97 +183,115 @@ section.contact div#message { display: none; } /* Form elements */ -form.cms { - margin-bottom: 3em; } - form.cms div.wrapper { - overflow: hidden; } - form.cms section { - margin-top: 3em; } - form.cms fieldset { - padding: 2em; - margin-bottom: 2em; - border: 0.5px solid black; - border-radius: 3px; } - form.cms fieldset legend { - font-size: 1.15em; } - form.cms div.formfield { - margin-bottom: 10px; - clear: both; - box-sizing: border-box; } - form.cms div.formfield.type, form.cms div.formfield.number, form.cms div.formfield.slug { - width: 77%; - clear: none; - float: left; } - form.cms div.formfield.number { - width: 20%; - float: right; } - form.cms div.formfield.error { - border: 2px dotted red; - padding: 10px; - margin: 10px -10px; - background: #f001; } - form.cms div.formfield.required div.label { - font-weight: 700; } - form.cms div.label, form.cms label { - font-size: 0.7rem; - font-weight: 400; - text-align: left; - margin-bottom: 2px; } - form.cms div.input { - overflow: hidden; } - form.cms div.helptext, form.cms span.required { - color: #666; - font-size: 12px !important; - font-weight: 400 !important; } - form.cms span.required { - font-style: italic; } - form.cms input, form.cms select, form.cms textarea { - background: white; - color: black; - border: 0.5px solid #ccc; - border-radius: 3px; - font-size: 1rem; - display: block; - width: 100%; - box-sizing: border-box; +form.cms div.wrapper { + margin: 0 auto; + padding: 0 0.5em; } + +form.cms fieldset { + border: 0.5px solid #ccc; + clear: both; + margin: 0.5em 0em; + padding: 0.5em; + border-radius: 0.25em; } + +form.cms img { + display: block; + clear: both; + width: 50px; + cursor: pointer; } + +form.cms div.formfield { + margin-bottom: 10px; + clear: both; + box-sizing: border-box; } + form.cms div.formfield.type, form.cms div.formfield.number, form.cms div.formfield.slug { + width: 77%; + clear: none; + float: left; } + form.cms div.formfield.number { + width: 20%; + float: right; } + +form.cms div.formfield.error { + border: 2px dotted red; + padding: 10px; + margin: 10px -10px; + background: #f001; } + +form.cms div.formfield.required div.label { + font-weight: 700; } + +form.cms div.label, form.cms label { + font-size: 0.7rem; + font-weight: 400; + text-align: left; + margin-bottom: 2px; } + +form.cms div.input { + overflow: hidden; } + +form.cms div.helptext, form.cms span.required { + color: #666; + font-size: 12px !important; + font-weight: 400 !important; } + +form.cms span.required { + font-style: italic; } + +form.cms input, form.cms select, form.cms textarea { + background: white; + color: black; + border: 0.5px solid #ccc; + border-radius: 3px; + font-size: 1rem; + display: block; + width: 100%; + box-sizing: border-box; + margin: 0; + padding: 5px 8px; + font-family: inherit; } + +form.cms input[type=checkbox] { + width: auto; + display: inline-block; + vertical-align: middle; } + +form.cms input[name$=title] { + font-weight: bold; } + +form.cms textarea { + font-size: 1rem; + height: 15em; + line-height: 1.5; } + +form.cms select { + background: white; + padding-left: 3px; } + +form.cms ul.errorlist { + margin: 0; + margin-bottom: 1em; + padding: 0; + list-style: none; + color: red; + font-size: 12px; } + form.cms ul.errorlist li { margin: 0; - padding: 5px 8px; - font-family: inherit; } - form.cms input[type=checkbox] { - width: auto; - display: inline-block; - vertical-align: middle; } - form.cms input[name$=title] { - font-weight: bold; } - form.cms textarea { - font-size: 1rem; - height: 15em; - line-height: 1.5; } - form.cms select { - background: white; - padding-left: 3px; } - form.cms ul.errorlist { + padding: 0; } + +form.cms div.global_error { + border: 2px dotted red; + padding: 10px; + margin: 1em -10px; + background: #f001; + color: red; + font-weight: bold; } + form.cms div.global_error ul.errorlist { margin: 0; - margin-bottom: 1em; - padding: 0; - list-style: none; - color: red; - font-size: 12px; } - form.cms ul.errorlist li { - margin: 0; - padding: 0; } - form.cms div.global_error { - border: 2px dotted red; - padding: 10px; - margin: 1em -10px; - background: #f001; - color: red; - font-weight: bold; } - form.cms div.global_error ul.errorlist { - margin: 0; - font-size: inherit; } - form.cms .errors { - color: red; - font-weight: bold; } + font-size: inherit; } + +form.cms .errors { + color: red; + font-weight: bold; } /*# 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 index 2a89a41..56553b5 100644 --- a/cms/static/cms/cms.scss.css.map +++ b/cms/static/cms/cms.scss.css.map @@ -5,5 +5,5 @@ "cms.scss" ], "names": [], - "mappings": "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" + "mappings": "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" } \ No newline at end of file diff --git a/cms/templates/cms/edit.html b/cms/templates/cms/edit.html index c095632..5389831 100644 --- a/cms/templates/cms/edit.html +++ b/cms/templates/cms/edit.html @@ -4,92 +4,49 @@ {% block title %}{% trans 'Edit' %} {{form.instance}}{% endblock %} {% block content %} -
- -
+ +
{% csrf_token %} - {{form.media}} - {% if form.errors or formset.errors %} + {% if form.errors %}
{% trans 'Please correct the error(s) below and save again' %}
{% endif %} - {% for field in form %} - {% include 'cms/formfield.html' with field=field %} - {% endfor %} -
- {{formset.management_form}} - {% for form in formset %} -
- {{form.media}} - {% for field in form.hidden_fields %} - {{field}} - {% endfor %} - - {% for field in form.visible_fields %} -
- {% include 'cms/formfield.html' with field=field %} -
- {% endfor %} - - {% for formset in form.formsets %} -
- {{formset.management_form}} - {% for form in formset %} -
- {{form.media}} - {% for field in form.hidden_fields %} - {{field}} - {% endfor %} - {% for field in form.visible_fields %} - {% include 'cms/formfield.html' with field=field %} - {% endfor %} -
- {% endfor %} - -
- {% endfor %} -
- {% endfor %} - -
+ {% include 'cms/form.html' %}
- -
+
+ {% endblock %} {% block extrabody %}