Separate default config values between file-only and admin settings

[friendica.git] / view / templates / field_combobox.tpl

diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
index 3d69e2d27275dc443a58c78d603c08f80710f73d..876e607cdfef9958c6f48acfe2442be10bda180e 100644 (file)
--- a/view/templates/field_combobox.tpl
+++ b/view/templates/field_combobox.tpl
@@ -4,15 +4,17 @@
                {{* html5 don't work on Chrome, Safari and IE9
                <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}}
+                  {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{/foreach}}
                </datalist> *}}
                
-               <input id="id_{{$field.0}}" type="text" value="{{$field.2}}">
+               <input id="id_{{$field.0}}" type="text" value="{{$field.2}}" aria-describedby='{{$field.0}}_tip'>
                <select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())">
                        <option value="">{{$field.5}}</option>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{$val}}</option>{{/foreach}}
                </select>
                
-               <span class='field_help'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>