From bebe0382652e0616c8d040b3e217c2a21b81beee Mon Sep 17 00:00:00 2001 From: Andreas Mair Date: Thu, 12 May 2005 11:01:29 +0200 Subject: 2005-05-12: 0.97-am3.2 - Added "make uninstall" to remove VDRAdmin from your system if you have installed it using "make install". Please always use this before you install a new release! - Fixed programming of repeating timers when day is "D" (Thanks to "maxkr" for reporting this). - Print date in prog_list & prog_list2 in system's locale. Please comment! - More transparent "selected channels" usage. - Added reccmds.conf content to rec_list (needs valid VDRCONFDIR in vdradmind.conf) - AutoTimers can now be limited to certain weekdays (Patch submitted by Magnus Schmidt). - Streaming can be turn on/off for live viewing and recordings viewing (Based on code submitted by Tobias Grimm). - Added streaming button to prog_list2. - Fixed handling of incorrect start/stop times in AutoTimer. - Changed localisation to use gettext() (Thanks to Tobias Grimm for doing most of the needed work). - Language can no longer be set in VDRAdmin, it's taken from your system's setting. Issue "export LC_MESSAGES=" if you need to change it, where is one of "de_DE", "en_EN", "es_ES", "fi_FI" or "fr_FR". - Added Finnish i18n (Submitted by Rolf Ahrenberg). - Fixed ":" & "|" handling in timer's directory (Thanks "vejoun"). - Added links to prog_list on channels in at_timer_list and timer_list. - Added IMDb lookup button to recording's detail view. - Added "Priority" and "Lifetime" tooltip to at_timer_list and timer_list (point mouse to timer's name). - Small changes for streaming recordings: Please update your vdradmind.conf (VIDEODIR & ST_VIDEODIR)! - Non-LinVDR logo on non-LinVDR machines (Posted by Unimatrix0 at vdrportal.de). --- template/default/at_new.html | 127 +++++++------- template/default/at_timer_list.html | 87 +++++----- template/default/bilder/logo_linvdr.gif | Bin 0 -> 3749 bytes template/default/bilder/logo_other.gif | Bin 0 -> 5035 bytes template/default/config.html | 287 +++++++++++++++++--------------- template/default/copper/logo_linvdr.gif | Bin 0 -> 3150 bytes template/default/copper/logo_other.gif | Bin 0 -> 1441 bytes template/default/error.html | 13 +- template/default/index.html | 17 +- template/default/left.html | 39 +++-- template/default/library.js | 2 +- template/default/noauth.html | 10 +- template/default/noperm.html | 6 +- template/default/prog_detail.html | 33 ++-- template/default/prog_list.html | 49 +++--- template/default/prog_list2.html | 67 ++++---- template/default/prog_summary.html | 53 +++--- template/default/prog_timeline.html | 84 +++++----- template/default/rc.html | 67 ++++---- template/default/rec_edit.html | 34 ++-- template/default/rec_list.html | 93 ++++++----- template/default/style.css | 2 +- template/default/timer_list.html | 145 ++++++++-------- template/default/timer_new.html | 110 ++++++------ template/default/toolbar.html | 23 +-- template/default/tv.html | 93 ++++++----- template/default/tv_flash.html | 7 +- 27 files changed, 745 insertions(+), 703 deletions(-) create mode 100644 template/default/bilder/logo_linvdr.gif create mode 100644 template/default/bilder/logo_other.gif create mode 100644 template/default/copper/logo_linvdr.gif create mode 100644 template/default/copper/logo_other.gif (limited to 'template/default') diff --git a/template/default/at_new.html b/template/default/at_new.html index 879d014..e1cabde 100644 --- a/template/default/at_new.html +++ b/template/default/at_new.html @@ -1,9 +1,10 @@ + - - <?% msg.c_progname %?> - <tmpl_if newtimer><?% msg.an_new_timer %?><tmpl_else><?% msg.an_edit_timer %?></tmpl_if> - + + VDRAdmin - <tmpl_if newtimer><%! Add New Auto Timer !%><tmpl_else><%! Edit Auto Timer !%></tmpl_if> + @@ -12,146 +13,160 @@
-

