summaryrefslogtreecommitdiff
path: root/html
diff options
context:
space:
mode:
Diffstat (limited to 'html')
-rw-r--r--html/program.tmpl4
-rw-r--r--html/search.tmpl13
2 files changed, 14 insertions, 3 deletions
diff --git a/html/program.tmpl b/html/program.tmpl
index cf1ff1c..e5ba30c 100644
--- a/html/program.tmpl
+++ b/html/program.tmpl
@@ -28,7 +28,7 @@
<td>
<select name='data' onChange="di(this.form.data.options[this.form.data.options.selectedIndex].value, '?cmd=program&amp;data=')">
<?% FOREACH ch = param.channels %?>
- <?% IF ch.2 != channelgroup %?>
+ <?% IF ch.2 && ch.2 != channelgroup %?>
<?% IF channelgroup %?>
</optgroup>
<?% END %?>
@@ -36,7 +36,9 @@
<?% END %?>
<option value="<?% ch.1 %?>"<?% ' selected="selected"' IF channelpos == ch.1 %?>><?% ch.0 %?></option>
<?% END %?>
+ <?% IF channelgroup %?>
</optgroup>
+ <?% END %?>
</select>
</td>
</form>
diff --git a/html/search.tmpl b/html/search.tmpl
index ccaed1e..4893a5b 100644
--- a/html/search.tmpl
+++ b/html/search.tmpl
@@ -55,8 +55,17 @@
<td>
<select name='__channel'>
<option value="0"><?% gettext('All channels') %?>
- <?% FOREACH chan = param.channels %?>
- <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?>><?% chan.first %?>
+ <?% FOREACH ch = param.channels %?>
+ <?% IF ch.2 && ch.2 != channelgroup %?>
+ <?% IF channelgroup %?>
+ </optgroup>
+ <?% END %?>
+ <optgroup label="<?% channelgroup = ch.2;ch.2 %?>">
+ <?% END %?>
+ <option value="<?% ch.1 %?>"<?% ' selected="selected"' IF cgi.param('__channel') == ch.1 %?>><?% ch.0 %?></option>
+ <?% END %?>
+ <?% IF channelgroup %?>
+ </optgroup>
<?% END %?>
</select>
</td>