From cf5a2ae50c6e789cf1f31c163241b807d00a7e00 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 20 Oct 2018 16:43:15 +0900 Subject: [PATCH] Update to Semantic UI 2.4 Related to crispy_forms_semantic_ui #7 "Update to Semantic UI 2.3, Django 1.11, Cripsy forms 1.7". Appearance in crispy-test-project is improved. --- semantic/forms.py | 22 ++++++++++++---------- semantic/templates/semantic/base.html | 9 ++++++--- semantic/templates/semantic/index.html | 4 ++-- semantic/views.py | 2 +- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/semantic/forms.py b/semantic/forms.py index 82507dd7..616bd759 100644 --- a/semantic/forms.py +++ b/semantic/forms.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- from django import forms + +from crispy_forms.bootstrap import AppendedText, FormActions, PrependedText from crispy_forms.helper import FormHelper -from crispy_forms.layout import Layout, Div, Submit, HTML, Button, Row, Field -from crispy_forms.bootstrap import AppendedText, PrependedText, FormActions +from crispy_forms.layout import HTML, Button, Div, Field, Layout +from crispy_forms_semantic_ui.semantic import StrictButton class MessageForm(forms.Form): @@ -49,8 +51,8 @@ class MessageForm(forms.Form): 'radio_buttons', Field('checkboxes', style="background: #FAFAFA"), FormActions( - Submit('save_changes', 'Save changes', css_class="btn-primary"), - Submit('cancel', 'Cancel'), + StrictButton('Save changes'), + StrictButton('Cancel'), ) ) @@ -102,7 +104,7 @@ class HorizontalMessageForm(forms.Form): choices=(('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5')), ) - # Bootstrap4 + # Semantic UI helper = FormHelper() helper.layout = Layout( Field('text_input'), @@ -110,17 +112,17 @@ class HorizontalMessageForm(forms.Form): 'radio_buttons', Field('checkboxes'), AppendedText('appended_text', '.00'), - AppendedText('appended_text2', '.00', css_class='form-control-lg'), + AppendedText('appended_text2', '.00'), PrependedText('prepended_text', - '', + '', active=True), PrependedText('prepended_text_two', '@'), 'multicolon_select', FormActions( - Submit('save_changes', 'Save changes', css_class="btn-primary"), - Submit('cancel', 'Cancel'), + StrictButton('Save changes'), + StrictButton('Cancel') ) ) helper.label_class = '' - helper.field_class = 'six wide field' + helper.field_class = '' diff --git a/semantic/templates/semantic/base.html b/semantic/templates/semantic/base.html index dd0b22a9..780d1a2b 100644 --- a/semantic/templates/semantic/base.html +++ b/semantic/templates/semantic/base.html @@ -1,3 +1,4 @@ +{% load i18n static %} @@ -7,7 +8,7 @@ - +
@@ -15,7 +16,9 @@ {% endblock %}
- - + + + + diff --git a/semantic/templates/semantic/index.html b/semantic/templates/semantic/index.html index f9723c10..c1dc80b0 100644 --- a/semantic/templates/semantic/index.html +++ b/semantic/templates/semantic/index.html @@ -3,8 +3,8 @@ {% block content %}
-
-
Crispy Test Project
+
+
Crispy Test Project
Bootstrap 3 Bootstrap 4 Semantic UI diff --git a/semantic/views.py b/semantic/views.py index c859ccf4..70d3e02a 100644 --- a/semantic/views.py +++ b/semantic/views.py @@ -4,7 +4,7 @@ def index(request): - #settings.CRISPY_TEMPLATE_PACK = 'semantic_ui' + settings.CRISPY_TEMPLATE_PACK = 'semantic-ui' from semantic.forms import HorizontalMessageForm, MessageForm # This view is missing all form handling logic for simplicity of the example