- +

diff --git a/template/default/config.html b/template/default/config.html index 2f6e104..1e240af 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -127,6 +127,12 @@ + + + + + + @@ -450,7 +456,7 @@ - + + + + + + + - + - + - + diff --git a/template/default/prog_list.html b/template/default/prog_list.html index f4fc6c7..032cc58 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -8,7 +8,7 @@ - + @@ -20,12 +20,12 @@

- +

- + - + + +

<%! Path to EPG images: !%>

<%! In "Channels" / "Playing Today"? !%>

<%! In "Channels"? !%>

checked /><%! Yes !%> checked /><%! No !%> @@ -458,6 +464,15 @@

<%! In "Playing Today"? !%>

+ checked /><%! Yes !%> + checked /><%! No !%> +

<%! In "What's On Now"? !%>

@@ -466,16 +481,16 @@

<%! In "AutoTimer"? !%>

checked /><%! Yes !%> checked /><%! No !%>

+ + @@ -44,8 +48,8 @@

AutoTimer is OK and will automatically program matching broadcasts.
inactive

AutoTimer is not active.

In addition to these functions you can add a new AutoTimer by clicking New AutoTimer 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 Delete Selected AutoTimers.

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

!%> +

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 to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.

!%> @@ -55,6 +59,7 @@

+ diff --git a/template/default/help_config.html b/template/default/help_config.html index acc7d59..705412b 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -15,10 +15,14 @@ +

+ + + - + @@ -33,7 +37,7 @@

[<%! General Settings !%>] [<%! VDR !%>] [<%! Identification !%>] [<%! Timeline !%>] [<%! AutoTimer !%>] [<%! Timer !%>] [<%! Streaming !%>] [<%! Expert !%>] [<%! Channel Selections !%>]

<%! General Settings !%>

<%! Skin: !%>: <%! The skin you want to use. !%>

<%! VDR !%>

<%! Number of DVB cards: !%>: <%! The number of DVB cards VDR can access. Depending on this value VDRAdmin will calculate critical timers in the Timer menu. !%>; <%! The path to VDR's recordings. It's used so that VDRAdmin can locate the recordings when using Recordings Streaming and reccmds.conf in the Recordings menu. !%>
<%! Path to configuration files: !%>: <%! The path where VDR's configuration files are located. If this directory contains the file reccmds.conf its content is shown in a selectbox in the Recordings menu. !%>
<%! Path to EPG images: !%>: <%! The path where the EPG images are stored. !%>

[<%! Top !%>]

<%! Identification !%>

<%! Username: !%>: <%! The username for the main user, i.e. the user having the most privileges. !%>

<%! Timeline !%>

<%! Hours: !%>: <%! The number of hours to show in the timeline. !%>

<%! AutoTimer !%>

<%! Active: !%>: <%! Activate or deactivate the AutoTimer function. !%>

<%! Timer !%>

<%! Priority: !%>: <%! An integer in the range 0...99, defining the priority of this timer and of recordings created by this timer. 0 represents the lowest value, 99 the highest. The priority is used to decide which timer shall be started in case there are two or more timers with the exact same start time. The first timer in the list with the highest priority will be used.

This value is also stored with the recording and is later used to decide which recording to remove from disk in order to free space for a new recording. If the disk runs full and a new recording needs more space, an existing recording with the lowest priority (and which has exceeded its guaranteed lifetime) will be removed.

If all available DVB cards are currently occupied, a timer with a higher priority will interrupt the timer with the lowest priority in order to start recording. !%>

<%! Streaming !%>

<%! Live Streaming: !%>: <%! Enable or disable live streaming using the streamdev plugin. You also have to set the correct HTTP Port for Streamdev below. !%>

<%! Expert !%>

<%!

This section is for experts only, i.e. you know what you are doing!

!%>

<%! Read EPG directly using epg.data: !%>

<%! Channel Selections !%>

<%!

If you want to limit the number of channels used in some parts of VDRAdmin, this is for you!

Use the radio buttons to activate or deactivate the wanted channels in the named menu.

To add channels to the list of wanted channels you have to select them in the left side selectbox and click >>>>>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <<<<<.

!%> +

To add channels to the list of wanted channels you have to select them in the left side selectbox and click . If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click .

!%>

[<%! Top !%>]

@@ -155,6 +161,7 @@

	<%! Configuration !%>	<%! Configuration !%>

diff --git a/template/default/help_no.html b/template/default/help_no.html index ce4d70a..2dcf4a5 100644 --- a/template/default/help_no.html +++ b/template/default/help_no.html @@ -11,7 +11,7 @@ - + diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html index da6ff33..4835ca3 100644 --- a/template/default/help_rec_list.html +++ b/template/default/help_rec_list.html @@ -11,7 +11,7 @@ - +

@@ -44,8 +44,8 @@

This column is only shown if you activated and configured Recordings Streaming in the Configuration menu. You can watch the recording at your workstation.

In addition to these functions you can delete a number of recordings at once by checking the box in the last but one column of those recordings and clicking Delete Selected Recordings.

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 Run button.

!%> +

