From fea04122f6f8b7e4f4ca4c59dc43be6567290d03 Mon Sep 17 00:00:00 2001 From: Andreas Mair Date: Fri, 23 Jun 2006 12:00:58 +0200 Subject: 2006-06-23: 3.4.6beta3 - Fixed: Crash in prog_detail if invalid EPG-ID (Bug #0000077, Reported by Reiner Buehl). - Fixed: Bug #0000034 (Reported by The Unknown). - Added: error page on internal vdradmind.pl errors. - Changed: access_log. - Removed: unused stuff in templates. - Fixed: quote special characters in "find repeatings" URL (Reported by Hans-Joachim Gurt). - Reworked: prog_timeline again (Fixes Bug #0000009, Reported by Georgius, Patch submitted by Torsten Herz). - Fixed: correct sorting in prog_list2 selectbox at the end of a month (Reported by sirtobi). - Changed: dates in prog_list2 selectbox now shows day and month (Requested by sirtobi). - Changed: Removed tabs in configuration menu. - Fixed: "Divide by 0" bug in prog_summary list view (Bug #0000072, Reported by djdagobert). - Changed: Place folders in rec_list at the top (Patch submitted by Frank Jepsen). - Fixed: Remember sorting after returning fom rec_rename (Bug #0000037, Reported by martind). - Fixed: Canceling rec_rename does no longer rename the recording (Bug #0000036, Reported by martind). - Fixed: VDRAdmin-AM didn't start if PID file was empty (Reported and fixed by Hirmke Michael). - Fixed: In prog_list2 starting time also works for other days. - Added: Icons to find repeatings and IMDb lookup in prog_list and prog_list2. - Added: Each AutoTimer can have its own start/stop margins (Requested by many people at vdrportal.de). NOTE: vdradmind.at format changed! --- template/default/about.html | 72 ---- template/default/at_timer_list.html | 28 +- template/default/at_timer_new.html | 77 +--- template/default/config.html | 704 +++++++++++++------------------ template/default/default/style.css | 70 +-- template/default/help_at_timer_list.html | 14 - template/default/help_at_timer_new.html | 14 - template/default/help_config.html | 14 - template/default/help_no.html | 14 - template/default/help_rec_list.html | 14 - template/default/help_timer_list.html | 14 - template/default/help_timer_new.html | 14 - template/default/navigation.html | 6 +- template/default/prog_detail.html | 18 +- template/default/prog_list.html | 20 +- template/default/prog_list2.html | 22 +- template/default/prog_summary.html | 6 - template/default/prog_summary2.html | 22 - template/default/prog_timeline.html | 643 ++++++++++++++-------------- template/default/rec_edit.html | 27 +- template/default/rec_list.html | 27 +- template/default/timer_list.html | 45 -- template/default/timer_new.html | 67 +-- template/default/vdr_cmds.html | 44 +- 24 files changed, 725 insertions(+), 1271 deletions(-) (limited to 'template/default') diff --git a/template/default/about.html b/template/default/about.html index f83e479..41b1468 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -14,149 +14,77 @@ - - - - - - - - - - - - - - - -

<%! Authors !%>

<%! Current author (VDRAdmin-AM branch): !%>
 Andreas Mair (Homepage)
<%! Original author (VDRAdmin): !%>
 Thomas Koch (Homepage)
- - - - - - - - - - - - - - - - - - - - - - - - - -

<%! Translation Team !%>

<%! Dutch: !%>
 Roel Koelewijn
<%! English: !%>
 Andreas Mair
<%! Finnish: !%>
 Rolf Ahrenberg
<%! French: !%>
 Trois Six (also at vdrportal.de), map, lobotomise, bads, Mickaël Nival
<%! German: !%>
 Andreas Mair
<%! Spanish: !%>
 Rüdiger Jung
<%! Russian: !%>
 Oleg Roitburd and Allrussian-forum translation team
- - - - - - - - - - - - - - - -

<%! Informations !%>

<%! VDRAdmin-AM version: !%>
<%! VDR version: !%>
- - - - - - - - - - - - - -

<%! Getting Help and Reporting Bugs !%>

  • <%! If you need help please first try to use the online help you'll find on some pages. You can access it by clicking . !%>
  • <%! If this doesn't provide the information you need you can try to get help at VDR-Portal if you understand German language. Please use the announcement thread if possible, search for: !%> "[ANNOUNCE] VDRAdmin-AM-"
  • <%! If you think you have found a bug please check that it's a new one and report it in the VDRAdmin-AM BugTracking system. !%>
diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index 4d12316..7408472 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -31,7 +31,6 @@
- @@ -44,7 +43,6 @@ help -

<%! AutoTimer !%>
@@ -52,7 +50,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - -

<%! Active !%> @@ -111,22 +108,10 @@

@@ -171,20 +156,8 @@
@@ -198,6 +171,7 @@
+
diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html index 2a3d88f..08339cd 100644 --- a/template/default/at_timer_new.html +++ b/template/default/at_timer_new.html @@ -15,7 +15,6 @@
- @@ -24,24 +23,12 @@ help -

<%! Add New AutoTimer !%><%! Edit AutoTimer !%>
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + - - - + - - - + - - - + - - - - - -
<%! AutoTimer Active: !%>
 @@ -54,28 +41,22 @@
<%! Search Patterns: !%>
<%! Search in: !%>
 checked /> checked /> checked />
<%! Search only on these days: !%>
 checked /> @@ -86,10 +67,8 @@ checked /> checked />
<%! Channel: !%>
<%! Starts After: !%>
 @@ -110,10 +87,8 @@  <%! o'clock !%>
<%! Ends Before: !%>
 @@ -121,53 +96,56 @@  <%! o'clock !%>
<%! Override Start/Stop Margins: !%>
 + checked /> + checked /> +
<%! Time Margin at Start: !%>
 + <%! minutes !%> +
<%! Time Margin at Stop: !%>
 + <%! minutes !%> +
<%! Priority: !%>
<%! Lifetime: !%>
checked />
<%! Remember programmed timers: !%>
 checked /> checked />
<%! Directory: !%>
@@ -186,28 +164,19 @@ - - - - - - - - -

<%! Title !%>

<%! Subtitle !%>

<%! Broadcasted !%>

<%! Stored in !%>
, - ()
<%! No matches found! !%>
diff --git a/template/default/config.html b/template/default/config.html index 1256609..d097577 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -24,7 +24,6 @@ - @@ -33,478 +32,384 @@ help -

<%! Configuration !%>
- - - - - - - - - - - - - +
"tab_selected""tab_unselected"><%! General Settings !%>"tab_selected""tab_unselected"><%! VDR !%>"tab_selected""tab_unselected"><%! Identification !%>"tab_selected""tab_unselected"><%! Timeline !%>"tab_selected""tab_unselected"><%! AutoTimer !%>"tab_selected""tab_unselected"><%! Timer !%>"tab_selected""tab_unselected"><%! Streaming !%>"tab_selected""tab_unselected"><%! Expert !%>"tab_selected""tab_unselected"><%! Channel Selections !%>
+ + + - - - - + + - - - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + +

<%! General Settings !%>

<%! Skin: !%>
 -
<%! Skin: !%>
 + -
<%! Login Page: !%>
 - +
<%! Login Page: !%>
 + -
<%! Number of channels to use: !%>
<%! Local net (no login required): !%>
<%! Language: !%>
 + +
<%! Number of channels to use: !%>
<%! Local net (no login required): !%>
<%! Language: !%>
 - - > + - + - + -
- - - -
<%! Number of DVB cards: !%>
- - - - - -
<%! Path to recordings: !%>
- - - - - -
<%! Path to configuration files: !%>
- - - - - -
<%! Path to EPG images: !%>
- - - + + + + + + + + + + + + + + + + + + + + +

<%! VDR !%>

<%! Number of DVB cards: !%>
<%! Path to recordings: !%>
<%! Path to configuration files: !%>
<%! Path to EPG images: !%>
- - - -
<%! Username: !%>
- - - - - -
<%! Password: !%>
- - - - - -
<%! Guest Account: !%>
- - checked /> - checked /> - - - - - -
<%! Guest Username: !%>
- - - - - -
<%! Guest Password: !%>
- - - + + + + + + + + + + + + + + + + + + + + + + + + +

<%! Identification !%>

<%! Username: !%>
<%! Password: !%>
<%! Guest Account: !%>
 + checked /> + checked /> +
<%! Guest Username: !%>
<%! Guest Password: !%>
- - - -
<%! Hours: !%>
- - - - - -
<%! Times: !%>
- - - - - -
<%! Tooltips: !%>
- - checked /> - checked /> - - - + + + + + + + + + + + + + + + + +

<%! Timeline !%>

<%! Hours: !%>
<%! Times: !%>
   <%! Also used for other EPG views! !%>
<%! Tooltips: !%>
 + checked /> + checked /> +
- - - -
<%! Active: !%>
- - checked /> - checked /> - - - - - -
<%! Timeout: !%>
- <%! minutes !%> - - - - -
<%! Priority: !%>
- - - - - -
<%! Lifetime: !%>
- - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

<%! AutoTimer !%>

<%! Active: !%>
 + checked /> + checked /> +
<%! Timeout: !%>
 <%! minutes !%>
<%! Priority: !%>
<%! Lifetime: !%>
<%! Send email after programming timer: !%>
 - checked /> - checked /> -
<%! Send email as: !%>
<%! Send email to: !%>
<%! Mail server: !%>
<%! SMTPAuth user: !%>
<%! SMTPAuth password: !%>
<%! Tooltips: !%>
 - checked /> - checked /> -
<%! Send email after programming timer: !%>
 + checked /> + checked /> +
<%! Send email as: !%>
<%! Send email to: !%>
<%! Mail server: !%>
<%! SMTPAuth user: !%>
<%! SMTPAuth password: !%>
<%! Tooltips: !%>
 + checked /> + checked /> +
- - - -
<%! Priority: !%>
- - - - - -
<%! Lifetime: !%>
- - - - - -
<%! Time Margin at Start: !%>
- <%! minutes !%> - - - - -
<%! Time Margin at Stop: !%>
- <%! minutes !%> - - - - -
<%! Tooltips in timeline: !%>
- - checked /> - checked /> - - - - - -
<%! Tooltips in list: !%>
- - checked /> - checked /> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> +

<%! Timer !%>

<%! Priority: !%>
<%! Lifetime: !%>
<%! Time Margin at Start: !%>
 <%! minutes !%>
<%! Time Margin at Stop: !%>
 <%! minutes !%>
<%! Tooltips in timeline: !%>
 + checked /> + checked /> +
<%! Tooltips in list: !%>
 + checked /> + checked /> +
<%! Add summary to new timers: !%>
 + checked /> + checked /> +
- - - -
<%! Live Streaming: !%>
- - checked /> - checked /> - - - - - -
<%! HTTP Port of Streamdev (also possible 3000/ts): !%>
- - - - - -
<%! Recordings Streaming: !%>
- - checked /> - checked /> - - - - - -
<%! Path to VDR Recordings on your workstation: !%>
- - - - - -
<%! MIME type for live streaming: !%>
- - - - - -
<%! Suffix for live streaming: !%>
- - - - - -
<%! MIME type for recordings streaming: !%>
- - - - - -
<%! Suffix for recordings streaming: !%>
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

<%! Streaming !%>

<%! Live Streaming: !%>
 + checked /> + checked /> +
<%! HTTP Port of Streamdev (also possible 3000/ts): !%>
<%! Recordings Streaming: !%>
 + checked /> + checked /> +
<%! Path to VDR Recordings on your workstation: !%>
<%! MIME type for live streaming: !%>
<%! Suffix for live streaming: !%>
<%! MIME type for recordings streaming: !%>
<%! Suffix for recordings streaming: !%>
- - - -
<%! Read EPG directly using epg.data: !%>
- - checked /> - checked /> - - - - - -
<%! epg.data filename: !%>
- - - - - -
<%! VFAT: !%>
- - checked /> - checked /> - - - + + + + + + + + + + + + + + + + +

<%! Expert !%>

<%! Read EPG directly using epg.data: !%>
 + checked /> + checked /> +
<%! epg.data filename: !%>
<%! VFAT: !%>
 + checked /> + checked /> +
- - - - +
+ + + - - - - - - - - - - - - - - -

<%! Channel Selections !%>

<%! In "Timeline"? !%>
 checked /> checked />
<%! In "Channels"? !%>
 checked /> checked />
<%! In "Playing Today"? !%>
 checked /> checked />
<%! In "What's On Now"? !%>
 checked /> checked />
<%! In "AutoTimer"? !%>
 checked /> checked />
<%! In "Watch TV"? !%>
 checked /> checked />
- @@ -515,18 +420,13 @@ -
- - -
diff --git a/template/default/default/style.css b/template/default/default/style.css index 6cfa02c..2d41ac6 100644 --- a/template/default/default/style.css +++ b/template/default/default/style.css @@ -69,6 +69,10 @@ h3, font-weight: bold; color: black; } +#prog_list .epg_title a { + margin: 0; + padding: 0; +} .col_label h5 { margin: 1px 5px; font-size: 11px; @@ -116,17 +120,6 @@ label + input { color: red; } -.row_spacer, -.row_spacer td, -.row_spacer td.selected, -.footer, -.footer td, -.footer td.selected, -.col_left, -.col_right, -.heading.optional { - display: none; -} body.help .heading { display: table-row; } @@ -138,6 +131,7 @@ body.help .heading { } .heading td { background-color: #6d96a9; + xbackground-color: #2089e6; /*TODO*/ height: 17px; } .heading h2, @@ -155,7 +149,7 @@ body.help .heading { background-color: #ffffff; } .row_odd td { - background-color: #f0faff; + background-color: #dee6ee; } .col_label, @@ -232,7 +226,7 @@ body.help .heading { #prog_summary .row_even td.col_content { width: 246px; height: 200px; - background-color: #f0faff; + background-color: #dee6ee; vertical-align: top; } #prog_summary table.content td.col_buttons { @@ -368,7 +362,7 @@ body.help .heading { vertical-align: top; width: 20px; text-align: center; - background-color: #f0faff; + background-color: #dee6ee; border-right: 1px solid #6d96a9; } @@ -435,7 +429,7 @@ body.help .heading { } #heading tr { vertical-align: middle; - background-color: #f0faff; + background-color: #dee6ee; } #heading td { vertical-align: middle; @@ -468,7 +462,7 @@ body.help .heading { background: red; } #prog_timeline .color_current { - background-color: #e6eee9; + background-color: #e6ffe9; } #prog_timeline .color_broadcast { background-color: #f7fffa; @@ -476,9 +470,8 @@ body.help .heading { #prog_timeline .color_timer { background-color: #ffeee9; } -#prog_timeline2 .col_channel { - width: 150px; - border: 1px solid #6d96a9; +#prog_timeline .col_spacer { + background-color: #e0e0e0; } #rec_list #path { margin: 1em 10px 0px 10px; @@ -515,9 +508,14 @@ body.help .heading { } #prog_timeline .row_even table td.color2, #timer_list .row_even table td.color2 { - background-color: #f0faff; + background-color: #dee6ee; +} +#prog_timeline table.timestable td.color1 { + background-color: #ffffff; +} +#prog_timeline table.timestable td.color2 { + background-color: #dee6ee; } - #vdr_cmds pre { margin: 0px; padding: 0px; @@ -531,18 +529,25 @@ body.help .heading { padding: 3px; margin-top: 1em; margin-bottom: 1em; - background-color: #f0faff; + background-color: #dee6ee; text-align: right; } #config .heading { - background-color: #f0faff; + background-color: #dee6ee; border: none; } #config .heading a { color: black; font-weight: normal; } +#config .group { + margin-top: 0.5em; + width: 100%; +} +#config .col_label { + width: 50%; +} .tabs td { padding: 0; margin: 0; @@ -568,14 +573,17 @@ body.help .heading { background-color: white; color: black; } -#about .col_label, -#config .col_label { - width: 100px; +#about .col_label { + width: 20%; } #about .col_label h5 { white-space: nowrap; } +select.channels { + min-width: 100px; +} + /* Tooltips */ .tt_border { border: 2px solid white; @@ -583,7 +591,7 @@ body.help .heading { .tt_table { width: 250px; border: 2px solid #6d96a9; - background-color: #f0faff; + background-color: #dee6ee; } .tt_table th { background-color: #6d96a9; @@ -638,7 +646,7 @@ body.help .heading { } #help .links { padding: 5px; - background-color: #f0faff; + background-color: #dee6ee; text-align: justify; } #help .links a { @@ -660,7 +668,7 @@ body.help .heading { #help .top_link { text-align: right; font-size: 0.8em; - background-color: #f0faff; + background-color: #dee6ee; padding: 1px 5px; margin: 0px; } @@ -684,8 +692,10 @@ body.help .heading { padding-bottom: 6px; text-align: center; } +/*TODO Farbe */ #navigation .navi:hover { - background-color: #f0faff; + xbackground-color: #f0faff; + background-color: #dee6ee; } #navigation .search { padding-top: 6px; diff --git a/template/default/help_at_timer_list.html b/template/default/help_at_timer_list.html index a321981..0edc33e 100644 --- a/template/default/help_at_timer_list.html +++ b/template/default/help_at_timer_list.html @@ -18,17 +18,9 @@ - - - - - - - - - - - - - -

<%! AutoTimer !%>

<%!

Here you will find a listing of automatic timers (AutoTimer) known to VDRAdmin-AM.

The list shows some information on AutoTimers. You can change the list's sorting by clicking the columns heading.

@@ -51,12 +43,6 @@

In addition to these functions you can add a new AutoTimer by clicking at the top and you can delete a number of AutoTimers at once by checking the box in the last column of those timers and clicking .

Click to force VDRAdmin-AM to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.

!%>
diff --git a/template/default/help_at_timer_new.html b/template/default/help_at_timer_new.html index 7443fd0..a747cc5 100644 --- a/template/default/help_at_timer_new.html +++ b/template/default/help_at_timer_new.html @@ -20,17 +20,9 @@ - - - - - - - - - - - - - -

<%! Edit AutoTimer !%>

<%!

Here you can edit an automatic timer's (AutoTimer) settings.

AutoTimer is a key feature of VDRAdmin-AM. An AutoTimer consists of one or more search terms and some other settings, that are looked for regularly in the Electronic Program Guide (EPG). On match AutoTimer adds a timer in VDR automatically for that broadcast. That's very comfortable for irregularly broadcasted series or movies you don't want to miss.

!%> @@ -80,12 +72,6 @@
diff --git a/template/default/help_config.html b/template/default/help_config.html index e6c7eef..bc2885d 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -21,17 +21,9 @@ - - - - - - - - - - - - - -

