From d6922e850779c4ff9d8bcbcef9842cf333eb8638 Mon Sep 17 00:00:00 2001 From: Andreas Mair Date: Wed, 1 Jun 2005 13:09:21 +0200 Subject: 2005-06-01: 0.97-am3.3pre - Allow browsers to cache all files VDRAdmin sends, except "text/html". This should speed up VDRAdmin but changing the skin or css needs a "shift reload". - Added support for VDR v1.3.25's recording info (Submitted by vejoun). - New config option for the number of columns to display in prog_summary. - Use localized date formates. - Now using "video/x-mpegurl" MIME type instead of "audio/x-mpegurl" for streaming (Suggested by stefan.h). - Added patches supplied by stefan.h: -> using EPG's subtitle when found for AutoTimer else " " (thaht's the VDR way). -> New config option VDRVFAT to find recordings if VDR has been compiled with or without VFAT define. - Fixed calling reccmds on recordings in subdirs, manual recordings (@rectitle) and repeating timer's recordings without episode title. - Fixed streaming of manual recordings (@rectitle) and repeating timer's recordings without episode title. - VDRAdmin-AM now uses the required charsets setting in templates, so no need to write "&xyz;" things in .po files. - Reworked templates to make better use of CSS (for example: timeline colours can be set by style.css). - EPG_PRUNE now is the number of channels to fetch from VDR (had been one too less before). - Added "install.sh" and "uninstall.sh" ("./install.sh -h" for help) (Requested by several people). - Made "name" columns in lists wrapping again (Reported by vejoun). - Deleting a single recording works again (Reported by vejoun). - Fixed streaming of recordings in subdirs (Reported by vejoun). - Added missing gray sign on deactivated AutoTimers (Reported by vejoun). --- template/default/at_new.html | 173 ------------------- template/default/at_timer_list.html | 127 +++++++------- template/default/at_timer_new.html | 174 +++++++++++++++++++ template/default/config.html | 280 +++++++++++++++++++------------ template/default/copper/navi.css | 15 +- template/default/copper/style.css | 77 +++++---- template/default/error.html | 39 +++-- template/default/help_at_timer_list.html | 54 ++++++ template/default/help_at_timer_new.html | 85 ++++++++++ template/default/help_config.html | 178 ++++++++++++++++++++ template/default/help_rec_list.html | 54 ++++++ template/default/help_timer_list.html | 58 +++++++ template/default/help_timer_new.html | 74 ++++++++ template/default/index.html | 4 +- template/default/left.html | 54 +++--- template/default/library.js | 4 +- template/default/navi.css | 15 +- template/default/noauth.html | 4 +- template/default/noperm.html | 7 +- template/default/prog_detail.html | 12 +- template/default/prog_list.html | 114 ++++++------- template/default/prog_list2.html | 95 +++++------ template/default/prog_summary.html | 47 +++--- template/default/prog_timeline.html | 63 ++++--- template/default/rc.html | 4 +- template/default/rec_edit.html | 100 +++++------ template/default/rec_list.html | 120 +++++++------ template/default/style.css | 88 ++++++---- template/default/timer_list.html | 176 +++++++++---------- template/default/timer_new.html | 236 +++++++++++++------------- template/default/toolbar.html | 4 +- template/default/tv.html | 27 ++- template/default/tv_flash.html | 4 +- 33 files changed, 1574 insertions(+), 992 deletions(-) delete mode 100644 template/default/at_new.html create mode 100644 template/default/at_timer_new.html create mode 100644 template/default/help_at_timer_list.html create mode 100644 template/default/help_at_timer_new.html create mode 100644 template/default/help_config.html create mode 100644 template/default/help_rec_list.html create mode 100644 template/default/help_timer_list.html create mode 100644 template/default/help_timer_new.html (limited to 'template/default') diff --git a/template/default/at_new.html b/template/default/at_new.html deleted file mode 100644 index e1cabde..0000000 --- a/template/default/at_new.html +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - VDRAdmin - <tmpl_if newtimer><%! Add New Auto Timer !%><tmpl_else><%! Edit Auto Timer !%></tmpl_if> - - - - - -
- - - - - - - - -
-

<%! Add New Auto Timer !%><%! Edit Auto Timer !%>

- 		- help -  
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  
<%! Auto Timer Active: !%> - - <%! Yes !%> - <%! No !%> - <%! oneshot !%> - - checked /> <%! Yes !%> - checked /> <%! No !%> - <%! oneshot !%> - -
<%! Search Patterns: !%> - -
<%! Search in: !%> - checked /> <%! Title !%> - checked /> <%! Subtitle !%> - checked /> <%! Description !%> -
<%! Search only on these days: !%> - checked /> <%! Monday !%> - checked /> <%! Tuesday !%> - checked /> <%! Wednesday !%> - checked /> <%! Thursday !%> - checked /> <%! Friday !%> - checked /> <%! Saturday !%> - checked /> <%! Sunday !%> -
<%! Channel: !%> - -
<%! Starts Before: !%> - -  :  - -  <%! o'clock !%> -
<%! Ends Before: !%> - -  :  - -  <%! o'clock !%> -
<%! Priority: !%> - -
<%! Lifetime: !%> - -
<%! Episode: !%> - checked /> -
<%! Remember programmed timers: !%> - checked /> <%! Yes !%> - checked /> <%! No !%> -
<%! Directory: !%> - -
  
-
- - - - -
- - - diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index c29fa11..eeb060a 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -2,27 +2,26 @@ - - VDRAdmin - <%! Auto Timer !%> + + VDRAdmin - <%! AutoTimer !%> - - + +
@@ -31,121 +30,123 @@ help - +
-

<%! Auto Timer !%>

+

<%! AutoTimer !%>

 -
-
<%! New Auto Timer !%>
 +
<%! New AutoTimer !%>
 
-
+
- - +
+ - - + + - - - + + - - - - - - - @@ -156,10 +157,12 @@ +
- - <%! Active !%> +

+ <%! Active !%> - +

- - <%! Channel !%> +

+ <%! Channel !%> - +

- - <%! Start !%> +

+ <%! Start !%> - +

- - <%! Stop !%> +

+ <%! Stop !%> - +

- - <%! Name !%> +

+ <%! Name !%> - +

  
  -

+

+ -

- - -

+ 		+
+ - +
-

+

+
- -

+
-

+

+
- -

+
-

+

+
-

+
-

+

+
edit -

+
-

+

+
delete -

+
-

+ 		+
+ +
 
 
+ + - - -
+ -
@@ -169,19 +172,17 @@
-
+
-
<%! Delete Selected Auto Timers !%>
 +
<%! Delete Selected AutoTimers !%>
diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html new file mode 100644 index 0000000..920eb1c --- /dev/null +++ b/template/default/at_timer_new.html @@ -0,0 +1,174 @@ + + + + + + VDRAdmin - <tmpl_if newtimer><%! Add New AutoTimer !%><tmpl_else><%! Edit AutoTimer !%></tmpl_if> + + + + + + + + + + + + + + +
+

<%! Add New AutoTimer !%><%! Edit AutoTimer !%>

+ 		+ help +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<%! AutoTimer Active: !%>
 + + <%! Yes !%> + <%! No !%> + <%! oneshot !%> + + checked /> <%! Yes !%> + checked /> <%! No !%> + <%! oneshot !%> + +
<%! Search Patterns: !%>
 + +
<%! Search in: !%>
 + checked /> <%! Title !%> + checked /> <%! Subtitle !%> + checked /> <%! Description !%> +
<%! Search only on these days: !%>
 + checked /> <%! Monday !%> + checked /> <%! Tuesday !%> + checked /> <%! Wednesday !%> + checked /> <%! Thursday !%> + checked /> <%! Friday !%> + checked /> <%! Saturday !%> + checked /> <%! Sunday !%> +
<%! Channel: !%>
 + +
<%! Starts After: !%>
 + +  :  + +  <%! o'clock !%> +
<%! Ends Before: !%>
 + +  :  + +  <%! o'clock !%> +
<%! Priority: !%>
 + +
<%! Lifetime: !%>
 + +
<%! Episode: !%>
 + checked /> +
<%! Remember programmed timers: !%>
 + checked /> <%! Yes !%> + checked /> <%! No !%> +
<%! Directory: !%>
 + +
+
+ + +
+ + +
+ + + diff --git a/template/default/config.html b/template/default/config.html index 0f8cd5a..7b21426 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -1,47 +1,42 @@ - + VDRAdmin - <%! Configuration !%> - +
- +
- - - - help - + - + +
-

<%! Configuration !%>

+ 		+

<%! Configuration !%>

  + + help  
-
- - - - - - + +
- +
- +
- + - + - + + + + + + + + + + + + + + + + + + +
<%! General Settings !%>

<%! General Settings !%>
<%! Skin: !%>
<%! Skin: !%>
<%! Login Page: !%>
<%! Login Page: !%>
<%! Number of channels to use: !%>
<%! Local net (no login required): !%>
 
+ + + + + + + - + + + + + + + + + + + + +

<%! VDR !%>

<%! Number of DVB Cards: !%>
<%! Number of DVB Cards: !%>
<%! Path to recordings: !%>
<%! Path to configuration files: !%>
 
-
- + +
- + - + - + - + - + - + @@ -134,23 +166,23 @@
<%! Identification !%>

<%! Identification !%>
<%! Username: !%>
<%! Username: !%>
<%! Password: !%>
<%! Password: !%>
<%! Guest Account: !%>
<%! Guest Account: !%>
 checked /> <%! Yes !%> checked /> <%! No !%> @@ -118,13 +150,13 @@
<%! Guest Username: !%>
<%! Guest Username: !%>
<%! Guest Password: !%>
<%! Guest Password: !%>
-
- + +
- + - + - - + + @@ -160,17 +192,17 @@
<%! Timeline !%>

<%! Timeline !%>
<%! Hours: !%>
<%! Hours: !%>
<%! Times: !%>
<%! Times: !%>
- +
- + - + - + - + - + + + + + + + <%! Edit AutoTimer !%> + + + + + +
<%! Auto Timer !%>

<%! AutoTimer !%>
 <%! Active: !%>
<%! Active: !%>
 checked /> <%! Yes !%> checked /> <%! No !%> @@ -179,32 +211,32 @@
<%! Timeout: !%>
<%! Timeout: !%>
 <%! minutes !%>
<%! Priority: !%>
<%! Priority: !%>
<%! Lifetime: !%>
<%! Lifetime: !%>
+ + + + + + + + + + + + + + + +
+

<%! Edit AutoTimer !%>

+
+

Here you can edit an automatic timer's settings.

+

AutoTimer is a key feature of VDRAdmin. 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.

+
+
AutoTimer Active:
+
Activate or deactivate this automatic timer. Deactivated automatic timers are still stored in the AutoTimer list so that they can be activated again, but they do not record anything meanwhile. Above that you can set this to "Oneshot" so this AutoTimer only programs the (one!) next matching broadcast.
+
Search Pattern:
+
Choosing the right search items decides whether only the wanted broadcasts or broadcasts having similar names or even nothing gets recorded.
Case doesn't matter, "X-Files" matches anything "x-files" will match. You can set multiple search items by separating them with spaces. Only broadcasts will match if they contain all items.
You'd better only use letters and numbers for search items, as the EPG often miss colons, brackets and other characters.
Experts can also use regular expressions, but you have to get needed information from the VDRAdmin sources (undocumented feature).

You can exclude broadcasts so that they don't get recorded even if they would match an AutoTimer. Therefore you have to enter that titles into the file vdradmind.bl, one event a line. This file must be located in your VDRAdmin's configuration folder. If this string is found either in the EPG's title or in title~subtitle, this event will not be programmed by AutoTimer. So you can disable complete episodes (for example when using "Enterprise" as Blacklist-string) or only one episode (when using "Enterprise~Azati Prime" as Blacklist-string).
+
Search in:
+
Here you can define the EPG sections where VDRAdmin should look for the search pattern.
+
Search only on these days:
+
Use these checkboxes to limit searching for matching broadcasts to a set of weekdays.
+
Channel:
+
The channel to look for matching broadcasts or "all" to search in all known or wanted channels. You can define the wanted channels for AutoTimer in "Configuration".
+
Starts After:
+
A broadcast must start after the time entered here to match. The first text field is for "hour", the second for "minute". +
Ends Before:
+
A broadcast must end before the time entered here to match. The first text field is for "hour", the second for "minute". +
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.
+
Lifetime:
+
The guaranteed lifetime (in days) of a recording created by this timer. 0 means that this recording may be automatically deleted at any time by a new recording with higher priority. 99 means that this recording will never be automatically deleted. Any number in the range 1...98 means that this recording may not be automatically deleted in favour of a new recording, until the given number of days since the start time of the recording has passed by.
+
Episode:
+
Check this box if you want VDRAdmin to append the broadcast's EPG subtitle to the recording's file name.
+
Remember programmed timers:
+
If you enable this VDRAdmin will track timers it has already programmed automatically. This is useful if want to deactivate or delete timers that have been programmed automatically in the timers listing.
+
Directory:
+
+ The directory this AutoTimer will place the recordings in. If the name shall contain subdirectories, these have to be delimited by '~' (since the '/' character may be part of a regular programme name).
VDRAdmin will append the matching broadcast's title and subtitle (if the "Episode" checkbox is marked) to the directory given here.

+ You can also use the following keywords that are replaced in the final file name by the values supplied by for example tvm2vdr: +
    +
  • %Title% - will become the title of the event.
    • +
  • %Subtitle% - will become the subtitle of the event.
    • +
  • %Director% - will become the director of the event.
    • +
  • %Date% - will become the date of the recording.
    • +
  • %Category% - will become the category of the Event (Spielfilm/Serie/...).
    • +
  • %Genre% - will become the genre of the Event (Drama/Krimi/..).
    • +
  • %Year% - will become the year of production.
    • +
  • %Country% - will become the country of production.
    • +
  • %Originaltitle% - will become the original title of the event.
    • +
  • %FSK% - will become the FSK from the event.
    • +
  • %Episode% - will become the episode's title of the event.
    • +
  • %Rating% - will become the rating of the event from the EPG provider.
    • +
+ Note:
+ If you use the above keywords it's in your own responsibility to supply the complete file name for the recordings! VDRAdmin will not append anything to the resulting string. +
+
+ + diff --git a/template/default/help_config.html b/template/default/help_config.html new file mode 100644 index 0000000..9c8c8a5 --- /dev/null +++ b/template/default/help_config.html @@ -0,0 +1,178 @@ + + + + + + + + + <%! Configuration !%> + + + + + + + + + + + + + + + + + + + + + +
+

<%! Configuration !%>

+
+

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

+

+

+ [General Settings] [VDR] [Identification] [Timeline] [AutoTimer] [Timer] [Streaming] [Expert] [Channel Selections] +
+

+

+

+
General Settings
+
+
+
Skin:
+
The skin you want to use.
+
Login Page:
+
The page you want to see at first connect to VDRAdmin.
+
Number of channels to use:
+
VDRAdmin will load the given number of channels from VDR and present only those in any fields where channels can be selected. This also limits the EPG information VDRAdmin will read so that you can use this to reduce VDRAdmin's memory consumption and increase its performance. 0 turns this feature off and VDRAdmin will use all available channels. Note: Changes are not populated immediately. You have to either wait until VDRAdmin reconnects to VDR to update its EPG information or force this update manually in the "AutoTimer" menu or restart VDRAdmin.
+
Local net (no login required):
+
Here you can specify an IP address or range that can login without providing login information. For example: "192.168.0.0/24" will include any IP starting with "192.168.0", "192.168.0.123/32" will only match "192.168.0.123".
+
+
[Top]
+
+
+ +
VDR
+
+
+
Number of DVB cards:
+
The number of DVB card VDR can access. Depending on this value VDRAdmin will calculate conflicting timers in the "Timers" menu.
+
Path to recordings:
+
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.
+
+ +
+
+ +
Identification
+
+
+
Username:
+
The username for the main user, i.e. the user having the most privileges.
+
Password:
+
The main user's password.
+
Guest Account:
+
If you want an user account having only limited privileges, this is for you. The guest user cannot modify anything, it's only allowed to view the EPG, timers, AutoTimers and recordings listings. +
Guest Username:
+
The username for the guest user.
+
Guest Password:
+
The guest user's password.
+
+
[Top]
+
+
+ +
Timeline
+
+
+
Hours:
+
The number of hours to show in the timeline.
+
Times:
+
A comma separated list of times in hh:mm format that appear in the selectbox placed at the top.
+
+
[Top]
+
+
+ +
AutoTimer
+
+
+
Active:
+
Activate or deactivate the AutoTimer function.
+
Timeout:
+
The interval, the the EPG data is checked for updating the AutoTimers.
+
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.
+
Lifetime:
+
The guaranteed lifetime (in days) of a recording created by this timer. 0 means that this recording may be automatically deleted at any time by a new recording with higher priority. 99 means that this recording will never be automatically deleted. Any number in the range 1...98 means that this recording may not be automatically deleted in favour of a new recording, until the given number of days since the start time of the recording has passed by.
+
+
[Top]
+
+
+ +
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.
+
Lifetime:
+
Time Margin at Start:
+
The number of minutes VDRAdmin subtracts from the broadcasts start time found in the EPG. This value is used for timers programmed by AutoTimer and timers manually programmed when pressing "Record" in any EPG view.
+
Time Margin at Stop:
+
The number of minutes VDRAdmin adds to the broadcasts stop time found in the EPG. This value is used for timers programmed by AutoTimer and timers manually programmed when pressing "Record" in any EPG view.
+
+
[Top]
+
+
+ +
Streaming
+
+
+
Life Streaming:
+
Enable or disable Life Streaming using the streamdev plugin. You also have to set the correct "HTTP Port for Streamdev" below.
+
HTTP Port of Streamdev (also possible 3000/ts):
+
Here you have to set the port number your VDR's streamdev-server listens for connections. Additionally you can also provide the stream type you like to use.
+
Recordings Streaming:
+
Enable or disable Recordings Streaming.
Well actually this is no real "streaming", but you have to setup your workstation so that it can access VDR's recordings. You can use for example Samba or NFS for this. VDRAdmin simply generates a playlist that contains all parts of the recording and sends this to your browser. If your browser and media player are configured correctly you will see the recording on your workstation's display.
+
Path to VDR Recordings on your workstation:
+
This is the path where your workstation can access VDR's recordings. This depends on your VDR and workstation setup, for example "\\vdr\videos" or "V:\" (on Windows) or "/mnt/videos" (on Linux).
+
+
[Top]
+
+
+ +
Expert
+
+ This section is for experts only, i.e. you know what you are doing! +
+
Read EPG directly using epg.data:
+
Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. If this option is activated VDRAdmin will read the epg.data file directly so that VDR doesn't get blocked.

Note:
There seems to be a bug somewhere. If you enable this option there's the rare(?) possibility, that some timers can't be programmed due to their summaries. If you experience this bug it would be very helpful if you could send the timer's information to me.
+
epg.data filename:
+
If you've enabled the option above you need to tell VDRAdmin where the epg.data file is located.
+
+
Number of columns in "What's On Now":
+
Change the number of columns displayed in "What's On Now" with this option. +
VFAT:
+
If you have compiled VDR with the VFAT define you have to enable this option. If this option is set to the wrong value, you may have problems with certain recordings if you want to stream them or run reccmds on them.
+
[Top]
+
+ + +
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 "<<<<<".

+
[Top]
+
+
+

+
+ + + diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html new file mode 100644 index 0000000..121ce7c --- /dev/null +++ b/template/default/help_rec_list.html @@ -0,0 +1,54 @@ + + + + + + <%! Recordings !%> + + + + + + + + + + + + + + + + + + + + + +
+

<%! 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.

+

Each row contains this information: +

+
Date
+
The date when the recording has been done. In case of folders this will show the number of recordings the folder contains.
+
Time
+
The time when the recording has been done. In case of folders this will show the number of new recordings the folder contains.
+
Name
+
The recording's or folder's name. Click it to show the recording's summary or descend into the folder.
+
Rename (Stift)
+
Rename a recording.
Note:This only works if VDR has the RENR SVDRPort command which is no core VDR feature but is available through a patch. vdr-aio21_svdrprename.patch or enAIO-v2.2+ provide this command.
+
Delete (Radiergummi)
+
Delete a recording.
+
Stream (stream)
+
This column is only shown if you activated and configured "Recordings Streaming" in configuration. 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.

+
+ + + diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html new file mode 100644 index 0000000..2294cea --- /dev/null +++ b/template/default/help_timer_list.html @@ -0,0 +1,58 @@ + + + + + + <%! Timer !%> + + + + + + + + + + + + + + + + + + + + + +
+

<%! 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.

+

Below the chart you'll find the timers list showing you some information on the timers. You can change the list's sorting by clicking the columns heading.

+

For each timer you have the following options: +

+
Set its state
+
By clicking on "Yes", "No", "VPS" or "Auto" in the "Active" column.
+
Quickly view its priority and lifetime
+
By pointing the mouse cursor to the timer's title.
+
View its EPG entry
+
Timers that use "AutoTimer Checking=Transmission Identification" will show you the corresponding EPG entry if you click on the timer's title.
+
Edit the timer
+
You can edit a timer by clicking Stift.
+
Delete the timer
+
To delete a timer you click Radiergummi.
+
+

+

Each timer's state is indicated by differently coloured boxes (in the chart view) or images (in the list view):
+     / on Timer is OK and will record.
+     / problem Timer conflicts with other timers. That's not critical, as long as you have enough DVB cards for the parallel recordings.
+     / 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".

+
+ + + diff --git a/template/default/help_timer_new.html b/template/default/help_timer_new.html new file mode 100644 index 0000000..0a283ef --- /dev/null +++ b/template/default/help_timer_new.html @@ -0,0 +1,74 @@ + + + + + + + + + <%! Edit Timer !%> + + + + + + + + + + + + + + + + + + + + + +
+

<%! Edit Timer !%>

+
+

Here you can edit a timer's settings.

+
+
Timer Active:
+
Activate or deactivate this timer. Deactivated timers are still stored in the timer list so that they can be activated again, but they do not record anything meanwhile.
+
AutoTimer Checking:
+
Depending on how this timer has been programmed you have up to three possible settings: +
+
Transmission Identification
+
Monitor this timer using the identification provided in the EPG. Please note that this only works if the provided identification is a fix and unique value! This option is not available with timers programmed in VDR.
+
Time
+
Monitor this timer using the start and stop time.
+
off
+
Do not monitor this timer.
+
+
+
Channel
+
The channel to record.
+
Day Of Recording
+
The day when the timer should get active. You can enter the day in two formats: +
    +
  • Two digits (DD). This will use the current month and year.
    • +
  • ISO norm (YYYY-MM-DD). Program your timers as far in the future as you like.
    • +
+ In case you want to program a repeating timer you can use the seven checkboxes below the text field. Check the box for each day you want the timer to get active. +
+
Start Time
+
This is the time when the timer should start recording. The first text field is for "hour", the second for "minute". +
End Time
+
This is the time when the timer should stop recording. The first text field is for "hour", the second for "minute". +
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.
+
Lifetime
+
The guaranteed lifetime (in days) of a recording created by this timer. 0 means that this recording may be automatically deleted at any time by a new recording with higher priority. 99 means that this recording will never be automatically deleted. Any number in the range 1...98 means that this recording may not be automatically deleted in favour of a new recording, until the given number of days since the start time of the recording has passed by.
+
Title of Recording
+
The file name this timer will give to a recording. If the name shall contain subdirectories, these have to be delimited by '~' (since the '/' character may be part of a regular programme name).

The special keywords TITLE and EPISODE, if present, will be replaced by the title and episode information from the EPG data at the time of recording (if that data is available). If at the time of recording either of these cannot be determined, TITLE will default to the channel name, and EPISODE will default to a blank.
+
Summary
+
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 file of the recording.
+
+
+ + diff --git a/template/default/index.html b/template/default/index.html index 6485b4a..6f6897a 100644 --- a/template/default/index.html +++ b/template/default/index.html @@ -2,7 +2,7 @@ - + VDRAdmin <tmpl_var version> (<tmpl_var host>) @@ -14,7 +14,7 @@ - <body bgcolor="#ffffff"> + <body> <p><%! Your Browser does not support frames! !%></p> </body> diff --git a/template/default/left.html b/template/default/left.html index f48b6e7..243f67e 100644 --- a/template/default/left.html +++ b/template/default/left.html @@ -2,7 +2,7 @@ - + VDRAdmin @@ -19,7 +19,7 @@ - + @@ -29,53 +29,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
 
 <%! What's On Now? !%>
<%! What's On Now? !%>
 <%! Playing Today !%>
<%! Playing Today !%>
 <%! Timeline !%>
<%! Timeline !%>
 <%! Channels !%>
<%! Channels !%>
 <%! Timer !%>
<%! Timer !%>
 <%! Auto Timer !%>
<%! AutoTimer !%>
 <%! Recordings !%>
<%! Recordings !%>
 <%! Configuration !%>
<%! Configuration !%>
 <%! Remote Control !%>
<%! Remote Control !%>
 <%! Watch TV !%>
<%! Watch TV !%>
 
-  
-   - +
+ + + +
diff --git a/template/default/library.js b/template/default/library.js index fc36da8..7e1a3b7 100644 --- a/template/default/library.js +++ b/template/default/library.js @@ -2,7 +2,7 @@ // this is part of VDR Admin // function open_help(url) { - window.open(url, "_blank", "width=500, height=460, resizable=yes, scrollbars=yes, status=no, toolbar=no"); + window.open(url, "_blank", "width=580, height=480, resizable=yes, scrollbars=yes, status=no, toolbar=no"); } function del(message, suffix) { @@ -26,7 +26,7 @@ function callurl( url ) { } function popup(URL) { - window.open(URL, '_new', 'width=500, height=250, scrollbars=auto, resizable=yes'); + window.open(URL, '_new', 'width=500, height=250, scrollbars=yes, resizable=yes, toolbar=no, status=no'); } function toolbar(URL) { diff --git a/template/default/navi.css b/template/default/navi.css index 2700538..73f9726 100644 --- a/template/default/navi.css +++ b/template/default/navi.css @@ -1,11 +1,6 @@ -textarea { color: #000; font-weight: normal; font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, Geneva } -input { color: #000; font-weight: normal; font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, Geneva } -select { color: #000; font-weight: normal; font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, Geneva } -td { color: black; font-size: 11px; font-family: Verdana, Arial, Helvetica, Geneva } -p { color: black; font-size: 11px; font-family: Verdana, Arial, Helvetica, Geneva } -h1,h2,h3,h4,h5,h6 { color: black; font-family: Verdana, Arial, Helvetica, Geneva } -a { color: #000000; font-weight: bold; text-decoration: none } -.klein { font-size: 10px; font-family: Verdana, Arial, Helvetica, Geneva } -.small { font-size: 8px; font-family: Verdana, Arial, Helvetica, Geneva } -.navi { font-size: 12px; font-family: Verdana, Arial, Helvetica, Geneva } +* { font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; } +input { color: black; font-weight: normal; font-size: 11px; } +td { color: black; font-size: 11px; } +a { color: black; font-weight: bold; text-decoration: none } a:hover { font-weight: bold; text-decoration: underline } +.navi { margin-left: 0.5em; font-size: 12px; } diff --git a/template/default/noauth.html b/template/default/noauth.html index 2f3d559..720cb69 100644 --- a/template/default/noauth.html +++ b/template/default/noauth.html @@ -1,13 +1,13 @@ - + <%! Authorization Required !%> - +

<%! Authorization Required !%>

<%! This server could not verify that you are authorized to access the document requested. Either you supplied the wrong credentials (e.g. bad password), or your browser doesn't understand how to supply the credentials required. !%>

diff --git a/template/default/noperm.html b/template/default/noperm.html index e81480c..804db90 100644 --- a/template/default/noperm.html +++ b/template/default/noperm.html @@ -1,15 +1,14 @@ - + <tmpl_var title> - +

- -

+

diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index 5e36114..d053c23 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -2,27 +2,27 @@ - + <tmpl_var title> - + - + + + + +
- | - +

 |     - 
  -
+ 		+

-

+




 [<%! close !%>] diff --git a/template/default/prog_list.html b/template/default/prog_list.html index da18971..7dc27b1 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -2,23 +2,23 @@ - + VDRAdmin - <%! Channels !%> - + - +
- @@ -35,63 +35,65 @@ +
-
-

-    +

+

+    stream -

+

<%! Channel: !%>  - +  
- - - - - - - - - - - +
- - - -
+ + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - -
+

+ 		+ +
  -

- <%! o'clock !%>

- 		-

-
-
-

- 		-

- - info - - noinfo - -

- 		-

record

- 		 
  +
- <%! o'clock !%>
+ 		+
+

+
+

+
+ 		+
+ + info + + noinfo + +
+ 		+
record
+
-
+
+ diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index 9738469..72f732c 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -2,7 +2,7 @@ - + VDRAdmin - <%! Playing Today !%> @@ -17,12 +17,12 @@ - +
- +
- +
-

<%! Playing Today !%>

+

<%! Playing Today !%>

  
@@ -100,22 +99,19 @@ - - - - - - - + + + + - +
      
  - + - - + - - - - - + + - - - - +


+
@@ -125,9 +121,9 @@


+ > @@ -147,12 +143,12 @@ chars = seite / 10 | format('%i'); b = b + 1 %?>
+ >
+ > - show.start && date.now < show.stop ? "#f7fffA" : "#e6eee9"; - bg_color = show.timer ? "#ffeee9" : bg_color %?> - + show.start && date.now < show.stop ? "col_broadcast" : "col_current"; + td_class = show.timer ? "col_timer" : td_class %?> +
> -
+
- + 2 %?> @@ -226,16 +222,13 @@
 
    
diff --git a/template/default/rc.html b/template/default/rc.html index 8c4d327..a820821 100644 --- a/template/default/rc.html +++ b/template/default/rc.html @@ -2,7 +2,7 @@ - + VDRAdmin - <%! Remote Control !%> (<tmpl_var host>) - + diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html index aa2f893..38da2eb 100644 --- a/template/default/rec_edit.html +++ b/template/default/rec_edit.html @@ -2,67 +2,67 @@ - + VDRAdmin - <%! Rename Recording !%> - + -
+
- - - + + +

<%! Rename Recording !%>

   +

<%! Rename Recording !%>

+
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    
    
 <%! Original Name of Recording: !%> 
 <%! New Name of Recording: !%> 
    
-
-
-
- - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<%! Original Name of Recording: !%>
<%! New Name of Recording: !%>
+ +
+ +
+ + + + + diff --git a/template/default/rec_list.html b/template/default/rec_list.html index 074b016..7929320 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -2,17 +2,17 @@ - + VDRAdmin - <%! Recordings !%> - - + +
- +
-

<%! Recordings !%>

+

<%! Recordings !%>

   @@ -23,88 +23,86 @@ - help + help  
-
- +
  - >> + >> 
-
- - +
+ - - + + - + - + - - - + + - - - - - - - - - + - + - + - +
- - <%! Date !%> +

+ <%! Date !%> - +

- - <%! Time !%> +

+ <%! Time !%> - +

- - <%! Name !%> +

+ <%! Name !%> - +

    
  -

+
+
-

+

+
<%! Total !%> -

+
-

+ 		+
-

+

+
<%! New !%> @@ -112,66 +110,66 @@ <%! New !%> -

+
-

+

+
  - + - + -

+
-

+

+
rename -

+
-

+

+
delete -

+
-

+

+
-

+
-

+

+
stream -

+
 
 
 
<%! Commands: !%> - - + - + 		 
diff --git a/template/default/style.css b/template/default/style.css index 08c9ce0..45b4f13 100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -1,32 +1,56 @@ -body { background: #c4cdd7 url(bilder/background.gif) repeat-x } -td { color: #000; font-weight: normal; font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif } -.rec { font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif } -div { color: #000; font-weight: normal; font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif } -input { color: #000; font-weight: normal; font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif } -textarea { color: #000; font-weight: normal; font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif } -select { color: #000; font-weight: normal; font-size: 11px; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif } -b { font-weight: bold } -i { font-style: italic } -a { color: #039; text-decoration: none } -a:visited { color: #039; text-decoration: none } -a:hover { color: #cc0000; text-decoration: underline } -a:active { color: #000; text-decoration: underline } -a.rec:link { color: #c00; text-decoration: none } -a.rec:visited { color: #000; text-decoration: none } -a.rec:hover { color: #cc0000; text-decoration: underline } -a.rec:active { color: #000; text-decoration: underline } -a.sort:link { color: black; text-decoration: none; font-weight: bold } -a.sort:visited { color: black; text-decoration: none; font-weight: bold } -a.sort:hover { color: black; text-decoration: underline; font-weight: bold } -a.sort:active { color: black; text-decoration: underline; font-weight: bold } -.headline { font-weight: bold; font-size: 14px; margin-top: 20px; margin-bottom: 20px } -.subheadline { color: #039; font-weight: bold } -.kleine { font-size: 10px } -.mini { font-size: 9px } -.rechts { text-align: right} -.einzug { margin: 10px 12px } -.einzug_ohnetop { margin-right: 12px; margin-left: 12px } -.einzug_liste { margin: 3px 5px 0px 5px; white-space: nowrap; } -.einzug_liste_headlines { margin-right: 5px; margin-left: 6px } -.einzugklein { color: #000; font-weight: normal; font-size: 10px; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; margin-right: 7px; margin-left: 7px } -.gbutton { color: black; font-weight: bold } +* { font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; } +#rc, #tv { background-color: black; margin: 0px; } +body { background-color: #c4cdd7; margin: 3px; } +form { margin: 0px; } +td { color: black; font-weight: normal; font-size: 11px; } +input { color: black; font-weight: normal; font-size: 11px; } +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 } + +h1 { margin-right: 12px; margin-left: 12px; font-size: 13px; font-weight: bold; color: black; display: inline; } +h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; } +h3 { margin: 0px 0px; font-size: 11px; font-weight: bold; color: black; } +h4 { margin: 0px 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; } +h5 { margin: 1px 5px; font-size: 11px; font-weight: normal; color: black; text-align: right; } + +a, a:visited, a:active { color: black; text-decoration: none; } +a:hover { color: gray; text-decoration: none; } + +#tv input, #tv select, #tv h5 { font-weight: normal; font-size: 9px; display: inline; } +#prog_list h2 { display: inline; } +#prog_summary .heading div { margin: 10px 12px; } +#prog_summary .content { margin-right: 12px; margin-left: 12px } +#prog_summary h2 { display: inline; } +#rec_list .list_row .name div { font-weight: bold; } +#prog_timeline a , #prog_timeline a:visited, #prog_timeline a:active { color: blue; } + +#error h2 { font-size: 11px; color: red; } + +.list_heading h2 { margin-right: 5px; margin-left: 6px; white-space: nowrap; } +.list_row td div { margin: 3px 5px 0px 5px; white-space: nowrap; } +.list_row td.name div { margin: 3px 5px 0px 5px; white-space: normal; } + +.color1 { background-color: #e6eff9; } +.color2 { background-color: #d5dee8; } +#prog_timeline #prgtable { border-left-color:#c4cdd7; border-bottom-color:#c4cdd7; } +#prog_timeline #timertable { background:red; border-left-color:#ffcdd7; border-bottom-color:#ffcdd7; } +#prog_timeline #timeline { background:red; } +#prog_timeline .col_current { background-color: #e6eee9; } +#prog_timeline .col_broadcast { background-color: #f7fffa; } +#prog_timeline .col_timer { background-color: #ffeee9; } +#rec_list #path { margin: 1em 0px; } +#timer_list .col_ok { background-color: #00a317; } +#timer_list .col_conflict { background-color: #a11917; } +#timer_list .col_collision { background-color: #ffde62; } +#timer_list .col_inactive { background-color: #858585; } +#timer_list #prgtable { border-left-color:#000000; border-right-color:#000000; } + +#content { margin-top: 1em; } +.group { margin-top: 0.5em; } +#buttons { margin-top: 0.5em; } + +#help dd dl dt { margin-top: 0.3em; font-weight: normal; font-style: italic; } +#help dt { margin-top: 0.6em; font-weight: bold; font-style: italic; } diff --git a/template/default/timer_list.html b/template/default/timer_list.html index 3862ba9..5060e2a 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -2,34 +2,28 @@ - + VDRAdmin - <%! Timer !%> - + - +
-
-

<%! Timer !%>

+

<%! Timer !%>

  @@ -43,20 +37,20 @@ - +
- help + help  
-
- +
+ - + - + - +
- +

 
- + - + = current; - bgfarbe=((programm % 2) == 0) ? farbenix1 : farbenix2; sender=timer.cdesc; %?>

 
 
align="center">
@@ -112,19 +100,23 @@
- + = current; IF sendung.active == 0 || sendung.active == 32768; - progfarbe=farbeinaktiv; + td_class="col_inactive"; ELSE; IF sendung.critical == 1; - progfarbe=farbekonflikt; + td_class="col_conflict"; ELSE; - progfarbe=farbesendung; + IF sendung.collision == 1; + td_class="col_collision"; + ELSE; + td_class="col_ok"; + END; END; END; IF sendung.starttime < current; @@ -141,19 +133,19 @@ IF start>pos; %?> - + - + - + - +






 
 
-
- - +
+ - - + + - - - + + - - - - - - - - - + - + +
- - <%! Active !%> +

+ <%! Active !%> - +

- - <%! Channel !%> +

+ <%! Channel !%> - +

- - <%! Date !%> +

+ <%! Date !%> - +

- - <%! Start !%> +

+ <%! Start !%> - +

- - <%! Stop !%> +

+ <%! Stop !%> - +

- - <%! Name !%> +

+ <%! Name !%> - +

  
  -

+

+ -

+ 		+
-

+ 		+
-

+ 		+
-

+ 		+
-

+

+
  -

+
-

edit

+ 		+
edit
 -

delete

+ 		+
delete
 -

+ 		+
 
 
+ + - - -

+ 		@@ -353,10 +343,10 @@
+
diff --git a/template/default/timer_new.html b/template/default/timer_new.html index 13fd8a4..f335cb6 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -2,7 +2,7 @@ - + VDRAdmin - <tmpl_if newtimer><%! Create New Timer !%><tmpl_else><%! Edit Timer !%></tmpl_if> @@ -37,137 +37,135 @@ - +
- +
- + - +
-

<%! Create New Timer !%><%! Edit Timer !%>

+

<%! Create New Timer !%><%! Edit Timer !%>

  help  
-
-
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
<%! Timer Active: !%> - checked /> <%! Yes !%> - checked /> <%! No !%> -
<%! Auto Timer Checking: !%> - - <%! Transmission Identification !%> - - checked /> <%! Time !%> - checked /> <%! off !%> -
<%! Channel: !%> - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
<%! Timer Active: !%>
 + checked /> <%! Yes !%> + checked /> <%! No !%> +
<%! AutoTimer Checking: !%>
 + + <%! Transmission Identification !%> + + checked /> <%! Time !%> + checked /> <%! off !%> +
<%! Channel: !%>
 + -
<%! Day Of Recording: !%> - -
- <%! Monday !%> - <%! Tuesday !%> - <%! Wednesday !%> - <%! Thursday !%> - <%! Friday !%> - <%! Saturday !%> - <%! Sunday !%> -
<%! Start Time: !%> - -  :  - -  <%! o'clock !%> -
<%! End Time: !%> - -  :  - -  <%! o'clock !%> -
<%! Priority: !%>
<%! Lifetime: !%>
<%! Title of Recording: !%>
<%! Summary: !%>
- -
-
- - + +
<%! Day Of Recording: !%>
 + +
+ <%! Monday !%> + <%! Tuesday !%> + <%! Wednesday !%> + <%! Thursday !%> + <%! Friday !%> + <%! Saturday !%> + <%! Sunday !%> +
<%! Start Time: !%>
 + +  :  + +  <%! o'clock !%> +
<%! End Time: !%>
 + +  :  + +  <%! o'clock !%> +
<%! Priority: !%>
<%! Lifetime: !%>
<%! Title of Recording: !%>
<%! Summary: !%>
+ +
+ +
diff --git a/template/default/toolbar.html b/template/default/toolbar.html index 5385f19..00f8a9f 100644 --- a/template/default/toolbar.html +++ b/template/default/toolbar.html @@ -2,13 +2,13 @@ - + VDRAdmin - Toolbar - + diff --git a/template/default/tv.html b/template/default/tv.html index faaf9b9..3c4fb90 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -3,7 +3,7 @@ VDRAdmin - <%! TV !%> (<tmpl_var host>) - + - - + -
+
@@ -179,7 +169,7 @@ select { font-weight: normal; width: 55px; height: 20px; font-size: 9px; font-fa + + +
- <%! Interval: !%> +
<%! Interval: !%>
- -   <%! Size: !%> + +   
<%! Size: !%>
- + 		 
 
diff --git a/template/default/tv_flash.html b/template/default/tv_flash.html index 7144413..29373cc 100644 --- a/template/default/tv_flash.html +++ b/template/default/tv_flash.html @@ -2,12 +2,12 @@ VDRAdmin - <%! TV !%> (<tmpl_var host>) - + - + -- cgit v1.2.3