diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-01-25 19:20:24 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-01-25 19:20:24 +0000 |
| commit | f03e43c0b5ab4ae0bd92b86df6b539aeaeccfe54 (patch) | |
| tree | 1a498c0f13c359b2f553bf738079505e7b44fc6a /skins/stone | |
| parent | eb43bf63c1b742f16d7832ad57f43bcbeabf6a15 (diff) | |
| download | xxv-f03e43c0b5ab4ae0bd92b86df6b539aeaeccfe54.tar.gz xxv-f03e43c0b5ab4ae0bd92b86df6b539aeaeccfe54.tar.bz2 | |
* SHARE: [Bug #13022] Fix typo
* program,aedit,tedit,redit: choices with group of channels
Diffstat (limited to 'skins/stone')
| -rw-r--r-- | skins/stone/alist.tmpl | 12 | ||||
| -rw-r--r-- | skins/stone/program.tmpl | 9 | ||||
| -rw-r--r-- | skins/stone/widgets/list.tmpl | 13 |
3 files changed, 27 insertions, 7 deletions
diff --git a/skins/stone/alist.tmpl b/skins/stone/alist.tmpl index 75cc62e..743a468 100644 --- a/skins/stone/alist.tmpl +++ b/skins/stone/alist.tmpl @@ -7,13 +7,13 @@ <?% ######################################################################## %?> <?% BLOCK RowButtons %?> <?% IF allow('tlist') %?> - <?% IF param.timers.$id.allTimer.size %?> + <?% IF param.timers.${id}.allTimer.size %?> <?% IF debug %?> -<!-- active: <?% param.timers.$id.activeTimer.size %?> --> -<!-- deactive:<?% param.timers.$id.deactiveTimer.size %?> --> +<!-- active: <?% param.timers.${id}.activeTimer.size %?> --> +<!-- deactive:<?% param.timers.${id}.deactiveTimer.size %?> --> <?% END %?> - <a href="?cmd=tlist&data=<?% param.timers.$id.allTimer.join('_') %?>" - onmouseover="ttptlist(this, '<?% gettext("Planned recordings") %?>','<?% param.timers.$id.allTimer.join('_') %?>', -200);" + <a href="?cmd=tlist&data=<?% param.timers.${id}.allTimer.join('_') %?>" + onmouseover="ttptlist(this, '<?% gettext("Planned recordings") %?>','<?% param.timers.${id}.allTimer.join('_') %?>', -200);"> <img src="images/info.<?% global.imagetyp %?>" alt="" /> </a> <?% END %?> @@ -66,6 +66,7 @@ <?% IF allow('aedit') %?> <a title="<?% gettext("Edit autotimer") %?>" href="javascript:popup('aedit','<?% id %?>',620,670,1)" class="fieldinline<?% IF state != "";" ";state;END %?>"> <?% END %?> + <?% IF channels.length > 0 || directory != "" %?> <font class="description<?% IF state != "";" ";state;END %?>"> <?% IF channels.length > 0; chlist = [ ]; @@ -81,6 +82,7 @@ <?% directory %?><br /> <?% END %?> </font> + <?% END %?> <?% "</a>" IF allow('aedit') %?> </td> </tr> diff --git a/skins/stone/program.tmpl b/skins/stone/program.tmpl index d69c7e2..df9db09 100644 --- a/skins/stone/program.tmpl +++ b/skins/stone/program.tmpl @@ -169,8 +169,17 @@ <form action=""> <select size="15" name="data" onchange="di('?cmd=program&data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> <?% FOREACH ch = param.channels %?> + <?% IF ch.2 && ch.2 != optgroup %?> + <?% IF optgroup %?> + </optgroup> + <?% END %?> + <optgroup label="<?% optgroup = ch.2;ch.2 %?>"> + <?% END %?> <option value="<?% ch.1 %?>"<?% ' selected="selected"' IF channelpos == ch.1 %?>><?% ch.0 %?></option> <?% END %?> + <?% IF optgroup %?> + </optgroup> + <?% END %?> </select> </form> <?% ####################################################################### %?> diff --git a/skins/stone/widgets/list.tmpl b/skins/stone/widgets/list.tmpl index c11deef..e44f888 100644 --- a/skins/stone/widgets/list.tmpl +++ b/skins/stone/widgets/list.tmpl @@ -18,17 +18,26 @@ <?% sel = '' %?> <?% dis = '' %?> <?% FOREACH valch = values %?> - <?% IF (valch == l.1 || valch == l.0) %?> + <?% IF (valch == l.1 || valch == l.0) %?> <?% sel = ' selected="selected"';LAST %?> <?% END %?> <?% END %?> <?% FOREACH valch = data.disabled %?> - <?% IF (valch == l.1 || valch == l.0) %?> + <?% IF (valch == l.1 || valch == l.0) %?> <?% dis = ' disabled="disabled"';LAST %?> <?% END %?> <?% END %?> + <?% 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> </tr> |