+

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

 - help + help  
-
+
- + - + - + - + - + - + + + + + + + - - - - - - - + - + - + - + + + + + + + - + - + - + - +
   
<%! Auto Timer Active: !%> - - - + <%! Yes !%> + <%! No !%> + <%! oneshot !%> - checked> - checked> - + checked /> <%! Yes !%> + checked /> <%! No !%> + <%! oneshot !%>
<%! Search Patterns: !%> - +
<%! Search in: !%> - checked> - checked> - checked> + 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: !%> - checked> +
<%! Episode: !%> + checked /> +
<%! Remember programmed timers: !%> - checked> - checked> + checked /> <%! Yes !%> + checked /> <%! No !%>
<%! Directory: !%> - +
   
-
- - - - +
+ + + + diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index c1bba7a..c29fa11 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -1,11 +1,10 @@ - - + - - <?% msg.c_progname %?> - <?% msg.al_autotimer %?> - + + VDRAdmin - <%! Auto Timer !%> + @@ -13,14 +12,14 @@
-

+

<%! Auto Timer !%>

 @@ -29,78 +28,76 @@
-
+
<%! New Auto Timer !%>
 		- help + help  
-
+
- + - - + + @@ -109,17 +106,17 @@ - + - + @@ -75,21 +76,21 @@
-

- 		- + <%! Active !%> - + - + - + <%! Channel !%> - + - + - + <%! Start !%> - + - + - + <%! Stop !%> - + - + - + <%! Name !%> - + - +    

- - + + <%! Yes !%> - - + + <%! No !%>

- - + -

@@ -133,52 +130,52 @@

-

+

- edit + edit

- delete + delete

-

+

 
 
-
+
-
+
<%! Force Update !%>
-
+
@@ -187,7 +184,7 @@
-
+
<%! Delete Selected Auto Timers !%>
- + diff --git a/template/default/bilder/logo_linvdr.gif b/template/default/bilder/logo_linvdr.gif new file mode 100644 index 0000000..d9d0398 Binary files /dev/null and b/template/default/bilder/logo_linvdr.gif differ diff --git a/template/default/bilder/logo_other.gif b/template/default/bilder/logo_other.gif new file mode 100644 index 0000000..8344c58 Binary files /dev/null and b/template/default/bilder/logo_other.gif differ diff --git a/template/default/config.html b/template/default/config.html index 690cf37..0f8cd5a 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -1,10 +1,9 @@ - - + - - <?% msg.c_progname %?> - <?% msg.co_config %?> - + + VDRAdmin - <%! Configuration !%> + @@ -13,18 +12,18 @@
-

+

<%! Configuration !%>

   - help + help  
-
+
@@ -35,13 +34,14 @@ @@ -175,111 +164,136 @@
- - - + + + + - - - + + - - - - - - @@ -77,7 +66,7 @@ - + - - + + - + - +
<%! General Settings !%>
+ <%! Skin: !%> -
-
<%! Login Page: !%>
<%! Number of DVB Cards: !%>
 
-
+
- - - + + + - - + + - - + + - + - - + + - - + + - + - +
<%! Identification !%>
<%! Username: !%>
<%! Password: !%>
<%! Guest Account: !%> - checked> - checked> + checked /> <%! Yes !%> + checked /> <%! No !%>
<%! Guest Username: !%>
<%! Guest Password: !%>
 
-
+
- - - + + + - - + + - - + + - + - +
<%! Timeline !%>
<%! Hours: !%>
<%! Times: !%>
 
- - - + + + - + - - - - - - - - + + - - + + + + + + + + - + - +
<%! Auto Timer !%>
 <%! Active: !%> - checked> - checked> + checked /> <%! Yes !%> + checked /> <%! No !%>
<%! Timeout: !%> <%! minutes !%>
<%! Priority: !%>
<%! Lifetime: !%>
 
-
+
- - - + + + - - + + - - + + - - + + - - + + - + - +
<%! Timer !%>
<%! Lifetime: !%>
<%! Priority: !%>
<%! Time Margin at Start: !%> <%! minutes !%>
<%! Time Margin at Stop: !%> <%! minutes !%>
 
