summaryrefslogtreecommitdiff
path: root/html
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2008-01-25 19:20:24 +0000
committerAndreas Brachold <vdr07@deltab.de>2008-01-25 19:20:24 +0000
commitb750c520cd965b42488a387e3a2b9c3fab67ccfc (patch)
tree98b9963e544bca5207085a7457dced5b94716784 /html
parentfb3e038cc7e44d3726854c7484d161886495b631 (diff)
downloadxxv-b750c520cd965b42488a387e3a2b9c3fab67ccfc.tar.gz
xxv-b750c520cd965b42488a387e3a2b9c3fab67ccfc.tar.bz2
* SHARE: [Bug #13022] Fix typo
* program,aedit,tedit,redit: choices with group of channels
Diffstat (limited to 'html')
-rw-r--r--html/program.tmpl9
-rw-r--r--html/widgets/list.tmpl19
2 files changed, 22 insertions, 6 deletions
diff --git a/html/program.tmpl b/html/program.tmpl
index e8c64a5..cf1ff1c 100644
--- a/html/program.tmpl
+++ b/html/program.tmpl
@@ -28,8 +28,15 @@
<td>
<select name='data' onChange="di(this.form.data.options[this.form.data.options.selectedIndex].value, '?cmd=program&amp;data=')">
<?% FOREACH ch = param.channels %?>
- <option value="<?% ch.1 %?>" <?% "selected" IF channelpos == ch.1 %?>><?% ch.0 %?></option>
+ <?% IF ch.2 != channelgroup %?>
+ <?% IF channelgroup %?>
+ </optgroup>
+ <?% END %?>
+ <optgroup label="<?% channelgroup = ch.2;ch.2 %?>">
+ <?% END %?>
+ <option value="<?% ch.1 %?>"<?% ' selected="selected"' IF channelpos == ch.1 %?>><?% ch.0 %?></option>
<?% END %?>
+ </optgroup>
</select>
</td>
</form>
diff --git a/html/widgets/list.tmpl b/html/widgets/list.tmpl
index 452636b..ca482c8 100644
--- a/html/widgets/list.tmpl
+++ b/html/widgets/list.tmpl
@@ -19,16 +19,25 @@
<?% sel = '' %?>
<?% dis = '' %?>
<?% FOREACH valch = values %?>
- <?% IF (valch == l.1 || valch == l.0) %?>
- <?% sel = ' selected="selected"';values.shift;LAST %?>
+ <?% IF (valch == l.1 || valch == l.0) %?>
+ <?% sel = ' selected="selected"';LAST %?>
<?% END %?>
<?% END %?>
<?% FOREACH valch = data.disabled %?>
- <?% IF (valch == l.1 || valch == l.0) %?>
- <?% dis = ' disabled="disabled"';data.disabled.shift;LAST %?>
+ <?% IF (valch == l.1 || valch == l.0) %?>
+ <?% dis = ' disabled="disabled"';LAST %?>
<?% END %?>
<?% END %?>
- <option value='<?% l.1 %?>'<?% sel %?><?% dis %?>><?% l.0 %?></option>
+ <?% IF l.2 && l.2 != optgroup %?>
+ <?% IF optgroup %?>
+ </optgroup>
+ <?% END %?>
+ <optgroup label="<?% optgroup = l.2;l.2 %?>">
+ <?% END %?>
+ <option value='<?% l.1 %?>'<?% sel %?><?% dis %?>><?% l.0 %?></option>
+ <?% END %?>
+ <?% IF optgroup %?>
+ </optgroup>
<?% END %?>
</select>
</td>