Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-24 14:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge branch 'form-builder' of github.com:torchbox/wagtail into form-builder

Browse source
This commit is contained in:
Matt Westcott 2014-05-21 14:48:51 +01:00
commit 9f045e3924
5 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
View file

@ -67,6 +67,41 @@ input, textarea, select, .richtext, .tagit{
}
}
/* select boxes */
.typed_choice_field .input{
position:relative;
select{
outline:none;
}
&:after{
@include border-radius(0 6px 6px 0);
z-index:0;
position:absolute;
right:1px;
top:1px;
height:95%;
width:1.5em;
font-family:wagtail;
content:"q";
border:1px solid $color-input-border;
border-width:0 0 0 1px;
text-align:center;
line-height:1.4em;
font-size:3em;
pointer-events:none;
color:$color-grey-3;
background-color:$color-fieldset-hover;
margin:0px 1px 0 0;
}
.ie &:after{
display:none;
}
}
/* radio and check boxes */
input[type=radio], input[type=checkbox]{
@include border-radius(0);
cursor:pointer;
@ -415,7 +450,7 @@ li.focused > .help{
.fields li{
padding-top:0.5em;
padding-bottom:1em;
padding-bottom:1.2em;
}
.field-content .input li{
@ -637,6 +672,10 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
.file_field &{
padding-top:0;
}
.boolean_field &{
padding-bottom:0;
}
}
input[type=submit], input[type=reset], input[type=button], .button, button{

1
wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html
View file

@ -5,6 +5,7 @@
{% block form_field %}
{{ field }}
{% endblock %}
<span></span>
</div>
{% if field.help_text %}
<p class="help">{{ field.help_text }}</p>

1
wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html
View file

@ -7,6 +7,7 @@
{% block form_field %}
{{ field }}
{% endblock %}
<span></span>
</div>
{% if field.help_text %}
<p class="help">{{ field.help_text }}</p>

9
wagtail/wagtailadmin/templates/wagtailadmin/skeleton.html
View file

@ -1,9 +1,10 @@
<!doctype html>
{% load compress %}
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <!--<![endif]-->
<!--[if lt IE 7]> <html class="no-js ie lt-ie9 lt-ie8 lt-ie7" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie lt-ie9 lt-ie8" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
<!--[if IE 8]> <html class="no-js ie lt-ie9" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
<!--[if IE 9]> <html class="no-js ie lt-ie10" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <![endif]-->
<!--[if gt IE 9]><!--> <html class="no-js" lang="{{ LANGUAGE_CODE|default:"en-gb" }}"> <!--<![endif]-->
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

4
wagtail/wagtailforms/models.py
View file

@ -77,11 +77,11 @@ class AbstractFormField(Orderable):
panels = [
FieldPanel('label'),
FieldPanel('field_type', classname="formbuilder-type"),
FieldPanel('help_text'),
FieldPanel('required'),
FieldPanel('field_type', classname="formbuilder-type"),
FieldPanel('choices', classname="formbuilder-choices"),
FieldPanel('default_value', classname="formbuilder-default"),
FieldPanel('help_text'),
]
class Meta: