summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2008-05-09 20:43:07 +0000
committerAndreas Brachold <vdr07@deltab.de>2008-05-09 20:43:07 +0000
commitf07d90a855db44f1a38ed64fdf07262d896b4f7c (patch)
tree0f5669e328066f7f02f1721264c3a0df269b9074
parentb38ba957ead73319bbf5e516aa9670518013574e (diff)
downloadxxv-f07d90a855db44f1a38ed64fdf07262d896b4f7c.tar.gz
xxv-f07d90a855db44f1a38ed64fdf07262d896b4f7c.tar.bz2
* 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'
Diffstat
-rw-r--r--skins/deltab/alist.tmpl14
-rw-r--r--skins/deltab/widgets/start.tmpl6
-rw-r--r--skins/snow/style.css10
-rw-r--r--skins/stone/alist.tmpl9
-rw-r--r--skins/stone/global.js6
-rw-r--r--skins/stone/index.tmpl6
-rw-r--r--skins/stone/widgets/start.tmpl6
-rw-r--r--skins/stone_flat/alist.tmpl9
-rw-r--r--skins/stone_flat/index.tmpl12
-rw-r--r--skins/xstyle/alist.tmpl5
-rw-r--r--skins/xstyle/index.tmpl1
-rw-r--r--skins/xstyle/widgets/start.tmpl1
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 @@
<?% channel = channels.split(',') %?>
<?% IF channel.size > 1 %?>
<select>
- <?% FOREACH chid = channel;
- chid_enc = reentities(chid);
- chid_name = param.channels.$chid_enc.Name;
- IF ! chid_name; chid_name = gettext('Unknown channel'); END %?>
+ <?% FOREACH chid_name = channel %?>
<option><?% chid_name %?></option>
- <?% END %?>
+ <?% END %?>
</select>
<?% ELSE;
- IF channel.first;
- chid_enc = reentities(channel.first);
- chid_name = param.channels.$chid_enc.Name;
- IF ! chid_name; chid_name = gettext('Unknown channel'); END;
- chid_name;
- END;
+ channel.first;
END %?>
</td>
<td<?% IF state != "";" class='";state;"'";END %?>>
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 version="1.0" encoding="<?% charset %?>"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<?% INCLUDE skin.cfg %?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<?% lang = locale.split('_') %?>
+<html xmlns="http://www.w3.org/1999/xhtml" <?% IF lang.1 %?>xml:lang="<?% lang.0 %?>" lang="<?% lang.0 %?>"<?% ELSE %?>xml:lang="en" lang="en"<?% END %?>>
<head>
<title><?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?></title>
+ <meta name="generator" content="XXV System - Version: <?% version %?>" />
<meta http-equiv="content-type" content="text/html; charset=<?% charset %?>" />
<meta http-equiv="content-script-type" content="text/javascript" />
<meta http-equiv="cache-control" content="no-cache" />
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 @@
<?% IF channels.length > 0 || directory != "" %?>
<font class="description<?% IF state != "";" ";state;END %?>">
<?% IF channels.length > 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) %?><br />
+ chop(channels,35) %?><br />
<?% END %?>
<?% IF directory != "" %?>
<?% directory %?><br />
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 version="1.0" encoding="<?% charset %?>"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<?% lang = locale.split('_') %?>
+<html xmlns="http://www.w3.org/1999/xhtml" <?% IF lang.1 %?>xml:lang="<?% lang.0 %?>" lang="<?% lang.0 %?>"<?% ELSE %?>xml:lang="en" lang="en"<?% END %?>>
<head>
<title><?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?></title>
+ <meta name="generator" content="XXV System - Version: <?% version %?>" />
<meta http-equiv="content-type" content="text/html; charset=<?% charset %?>" />
<meta http-equiv="content-script-type" content="text/javascript" />
<meta http-equiv="cache-control" content="no-cache" />
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 version="1.0" encoding="<?% charset %?>"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<?% INCLUDE skin.cfg %?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<?% lang = locale.split('_') %?>
+<html xmlns="http://www.w3.org/1999/xhtml" <?% IF lang.1 %?>xml:lang="<?% lang.0 %?>" lang="<?% lang.0 %?>"<?% ELSE %?>xml:lang="en" lang="en"<?% END %?>>
<head>
<title><?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?></title>
+ <meta name="generator" content="XXV System - Version: <?% version %?>" />
<meta http-equiv="content-type" content="text/html; charset=<?% charset %?>" />
<meta http-equiv="content-script-type" content="text/javascript" />
<meta http-equiv="cache-control" content="no-cache" />
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 @@
<td class="fieldinline">
<font class="description<?% IF state != "";" ";state;END %?>">
<?% IF channels.length > 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 %?>
</font>
</td>
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 version="1.0" encoding="<?% charset %?>"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<?% lang = locale.split('_') %?>
+<html xmlns="http://www.w3.org/1999/xhtml" <?% IF lang.1 %?>xml:lang="<?% lang.0 %?>" lang="<?% lang.0 %?>"<?% ELSE %?>xml:lang="en" lang="en"<?% END %?>>
<head>
- <title>XXV</title>
+ <title><?% IF param.title.defined;param.title;ELSE %?>XXV<?% END %?></title>
+ <meta name="generator" content="XXV System - Version: <?% version %?>" />
<meta http-equiv="content-type" content="text/html; charset=<?% charset %?>" />
+ <meta http-equiv="content-script-type" content="text/javascript" />
<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="pragma" content="no-cache" />
<meta name="robots" content="noindex,noarchive,nofollow" />
+ <link rel="shortcut icon" href="favicon.ico" />
+ <link rel="stylesheet" type="text/css" href="style.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="print.css" media="print" />
<script language="javascript" type="text/javascript">
<!--
// Automated reload with right page
diff --git a/skins/xstyle/alist.tmpl b/skins/xstyle/alist.tmpl
index 0384b3f..d8cd462 100644
--- a/skins/xstyle/alist.tmpl
+++ b/skins/xstyle/alist.tmpl
@@ -79,9 +79,8 @@
<?% ELSIF c == 4; # Channel Field %?>
<td>
<?% text = "" %?>
- <?% FOREACH chid = field.split(',') %?>
- <?% chid_enc = reentities(chid) %?>
- <?% text = "$text ${param.channels.$chid_enc.Name}" %?>
+ <?% FOREACH ch = field.split(',') %?>
+ <?% text = "$text ${ch}" %?>
<?% LAST IF text.length > 20 %?>
<?% END %?>
<?% chop(text,20) %?>
diff --git a/skins/xstyle/index.tmpl b/skins/xstyle/index.tmpl
index d603992..8ffebe7 100644
--- a/skins/xstyle/index.tmpl
+++ b/skins/xstyle/index.tmpl
@@ -4,6 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>XXV</title>
+ <meta name="generator" content="XXV System - Version: <?% version %?>" />
<meta http-equiv="content-type" content="text/html; charset=<?% charset %?>" />
<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="pragma" content="no-cache" />
diff --git a/skins/xstyle/widgets/start.tmpl b/skins/xstyle/widgets/start.tmpl
index 43d9811..a48e427 100644
--- a/skins/xstyle/widgets/start.tmpl
+++ b/skins/xstyle/widgets/start.tmpl
@@ -8,6 +8,7 @@
<link rel="alternate" type="application/rss+xml" title="RSS-News 1.0" href="http://<?% info.HOST %?>/?cmd=request&data=rss&__version=1">
<link rel="alternate" type="application/rss+xml" title="RSS-News 2.0" href="http://<?% info.HOST %?>/?cmd=request&data=rss&__version=2">
<?% END %?>
+ <meta name="generator" content="XXV System - Version: <?% version %?>" />
<meta http-equiv="Content-Type" content="text/html; charset=<?% charset %?>">
<meta name="copyright" content="copyright 2004 Xpix">
<!-- Styles -->
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-09 19:10:37 +0000