crispy forms :)
This commit is contained in:
parent
2b3e1a5243
commit
a935a2899b
@ -2,9 +2,9 @@
|
|||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="f314243c-cf5d-48a7-b986-5e05ee924c9f" name="Default" comment="">
|
<list default="true" id="f314243c-cf5d-48a7-b986-5e05ee924c9f" name="Default" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
<change beforePath="$PROJECT_DIR$/Recipies/settings.py" afterPath="$PROJECT_DIR$/Recipies/settings.py" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/cookbook/filters.py" afterPath="$PROJECT_DIR$/cookbook/filters.py" />
|
||||||
<change beforePath="$PROJECT_DIR$/cookbook/templates/index.html" afterPath="$PROJECT_DIR$/cookbook/templates/index.html" />
|
<change beforePath="$PROJECT_DIR$/cookbook/templates/index.html" afterPath="$PROJECT_DIR$/cookbook/templates/index.html" />
|
||||||
<change beforePath="$PROJECT_DIR$/cookbook/views.py" afterPath="$PROJECT_DIR$/cookbook/views.py" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
<option name="TRACKING_ENABLED" value="true" />
|
||||||
@ -58,11 +58,11 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="filters.py" pinned="false" current-in-tab="true">
|
<file leaf-file-name="filters.py" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/cookbook/filters.py">
|
<entry file="file://$PROJECT_DIR$/cookbook/filters.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="250">
|
<state relative-caret-position="275">
|
||||||
<caret line="10" column="49" lean-forward="true" selection-start-line="10" selection-start-column="49" selection-end-line="10" selection-end-column="49" />
|
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#21#0" expanded="true" />
|
<element signature="e#0#21#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
@ -74,7 +74,7 @@
|
|||||||
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
|
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="225">
|
<state relative-caret-position="225">
|
||||||
<caret line="9" column="49" lean-forward="true" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
|
<caret line="9" column="49" lean-forward="false" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#31#0" expanded="true" />
|
<element signature="e#0#31#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
@ -82,11 +82,11 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
|
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="400">
|
<state relative-caret-position="525">
|
||||||
<caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
|
<caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@ -95,8 +95,8 @@
|
|||||||
<file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
|
<file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
|
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="501">
|
<state relative-caret-position="626">
|
||||||
<caret line="41" column="4" lean-forward="false" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
|
<caret line="31" column="34" lean-forward="false" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="34" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@ -140,11 +140,11 @@
|
|||||||
<option value="$PROJECT_DIR$/Recipies/urls.py" />
|
<option value="$PROJECT_DIR$/Recipies/urls.py" />
|
||||||
<option value="$PROJECT_DIR$/cookbook/templates/registration/login.html" />
|
<option value="$PROJECT_DIR$/cookbook/templates/registration/login.html" />
|
||||||
<option value="$PROJECT_DIR$/cookbook/forms.py" />
|
<option value="$PROJECT_DIR$/cookbook/forms.py" />
|
||||||
<option value="$PROJECT_DIR$/Recipies/settings.py" />
|
|
||||||
<option value="$PROJECT_DIR$/cookbook/tables.py" />
|
<option value="$PROJECT_DIR$/cookbook/tables.py" />
|
||||||
<option value="$PROJECT_DIR$/cookbook/views.py" />
|
<option value="$PROJECT_DIR$/cookbook/views.py" />
|
||||||
<option value="$PROJECT_DIR$/cookbook/templates/index.html" />
|
|
||||||
<option value="$PROJECT_DIR$/cookbook/filters.py" />
|
<option value="$PROJECT_DIR$/cookbook/filters.py" />
|
||||||
|
<option value="$PROJECT_DIR$/Recipies/settings.py" />
|
||||||
|
<option value="$PROJECT_DIR$/cookbook/templates/index.html" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
@ -265,7 +265,7 @@
|
|||||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||||
<property name="DefaultHtmlFileTemplate" value="HTML File" />
|
<property name="DefaultHtmlFileTemplate" value="HTML File" />
|
||||||
<property name="com.intellij.database.dataSource.DataSourceTemplate" value="Sqlite (Xerial)" />
|
<property name="com.intellij.database.dataSource.DataSourceTemplate" value="Sqlite (Xerial)" />
|
||||||
<property name="SearchEverywhereHistoryKey" value="model	FILE	file://F:/Developement/Django/Recipies/cookbook/models.py settings	FILE	file://F:/Developement/Django/Recipies/Recipies/settings.py forms	FILE	file://F:/Developement/Django/Recipies/cookbook/forms.py base	FILE	file://F:/Developement/Django/Recipies/cookbook/templates/base.html mode	FILE	file://F:/Developement/Django/Recipies/cookbook/models.py settin	FILE	file://F:/Developement/Django/Recipies/Recipies/settings.py" />
|
<property name="SearchEverywhereHistoryKey" value="setting	FILE	file://F:/Developement/Django/Recipies/Recipies/settings.py model	FILE	file://F:/Developement/Django/Recipies/cookbook/models.py settings	FILE	file://F:/Developement/Django/Recipies/Recipies/settings.py forms	FILE	file://F:/Developement/Django/Recipies/cookbook/forms.py base	FILE	file://F:/Developement/Django/Recipies/cookbook/templates/base.html mode	FILE	file://F:/Developement/Django/Recipies/cookbook/models.py settin	FILE	file://F:/Developement/Django/Recipies/Recipies/settings.py" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
<key name="MoveFile.RECENT_KEYS">
|
||||||
@ -333,8 +333,8 @@
|
|||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32968178" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32968178" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2597809" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2597809" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32968178" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32968178" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20450929" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20450929" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23952255" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23952255" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
@ -623,14 +623,6 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="501">
|
|
||||||
<caret line="41" column="4" lean-forward="false" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/cookbook/models.py">
|
<entry file="file://$PROJECT_DIR$/cookbook/models.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="850">
|
<state relative-caret-position="850">
|
||||||
@ -657,7 +649,7 @@
|
|||||||
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
|
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="225">
|
<state relative-caret-position="225">
|
||||||
<caret line="9" column="49" lean-forward="true" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
|
<caret line="9" column="49" lean-forward="false" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#31#0" expanded="true" />
|
<element signature="e#0#31#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
@ -674,23 +666,31 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
|
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="400">
|
<state relative-caret-position="626">
|
||||||
<caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
|
<caret line="31" column="34" lean-forward="false" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="34" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/cookbook/filters.py">
|
<entry file="file://$PROJECT_DIR$/cookbook/filters.py">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="250">
|
<state relative-caret-position="275">
|
||||||
<caret line="10" column="49" lean-forward="true" selection-start-line="10" selection-start-column="49" selection-end-line="10" selection-end-column="49" />
|
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#0#21#0" expanded="true" />
|
<element signature="e#0#21#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="525">
|
||||||
|
<caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
@ -29,6 +29,8 @@ ALLOWED_HOSTS = []
|
|||||||
LOGIN_REDIRECT_URL = "index"
|
LOGIN_REDIRECT_URL = "index"
|
||||||
LOGOUT_REDIRECT_URL = "index"
|
LOGOUT_REDIRECT_URL = "index"
|
||||||
|
|
||||||
|
CRISPY_TEMPLATE_PACK = 'bootstrap4'
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
@ -40,6 +42,7 @@ INSTALLED_APPS = [
|
|||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
'django_tables2',
|
'django_tables2',
|
||||||
'django_filters',
|
'django_filters',
|
||||||
|
'crispy_forms',
|
||||||
'cookbook.apps.CookbookConfig',
|
'cookbook.apps.CookbookConfig',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from cookbook.models import Recipe
|
|||||||
|
|
||||||
|
|
||||||
class RecipeFilter(django_filters.FilterSet):
|
class RecipeFilter(django_filters.FilterSet):
|
||||||
name = django_filters.CharFilter(lookup_expr='iexact')
|
name = django_filters.CharFilter(lookup_expr='contains')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Recipe
|
model = Recipe
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% load django_tables2 %}
|
{% load django_tables2 %}
|
||||||
|
{% load crispy_forms_tags %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
||||||
{% block title %}{% trans "Cookbook" %}{% endblock %}
|
{% block title %}{% trans "Cookbook" %}{% endblock %}
|
||||||
@ -12,7 +13,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<form action="" method="get">
|
<form action="" method="get">
|
||||||
{{ filter.form.as_p }}
|
{% crispy filter.form %}
|
||||||
<input type="submit"/>
|
<input type="submit"/>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user