<%! Configuration !%>

<%!

Here you can change general settings and base settings for timers, AutoTimers, channel selection and streaming parameters.

!%>
@@ -185,12 +177,6 @@
[<%! Top !%>]
diff --git a/template/default/help_no.html b/template/default/help_no.html index ce6b7e5..48e8d0f 100644 --- a/template/default/help_no.html +++ b/template/default/help_no.html @@ -14,26 +14,12 @@ - - - - - - - - - - - - - -

<%! No Help Available !%>

<%!

No help available yet. For adding or changing text please contact mail@andreas.vdr-developer.org.

!%>
diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html index 31984db..d507363 100644 --- a/template/default/help_rec_list.html +++ b/template/default/help_rec_list.html @@ -14,17 +14,9 @@ - - - - - - - - - - - - - -

<%! Recordings !%>

<%!

Here you will find a listing of recordings known to VDR. The headline will also show you VDR's total and free disk space.

The listing showing you some information on the recordings. You can change the list's sorting by clicking the columns heading. Above the list you'll see the navigation path. If you want to view the contents of previous folders you'll have to click on its name in that path.

@@ -48,12 +40,6 @@

If you've set the path the VDR's configuration files and have entries in VDR's reccmds.conf you can run those commands for the selected recording by selecting the wanted command in the select box locate next to Commands: and pressing the button.

