From e7b1e815ca77d9e4f2b7d6aa29ec986d0ac7da86 Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Tue, 1 Jan 2008 18:08:52 +0000 Subject: * STREAM: Add HTTPD Streaming for recording, with starttime * RECORDS: Start playback with start time * TIMERS: drop workaround getOldDeactivTimer - 'Search for old and deactivated Timers and delete this' cleanup etc/xxvd.cfg.example, skin.cfg rdisplay: add input field for start time --- skins/deltab/images/recover.gif | 1 + skins/deltab/images/recover.png | 1 + skins/deltab/rdisplay.tmpl | 115 +++++++++++++++++++++++--------------- skins/deltab/rlist.tmpl | 12 ++-- skins/deltab/skin.cfg | 3 - skins/deltab/skin.cfg.default | 3 - skins/stone/rdisplay.tmpl | 103 ++++++++++++++++++++++------------ skins/stone/rlist.tmpl | 10 +--- skins/stone/skin.cfg | 3 +- skins/stone/skin.cfg.default | 1 - skins/stone_flat/rdisplay.tmpl | 113 +++++++++++++++++++++++++------------ skins/stone_flat/rlist.tmpl | 10 +--- skins/stone_flat/skin.cfg | 1 - skins/stone_flat/skin.cfg.default | 1 - 14 files changed, 226 insertions(+), 151 deletions(-) create mode 120000 skins/deltab/images/recover.gif create mode 120000 skins/deltab/images/recover.png diff --git a/skins/deltab/images/recover.gif b/skins/deltab/images/recover.gif new file mode 120000 index 0000000..aa0bd41 --- /dev/null +++ b/skins/deltab/images/recover.gif @@ -0,0 +1 @@ +../../stone/images/recover.gif \ No newline at end of file diff --git a/skins/deltab/images/recover.png b/skins/deltab/images/recover.png new file mode 120000 index 0000000..72ee109 --- /dev/null +++ b/skins/deltab/images/recover.png @@ -0,0 +1 @@ +../../stone/images/recover.png \ No newline at end of file diff --git a/skins/deltab/rdisplay.tmpl b/skins/deltab/rdisplay.tmpl index 2da9f5d..e253b22 100644 --- a/skins/deltab/rdisplay.tmpl +++ b/skins/deltab/rdisplay.tmpl @@ -1,16 +1,36 @@ -
+ + + + + +
+ + + :: + 1 %?> - - - -
Dauer: :: +
: @@ -29,9 +49,17 @@ @@ -67,7 +95,13 @@ Stunden = c div 3600; Minuten = c div 60 mod 60 -%?> @@ -181,43 +215,10 @@ diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl index 81dc8f0..96d6f74 100644 --- a/skins/deltab/rlist.tmpl +++ b/skins/deltab/rlist.tmpl @@ -95,13 +95,7 @@ - - - - " /> - - - + " /> @@ -110,7 +104,7 @@ - " /> + " /> @@ -242,10 +236,12 @@ Aktualisieren  +
" href="?cmd=rrecover">  " href="?cmd=rrecover"> +
diff --git a/skins/deltab/skin.cfg b/skins/deltab/skin.cfg index 0c0aaac..b508f70 100644 --- a/skins/deltab/skin.cfg +++ b/skins/deltab/skin.cfg @@ -2,9 +2,6 @@ - - - diff --git a/skins/deltab/skin.cfg.default b/skins/deltab/skin.cfg.default index 0c0aaac..b508f70 100644 --- a/skins/deltab/skin.cfg.default +++ b/skins/deltab/skin.cfg.default @@ -2,9 +2,6 @@ - - - diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl index 1ab5929..d101c84 100644 --- a/skins/stone/rdisplay.tmpl +++ b/skins/stone/rdisplay.tmpl @@ -1,4 +1,10 @@ + + + + + + - 3 %?> -
- - + + + + :: + 1 %?> - - - -
: :: +
: @@ -39,8 +57,16 @@
" alt="" />
- - + + + + + + + + + +
@@ -51,32 +77,14 @@ 0;quest=data.SubTitle;END %?> -
+
+ + - 7200 ? 600 : 500 %?> + 7200 ? 600 : 500 %?>
- - - + + + + + + + + + + +
- : + + + + : + + +
@@ -155,7 +186,7 @@ IF data.Duration > secold; class = (class == 'marksright2' ? 'marksright1' : 'marksright2'); percent = ((data.Duration - secold) / data.Duration) * width; - -%?> - ::" /> + -%?> - "" /> @@ -203,7 +234,7 @@ @@ -229,7 +260,7 @@  : 
- : + + + + + : + + + +
- +
diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl index 1002a8b..f22beaa 100644 --- a/skins/stone/rlist.tmpl +++ b/skins/stone/rlist.tmpl @@ -76,13 +76,7 @@ - - - - " /> - - - + " /> @@ -91,7 +85,7 @@ - " /> + " /> diff --git a/skins/stone/skin.cfg b/skins/stone/skin.cfg index d6bf351..0682ed0 100644 --- a/skins/stone/skin.cfg +++ b/skins/stone/skin.cfg @@ -2,8 +2,7 @@ - - + diff --git a/skins/stone/skin.cfg.default b/skins/stone/skin.cfg.default index 32e24b9..0682ed0 100644 --- a/skins/stone/skin.cfg.default +++ b/skins/stone/skin.cfg.default @@ -2,7 +2,6 @@ - diff --git a/skins/stone_flat/rdisplay.tmpl b/skins/stone_flat/rdisplay.tmpl index e9c9b7f..0a44df8 100644 --- a/skins/stone_flat/rdisplay.tmpl +++ b/skins/stone_flat/rdisplay.tmpl @@ -1,4 +1,10 @@ + + + + + + - 3 %?> -
- - + + + + :: + 1 %?> - - - -
: :: +
: + + + + + + + + + + @@ -39,8 +67,16 @@
" alt="" />
- - + + + + + + + + + +
@@ -51,32 +87,14 @@ 0;quest=data.SubTitle;END %?> -
+
+ +
@@ -118,7 +151,15 @@ Stunden = c div 3600; Minuten = c div 60 mod 60 -%?> - : + + + + + : + + + + @@ -203,7 +244,7 @@ @@ -229,7 +270,7 @@  :  - + diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl index 7099043..ad70c04 100644 --- a/skins/stone_flat/rlist.tmpl +++ b/skins/stone_flat/rlist.tmpl @@ -78,13 +78,7 @@ - - - - " /> - - - + " /> @@ -93,7 +87,7 @@ - " /> + " /> diff --git a/skins/stone_flat/skin.cfg b/skins/stone_flat/skin.cfg index d6bf351..4a5ae7c 100644 --- a/skins/stone_flat/skin.cfg +++ b/skins/stone_flat/skin.cfg @@ -2,7 +2,6 @@ - diff --git a/skins/stone_flat/skin.cfg.default b/skins/stone_flat/skin.cfg.default index 32e24b9..0682ed0 100644 --- a/skins/stone_flat/skin.cfg.default +++ b/skins/stone_flat/skin.cfg.default @@ -2,7 +2,6 @@ - -- cgit v1.2.3