-
+ +
- - - + + + - - + + - - + + + + + + + + + + + + + + + + + - + - +
<%! Streaming !%>
<%! Live Streaming !%> + checked /> <%! Yes !%> + checked /> <%! No !%> +
<%! Recordings Streaming !%> + checked /> <%! Yes !%> + checked /> <%! No !%> +
<%! HTTP Port of Streamdev (also possible 3000/ts): !%>
<%! Path to VDR Recordings: !%>
 
+
-
+
- + - + + + + + + + - + - + - + - + - +
-
+
<%! Channel Selections !%>
  
<%! In "Timeline"? !%> + checked /> <%! Yes !%> + checked /> <%! No !%> +
<%! In "Channels" / "Playing Today"? !%> - checked> - checked> + checked /> <%! Yes !%> + checked /> <%! No !%>
<%! In "What's On Now"? !%> - checked> - checked> + checked /> <%! Yes !%> + checked /> <%! No !%>
<%! In "Auto Timer"? !%> - checked> - checked> + checked /> <%! Yes !%> + checked /> <%! No !%>
-
+
-
- +
+ 		-
+
-
- - - +
+ + + diff --git a/template/default/copper/logo_linvdr.gif b/template/default/copper/logo_linvdr.gif new file mode 100644 index 0000000..2196a8f Binary files /dev/null and b/template/default/copper/logo_linvdr.gif differ diff --git a/template/default/copper/logo_other.gif b/template/default/copper/logo_other.gif new file mode 100644 index 0000000..4e95955 Binary files /dev/null and b/template/default/copper/logo_other.gif differ diff --git a/template/default/error.html b/template/default/error.html index 5e72bab..69f297d 100644 --- a/template/default/error.html +++ b/template/default/error.html @@ -1,16 +1,19 @@ + - - <tmpl_var name="title"> + + <%! Error! !%> + +
- -
+ +
-
+
diff --git a/template/default/index.html b/template/default/index.html index 0763baa..6485b4a 100644 --- a/template/default/index.html +++ b/template/default/index.html @@ -1,20 +1,21 @@ - - + - - <?% msg.c_progname %?> <tmpl_var version> (<tmpl_var host>) - + + VDRAdmin <tmpl_var version> (<tmpl_var host>) + + + - - + + <body bgcolor="#ffffff"> - <p><?% msg.i_noframes %?></p> + <p><%! Your Browser does not support frames! !%></p> </body> diff --git a/template/default/left.html b/template/default/left.html index e998200..f48b6e7 100644 --- a/template/default/left.html +++ b/template/default/left.html @@ -1,11 +1,10 @@ - - + - - <?% msg.c_progname %?> - + + VDRAdmin + @@ -30,37 +22,38 @@
-

+

<%! Playing Today !%>

    
- + - + - + @@ -75,16 +68,16 @@ @@ -92,15 +85,15 @@ - + - +
-

- 		-

+ + +  [S] +
 
  -

-

+

- <%! o'clock !%>

 -



+



-

+

-

+

 
       
-
+
diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index 84f5df3..ac38e23 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -1,12 +1,11 @@ - - + - - - <?% msg.c_progname %?> - <?% msg.ps_headline %?> - + + + VDRAdmin - <%! What's On Now? !%> + @@ -15,18 +14,18 @@
-

 

+

 <%! o'clock !%>

 -   |  - -   + <%! What's on: !%> <%! now !%> |<%! at: !%>  + +  <%! o'clock !%>  
- -
+ +
@@ -40,8 +39,10 @@

-  [S] -

+ +  [S] + +

@@ -52,15 +53,15 @@

-
-
+
+
-
+
-
-   -
-
+
+  <%! more !%> +
+
- <?% msg.ps_view %?> + <%! TV select !%> - <?% msg.ps_search %?> + <%! Search for other show times !%> - <?% msg.ps_more_info %?> + <%! More Information !%> - noinfo + noinfo - <?% msg.ps_record %?> + <%! Record !%>
diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index d0f3f0e..addd50d 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -1,10 +1,12 @@ - + - - - <?% msg.c_progname %?> - <?%msg.pt_headline %?> + + + VDRAdmin - <%! What's On Now? !%> + + - -