Use to force reloading of VDR's recordings listing.

!%>
diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html index 7ddf15f..a298b2d 100644 --- a/template/default/help_timer_list.html +++ b/template/default/help_timer_list.html @@ -18,17 +18,9 @@ - - - - - - - - - - - - - -

<%! Timer !%>

<%!

Here you will find a listing of timers known to VDR.

On top you will find a chart showing a day's timers graphically. This provides an quick overview on what's going on at the specified day and helps you in finding conflicting timers. Moving the mouse cursor above any timer box will display a tooltip containing the timer's title, priority, lifetime and duration.

@@ -56,12 +48,6 @@

In addition to these functions you can add a new timer by clicking at the top and you can delete a number of timers at once by checking the box in the last column of those timers and clicking .

You can and selected timers.

!%>
diff --git a/template/default/help_timer_new.html b/template/default/help_timer_new.html index 875181f..20d552e 100644 --- a/template/default/help_timer_new.html +++ b/template/default/help_timer_new.html @@ -17,17 +17,9 @@ - - - - - - - - - - - - - -

<%! Edit Timer !%>

<%!

Here you can edit a timer's settings.

!%>
@@ -68,12 +60,6 @@
<%! Arbitrary text that describes the recording made by this timer. If this field is not empty, its contents will be written into the summary.vdr or info.vdr file of the recording. !%>
diff --git a/template/default/navigation.html b/template/default/navigation.html index 277e237..bbcdc1b 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -11,7 +11,7 @@ - - - - - - - - - - - - - - - - - -
- - - - - - - -
-

 <%! o'clock !%>

