diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-01-26 12:52:34 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-01-26 12:52:34 +0000 |
| commit | 7f1d0733ccd1f4a7b33c2ed56d5a2d41863796cb (patch) | |
| tree | bff0c0fbb42a1e2ac90a860955e5ea368e98a072 /html | |
| parent | b750c520cd965b42488a387e3a2b9c3fab67ccfc (diff) | |
| download | xxv-7f1d0733ccd1f4a7b33c2ed56d5a2d41863796cb.tar.gz xxv-7f1d0733ccd1f4a7b33c2ed56d5a2d41863796cb.tar.bz2 | |
* Remove double query to select fields from SQL Query
* search, movetimeredit: Show channels groups
* now/next/schema: show weekday as group
* AUTOTIMER: Fuzzy compare between matching event and exists timers, recordings, chronicle. see mysql/soundex
* AUTOTIMER: Detect exists timer with changed starttime inside pretime and aftertime from timers, inseed fixed five minutes
* AUTOTIMER: status with translated field headers
* MOVETIMER/CHRONICLE: mtl/chrl/chrs - query name from channels with single SQL-Query
Diffstat (limited to 'html')
| -rw-r--r-- | html/program.tmpl | 4 | ||||
| -rw-r--r-- | html/search.tmpl | 13 |
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&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> |