diff options
| -rw-r--r-- | skins/deltab/now.tmpl | 13 | ||||
| -rw-r--r-- | skins/deltab/schema.tmpl | 13 | ||||
| -rw-r--r-- | skins/deltab/search.tmpl | 15 | ||||
| -rw-r--r-- | skins/stone/now.tmpl | 13 | ||||
| -rw-r--r-- | skins/stone/schema.tmpl | 15 | ||||
| -rw-r--r-- | skins/stone/search.tmpl | 15 | ||||
| -rw-r--r-- | skins/stone_flat/now.tmpl | 15 | ||||
| -rw-r--r-- | skins/stone_flat/schema.tmpl | 13 | ||||
| -rw-r--r-- | skins/stone_flat/search.tmpl | 15 | ||||
| -rw-r--r-- | skins/xstyle/search.tmpl | 13 |
10 files changed, 109 insertions, 31 deletions
diff --git a/skins/deltab/now.tmpl b/skins/deltab/now.tmpl index 351679e..f66005b 100644 --- a/skins/deltab/now.tmpl +++ b/skins/deltab/now.tmpl @@ -162,10 +162,11 @@ </form> <form action=""> <p> - <select size="5" name='data' onchange="di('?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> + <?% zeiten = param.periods.split(','); %?> + <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> <?% today = [] %?> <?% tomor = [] %?> - <?% FOREACH zeit = param.periods.split(','); %?> + <?% FOREACH zeit = zeiten %?> <?% tom = 0 %?> <?% PERL %?> use Date::Manip; @@ -184,8 +185,14 @@ today.push(z); END %?> <?% END %?> + <optgroup label="<?% date.format(today.0, "%A", locale) %?>"> <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> - <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M (%a)", locale) %?></option><?% END %?> + </optgroup> + <?% IF tomor.size > 0 %?> + <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>"> + <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> + </optgroup> + <?% END %?> </select> <?% IF allow('erestart') %?> <br /> diff --git a/skins/deltab/schema.tmpl b/skins/deltab/schema.tmpl index 280a803..f6fca91 100644 --- a/skins/deltab/schema.tmpl +++ b/skins/deltab/schema.tmpl @@ -208,10 +208,11 @@ </form> <form action=""> <p> - <select size="5" name='data' onchange="di('?cmd=sch&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> + <?% zeiten = param.periods.split(','); %?> + <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=sch&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> <?% today = [] %?> <?% tomor = [] %?> - <?% FOREACH zeit = param.periods.split(','); %?> + <?% FOREACH zeit = zeiten %?> <?% tom = 0 %?> <?% PERL %?> use Date::Manip; @@ -230,8 +231,14 @@ today.push(z); END %?> <?% END %?> + <optgroup label="<?% date.format(today.0, "%A", locale) %?>"> <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> - <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M (%a), locale") %?></option><?% END %?> + </optgroup> + <?% IF tomor.size > 0 %?> + <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>"> + <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> + </optgroup> + <?% END %?> </select> <?% IF allow('erestart') %?> <br /> diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl index 7a07b6c..36229cd 100644 --- a/skins/deltab/search.tmpl +++ b/skins/deltab/search.tmpl @@ -123,9 +123,18 @@ <?% gettext('Channel',30) %?><br /> <select name='__channel'> <option value="0"><?% gettext('All channels') %?></option> - <?% FOREACH chan = param.channels %?> - <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected="selected"<?% END %?>><?% chan.first %?></option> - <?% END %?> + <?% 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> <br /><br /> <input type='submit' value='<?% gettext('Search') %?>' /> diff --git a/skins/stone/now.tmpl b/skins/stone/now.tmpl index 6ab3650..9d36550 100644 --- a/skins/stone/now.tmpl +++ b/skins/stone/now.tmpl @@ -175,10 +175,11 @@ <input type="hidden" name="__cgrp" value="<?% cgi.param('__cgrp') %?>" /> </form> <form action=""> - <select size="5" name='data' onchange="di('?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> + <?% zeiten = param.periods.split(','); %?> + <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> <?% today = [] %?> <?% tomor = [] %?> - <?% FOREACH zeit = param.periods.split(','); %?> + <?% FOREACH zeit = zeiten; %?> <?% tom = 0 %?> <?% PERL %?> use Date::Manip; @@ -197,8 +198,14 @@ today.push(z); END %?> <?% END %?> + <optgroup label="<?% date.format(today.0, "%A", locale) %?>"> <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> - <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M (%a)", locale) %?></option><?% END %?> + </optgroup> + <?% IF tomor.size > 0 %?> + <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>"> + <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> + </optgroup> + <?% END %?> </select> </form> </td> diff --git a/skins/stone/schema.tmpl b/skins/stone/schema.tmpl index a7fe955..0c7d97e 100644 --- a/skins/stone/schema.tmpl +++ b/skins/stone/schema.tmpl @@ -226,10 +226,11 @@ <input type="hidden" name="__cgrp" value="<?% cgi.param('__cgrp') %?>" /> </form> <form action=""> - <select size="5" name='data' onchange="di('?cmd=sch&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> - <?% today = [] %?> + <?% zeiten = param.periods.split(','); %?> + <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=sch&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> + <?% today = [] %?> <?% tomor = [] %?> - <?% FOREACH zeit = param.periods.split(','); %?> + <?% FOREACH zeit = zeiten %?> <?% tom = 0 %?> <?% PERL %?> use Date::Manip; @@ -248,8 +249,14 @@ today.push(z); END %?> <?% END %?> + <optgroup label="<?% date.format(today.0, "%A", locale) %?>"> <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> - <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M (%a)", locale) %?></option><?% END %?> + </optgroup> + <?% IF tomor.size > 0 %?> + <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>"> + <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> + </optgroup> + <?% END %?> </select> </form> </td> diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl index cb4d614..136f648 100644 --- a/skins/stone/search.tmpl +++ b/skins/stone/search.tmpl @@ -155,9 +155,18 @@ <?% gettext('Channel',30) %?><br /> <select name='__channel'> <option value="0"><?% gettext('All channels') %?></option> - <?% FOREACH chan = param.channels %?> - <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?>><?% chan.first %?></option> - <?% END %?> + <?% 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> <br /><br /> <input type='submit' value='<?% gettext('Search') %?>' /> diff --git a/skins/stone_flat/now.tmpl b/skins/stone_flat/now.tmpl index d5a3c6d..a466064 100644 --- a/skins/stone_flat/now.tmpl +++ b/skins/stone_flat/now.tmpl @@ -184,10 +184,11 @@ <input type="hidden" name="__cgrp" value="<?% cgi.param('__cgrp') %?>" /> </form> <form action=""> - <select size="5" name='data' onchange="di('?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> - <?% today = [] %?> + <?% zeiten = param.periods.split(','); %?> + <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> + <?% today = [] %?> <?% tomor = [] %?> - <?% FOREACH zeit = param.periods.split(','); %?> + <?% FOREACH zeit = zeiten %?> <?% tom = 0 %?> <?% PERL %?> use Date::Manip; @@ -206,8 +207,14 @@ today.push(z); END %?> <?% END %?> + <optgroup label="<?% date.format(today.0, "%A", locale) %?>"> <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> - <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M (%a)", locale) %?></option><?% END %?> + </optgroup> + <?% IF tomor.size > 0 %?> + <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>"> + <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> + </optgroup> + <?% END %?> </select> </form> </td> diff --git a/skins/stone_flat/schema.tmpl b/skins/stone_flat/schema.tmpl index b80cfc1..050dcd4 100644 --- a/skins/stone_flat/schema.tmpl +++ b/skins/stone_flat/schema.tmpl @@ -226,10 +226,11 @@ <input type="hidden" name="__cgrp" value="<?% cgi.param('__cgrp') %?>" /> </form> <form action=""> - <select size="5" name='data' onchange="di('?cmd=sch&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> + <?% zeiten = param.periods.split(','); %?> + <select size="<?% zeiten.size + 3 %?>" name='data' onchange="di('?cmd=sch&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> <?% today = [] %?> <?% tomor = [] %?> - <?% FOREACH zeit = param.periods.split(','); %?> + <?% FOREACH zeit = zeiten %?> <?% tom = 0 %?> <?% PERL %?> use Date::Manip; @@ -248,8 +249,14 @@ today.push(z); END %?> <?% END %?> + <optgroup label="<?% date.format(today.0, "%A", locale) %?>"> <?% FOREACH z = today %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> - <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M (%a), locale") %?></option><?% END %?> + </optgroup> + <?% IF tomor.size > 0 %?> + <optgroup label="<?% date.format(tomor.0, "%A", locale) %?>"> + <?% FOREACH z = tomor %?><option value="<?% z %?>"><?% date.format(z, "%H:%M", locale) %?></option><?% END %?> + </optgroup> + <?% END %?> </select> </form> </td> diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl index 5d66e3c..41481fb 100644 --- a/skins/stone_flat/search.tmpl +++ b/skins/stone_flat/search.tmpl @@ -144,9 +144,18 @@ <?% gettext('Channel',30) %?><br /> <select name='__channel'> <option value="0"><?% gettext('All channels') %?></option> - <?% FOREACH chan = param.channels %?> - <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?>><?% chan.first %?></option> - <?% END %?> + <?% 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> <br /><br /> <input type='submit' value='<?% gettext('Search') %?>' /> diff --git a/skins/xstyle/search.tmpl b/skins/xstyle/search.tmpl index 70e0445..b402f91 100644 --- a/skins/xstyle/search.tmpl +++ b/skins/xstyle/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> |