- 		- <%! What's on: !%>  - -  | <%! at: !%>  - -  <%! o'clock !%> - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -

<%! Timeline: !%>  <%! o'clock !%> <%! to !%>  <%! o'clock !%>

- - - - - - - - - - - - - - - - - -

-
- - -

- -
- - - - - - - - - - -
-
- - 		- - bis_minute; stop_minute = bis_minute; END; - - laenge_pix = (stop_minute - start_minute) * einheit; - - IF show.timer; - td_class = "color_timer"; - ELSE; - td_class = date.now >= show.start && date.now < show.stop ? "color_current" : "color_broadcast"; - END; -%?> - - -= old_stop_minute) && (start_minute < bis_minute) %?> - - - - - - - -
-
- - - -
- - - > - - - -
onMouseOver="tip('VDR--'); return true;" onMouseOut="untip(); return true;"> -
- - - - - - - - - -
- - -
-
-
-
- - + + + + + + + VDRAdmin-AM - <%! Timeline !%> + + + + + + + 5px/min + # 2 hours=120min: 600px -> 5px/min + # 3 hours=180min: 720px -> 4px/min + # 4 hours=240min: 720px -> 3px/min + # 5 hours=300min: 600px -> 2px/min + # 6 hours=360min: 720px -> 2px/min + event_w = show_hours * 300; + IF event_w > 720; event_w = 720; END; + px_per_min = (event_w / end_min) | format('%i'); + event_w = end_min * px_per_min; +-%?> + + + + + + + + + + + + + + + + +
+ + + + + +
+

 <%! o'clock !%>