In addition to these functions you can delete a number of recordings at once by checking the box in the last but one column of those recordings and clicking .

!%> diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html index 3e6503a..b2a4479 100644 --- a/template/default/help_timer_list.html +++ b/template/default/help_timer_list.html @@ -12,6 +12,10 @@ + + + +

@@ -49,7 +53,7 @@ / impossible

Timer is critical and will most likely not record.
/ inactive

Timer is not active.

In addition to these functions you can add a new timer by clicking New Timer 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 Delete Selected Timers.

!%> +

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 .

!%> @@ -59,6 +63,7 @@

+ diff --git a/template/default/infobox.js b/template/default/infobox.js index 5b81179..a4f8781 100644 --- a/template/default/infobox.js +++ b/template/default/infobox.js @@ -60,6 +60,8 @@ function tip(name){ } function showtip(){ + if (isNaN(x)) return; + idiv.left=(((x+260)

@@ -38,7 +38,7 @@

- <%! Channels !%> + <%! Channels !%>

diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index d62f677..34821d6 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -34,14 +34,20 @@

+ + +

+ +

+ [<%! close !%>] [<%! view !%>] [<%! record !%>] - [<%! search !%>] + [<%! search !%>] - - [IMDb] + + [IMDb]

<%! Channel: !%> - @@ -58,14 +58,17 @@

-
-

+ +

+ +
+

diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index bbe7768..081bbe2 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -25,17 +25,19 @@ - -

<%! Playing Today !%>

@@ -64,12 +66,17 @@

+ +

+ +
+

diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index 606b76d..0d3b9ac 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -9,7 +9,7 @@ - + @@ -37,7 +37,7 @@

- +

[S] @@ -71,7 +71,7 @@

diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index 046b368..bad19e7 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -52,7 +52,7 @@ #bigtable { position:absolute; top:100px; left: px; z-index: 1; } - - +

@@ -28,7 +28,7 @@ - + @@ -36,23 +36,23 @@ - - - + + + - - - + + + - - - + + + - + @@ -61,12 +61,12 @@ - + - + - + @@ -75,7 +75,7 @@ - + @@ -84,9 +84,9 @@ - - - + + + @@ -95,7 +95,7 @@ - + @@ -104,9 +104,9 @@ - + - + diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html index 2b12a7d..c77c255 100644 --- a/template/default/rec_edit.html +++ b/template/default/rec_edit.html @@ -25,7 +25,7 @@

- @@ -37,13 +37,13 @@ - + - + diff --git a/template/default/rec_list.html b/template/default/rec_list.html index 7694224..28aa4a4 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -54,7 +54,7 @@ - - - - - - + + + @@ -107,11 +107,11 @@ - - - - - - + + + diff --git a/template/default/style.css b/template/default/style.css index 3f57d09..e24ed8a 100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -8,7 +8,6 @@ textarea { color: black; font-weight: normal; font-size: 11px; } select { color: black; font-weight: normal; font-size: 11px; } b { font-weight: bold } i { font-style: italic } -.gbutton { color: black; font-weight: bold; } .submit { height: 20px; } h1 { margin-right: 12px; margin-left: 12px; font-size: 13px; font-weight: bold; color: black; display: inline; } @@ -39,19 +38,19 @@ label + input { margin-left: 1em; } .col_wanted_channels { text-align: left; padding: 10px; width: 40%; } .col_navi { text-align: right; white-space: nowrap; } -.heading td[selected] { background-image: url("bilder/uebersicht_oben_selected.gif"); } +.heading td.selected { background-image: url("bilder/uebersicht_oben_selected.gif"); } .heading td { background-image: url("bilder/uebersicht_oben.gif"); } .heading .col_left { background-image: url("bilder/uebersicht_oben_links.gif"); } .heading .col_right { background-image: url("bilder/uebersicht_oben_rechts.gif"); } -.row_odd td[selected] { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); } +.row_odd td.selected { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); } .row_odd td { background-image: url("bilder/uebersicht_mitte_dark.gif"); } .row_odd .col_left { background-image: url("bilder/uebersicht_links_dark.gif"); } .row_odd .col_right { background-image: url("bilder/uebersicht_rechts_dark.gif"); } -.row_even td[selected], .row_spacer td[selected] { background-image: url("bilder/uebersicht_mitte_selected.gif"); } +.row_even td.selected, .row_spacer td.selected { background-image: url("bilder/uebersicht_mitte_selected.gif"); } .row_even td, .row_spacer td { background-image: url("bilder/uebersicht_mitte.gif"); } .row_even .col_left, .row_spacer .col_left { background-image: url("bilder/uebersicht_links.gif"); } .row_even .col_right, .row_spacer .col_right { background-image: url("bilder/uebersicht_rechts.gif"); } -.footer td[selected] { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); } +.footer td.selected { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); } .footer td { height: 30px; background-image: url("bilder/uebersicht_unten.gif"); } .footer .col_left { background-image: url("bilder/uebersicht_unten_links.gif"); } .footer .col_right { background-image: url("bilder/uebersicht_unten_rechts.gif"); } @@ -70,7 +69,7 @@ label + input { margin-left: 1em; } #heading .col_left { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_start.gif"); } #heading .col_title { background-image: url("bilder/nav_button_back_mitte.gif"); } #heading .col_other { text-align: right; background-image: url("bilder/nav_button_back_mitte.gif"); } -#heading .col_other span { float: right; } +#heading .col_other table { display: inline; } #heading .col_help { text-align: center; width: 45px; background-image: url("bilder/nav_button_back_mitte.gif"); } #heading .col_right { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_end.gif"); } @@ -110,10 +109,10 @@ label + input { margin-left: 1em; } #prog_summary .footer td { height: 38px; width: 246px; background-image: url("bilder/sum_bottom_mid.gif"); text-align: center; vertical-align: middle; } #prog_summary .footer .col_left { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_left.gif"); } #prog_summary .footer .col_right { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_right.gif"); } -#prog_summary .date { text-align: right; margin-top: 1em; float: left; } -#prog_summary .duration { text-align: right; margin-top: 1em; } +#prog_summary .date { text-align: right; margin-top: 3px; float: left; } +#prog_summary .duration { text-align: right; margin-top: 3px; } #prog_summary .title { margin-top: 1em; width: 246px; overflow: hidden; white-space: nowrap; } -#prog_summary .summary { margin-top: 1em; margin-bottom: 1em; width: 240px; height: 100px; overflow: hidden; white-space: normal; } +#prog_summary .summary { margin-top: 1em; margin-bottom: 3px; width: 240px; height: 124px; overflow: hidden; white-space: normal; } /* Tooltips */ .tt_table { width: 250px; border: 2px solid #333399; background-color: #ccccff; } diff --git a/template/default/timer_list.html b/template/default/timer_list.html index afc95a1..66dc2e9 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -33,31 +33,24 @@ faktor=2.2; %?> -

