From f07d90a855db44f1a38ed64fdf07262d896b4f7c Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Fri, 9 May 2008 20:43:07 +0000 Subject: * SHARE: Submit event data delayed and transmit data as block * SHARE: use persist random id * UTF-8: Reorder defines * UTF-8: Replace 'SET NAMES' with 'set character set' * alist: Move generation of channels name from template to perl code * skins: header add generator meta-tag with version * RECORDS: Replace character by Hexnibble * HTTPD: Speedup lookup find skins * HTTPD: Build options for start page delayed, avoid wrong UTF8 translation * CHRONICLE: add cgi-parameter start/limit for paging query * EPG: now: add cgi-parameter __cgrp=all to get all data * CHRONICLE: Add message to console by delete entry * OUTPUT/Ajax: optimize callback 'questions' --- skins/deltab/alist.tmpl | 14 +++----------- skins/deltab/widgets/start.tmpl | 6 ++++-- skins/snow/style.css | 10 +++++++++- skins/stone/alist.tmpl | 9 +-------- skins/stone/global.js | 6 +++--- skins/stone/index.tmpl | 6 ++++-- skins/stone/widgets/start.tmpl | 6 ++++-- skins/stone_flat/alist.tmpl | 9 +-------- skins/stone_flat/index.tmpl | 12 +++++++++--- skins/xstyle/alist.tmpl | 5 ++--- skins/xstyle/index.tmpl | 1 + skins/xstyle/widgets/start.tmpl | 1 + 12 files changed, 42 insertions(+), 43 deletions(-) diff --git a/skins/deltab/alist.tmpl b/skins/deltab/alist.tmpl index ae00a97..f2712e7 100644 --- a/skins/deltab/alist.tmpl +++ b/skins/deltab/alist.tmpl @@ -63,20 +63,12 @@ 1 %?> > diff --git a/skins/deltab/widgets/start.tmpl b/skins/deltab/widgets/start.tmpl index aa69505..3e57376 100644 --- a/skins/deltab/widgets/start.tmpl +++ b/skins/deltab/widgets/start.tmpl @@ -1,10 +1,12 @@ "?> - - + +xml:lang="" lang=""xml:lang="en" lang="en"> <?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?> + diff --git a/skins/snow/style.css b/skins/snow/style.css index b762957..dd3d804 100644 --- a/skins/snow/style.css +++ b/skins/snow/style.css @@ -147,6 +147,8 @@ text-align:right; .title { font-size:12px; +white-space:nowrap; +overflow:hidden; } .deactive { @@ -629,7 +631,13 @@ height:4em; overflow:hidden; } -.subtitle,.description,.channel { +.subtitle,.channel { +font-size:10px; +white-space:nowrap; +overflow:hidden; +} + +.description { font-size:10px; } diff --git a/skins/stone/alist.tmpl b/skins/stone/alist.tmpl index 3a637f0..363c05c 100644 --- a/skins/stone/alist.tmpl +++ b/skins/stone/alist.tmpl @@ -69,14 +69,7 @@ 0 || directory != "" %?> "> 0; - chlist = [ ]; - FOREACH chid = channels.split(','); - chid_enc = reentities(chid); - chid_name = param.channels.$chid_enc.Name; - IF ! chid_name; chid_name = gettext('Unknown channel'); END; - chlist.push( chid_name ); - END; - chop(chlist.join(','),35) %?>
+ chop(channels,35) %?>

diff --git a/skins/stone/global.js b/skins/stone/global.js index 093523e..ed67dbf 100644 --- a/skins/stone/global.js +++ b/skins/stone/global.js @@ -90,10 +90,10 @@ function toggle(cmd,data) { var img = document.getElementById('toggle' + tid); if(img) { - if(ton) { - if(tcon) + if(ton != '0') { + if(tcon != '0') className = 'problem'; - else if(trun) + else if(trun != '0') className = 'running'; else className = ''; diff --git a/skins/stone/index.tmpl b/skins/stone/index.tmpl index a8cae26..a159701 100644 --- a/skins/stone/index.tmpl +++ b/skins/stone/index.tmpl @@ -1,9 +1,11 @@ "?> - - + +xml:lang="" lang=""xml:lang="en" lang="en"> <?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?> + diff --git a/skins/stone/widgets/start.tmpl b/skins/stone/widgets/start.tmpl index 45d11d9..20e08fd 100644 --- a/skins/stone/widgets/start.tmpl +++ b/skins/stone/widgets/start.tmpl @@ -1,10 +1,12 @@ "?> - - + +xml:lang="" lang=""xml:lang="en" lang="en"> <?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?> + diff --git a/skins/stone_flat/alist.tmpl b/skins/stone_flat/alist.tmpl index d9461f9..df87733 100644 --- a/skins/stone_flat/alist.tmpl +++ b/skins/stone_flat/alist.tmpl @@ -68,14 +68,7 @@ "> 0; - chlist = [ ]; - FOREACH chid = channels.split(','); - chid_enc = reentities(chid); - chid_name = param.channels.$chid_enc.Name; - IF ! chid_name; chid_name = gettext('Unknown channel'); END; - chlist.push( chid_name ); - END; - chop(chlist.join(' '),50); + chop(channels,50); END %?> diff --git a/skins/stone_flat/index.tmpl b/skins/stone_flat/index.tmpl index 5a7c405..a159701 100644 --- a/skins/stone_flat/index.tmpl +++ b/skins/stone_flat/index.tmpl @@ -1,13 +1,19 @@ "?> - - + +xml:lang="" lang=""xml:lang="en" lang="en"> - XXV + <?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?> + + + + +