+ 		+ <%! What's on: !%>  + +  | <%! at: !%>  + +  <%! o'clock !%> + +
+ + +
+ + + + + + + + + + +
+

 <%! o'clock !%> <%! to !%>  <%! o'clock !%>

+
+ 		+ + + + + + + + last_sec - 1800 %?> + + last_sec - end_min * 60 - 1800); + diff_sec = last_sec - end_min * 60; + END; +%?> + + + + +
+ + + + + + + + + + + + + + + + + +
+
+ + +
+
+
+ + + + + + + + + + +
+
+ + 		+ += end_min); BREAK; END; +%?> + + + + end_min; stop_minute = end_min; END; + + px_w = (stop_minute - start_minute) * px_per_min; + + IF show.timer; + td_class = "color_timer"; + ELSE; + td_class = date.now >= show.start && date.now < show.stop ? "color_current" : "color_broadcast"; + END; +%?> += old_stop_minute); + IF (start_minute > old_stop_minute + 1); + diff = (start_minute - old_stop_minute) * px_per_min; +%?> + + + + +
+
+ + + +
+ + "> + + + +
onMouseOver="tip('VDR--'); return true;" onMouseOut="untip(); return true;"> +
+ + + + + + + + + +
+ + + +
+
+ + += start_sec) && (date.now < end_sec) %?> + + + +
+
+ + diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html index c8f88b3..784fc56 100644 --- a/template/default/rec_edit.html +++ b/template/default/rec_edit.html @@ -15,53 +15,28 @@
- -

