diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
| commit | e9462ba14529b7172ba5a21e7985d24de91faa37 (patch) | |
| tree | c2270ca2975f6683a361c5959894b6bbc954475d /view/tpl/field_combobox.tpl | |
| parent | 2b9322fc7d879fecbe334083bbd028538c985c54 (diff) | |
| parent | b775a1aa0e36a74f0f937d85f458fd12af18a264 (diff) | |
| download | volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.gz volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.bz2 volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.zip | |
resolve merge conflict
Diffstat (limited to 'view/tpl/field_combobox.tpl')
| -rwxr-xr-x | view/tpl/field_combobox.tpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl index 337c60673..523595c0b 100755 --- a/view/tpl/field_combobox.tpl +++ b/view/tpl/field_combobox.tpl @@ -1,13 +1,13 @@ - <div class='field combobox'> + <div class='field combobox input form-group'> <label class="mainlabel" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> - {{* html5 don't work on Chrome, Safari and IE9 see https://github.com/thgreasi/datalist-polyfill + {{* <input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" > <datalist id="data_{{$field.0}}" > {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}} - </datalist> *}} + </datalist>*}} - <input id="id_{{$field.0}}" type="text" value="{{$field.2}}"> - <select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())"> + <input id="id_{{$field.0}}" class="form-control" type="text" value="{{$field.2}}"> + <select id="select_{{$field.0}}" class="form-control" onChange="$('#id_{{$field.0}}').val($(this).val())"> <option value="">{{$field.5}}</option> {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}} </select> |