merged r10456 from trunk:

Partly revert r10429.
3.4
Daniel Tiefnig 14 years ago
commit 22dfe4e85f

@ -139,6 +139,24 @@
[% END %]
</div>
</li>
[% ELSIF preference.key == "sound_set" %]
<li class="ui-state-default">
<div class="span-5" title="[% preference.description %]">[% preference.key %]:</div>
<div class="span-1"><span class="ui-icon ui-icon-help help" title="[% preference.description %]"></span></div>
<div class="span-10 last">
<select size="1" name="[% preference.key %]" [% IF !edit_preferences %]disabled="disabled"[% END %] />
<option value=""></option>
[% FOREACH option IN preference.value.options %]
<option value="[% option.id %]"
[% IF option.id == preference.value.selected %]
selected="selected"
[% END %]>
[% option.name %]
</option>
[% END %]
</select>
</div>
</li>
[% ELSIF preference.data_type == "boolean" %]
<li class="ui-state-default">
<div class="span-5" title="[% preference.description %]">[% preference.key %]:</div>

@ -142,6 +142,24 @@
[% END %]
</div>
</li>
[% ELSIF preference.key == "sound_set" %]
<li class="ui-state-default">
<div class="span-5" title="[% preference.description %]">[% preference.key %]:</div>
<div class="span-1"><span class="ui-icon ui-icon-help help" title="[% preference.description %]"></span></div>
<div class="span-10 last">
<select size="1" name="[% preference.key %]" [% IF !edit_preferences %]disabled="disabled"[% END %] />
<option value=""></option>
[% FOREACH option IN preference.value.options %]
<option value="[% option.id %]"
[% IF option.id == preference.value.selected %]
selected="selected"
[% END %]>
[% option.name %]
</option>
[% END %]
</select>
</div>
</li>
[% ELSIF preference.data_type == "boolean" %]
<li class="ui-state-default">
<div class="span-5" title="[% preference.description %]">[% preference.key %]:</div>

@ -93,6 +93,24 @@
[% END %]
</div>
</li>
[% ELSIF preference.key == "sound_set" %]
<li class="ui-state-default">
<div class="span-5" title="[% preference.description %]">[% preference.key %]:</div>
<div class="span-1"><span class="ui-icon ui-icon-help help" title="[% preference.description %]"></span></div>
<div class="span-10 last">
<select size="1" name="[% preference.key %]" [% IF !edit_preferences %]disabled="disabled"[% END %] />
<option value=""></option>
[% FOREACH option IN preference.value.options %]
<option value="[% option.id %]"
[% IF option.id == preference.value.selected %]
selected="selected"
[% END %]>
[% option.name %]
</option>
[% END %]
</select>
</div>
</li>
[% ELSIF preference.data_type == "boolean" %]
<li class="ui-state-default">
<div class="span-5" title="[% preference.description %]">[% preference.key %]:</div>

Loading…
Cancel
Save