<%! Rename Recording !%>
- - - - - - - - - - - - - - - + - - - - - - - -
-
<%! Original Name of Recording: !%>
<%! New Name of Recording: !%>
<%! Subtitle: !%>
<%! Subtitle: !%>
<%! Summary: !%>
diff --git a/template/default/rec_list.html b/template/default/rec_list.html index 1cba17f..2235c76 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -14,7 +14,6 @@ - -

<%! Recordings !%>

 @@ -27,7 +26,6 @@ help
@@ -41,7 +39,6 @@ - - - - - - - - - - - - - - - - - - - - -

<%! Date !%> @@ -94,20 +89,10 @@

<%! Total !%> @@ -133,7 +118,7 @@ - rename + rename @@ -151,18 +136,8 @@
diff --git a/template/default/timer_list.html b/template/default/timer_list.html index c6ec456..17b9fe1 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -40,7 +40,6 @@
- -

<%! Timer !%>

 @@ -51,7 +50,6 @@ help
@@ -60,7 +58,6 @@
- - - - - - - - - - - - - -

@@ -71,15 +68,8 @@
@@ -189,12 +179,6 @@
@@ -204,7 +188,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -

<%! Active !%> @@ -287,23 +268,10 @@

diff --git a/template/default/timer_new.html b/template/default/timer_new.html index e915c6f..4b29af3 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -44,7 +44,6 @@
- @@ -53,32 +52,18 @@ help -

<%! Create New Timer !%><%! Edit Timer !%>
- - - - - - - - - - - - - - - - - - + - - - - - - + - - - - - + + - - - - + + - - - - + + - - - - + + - - - - - - + + - - - - -
<%! Timer Active: !%>
 checked /> checked />
<%! AutoTimer Checking: !%>
 @@ -88,10 +73,8 @@ checked /> checked />
<%! Channel: !%>
<%! Day Of Recording: !%>
<%! Day Of Recording: !%>
@@ -116,10 +97,8 @@
<%! Start Time: !%>
 @@ -130,12 +109,10 @@ (<%! Buffer: !%> <%! minutes !%>)
<%! End Time: !%>
 +
<%! End Time: !%>
  :  @@ -144,51 +121,33 @@ (<%! Buffer: !%> <%! minutes !%>)
<%! Use VPS: !%>
checked />
<%! Use VPS: !%>
checked />
<%! Priority: !%>
<%! Priority: !%>
<%! Lifetime: !%>
<%! Lifetime: !%>
<%! Title of Recording: !%>
<%! Title of Recording: !%>
<%! Summary: !%>
(<%! readonly !%>)
<%! Timer has been set by AutoTimer pattern: !%>
<%! Timer has been set by AutoTimer pattern: !%>
diff --git a/template/default/vdr_cmds.html b/template/default/vdr_cmds.html index 2a32e5b..701bed8 100644 --- a/template/default/vdr_cmds.html +++ b/template/default/vdr_cmds.html @@ -14,33 +14,19 @@ - -

<%! VDR Commands !%>

 help
- - - - - - - - - - - - - + - - - + - - - + - - - - - -
<%! Number of lines to show: !%>
<%! Number of lines to show: !%>
<%! SVDRP commands: !%>
<%! SVDRP commands: !%>
<%! Commands defined in commands.conf: !%>
<%! Commands defined in commands.conf: !%>
@@ -88,28 +64,14 @@ - - - - - - - - - - - - - -

<%! Output !%>
-- cgit v1.2.3