summaryrefslogtreecommitdiff
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
commitf03e43c0b5ab4ae0bd92b86df6b539aeaeccfe54 (patch)
tree1a498c0f13c359b2f553bf738079505e7b44fc6a
parenteb43bf63c1b742f16d7832ad57f43bcbeabf6a15 (diff)
downloadxxv-f03e43c0b5ab4ae0bd92b86df6b539aeaeccfe54.tar.gz
xxv-f03e43c0b5ab4ae0bd92b86df6b539aeaeccfe54.tar.bz2
* SHARE: [Bug #13022] Fix typo
* program,aedit,tedit,redit: choices with group of channels
Diffstat
-rw-r--r--skins/deltab/alist.tmpl10
-rw-r--r--skins/deltab/program.tmpl9
-rw-r--r--skins/deltab/widgets/list.tmpl9
-rw-r--r--skins/stone/alist.tmpl12
-rw-r--r--skins/stone/program.tmpl9
-rw-r--r--skins/stone/widgets/list.tmpl13
-rw-r--r--skins/stone_flat/alist.tmpl10
-rw-r--r--skins/stone_flat/program.tmpl7
-rw-r--r--skins/xstyle/widgets/list.tmpl15
9 files changed, 73 insertions, 21 deletions
diff --git a/skins/deltab/alist.tmpl b/skins/deltab/alist.tmpl
index 21699b1..5b64190 100644
--- a/skins/deltab/alist.tmpl
+++ b/skins/deltab/alist.tmpl
@@ -6,13 +6,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&amp;data=<?% param.timers.$id.allTimer.join('_') %?>"
- onmouseover="ttptlist(this, '<?% gettext("Planned recordings") %?>','<?% param.timers.$id.allTimer.join('_') %?>', -400);"
+ <a href="?cmd=tlist&amp;data=<?% param.timers.${id}.allTimer.join('_') %?>"
+ onmouseover="ttptlist(this, '<?% gettext("Planned recordings") %?>','<?% param.timers.${id}.allTimer.join('_') %?>', -400);">
<img src="images/info.<?% global.imagetyp %?>" alt="" />
</a>
<?% END %?>
diff --git a/skins/deltab/program.tmpl b/skins/deltab/program.tmpl
index b83d9c9..d2b7f1d 100644
--- a/skins/deltab/program.tmpl
+++ b/skins/deltab/program.tmpl
@@ -116,8 +116,15 @@
<p>
<select size="15" name='data' onchange="di('?cmd=program&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
<?% FOREACH ch = param.channels %?>
- <option value="<?% ch.1 %?>" <?% 'selected="selected"' IF cgi.param('data') == 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>
</p>
</form>
diff --git a/skins/deltab/widgets/list.tmpl b/skins/deltab/widgets/list.tmpl
index 233c108..90b0f8f 100644
--- a/skins/deltab/widgets/list.tmpl
+++ b/skins/deltab/widgets/list.tmpl
@@ -28,8 +28,17 @@
<?% 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>
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&amp;data=<?% param.timers.$id.allTimer.join('_') %?>"
- onmouseover="ttptlist(this, '<?% gettext("Planned recordings") %?>','<?% param.timers.$id.allTimer.join('_') %?>', -200);"
+ <a href="?cmd=tlist&amp;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&amp;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>
diff --git a/skins/stone_flat/alist.tmpl b/skins/stone_flat/alist.tmpl
index b0474bf..78e7deb 100644
--- a/skins/stone_flat/alist.tmpl
+++ b/skins/stone_flat/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&amp;data=<?% param.timers.$id.allTimer.join(',') %?>"
- onmouseover="ttptlist(this, '<?% gettext("Planned recordings") %?>','<?% param.timers.$id.allTimer.join(',') %?>', -350);"
+ <a href="?cmd=tlist&amp;data=<?% param.timers.${id}.allTimer.join(',') %?>"
+ onmouseover="ttptlist(this, '<?% gettext("Planned recordings") %?>','<?% param.timers.${id}.allTimer.join(',') %?>', -350);">
<img src="images/info.<?% global.imagetyp %?>" alt="" />
</a>
<?% END %?>
diff --git a/skins/stone_flat/program.tmpl b/skins/stone_flat/program.tmpl
index bb7506b..b183171 100644
--- a/skins/stone_flat/program.tmpl
+++ b/skins/stone_flat/program.tmpl
@@ -162,8 +162,15 @@
<form action="">
<select size="15" name="data" onchange="di('?cmd=program&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
<?% FOREACH ch = param.channels %?>
+ <?% 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>
</form>
<?% ####################################################################### %?>
diff --git a/skins/xstyle/widgets/list.tmpl b/skins/xstyle/widgets/list.tmpl
index 5edad31..ca482c8 100644
--- a/skins/xstyle/widgets/list.tmpl
+++ b/skins/xstyle/widgets/list.tmpl
@@ -19,16 +19,25 @@
<?% 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 %?>
- <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>
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-10 08:49:11 +0000