+
	<%! Original Name of Recording: !%>		" size="55" readonly />
	<%! New Name of Recording: !%>		" size="55" />
	selected="yes"> +	<%! Date !%> @@ -65,7 +65,7 @@	selected="yes"> +	<%! Time !%> @@ -76,7 +76,7 @@	selected="yes"> +	<%! Name !%> @@ -97,9 +97,9 @@
	selected="yes">	selected="yes">	selected="yes">
	selected="yes"> +	<%! Total !%>	selected="yes"> +	@@ -123,11 +123,11 @@	selected="yes"> +	- + - +	@@ -137,7 +137,7 @@	- +	@@ -156,9 +156,9 @@
	selected="yes">	selected="yes">	selected="yes">

- - - - + +

<%! Timer !%>

- - - - - - - -

<%! New Timer !%>

- -

+ + + + - + - - -

<%! Timer !%>

+ + +

@@ -66,7 +59,7 @@

- @@ -211,14 +204,14 @@ - + - selected="yes"> +

<%! Active !%> @@ -229,7 +222,7 @@

- selected="yes"> +

<%! Channel !%> @@ -240,7 +233,7 @@

- selected="yes"> +

<%! Date !%> @@ -251,7 +244,7 @@

- selected="yes"> +

<%! Start !%> @@ -262,7 +255,7 @@

- selected="yes"> +

<%! Stop !%> @@ -273,7 +266,7 @@

- selected="yes"> +

<%! Name !%> @@ -291,12 +284,12 @@ - selected="yes"> - selected="yes"> - selected="yes"> - selected="yes"> - selected="yes"> - selected="yes"> + + + + + + @@ -304,24 +297,24 @@ - selected="yes"> +
- + - + - + - + - + <%! Yes !%> <%! No !%> <%! VPS !%> @@ -329,21 +322,21 @@
- selected="yes"> +
- selected="yes"> +
- selected="yes"> +
- selected="yes"> +
- selected="yes"> +
- + @@ -355,7 +348,7 @@
-
+

@@ -366,23 +359,22 @@ - selected="yes"> - selected="yes"> - selected="yes"> - selected="yes"> - selected="yes"> - selected="yes"> + + + + + + -
-
- -
- - +
+ +
+ +

diff --git a/template/default/timer_new.html b/template/default/timer_new.html index 75f8224..d900f73 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -119,7 +119,7 @@ -

<%! Start Time: !%>

+

<%! Start Time: !%>

: diff --git a/template/default/tv.html b/template/default/tv.html index fc606e0..0be28bc 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -9,7 +9,7 @@ - -

- + +

@@ -82,7 +82,7 @@ - + @@ -90,23 +90,23 @@ - - - + + + - - - + + + - - - + + + - + @@ -115,12 +115,12 @@ - + - + - + @@ -129,7 +129,7 @@ - + @@ -138,9 +138,9 @@ - - - + + + @@ -149,7 +149,7 @@ - + @@ -158,9 +158,9 @@ - + - + @@ -174,28 +174,26 @@ - -- cgit v1.2.3




















- - <%! Interval: !%> - - - <%! Size: !%> - - - +	+ <%! Interval: !%> + + + <%! Size: !%> + +	<%! Open in separate window !%>

<%! AutoTimer !%>