diff --git a/cms/forms.py b/cms/forms.py index 09168d0..ca7ffc8 100644 --- a/cms/forms.py +++ b/cms/forms.py @@ -8,6 +8,9 @@ from django.utils.translation import gettext_lazy as _ Page = swapper.load_model('cms', 'Page') Section = swapper.load_model('cms', 'Section') +class ConfirmationForm(forms.Form): + pass + class ContactForm(forms.Form): sender = forms.EmailField(label=_('Your email address')) spam_protection = forms.CharField(label=_('Your message'), widget=forms.Textarea()) diff --git a/cms/static/cms/cms.scss b/cms/static/cms/cms.scss index 0b5051e..5c8e42e 100644 --- a/cms/static/cms/cms.scss +++ b/cms/static/cms/cms.scss @@ -284,8 +284,7 @@ form.cms { } div.formfield { - margin: 5px 0; - padding: 10px 0; + margin-bottom: 10px; clear: both; box-sizing: border-box; @@ -314,7 +313,7 @@ form.cms { } } - div.label { + div.label, label { font-size: 0.8rem; font-weight: 400; text-align: left; @@ -322,7 +321,6 @@ form.cms { div.input { overflow: hidden; - margin: 5px 0; } div.helptext, span.required { @@ -340,13 +338,20 @@ form.cms { color: black; border: 1px solid #aaa; font-size: 1rem; - display: inline-block; + display: block; width: 100%; box-sizing: border-box; margin: 0; padding: 5px; + font-family: inherit; + } + input[type=checkbox] { + display: inline-block; + vertical-align: middle; } textarea { + font-size: 1rem; + padding: 5px 5px; height: 15em; } diff --git a/cms/static/cms/cms.scss.css b/cms/static/cms/cms.scss.css index 3a20bde..fc9e82d 100644 --- a/cms/static/cms/cms.scss.css +++ b/cms/static/cms/cms.scss.css @@ -202,8 +202,7 @@ form.cms fieldset { font-size: 1.15em; } form.cms div.formfield { - margin: 5px 0; - padding: 10px 0; + margin-bottom: 10px; clear: both; box-sizing: border-box; } form.cms div.formfield.type, form.cms div.formfield.number { @@ -226,14 +225,13 @@ form.cms div.formfield.required div.label { form.cms div.formfield.required input, form.cms div.formfield.required select, form.cms div.formfield.required .textarea, form.cms div.formfield.required div.textarea { border: 1px solid black; } -form.cms div.label { +form.cms div.label, form.cms label { font-size: 0.8rem; font-weight: 400; text-align: left; } form.cms div.input { - overflow: hidden; - margin: 5px 0; } + overflow: hidden; } form.cms div.helptext, form.cms span.required { color: #666; @@ -248,13 +246,20 @@ form.cms input, form.cms select, form.cms textarea { color: black; border: 1px solid #aaa; font-size: 1rem; - display: inline-block; + display: block; width: 100%; box-sizing: border-box; margin: 0; - padding: 5px; } + padding: 5px; + font-family: inherit; } + +form.cms input[type=checkbox] { + display: inline-block; + vertical-align: middle; } form.cms textarea { + font-size: 1rem; + padding: 5px 5px; height: 15em; } form.cms input[type=checkbox] { diff --git a/cms/static/cms/cms.scss.css.map b/cms/static/cms/cms.scss.css.map index ad343ba..e5a892f 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/confirm.html b/cms/templates/cms/confirm.html index b1e0e0c..40b3f0e 100644 --- a/cms/templates/cms/confirm.html +++ b/cms/templates/cms/confirm.html @@ -30,7 +30,10 @@ {{deleted|unordered_list}} - +
+ {% csrf_token %} + +
{% endif %} diff --git a/cms/templates/cms/edit.html b/cms/templates/cms/edit.html index 967efe7..15e88e8 100644 --- a/cms/templates/cms/edit.html +++ b/cms/templates/cms/edit.html @@ -20,15 +20,16 @@ {% endif %} {% for field in form %} - {% include 'cms/formfield.html' with field=field %} + {% if field.field.widget.input_type == 'checkbox' %} + {% include 'cms/formfield_checkbox.html' with field=field %} + {% else %} + {% include 'cms/formfield.html' with field=field %} + {% endif %} {% endfor %} {% if form.instance.pk %}
-
- -
- +
{% endif %} @@ -50,6 +51,8 @@ {% for field in form.visible_fields %} {% if field.name == 'DELETE' and not form.instance.pk %} + {% elif field.field.widget.input_type == 'checkbox' %} + {% include 'cms/formfield_checkbox.html' with field=field counter=forloop.parentloop.counter0 %} {% else %} {% include 'cms/formfield.html' with field=field counter=forloop.parentloop.counter0 %} {% endif %} diff --git a/cms/templates/cms/formfield_checkbox.html b/cms/templates/cms/formfield_checkbox.html new file mode 100644 index 0000000..385c8d9 --- /dev/null +++ b/cms/templates/cms/formfield_checkbox.html @@ -0,0 +1,11 @@ +
+
+ {{field.errors}} +
+
+ {{field}} {{field.label_tag}} +
+
+ {{field.help_text}} +
+
diff --git a/cms/templates/cms/page.html b/cms/templates/cms/page.html index 9d9734e..71ae19b 100644 --- a/cms/templates/cms/page.html +++ b/cms/templates/cms/page.html @@ -9,16 +9,10 @@ {% include_section section %} {% endfor %} -
- {% if user.is_staff %} - {% if page.slug %} - {% trans 'edit this page' %} - {% else %} - {% trans 'edit this page' %} - {% endif %} - {% else %} - {% trans 'login' %} - {% endif %} -
+ {% if user.is_staff %} +
+ {% trans 'edit this page' %} +
+ {% endif %} {% endblock %} diff --git a/cms/views.py b/cms/views.py index d71ee20..72a9a11 100644 --- a/cms/views.py +++ b/cms/views.py @@ -160,12 +160,21 @@ class TypeMixin(MenuMixin): class BaseUpdateView(generic.UpdateView): template_name = 'cms/edit.html' + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs.update({'label_suffix': ''}) + return kwargs + def form_valid(self, form): if 'delete' in self.request.POST: collector = NestedObjects(using='default') collector.collect([self.object]) self.template_name = 'cms/confirm.html' - return self.render_to_response(self.get_context_data(deleted=collector.nested(), protected=collector.protected)) + return self.render_to_response(self.get_context_data( + deleted = collector.nested(), + protected = collector.protected, + object = self.object, + )) else: form.save() return redirect(self.request.session.get('previous_url')) @@ -177,7 +186,7 @@ class UpdatePage(StaffRequiredMixin, TypeMixin, BaseUpdateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) if 'formset' not in context: - context['formset'] = SectionFormSet(instance=self.object) + context['formset'] = SectionFormSet(instance=self.object, form_kwargs={'label_suffix': ''}) return context def post(self, request, *args, **kwargs):