diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2006-06-23 12:00:58 +0200 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2006-06-23 12:00:58 +0200 |
| commit | fea04122f6f8b7e4f4ca4c59dc43be6567290d03 (patch) | |
| tree | b4b632a66d38a4d7f14b9e78b1802a9c60e3f331 /template/default | |
| parent | 9e8fe7b8ec42e928db062413ee824b7b4ec13132 (diff) | |
| download | vdradmin-am-3.4.6beta3.tar.gz vdradmin-am-3.4.6beta3.tar.bz2 | |
2006-06-23: 3.4.6beta3v3.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!
Diffstat (limited to 'template/default')
24 files changed, 725 insertions, 1271 deletions
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 @@ <body id="about" onload="window.focus()"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> - <td class="col_left"></td> <td colspan="2"><h2><%! Authors !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Current author (VDRAdmin-AM branch): !%></h5></td> <td class="col_value"><a href="mailto:mail@andreas.vdr-developer.org">Andreas Mair</a> (<a href="http://andreas.vdr-developer.org" target="_blank">Homepage</a>)</td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Original author (VDRAdmin): !%></h5></td> <td class="col_value">Thomas Koch (<a href="http://www.linvdr.org" target="_blank">Homepage</a>)</td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> - <td class="col_left"></td> <td colspan="2"><h2><%! Translation Team !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Dutch: !%></h5></td> <td class="col_value">Roel Koelewijn</td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! English: !%></h5></td> <td class="col_value">Andreas Mair</td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Finnish: !%></h5></td> <td class="col_value">Rolf Ahrenberg</td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! French: !%></h5></td> <td class="col_value"><!-- <%! At the moment unmaintained, former translations by: !%> -->Trois Six (also at vdrportal.de), map, lobotomise, bads, Mickaël Nival</td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! German: !%></h5></td> <td class="col_value">Andreas Mair</td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Spanish: !%></h5></td> <td class="col_value">Rüdiger Jung</td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Russian: !%></h5></td> <td class="col_value">Oleg Roitburd and Allrussian-forum translation team</td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> - <td class="col_left"></td> <td colspan="2"><h2><%! Informations !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! VDRAdmin-AM version: !%></h5></td> <td class="col_value"><tmpl_var myversion></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! VDR version: !%></h5></td> <td class="col_value"><tmpl_var vdrversion></td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><%! Getting Help and Reporting Bugs !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td> <ul> <li><%! If you need help please first try to use the online help you'll find on some pages. You can access it by clicking <img src="bilder/help.png"/>. !%></li> <li><%! If this doesn't provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_blank">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for: !%> "[ANNOUNCE] VDRAdmin-AM-<tmpl_var myversion>"</li> <li><%! If you think you have found a bug please check that it's a new one and report it in the <a href="http://www.vdr-developer.org/mantisbt/main_page.php" target="_blank">VDRAdmin-AM BugTracking system</a>. !%></li> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </body> 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 @@ <form action="<tmpl_var url>" method="get" name="FormName0"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"> <td class="col_title"> <h1><%! AutoTimer !%></h1> </td> @@ -44,7 +43,6 @@ <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>"/></a> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> </form> @@ -52,7 +50,6 @@ <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list"> <tr class="heading"> - <td class="col_left"></td> <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"> <h2> <a href="<tmpl_var sortbyactiveurl>"><%! Active !%> @@ -111,22 +108,10 @@ <td class="col_edit"></td> <td class="col_delete"></td> <td class="col_checkbox"><input type="checkbox" name="SELALL" value="SELALL" onclick="AllMessages(this.form);" title="<%! Select all/none !%>"/></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td> - <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td> - <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td> - <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td> - <td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>"></td> - <td colspan="3"></td> - <td class="col_right"></td> </tr> <tmpl_loop at_timer_loop> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"></td> <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"> <div> <tmpl_if active> @@ -171,20 +156,8 @@ <input type="checkbox" name="xxxx_<tmpl_var id>"/> </div> </td> - <td class="col_right"></td> </tr> </tmpl_loop> - - <tr class="footer"> - <td class="col_left"></td> - <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td> - <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td> - <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td> - <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td> - <td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>"></td> - <td colspan="3"></td> - <td class="col_right"></td> - </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons"> @@ -198,6 +171,7 @@ </tr> </table> <input type="hidden" name="aktion" value="at_timer_aktion"/> + <input type="hidden" name="sortby" value="<tmpl_var sortby>"/> </form> </body> 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 @@ <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"> <h1><tmpl_if newtimer><%! Add New AutoTimer !%><tmpl_else><%! Edit AutoTimer !%></tmpl_if></h1> </td> @@ -24,24 +23,12 @@ <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>"/></a> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> <div id="content"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> - <tr class="heading optional"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! AutoTimer Active: !%></h5></td> <td class="col_value"> <?% IF active == 2 %?> @@ -54,28 +41,22 @@ <input type="radio" name="active" value="2" id="active_oneshot" /><label for="active_oneshot"><%! oneshot !%></label> <?% END %?> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! Search Patterns: !%></h5></td> <td class="col_value"> <input type="text" name="pattern" value="<tmpl_var pattern>" size="40" /> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Search in: !%></h5></td> <td class="col_value"> <input type="checkbox" name="title" value="1" id="searchin_title" <tmpl_if title>checked</tmpl_if> /><label for="searchin_title"><%! Title !%></label> <input type="checkbox" name="subtitle" value="1" id="searchin_subtitle" <tmpl_if subtitle>checked</tmpl_if> /><label for="searchin_subtitle"><%! Subtitle !%></label> <input type="checkbox" name="description" value="1" id="searchin_description" <tmpl_if description>checked</tmpl_if> /><label for="searchin_description"><%! Description !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! Search only on these days: !%></h5></td> <td class="col_value"> <input type="checkbox" name="wday_mon" value="1" id="wday_mon" <tmpl_if wday_mon>checked</tmpl_if> /><label for="wday_mon"><%! Monday !%></label> @@ -86,10 +67,8 @@ <input type="checkbox" name="wday_sat" value="1" id="wday_sat" <tmpl_if wday_sat>checked</tmpl_if> /><label for="wday_sat"><%! Saturday !%></label> <input type="checkbox" name="wday_sun" value="1" id="wday_sun" <tmpl_if wday_sun>checked</tmpl_if> /><label for="wday_sun"><%! Sunday !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Channel: !%></h5></td> <td class="col_value"> <select class="submit" name="channel"> @@ -99,10 +78,8 @@ </tmpl_loop> </select> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! Starts After: !%></h5></td> <td class="col_value"> <input type="text" name="starth" value="<tmpl_var starth>" size="2" maxlength="2" /> @@ -110,10 +87,8 @@ <input type="text" name="startm" value="<tmpl_var startm>" size="2" maxlength="2" /> <%! o'clock !%> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! Ends Before: !%></h5></td> <td class="col_value"> <input type="text" name="stoph" value="<tmpl_var stoph>" size="2" maxlength="2" /> @@ -121,53 +96,56 @@ <input type="text" name="stopm" value="<tmpl_var stopm>" size="2" maxlength="2" /> <%! o'clock !%> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> + <td class="col_label"><h5><%! Override Start/Stop Margins: !%></h5></td> + <td class="col_value"> + <input type="radio" name="buffers" value="1" id="buffers_yes" <tmpl_if buffers>checked</tmpl_if> /><label for="buffers_yes"><%! Yes !%></label> + <input type="radio" name="buffers" value="0" id="buffers_no" <tmpl_unless buffers>checked</tmpl_unless> /><label for="buffers_no"><%! No !%></label> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Time Margin at Start: !%></h5></td> + <td class="col_value"> + <input type="text" name="bstart" value="<tmpl_var bstart>" size="2" maxlength="2" /> <%! minutes !%> + </td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td> + <td class="col_value"> + <input type="text" name="bstop" value="<tmpl_var bstop>" size="2" maxlength="2" /> <%! minutes !%> + </td> + </tr> + <tr class="row_even"> <td class="col_label"><h5><%! Priority: !%></h5></td> <td class="col_value"> <input type="text" name="prio" value="<tmpl_var prio>" size="2" maxlength="2" /> </td> - <td class="col_right"></td> </tr> - <tr class="row_even"> - <td class="col_left"></td> + <tr class="row_odd"> <td class="col_label"><h5><%! Lifetime: !%></h5></td> <td class="col_value"> <input type="text" name="lft" value="<tmpl_var lft>" size="2" maxlength="2" /> </td> - <td class="col_right"></td> </tr> - <tr class="row_odd"> - <td class="col_left"></td> + <tr class="row_even"> <td class="col_label"><h5><label for="episode"><%! Episode: !%></label></h5></td> <td class="col_value"> <input type="checkbox" name="episode" value="1" id="episode" <tmpl_if episode>checked</tmpl_if> /> </td> - <td class="col_right"></td> </tr> - <tr class="row_even"> - <td class="col_left"></td> + <tr class="row_odd"> <td class="col_label"><h5><%! Remember programmed timers: !%></h5></td> <td class="col_value"> <input type="radio" name="done" value="1" id="rem_yes" <tmpl_if done>checked</tmpl_if> /><label for="rem_yes"><%! Yes !%></label> <input type="radio" name="done" value="0" id="rem_no" <tmpl_unless done>checked</tmpl_unless> /><label for="rem_no"><%! No !%></label> </td> - <td class="col_right"></td> </tr> - <tr class="row_odd"> - <td class="col_left"></td> + <tr class="row_even"> <td class="col_label"><h5><%! Directory: !%></h5></td> <td class="col_value"> <input type="text" name="directory" value="<tmpl_var directory>" size="40" /> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> </table> </div> @@ -186,28 +164,19 @@ <tmpl_if matches> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="list"> <tr class="heading"> - <td class="col_left"></h2></td> <td><h2><%! Title !%></h2></td> <td><h2><%! Subtitle !%></h2></td> <td><h2><%! Broadcasted !%></h2></td> <td><h2><%! Stored in !%></h2></td> - <td class="col_right"></td> </tr> <tmpl_loop matches> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"></td> <td><tmpl_var otitle></td> <td><tmpl_var subtitle></td> <td><tmpl_var date>, <tmpl_var start> - <tmpl_var stop> (<tmpl_var channel>)</td> <td><tmpl_var title></td> - <td class="col_right"></td> </tr> </tmpl_loop> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="4"></td> - <td class="col_right"></td> - </tr> </table> <tmpl_else> <div class="warning"><%! No matches found! !%></div> 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 @@ <input type="hidden" name="new_tab" value="<?% active_tab %?>"/> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"> <h1><%! Configuration !%></h1> </td> @@ -33,478 +32,384 @@ <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> - <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> - <tr class="tabs"> - <td class="col_left"></td> - <td colspan="2"><span class=<?% IF active_tab == 0 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('0')"><%! General Settings !%></a></span><span class=<?% IF active_tab == 1 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('1')"><%! VDR !%></a></span><span class=<?% IF active_tab == 2 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('2')"><%! Identification !%></a></span><span class=<?% IF active_tab == 3 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('3')"><%! Timeline !%></a></span><span class=<?% IF active_tab == 4 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('4')"><%! AutoTimer !%></a></span><span class=<?% IF active_tab == 5 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('5')"><%! Timer !%></a></span><span class=<?% IF active_tab == 6 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('6')"><%! Streaming !%></a></span><span class=<?% IF active_tab == 7 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('7')"><%! Expert !%></a></span><span class=<?% IF active_tab == 8 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('8')"><%! Channel Selections !%></a></span></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> -<?% SWITCH active_tab %?> -<?% CASE 0 %?> <!-- General Settings --> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><%! General Settings !%></h2></td> + </tr> <!-- Only one template, so no need to chose - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Template: !%></h5></td> - <td class="col_value"> - <select class="submit" name="TEMPLATE"> + <tr class="row_odd"> + <td class="col_label"><h5><%! Template: !%></h5></td> + <td class="col_value"> + <select class="submit" name="TEMPLATE"> <tmpl_loop name="TEMPLATELIST"> - <option value="<tmpl_var name>" <tmpl_if aktemplate> selected</tmpl_if>><tmpl_var name></option> + <option value="<tmpl_var name>" <tmpl_if aktemplate> selected</tmpl_if>><tmpl_var name></option> </tmpl_loop> - </select> - </td> - <td class="col_right"></td> - </tr> + </select> + </td> + </tr> --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Skin: !%></h5></td> - <td class="col_value"> - <select class="submit" name="SKIN"> + <tr class="row_odd"> + <td class="col_label"><h5><%! Skin: !%></h5></td> + <td class="col_value"> + <select class="submit" name="SKIN"> <tmpl_loop name="SKINLIST"> - <option value="<tmpl_var name>" <tmpl_if sel> selected</tmpl_if>><tmpl_var name></option> + <option value="<tmpl_var name>" <tmpl_if sel> selected</tmpl_if>><tmpl_var name></option> </tmpl_loop> - </select> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Login Page: !%></h5></td> - <td class="col_value"> - <select class="submit" name="LOGINPAGE"> + </select> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Login Page: !%></h5></td> + <td class="col_value"> + <select class="submit" name="LOGINPAGE"> <tmpl_loop name="LOGINPAGES"> - <option value="<tmpl_var id>" <tmpl_if current> selected</tmpl_if>><tmpl_var name></option> + <option value="<tmpl_var id>" <tmpl_if current> selected</tmpl_if>><tmpl_var name></option> </tmpl_loop> - </select> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Number of channels to use: !%></h5></td> - <td class="col_value"><input type="text" name="EPG_PRUNE" value="<tmpl_var EPG_PRUNE>" size="5" maxlength="25" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Local net (no login required): !%></h5></td> - <td class="col_value"><input type="text" name="LOCAL_NET" value="<tmpl_var LOCAL_NET>" size="20" maxlength="50" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Language: !%></h5></td> - <td class="col_value"> + </select> + </td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Number of channels to use: !%></h5></td> + <td class="col_value"><input type="text" name="EPG_PRUNE" value="<tmpl_var EPG_PRUNE>" size="5" maxlength="25" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Local net (no login required): !%></h5></td> + <td class="col_value"><input type="text" name="LOCAL_NET" value="<tmpl_var LOCAL_NET>" size="20" maxlength="50" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Language: !%></h5></td> + <td class="col_value"> <tmpl_if name="MY_LOCALES"> - <select class="submit" name="LANG"> + <select class="submit" name="LANG"> <tmpl_loop name="MY_LOCALES"> - <option value="<tmpl_var id>" <tmpl_if cur>selected</tmpl_if>><tmpl_var name></option> + <option value="<tmpl_var id>" <tmpl_if cur>selected</tmpl_if>><tmpl_var name></option> </tmpl_loop> - </select> + </select> <tmpl_else> - <input type="text" name="LANG" value="<tmpl_var LANG>" size="20" maxlength="50" /> + <input type="text" name="LANG" value="<tmpl_var LANG>" size="20" maxlength="50" /> </tmpl_if> - </td> - <td class="col_right"></td> - </tr> + </td> + </tr> + </table> -<?% CASE 1 %?> <!-- VDR --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Number of DVB cards: !%></h5></td> - <td class="col_value"><input type="text" name="RECORDINGS" value="<tmpl_var RECORDINGS>" size="2" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Path to recordings: !%></h5></td> - <td class="col_value"><input type="text" name="VIDEODIR" value="<tmpl_var VIDEODIR>" size="20" maxlength="256" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Path to configuration files: !%></h5></td> - <td class="col_value"><input type="text" name="VDRCONFDIR" value="<tmpl_var VDRCONFDIR>" size="20" maxlength="256" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Path to EPG images: !%></h5></td> - <td class="col_value"><input type="text" name="EPGIMAGES" value="<tmpl_var EPGIMAGES>" size="20" maxlength="256" /></td> - <td class="col_right"></td> - </tr> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><%! VDR !%></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Number of DVB cards: !%></h5></td> + <td class="col_value"><input type="text" name="RECORDINGS" value="<tmpl_var RECORDINGS>" size="2" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Path to recordings: !%></h5></td> + <td class="col_value"><input type="text" name="VIDEODIR" value="<tmpl_var VIDEODIR>" size="20" maxlength="256" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Path to configuration files: !%></h5></td> + <td class="col_value"><input type="text" name="VDRCONFDIR" value="<tmpl_var VDRCONFDIR>" size="20" maxlength="256" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Path to EPG images: !%></h5></td> + <td class="col_value"><input type="text" name="EPGIMAGES" value="<tmpl_var EPGIMAGES>" size="20" maxlength="256" /></td> + </tr> + </table> -<?% CASE 2 %?> <!-- Identification --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Username: !%></h5></td> - <td class="col_value"><input type="text" name="USERNAME" value="<tmpl_var USERNAME>" size="12" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Password: !%></h5></td> - <td class="col_value"><input type="password" name="PASSWORD" value="<tmpl_var PASSWORD>" size="12" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Guest Account: !%></h5></td> - <td class="col_value"> - <input type="radio" name="GUEST_ACCOUNT" value="1" id="guest_yes" <tmpl_if guest_account>checked</tmpl_if> /><label for="guest_yes"><%! Yes !%></label> - <input type="radio" name="GUEST_ACCOUNT" value="0" id="guest_no" <tmpl_unless guest_account>checked</tmpl_unless> /><label for="guest_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Guest Username: !%></h5></td> - <td class="col_value"><input type="text" name="USERNAME_GUEST" value="<tmpl_var USERNAME_GUEST>" size="12" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Guest Password: !%></h5></td> - <td class="col_value"><input type="password" name="PASSWORD_GUEST" value="<tmpl_var PASSWORD_GUEST>" size="12" /></td> - <td class="col_right"></td> - </tr> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><%! Identification !%></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Username: !%></h5></td> + <td class="col_value"><input type="text" name="USERNAME" value="<tmpl_var USERNAME>" size="12" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Password: !%></h5></td> + <td class="col_value"><input type="password" name="PASSWORD" value="<tmpl_var PASSWORD>" size="12" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Guest Account: !%></h5></td> + <td class="col_value"> + <input type="radio" name="GUEST_ACCOUNT" value="1" id="guest_yes" <tmpl_if guest_account>checked</tmpl_if> /><label for="guest_yes"><%! Yes !%></label> + <input type="radio" name="GUEST_ACCOUNT" value="0" id="guest_no" <tmpl_unless guest_account>checked</tmpl_unless> /><label for="guest_no"><%! No !%></label> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Guest Username: !%></h5></td> + <td class="col_value"><input type="text" name="USERNAME_GUEST" value="<tmpl_var USERNAME_GUEST>" size="12" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Guest Password: !%></h5></td> + <td class="col_value"><input type="password" name="PASSWORD_GUEST" value="<tmpl_var PASSWORD_GUEST>" size="12" /></td> + </tr> + </table> -<?% CASE 3 %?> <!-- Timeline --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Hours: !%></h5></td> - <td class="col_value"><input type="text" name="ZEITRAHMEN" value="<tmpl_var ZEITRAHMEN>" size="2" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Times: !%></h5></td> - <td class="col_value"><input type="text" name="TIMES" value="<tmpl_var TIMES>" size="20" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Tooltips: !%></h5></td> - <td class="col_value"> - <input type="radio" name="TL_TOOLTIP" value="1" id="tl_tooltip_yes" <tmpl_if tl_tooltip>checked</tmpl_if> /><label for="tl_tooltip_yes"><%! Yes !%></label> - <input type="radio" name="TL_TOOLTIP" value="0" id="tl_tooltip_no" <tmpl_unless tl_tooltip>checked</tmpl_unless> /><label for="tl_tooltip_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><%! Timeline !%></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Hours: !%></h5></td> + <td class="col_value"><input type="text" name="ZEITRAHMEN" value="<tmpl_var ZEITRAHMEN>" size="2" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Times: !%></h5></td> + <td class="col_value"><input type="text" name="TIMES" value="<tmpl_var TIMES>" size="20" /> <%! Also used for other EPG views! !%></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Tooltips: !%></h5></td> + <td class="col_value"> + <input type="radio" name="TL_TOOLTIP" value="1" id="tl_tooltip_yes" <tmpl_if tl_tooltip>checked</tmpl_if> /><label for="tl_tooltip_yes"><%! Yes !%></label> + <input type="radio" name="TL_TOOLTIP" value="0" id="tl_tooltip_no" <tmpl_unless tl_tooltip>checked</tmpl_unless> /><label for="tl_tooltip_no"><%! No !%></label> + </td> + </tr> + </table> -<?% CASE 4 %?> <!-- AutoTimer --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Active: !%></h5></td> - <td class="col_value"> - <input type="radio" name="AT_FUNC" value="1" id="at_yes" <tmpl_if at_func>checked</tmpl_if> /><label for="at_yes"><%! Yes !%></label> - <input type="radio" name="AT_FUNC" value="0" id="at_no" <tmpl_unless at_func>checked</tmpl_unless> /><label for="at_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Timeout: !%></h5></td> - <td class="col_value"><input type="text" name="AT_TIMEOUT" value="<tmpl_var AT_TIMEOUT>" size="4" /> <%! minutes !%></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Priority: !%></h5></td> - <td class="col_value"><input type="text" name="AT_PRIORITY" value="<tmpl_var AT_PRIORITY>" size="2" maxlength="2" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Lifetime: !%></h5></td> - <td class="col_value"><input type="text" name="AT_LIFETIME" value="<tmpl_var AT_LIFETIME>" size="2" maxlength="2" /></td> - <td class="col_right"></td> - </tr> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><%! AutoTimer !%></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Active: !%></h5></td> + <td class="col_value"> + <input type="radio" name="AT_FUNC" value="1" id="at_yes" <tmpl_if at_func>checked</tmpl_if> /><label for="at_yes"><%! Yes !%></label> + <input type="radio" name="AT_FUNC" value="0" id="at_no" <tmpl_unless at_func>checked</tmpl_unless> /><label for="at_no"><%! No !%></label> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Timeout: !%></h5></td> + <td class="col_value"><input type="text" name="AT_TIMEOUT" value="<tmpl_var AT_TIMEOUT>" size="4" /> <%! minutes !%></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Priority: !%></h5></td> + <td class="col_value"><input type="text" name="AT_PRIORITY" value="<tmpl_var AT_PRIORITY>" size="2" maxlength="2" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Lifetime: !%></h5></td> + <td class="col_value"><input type="text" name="AT_LIFETIME" value="<tmpl_var AT_LIFETIME>" size="2" maxlength="2" /></td> + </tr> <!-- - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Time Margin at Start: !%></h5></td> - <td class="col_value"><input type="text" name="AT_MARGIN_BEGIN" value="<tmpl_var AT_MARGIN_BEGIN>" size="2" maxlength="2" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td> - <td class="col_value"><input type="text" name="AT_MARGIN_END" value="<tmpl_var AT_MARGIN_END>" size="2" maxlength="2" /></td> - <td class="col_right"></td> - </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Time Margin at Start: !%></h5></td> + <td class="col_value"><input type="text" name="AT_MARGIN_BEGIN" value="<tmpl_var AT_MARGIN_BEGIN>" size="2" maxlength="2" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td> + <td class="col_value"><input type="text" name="AT_MARGIN_END" value="<tmpl_var AT_MARGIN_END>" size="2" maxlength="2" /></td> + </tr> --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Send email after programming timer: !%></h5></td> - <td class="col_value"> - <input type="radio" name="AT_SENDMAIL" value="1" id="at_sendmail_yes" <tmpl_if at_sendmail>checked</tmpl_if> /><label for="at_sendmail_yes"><%! Yes !%></label> - <input type="radio" name="AT_SENDMAIL" value="0" id="at_sendmail_no" <tmpl_unless at_sendmail>checked</tmpl_unless> /><label for="at_sendmail_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Send email as: !%></h5></td> - <td class="col_value"><input type="text" name="MAIL_FROM" value="<tmpl_var MAIL_FROM>" size="20" maxlength="100" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Send email to: !%></h5></td> - <td class="col_value"><input type="text" name="MAIL_TO" value="<tmpl_var MAIL_TO>" size="20" maxlength="100" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Mail server: !%></h5></td> - <td class="col_value"><input type="text" name="MAIL_SERVER" value="<tmpl_var MAIL_SERVER>" size="20" maxlength="100" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! SMTPAuth user: !%></h5></td> - <td class="col_value"><input type="text" name="MAIL_AUTH_USER" value="<tmpl_var MAIL_AUTH_USER>" size="20" maxlength="100" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! SMTPAuth password: !%></h5></td> - <td class="col_value"><input type="password" name="MAIL_AUTH_PASS" value="<tmpl_var MAIL_AUTH_PASS>" size="20" maxlength="100" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Tooltips: !%></h5></td> - <td class="col_value"> - <input type="radio" name="AT_TOOLTIP" value="1" id="at_tooltip_yes" <tmpl_if at_tooltip>checked</tmpl_if> /><label for="at_tooltip_yes"><%! Yes !%></label> - <input type="radio" name="AT_TOOLTIP" value="0" id="at_tooltip_no" <tmpl_unless at_tooltip>checked</tmpl_unless> /><label for="at_tooltip_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Send email after programming timer: !%></h5></td> + <td class="col_value"> + <input type="radio" name="AT_SENDMAIL" value="1" id="at_sendmail_yes" <tmpl_if at_sendmail>checked</tmpl_if> /><label for="at_sendmail_yes"><%! Yes !%></label> + <input type="radio" name="AT_SENDMAIL" value="0" id="at_sendmail_no" <tmpl_unless at_sendmail>checked</tmpl_unless> /><label for="at_sendmail_no"><%! No !%></label> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Send email as: !%></h5></td> + <td class="col_value"><input type="text" name="MAIL_FROM" value="<tmpl_var MAIL_FROM>" size="20" maxlength="100" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Send email to: !%></h5></td> + <td class="col_value"><input type="text" name="MAIL_TO" value="<tmpl_var MAIL_TO>" size="20" maxlength="100" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Mail server: !%></h5></td> + <td class="col_value"><input type="text" name="MAIL_SERVER" value="<tmpl_var MAIL_SERVER>" size="20" maxlength="100" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! SMTPAuth user: !%></h5></td> + <td class="col_value"><input type="text" name="MAIL_AUTH_USER" value="<tmpl_var MAIL_AUTH_USER>" size="20" maxlength="100" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! SMTPAuth password: !%></h5></td> + <td class="col_value"><input type="password" name="MAIL_AUTH_PASS" value="<tmpl_var MAIL_AUTH_PASS>" size="20" maxlength="100" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Tooltips: !%></h5></td> + <td class="col_value"> + <input type="radio" name="AT_TOOLTIP" value="1" id="at_tooltip_yes" <tmpl_if at_tooltip>checked</tmpl_if> /><label for="at_tooltip_yes"><%! Yes !%></label> + <input type="radio" name="AT_TOOLTIP" value="0" id="at_tooltip_no" <tmpl_unless at_tooltip>checked</tmpl_unless> /><label for="at_tooltip_no"><%! No !%></label> + </td> + </tr> + </table> -<?% CASE 5 %?> <!-- Timer --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Priority: !%></h5></td> - <td class="col_value"><input type="text" name="TM_PRIORITY" value="<tmpl_var TM_PRIORITY>" size="2" maxlength="2" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Lifetime: !%></h5></td> - <td class="col_value"><input type="text" name="TM_LIFETIME" value="<tmpl_var TM_LIFETIME>" size="2" maxlength="2" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Time Margin at Start: !%></h5></td> - <td class="col_value"><input type="text" name="TM_MARGIN_BEGIN" value="<tmpl_var TM_MARGIN_BEGIN>" size="3" /> <%! minutes !%></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td> - <td class="col_value"><input type="text" name="TM_MARGIN_END" value="<tmpl_var TM_MARGIN_END>" size="3" /> <%! minutes !%></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Tooltips in timeline: !%></h5></td> - <td class="col_value"> - <input type="radio" name="TM_TT_TIMELINE" value="1" id="tm_tl_timeline_yes" <tmpl_if tm_tt_timeline>checked</tmpl_if> /><label for="tm_tl_timeline_yes"><%! Yes !%></label> - <input type="radio" name="TM_TT_TIMELINE" value="0" id="tm_tl_timeline_no" <tmpl_unless tm_tt_timeline>checked</tmpl_unless> /><label for="tm_tl_timeline_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Tooltips in list: !%></h5></td> - <td class="col_value"> - <input type="radio" name="TM_TT_LIST" value="1" id="tm_tl_list_yes" <tmpl_if tm_tt_list>checked</tmpl_if> /><label for="tm_tl_list_yes"><%! Yes !%></label> - <input type="radio" name="TM_TT_LIST" value="0" id="tm_tl_list_no" <tmpl_unless tm_tt_list>checked</tmpl_unless> /><label for="tm_tl_list_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><%! Timer !%></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Priority: !%></h5></td> + <td class="col_value"><input type="text" name="TM_PRIORITY" value="<tmpl_var TM_PRIORITY>" size="2" maxlength="2" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Lifetime: !%></h5></td> + <td class="col_value"><input type="text" name="TM_LIFETIME" value="<tmpl_var TM_LIFETIME>" size="2" maxlength="2" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Time Margin at Start: !%></h5></td> + <td class="col_value"><input type="text" name="TM_MARGIN_BEGIN" value="<tmpl_var TM_MARGIN_BEGIN>" size="3" /> <%! minutes !%></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td> + <td class="col_value"><input type="text" name="TM_MARGIN_END" value="<tmpl_var TM_MARGIN_END>" size="3" /> <%! minutes !%></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Tooltips in timeline: !%></h5></td> + <td class="col_value"> + <input type="radio" name="TM_TT_TIMELINE" value="1" id="tm_tl_timeline_yes" <tmpl_if tm_tt_timeline>checked</tmpl_if> /><label for="tm_tl_timeline_yes"><%! Yes !%></label> + <input type="radio" name="TM_TT_TIMELINE" value="0" id="tm_tl_timeline_no" <tmpl_unless tm_tt_timeline>checked</tmpl_unless> /><label for="tm_tl_timeline_no"><%! No !%></label> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Tooltips in list: !%></h5></td> + <td class="col_value"> + <input type="radio" name="TM_TT_LIST" value="1" id="tm_tl_list_yes" <tmpl_if tm_tt_list>checked</tmpl_if> /><label for="tm_tl_list_yes"><%! Yes !%></label> + <input type="radio" name="TM_TT_LIST" value="0" id="tm_tl_list_no" <tmpl_unless tm_tt_list>checked</tmpl_unless> /><label for="tm_tl_list_no"><%! No !%></label> + </td> + </tr> <!-- <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Add summary to new timers: !%></h5></td> - <td class="col_value"> - <input type="radio" name="TM_ADD_SUMMARY" value="1" id="tm_add_summary_yes" <tmpl_if tm_add_summary>checked</tmpl_if> /><label for="tm_add_summary_yes"><%! Yes !%></label> - <input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <tmpl_unless tm_add_summary>checked</tmpl_unless> /><label for="tm_add_summary_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr>--> + <td class="col_label"><h5><%! Add summary to new timers: !%></h5></td> + <td class="col_value"> + <input type="radio" name="TM_ADD_SUMMARY" value="1" id="tm_add_summary_yes" <tmpl_if tm_add_summary>checked</tmpl_if> /><label for="tm_add_summary_yes"><%! Yes !%></label> + <input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <tmpl_unless tm_add_summary>checked</tmpl_unless> /><label for="tm_add_summary_no"><%! No !%></label> + </td> + </tr>--> + </table> <tmpl_if ST_FUNC> -<?% CASE 6 %?> <!-- Streaming --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Live Streaming: !%></h5></td> - <td class="col_value"> - <input type="radio" name="ST_LIVE_ON" value="1" id="live_yes" <tmpl_if ST_LIVE_ON>checked</tmpl_if> /><label for="live_yes"><%! Yes !%></label> - <input type="radio" name="ST_LIVE_ON" value="0" id="live_no" <tmpl_unless ST_LIVE_ON>checked</tmpl_unless> /><label for="live_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! HTTP Port of Streamdev (also possible 3000/ts): !%></h5></td> - <td class="col_value"><input type="text" name="ST_STREAMDEV_PORT" value="<tmpl_var ST_STREAMDEV_PORT>" size="10" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Recordings Streaming: !%></h5></td> - <td class="col_value"> - <input type="radio" name="ST_REC_ON" value="1" id="rec_yes" <tmpl_if ST_REC_ON>checked</tmpl_if> /><label for="rec_yes"><%! Yes !%></label> - <input type="radio" name="ST_REC_ON" value="0" id="rec_no" <tmpl_unless ST_REC_ON>checked</tmpl_unless> /><label for="rec_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Path to VDR Recordings on your workstation: !%></h5></td> - <td class="col_value"><input type="text" name="ST_VIDEODIR" value="<tmpl_var ST_VIDEODIR>" size="20" maxlength="256" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! MIME type for live streaming: !%></h5></td> - <td class="col_value"><input type="text" name="TV_MIMETYPE" value="<tmpl_var TV_MIMETYPE>" size="20" maxlength="256" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Suffix for live streaming: !%></h5></td> - <td class="col_value"><input type="text" name="TV_EXT" value="<tmpl_var TV_EXT>" size="4" maxlength="256" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! MIME type for recordings streaming: !%></h5></td> - <td class="col_value"><input type="text" name="REC_MIMETYPE" value="<tmpl_var REC_MIMETYPE>" size="20" maxlength="256" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Suffix for recordings streaming: !%></h5></td> - <td class="col_value"><input type="text" name="REC_EXT" value="<tmpl_var REC_EXT>" size="4" maxlength="256" /></td> - <td class="col_right"></td> - </tr> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><%! Streaming !%></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Live Streaming: !%></h5></td> + <td class="col_value"> + <input type="radio" name="ST_LIVE_ON" value="1" id="live_yes" <tmpl_if ST_LIVE_ON>checked</tmpl_if> /><label for="live_yes"><%! Yes !%></label> + <input type="radio" name="ST_LIVE_ON" value="0" id="live_no" <tmpl_unless ST_LIVE_ON>checked</tmpl_unless> /><label for="live_no"><%! No !%></label> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! HTTP Port of Streamdev (also possible 3000/ts): !%></h5></td> + <td class="col_value"><input type="text" name="ST_STREAMDEV_PORT" value="<tmpl_var ST_STREAMDEV_PORT>" size="10" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Recordings Streaming: !%></h5></td> + <td class="col_value"> + <input type="radio" name="ST_REC_ON" value="1" id="rec_yes" <tmpl_if ST_REC_ON>checked</tmpl_if> /><label for="rec_yes"><%! Yes !%></label> + <input type="radio" name="ST_REC_ON" value="0" id="rec_no" <tmpl_unless ST_REC_ON>checked</tmpl_unless> /><label for="rec_no"><%! No !%></label> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Path to VDR Recordings on your workstation: !%></h5></td> + <td class="col_value"><input type="text" name="ST_VIDEODIR" value="<tmpl_var ST_VIDEODIR>" size="20" maxlength="256" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! MIME type for live streaming: !%></h5></td> + <td class="col_value"><input type="text" name="TV_MIMETYPE" value="<tmpl_var TV_MIMETYPE>" size="20" maxlength="256" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Suffix for live streaming: !%></h5></td> + <td class="col_value"><input type="text" name="TV_EXT" value="<tmpl_var TV_EXT>" size="4" maxlength="256" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! MIME type for recordings streaming: !%></h5></td> + <td class="col_value"><input type="text" name="REC_MIMETYPE" value="<tmpl_var REC_MIMETYPE>" size="20" maxlength="256" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! Suffix for recordings streaming: !%></h5></td> + <td class="col_value"><input type="text" name="REC_EXT" value="<tmpl_var REC_EXT>" size="4" maxlength="256" /></td> + </tr> <!-- not (yet?) supported - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Bandwidth of Streams: !%></h5></td> - <td class="col_value"> - <select class="submit" name="STREAMTYPE"> + <tr class="row_odd"> + <td class="col_label"><h5><%! Bandwidth of Streams: !%></h5></td> + <td class="col_value"> + <select class="submit" name="STREAMTYPE"> <tmpl_loop name="STREAMTYPELIST"> - <option value="<tmpl_var name>" <tmpl_if sel> selected</tmpl_if>><tmpl_var name></option> + <option value="<tmpl_var name>" <tmpl_if sel> selected</tmpl_if>><tmpl_var name></option> </tmpl_loop> - </select> - </td> - <td class="col_right"></td> - </tr> + </select> + </td> + </tr> --> + </table> </tmpl_if> -<?% CASE 7 %?> <!-- Expert --> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Read EPG directly using epg.data: !%></h5></td> - <td class="col_value"> - <input type="radio" name="EPG_DIRECT" value="1" id="epg_yes" <tmpl_if EPG_DIRECT>checked</tmpl_if> /><label for="epg_yes"><%! Yes !%></label> - <input type="radio" name="EPG_DIRECT" value="0" id="epg_no" <tmpl_unless EPG_DIRECT>checked</tmpl_unless> /><label for="epg_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! epg.data filename: !%></h5></td> - <td class="col_value"><input type="text" name="EPG_FILENAME" value="<tmpl_var EPG_FILENAME>" size="20" maxlength="256" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! VFAT: !%></h5></td> - <td class="col_value"> - <input type="radio" name="VDRVFAT" value="1" id="vfat_yes" <tmpl_if VDRVFAT>checked</tmpl_if> /><label for="vfat_yes"><%! Yes !%></label> - <input type="radio" name="VDRVFAT" value="0" id="vfat_no" <tmpl_unless VDRVFAT>checked</tmpl_unless> /><label for="vfat_no"><%! No !%></label> - </td> - <td class="col_right"></td> - </tr> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><%! Expert !%></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! Read EPG directly using epg.data: !%></h5></td> + <td class="col_value"> + <input type="radio" name="EPG_DIRECT" value="1" id="epg_yes" <tmpl_if EPG_DIRECT>checked</tmpl_if> /><label for="epg_yes"><%! Yes !%></label> + <input type="radio" name="EPG_DIRECT" value="0" id="epg_no" <tmpl_unless EPG_DIRECT>checked</tmpl_unless> /><label for="epg_no"><%! No !%></label> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><%! epg.data filename: !%></h5></td> + <td class="col_value"><input type="text" name="EPG_FILENAME" value="<tmpl_var EPG_FILENAME>" size="20" maxlength="256" /></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><%! VFAT: !%></h5></td> + <td class="col_value"> + <input type="radio" name="VDRVFAT" value="1" id="vfat_yes" <tmpl_if VDRVFAT>checked</tmpl_if> /><label for="vfat_yes"><%! Yes !%></label> + <input type="radio" name="VDRVFAT" value="0" id="vfat_no" <tmpl_unless VDRVFAT>checked</tmpl_unless> /><label for="vfat_no"><%! No !%></label> + </td> + </tr> + </table> -<?% CASE 8 %?> <!-- Channel Selections --> - <tr> - <td colspan="2"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="3"><h2><%! Channel Selections !%></h2></td> + </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! In "Timeline"? !%></h5></td> <td class="col_value" colspan="2"> <input type="radio" name="CHANNELS_WANTED_TIMELINE" value="1" id="tl_yes" <tmpl_if CHANNELS_WANTED_TIMELINE>checked</tmpl_if> /><label for="tl_yes"><%! Yes !%></label> <input type="radio" name="CHANNELS_WANTED_TIMELINE" value="0" id="tl_no" <tmpl_unless CHANNELS_WANTED_TIMELINE>checked</tmpl_unless> /><label for="tl_no"><%! No !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! In "Channels"? !%></h5></td> <td class="col_value" colspan="2"> <input type="radio" name="CHANNELS_WANTED_PRG" value="1" id="prg_yes" <tmpl_if CHANNELS_WANTED_PRG>checked</tmpl_if> /><label for="prg_yes"><%! Yes !%></label> <input type="radio" name="CHANNELS_WANTED_PRG" value="0" id="prg_no"<tmpl_unless CHANNELS_WANTED_PRG>checked</tmpl_unless> /><label for="prg_no"><%! No !%> </label> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! In "Playing Today"? !%></h5></td> <td class="col_value" colspan="2"> <input type="radio" name="CHANNELS_WANTED_PRG2" value="1" id="prg2_yes" <tmpl_if CHANNELS_WANTED_PRG2>checked</tmpl_if> /><label for="prg2_yes"><%! Yes !%></label> <input type="radio" name="CHANNELS_WANTED_PRG2" value="0" id="prg2_no"<tmpl_unless CHANNELS_WANTED_PRG2>checked</tmpl_unless> /><label for="prg2_no"><%! No !%> </label> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! In "What's On Now"? !%></h5></td> <td class="col_value" colspan="2"> <input type="radio" name="CHANNELS_WANTED_SUMMARY" value="1" id="sum_yes" <tmpl_if CHANNELS_WANTED_SUMMARY>checked</tmpl_if> /><label for="sum_yes"><%! Yes !%></label> <input type="radio" name="CHANNELS_WANTED_SUMMARY" value="0" id="sum_no" <tmpl_unless CHANNELS_WANTED_SUMMARY>checked</tmpl_unless> /><label for="sum_no"><%! No !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! In "AutoTimer"? !%></h5></td> <td class="col_value" colspan="2"> <input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="1" id="wat_yes" <tmpl_if CHANNELS_WANTED_AUTOTIMER>checked</tmpl_if> /><label for="wat_yes"><%! Yes !%></label> <input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="0" id="wat_no" <tmpl_unless CHANNELS_WANTED_AUTOTIMER>checked</tmpl_unless> /><label for="wat_no"><%! No !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! In "Watch TV"? !%></h5></td> <td class="col_value" colspan="2"> <input type="radio" name="CHANNELS_WANTED_WATCHTV" value="1" id="wtv_yes" <tmpl_if CHANNELS_WANTED_WATCHTV>checked</tmpl_if> /><label for="wtv_yes"><%! Yes !%></label> <input type="radio" name="CHANNELS_WANTED_WATCHTV" value="0" id="wtv_no" <tmpl_unless CHANNELS_WANTED_WATCHTV>checked</tmpl_unless> /><label for="wtv_no"><%! No !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_channels"> - <select name="all_channels" size="8" multiple> + <select name="all_channels" size="8" multiple class="channels"> <tmpl_loop name="ALL_CHANNELS"> <option value="<tmpl_var vdr_id>"><tmpl_var name escape="html"></option> </tmpl_loop> @@ -515,18 +420,13 @@ <input type="submit" class="submit" name="submit" value="<<<<<" /> </td> <td class="col_wanted_channels"> - <select name="selected_channels" size="8" multiple> + <select name="selected_channels" size="8" multiple class="channels"> <tmpl_loop name="SELECTED_CHANNELS"> <option value="<tmpl_var vdr_id>"><tmpl_var name escape="html"></option> </tmpl_loop> </select> </td> - <td class="col_right"></td> </tr> - </table> -<?% END %?> - </td> - </tr> </table> <div id="buttons"> 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 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><%! AutoTimer !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td> <%! <p>Here you will find a listing of automatic timers (AutoTimer) known to VDRAdmin-AM.</p> <p>The list shows some information on AutoTimers. You can change the list's sorting by clicking the columns heading.</p> @@ -51,12 +43,6 @@ <p>In addition to these functions you can add a new AutoTimer by clicking <input type="submit" class="submit" value="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 <input type="submit" class="submit" value="Delete Selected AutoTimers"/>.</p> <p>Click <input type="submit" class="submit" value="Force Update"/> to force VDRAdmin-AM to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.</p> !%> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </form> 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 @@ <body id="at_timer_new" class="help" onload="window.focus()"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><%! Edit AutoTimer !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"</td> <td> <%! <p>Here you can edit an automatic timer's (AutoTimer) settings.</p> <p>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.</p> !%> @@ -80,12 +72,6 @@ </dd> </dl> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </body> 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 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><a id="top" name="top"></a><%! Configuration !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td> <%! <p>Here you can change general settings and base settings for timers, AutoTimers, channel selection and streaming parameters.</p> !%> <div class="links"> @@ -185,12 +177,6 @@ <div class="top_link">[<a href="#top"><%! Top !%></a>]</div> </div> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </form> 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 @@ <body id="no" class="help" onload="window.focus()"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><%! No Help Available !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td> <%! <p>No help available yet. For adding or changing text please contact <a href="mailto:mail@andreas.vdr-developer.org">mail@andreas.vdr-developer.org</a>.</p> !%> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </body> 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 @@ <body id="rec_list" class="help" onload="window.focus()"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><%! Recordings !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td> <%! <p>Here you will find a listing of recordings known to VDR. The headline will also show you VDR's total and free disk space.</p> <p>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.</p> @@ -48,12 +40,6 @@ <p>If you've set the path the VDR's configuration files and have entries in VDR's <span class="ref_file">reccmds.conf</span> you can run those commands for the selected recording by selecting the wanted command in the select box locate next to <span class="ref_label">Commands:</span> and pressing the <input type="submit" class="submit" value="Run"/> button.</p> <p>Use <input type="submit" class="submit" value="Refresh"/> to force reloading of VDR's recordings listing.</p> !%> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </body> 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 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><%! Timer !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td> <%! <p>Here you will find a listing of timers known to VDR.</p> <p>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.</p> @@ -56,12 +48,6 @@ <p>In addition to these functions you can add a new timer by clicking <input type="submit" class="submit" value="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 <input type="submit" class="submit" value="Delete Selected Timers"/>.</p> <p>You can <input type="submit" class="submit" value="activate"/> and <input type="submit" class="submit" value="inactivate"/> selected timers.</p> !%> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </form> 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 @@ <body id="timer_new" class="help" onload="window.focus()"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><%! Edit Timer !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td> <%! <p>Here you can edit a timer's settings.</p> !%> <dl> @@ -68,12 +60,6 @@ <dd><%! Arbitrary text that describes the recording made by this timer. If this field is not empty, its contents will be written into the <span class="ref_file">summary.vdr</span> or <span class="ref_file">info.vdr</span> file of the recording. !%></dd> </dl> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </body> 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 @@ <script type="text/javascript"> <!-- function rc_open() { - window.open("./vdradmin.pl?aktion=rc_show", "vdradminRC", "width=213, height=510, resizable=no, scrollbars=no, status=no, toolbar=no"); + window.open("./vdradmin.pl?aktion=rc_show", "vdradminRC", "width=200, height=510, resizable=no, scrollbars=no, status=no, toolbar=no"); } function tv_open() { window.open("./vdradmin.pl?aktion=tv_show", "vdradminTV", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no"); @@ -29,7 +29,7 @@ <a href="vdradmin.pl?aktion=prog_summary" target="main"><%! What's On Now? !%></a> </div> <div class="navi" id="prog_list2"> - <a href="vdradmin.pl?aktion=prog_list2" target="main"><%! Playing Today !%></a> + <a href="vdradmin.pl?aktion=prog_list2" target="main"><%! Playing Today? !%></a> </div> <div class="navi" id="prog_timeline"> <a href="vdradmin.pl?aktion=prog_timeline" target="main"><%! Timeline !%></a> @@ -53,7 +53,7 @@ <a href="vdradmin.pl?aktion=tv_show" target="main"><%! Watch TV !%></a> </div> <div class="navi" id="commands"> - <a href="vdradmin.pl?aktion=vdr_cmds" target="main"><%! VDR Commands !%></a> + <a href="vdradmin.pl?aktion=vdr_cmds" target="main"><%! Commands !%></a> </div> <div class="navi" id="config"> <a href="vdradmin.pl?aktion=config" target="main"><%! Configuration !%></a> diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index d5fc830..8e3d6c4 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -14,19 +14,11 @@ <body id="prog_detail" onload="window.focus()"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> - <td class="col_left"></td> <td class="col_content"> <span class="channel_name"><tmpl_var channel_name></span><tmpl_if date><span class="date_long"><tmpl_var date></span><span class="time_duration"><span class="time_start"><tmpl_var start></span> - <span class="time_stop"><tmpl_var stop></span></span><tmpl_if vps><span class="time_vps"><%! VPS !%> <tmpl_var vps></span></tmpl_if></tmpl_if> </td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_content"> <table border="0" cellspacing="0" cellpadding="0" class="content"> <tr> @@ -61,7 +53,7 @@ <div class="epg_subtitle"><tmpl_var subtitle></div> </tmpl_if> <div class="epg_summary"><tmpl_var text></div> - <tmpl_if video> + <tmpl_if has_video> <div class="epg_video"> <h4><%! Video tracks: !%></h4> <tmpl_loop video> @@ -69,7 +61,7 @@ </tmpl_loop> </div> </tmpl_if> - <tmpl_if audio> + <tmpl_if has_audio> <div class="epg_audio"> <h4><%! Audio tracks: !%></h4> <tmpl_loop audio> @@ -92,12 +84,6 @@ </tr> </table> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> </table> </body> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index beecd21..f81d1ad 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -15,7 +15,6 @@ <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"> <h1> <a href="javascript:callurl('<tmpl_var switchurl>');" title="<%! TV select !%>"><tmpl_var progname></a> @@ -32,7 +31,6 @@ </select> <input type="submit" class="submit" name="submit" value="<%! Go! !%>" /> </td> - <td class="col_right"></td> </tr> </table> <input type="hidden" name="aktion" value="prog_list" /> @@ -43,23 +41,15 @@ <tmpl_if newd> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> - <td class="col_left"></td> <td colspan="2"> <span class="channel_name"><tmpl_var progname></span> <span class="date_long"><tmpl_var longdate></span> </td> <td class="col_navi"><tmpl_if prev_channel><a href="<tmpl_var prev_channel>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if><tmpl_if next_channel><a href="<tmpl_var next_channel>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="3"></td> - <td class="col_right"></td> </tr> <tmpl_else> <tmpl_unless endd> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"></td> <td class="col_duration"> <a name="<tmpl_var anchor>"><tmpl_var emit> - <tmpl_var duration></a> </td> @@ -80,23 +70,21 @@ </tmpl_if> </td> <td class="col_buttons"> + <span class="action repeatings"><a href="vdradmin.pl?search=<tmpl_var find_title>&aktion=prog_summary&submit=go11"><img src="bilder/find.png" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a></span> <tmpl_if infurl> <span class="action info"><a href="javascript:popup('<tmpl_var infurl>');" title="<%! More Information !%>"><img src="bilder/info_button.png" border="0" alt="info" /></a></span> <tmpl_else> <span class="action info"><img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<%! No Information !%>" /></span> </tmpl_if> <span class="action record"><a href="<tmpl_var recurl>"><img src="bilder/rec_button.png" border="0" alt="record" title="<%! Record !%>" /></a></span> + <tmpl_if imdburl> + <span class="action imdb"><a href="<tmpl_var imdburl>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>';return true" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>" /></a></span> + </tmpl_if> </td> - <td class="col_right"></td> </tr> </tmpl_unless> </tmpl_if> <tmpl_if endd> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="3"></td> - <td class="col_right"></td> - </tr> </table> </tmpl_if> </tmpl_loop> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index 630eab1..bd7319d 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -24,7 +24,6 @@ <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"> <h1><tmpl_var title></h1> <%! starting at !%> @@ -34,12 +33,11 @@ <td class="col_navi"> <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if> <select name="days" size="1" onchange="window.open(this.options[this.selectedIndex].value,'main')"> <tmpl_loop days> - <option value="<tmpl_var id>" <tmpl_if sel>selected</tmpl_if>><tmpl_var name>.</option> + <option value="<tmpl_var id>" <tmpl_if sel>selected</tmpl_if>><tmpl_var name></option> </tmpl_loop> </select> <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if> </td> - <td class="col_right"></td> </tr> </table> <input type="hidden" name="aktion" value="prog_list2" /> @@ -51,7 +49,6 @@ <tmpl_if newd> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> - <td class="col_left"></td> <td colspan="4"> <span class="channel_name"><a href="<tmpl_var proglink>" title="<%! Channels !%>"><tmpl_var channel_name></a></span> <span class="date_long"><tmpl_var longdate></span> @@ -60,17 +57,10 @@ </tmpl_if> <span class="action switch"><a href="javascript:callurl('<tmpl_var switchurl>');" title="<%! TV select !%>"><img src="bilder/view.png" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a></span> </td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="4"></td> - <td class="col_right"></td> </tr> <tmpl_else> <tmpl_unless endd> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"></td> <td class="col_duration"> <a id="<tmpl_var anchor>" name="<tmpl_var anchor>"><tmpl_var emit> - <tmpl_var duration></a> </td> @@ -93,23 +83,21 @@ </div> </td> <td class="col_buttons"> + <span class="action repeatings"><a href="vdradmin.pl?search=<tmpl_var find_title>&aktion=prog_summary&submit=go11"><img src="bilder/find.png" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a></span> <tmpl_if infurl> <span class="action info"><a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.png" border="0" title="<%! More Information !%>" alt="info"/></a></span> <tmpl_else> <span class="action info"><img src="bilder/info_button_disabled.png" border="0" title="<%! No Information !%>" alt="noinfo"/></span> </tmpl_if> <span class="action record"><a href="<tmpl_var recurl>"><img src="bilder/rec_button.png" border="0" title="<%! Record !%>" alt="record"/></a></span> + <tmpl_if imdburl> + <span class="action imdb"><a href="<tmpl_var imdburl>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>';return true" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>" /></a></span> + </tmpl_if> </td> - <td class="col_right"></td> </tr> </tmpl_unless> </tmpl_if> <tmpl_if endd> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="4"></td> - <td class="col_right"></td> - </tr> </table> </tmpl_if> </tmpl_loop> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index a7a300f..56371c3 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -16,7 +16,6 @@ <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"> <h1><tmpl_var title></h1> </td> @@ -34,7 +33,6 @@ <%! at !%> <input type="text" name="time" size="5" value="<tmpl_var now>" /> <%! o'clock !%> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> <input type="hidden" name="aktion" value="prog_summary" /> @@ -44,7 +42,6 @@ <tmpl_if longdate> <table border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> - <td class="col_left"></td> <td class="col_center"> <a id="<tmpl_var anchor>" name="<tmpl_var anchor>"></a> <span class="channel_name"><a href="<tmpl_var proglink>" title="<%! Channels !%>"><tmpl_var progname></a></span> @@ -59,10 +56,8 @@ </tmpl_if> --> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_content"> <table border="0" cellspacing="0" cellpadding="0" class="content"> <tr> @@ -126,7 +121,6 @@ </tr> </table> </td> - <td class="col_right"></td> </tr> </table> </tmpl_if> diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html index b5336e2..5d94619 100644 --- a/template/default/prog_summary2.html +++ b/template/default/prog_summary2.html @@ -16,7 +16,6 @@ <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"> <h1><tmpl_var title></h1> </td> @@ -34,23 +33,11 @@ <%! at !%> <input type="text" name="time" size="5" value="<tmpl_var now>" /> <%! o'clock !%> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> <input type="hidden" name="aktion" value="prog_summary" /> <table border="0" cellspacing="0" cellpadding="0" width="100%" class="list" id="content"> - <tr class="heading optional"> - <td class="col_left"></td> - <td colspan="4"></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="4"></td> - <td class="col_right"></td> - </tr> - <?% tr_class = "row_odd"; olddate = ""; @@ -61,13 +48,10 @@ IF olddate != broadcast.date; olddate = broadcast.date; %?> <tr class="newday"> - <td class="col_left"></td> <td colspan="4"><span class="date_long"><?% broadcast.longdate %?></span></td> - <td class="col_right"></td> </tr> <?% END %?> <tr class="<?% tr_class %?>"> - <td class="col_left"></td> <td class="col_duration"> <span class="time_duration"><span class="time_start"><?% broadcast.start %?></span> - <span class="time_stop"><?% broadcast.stop %?></span></span> <?% IF broadcast.show_percent %?> @@ -119,17 +103,11 @@ <?% END %?> <?% END %?> </td> - <td class="col_right"></td> </tr> <?% tr_class = (tr_class == "row_odd") ? "row_even" : "row_odd"; END; END %?> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="4"></td> - <td class="col_right"></td> - </tr> </table> </form> </body> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index fef4868..c040918 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -1,316 +1,327 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> - -<head> - <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_timeline" /> - <meta http-equiv="content-type" content="text/html;charset=<%! ISO-8859-1 !%>" /> - <title>VDRAdmin-AM - <%! Timeline !%></title> - <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> - <tmpl_if usercss> - <link href="user.css" rel="stylesheet" media="screen" type="text/css" /> - </tmpl_if> - <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> - -<?%- - breite = 600; - seite = 100; - zeitrahmen = config.ZEITRAHMEN || 1; # Zeitrahmen der angezeigt werden soll in Stunden - times = config.TIMES.split(',\s*'); - - USE date; - jetzt_stunde = date.format(date.now, '%H'); - jetzt_minute = date.format(date.now, '%M'); - akt_stunde = date.format(now_sec, '%H'); - akt_minute = (date.format(now_sec, '%M') < 30 ? '00' : '30'); - diff_minute = jetzt_minute - akt_minute; - - IF date.format(date.now, '%H:%M') == date.format(now_sec, '%H:%M'); - akt_sekunde = now_sec - (diff_minute * 60); - ELSE; - akt_sekunde = now_sec; - END; - akt_sekunde = akt_sekunde - akt_sekunde % 60; - - bis = 60 * zeitrahmen; - bis_sec = akt_sekunde + (bis * 60); - bis_minute = bis; - bis_stunde = date.format(bis_sec, '%H'); - - minute = 0; - z = 0; - einheit = ((breite / bis) + 0.5) | format('%i'); - breite = bis * einheit; --%?> - - <style type="text/css"> - table.prgname { - border-width:1px; - border-style:none; - border-spacing:0px; - padding:0px; - margin:0px; - text-align:left; - table-layout:fixed; - overflow:hidden; - } - td.prgname { - margin: 0 2px; - } - - .prgtable { - border-left-width:1px; - border-right-width:1px; - border-top-width:0px; - border-bottom-width:1px; - border-left-style:solid; - border-right-style:solid; - border-top-style:none; - border-bottom-style:solid; - border-spacing:0px; - padding:0px; - margin:0px; - text-align:left; - table-layout:fixed; - overflow:hidden; - } - .prgtable span, - .timertable span { - padding: 0 2px; - } - - .timertable { - border-left-width:1px; - border-right-width:1px; - border-top-width:0px; - border-bottom-width:1px; - border-left-style:solid; - border-right-style:solid; - border-top-style:none; - border-bottom-style:solid; - border-spacing:0px; - padding:0px; - margin:0px; - text-align:left; - table-layout:fixed; - overflow:hidden; - } - - .timestables { - border-left-width:1px; - border-right-width:1px; - border-top-width:0px; - border-bottom-width:1px; - border-left-style:solid; - border-right-style:solid; - border-top-style:none; - border-bottom-style:solid; - border-spacing:0px; - border-color:black; - padding:0px; - margin:0px; - table-layout:fixed; - } - - <?% IF (date.now >= akt_sekunde) && (date.now - akt_sekunde < bis_sec) %?> - #timeline { position:absolute; filter:Alpha(opacity=50); top:20px; left:<?% seite + (einheit * diff_minute) + 30 %?>px; width:1px; height:<?% shows.keys.size * 18 + 19 %?>px; z-index:10; z-index:2; } - <?% END %?> - - #bigtable { position:absolute; top:0; left: 0; z-index: 1; } - </style> - - <script type="text/javascript" language="JavaScript"> - function Go(x) { - if(x =="nothing") { - document.forms[0].reset(); - document.forms[0].elements[0].blur(); - return; - } else { - parent.frames[1].location.href = x; - document.forms[0].elements[0].blur(); - } - } - </script> -<?% IF config.TL_TOOLTIP %?> - <script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script> -<?% END %?> -</head> - -<body id="prog_timeline"> -<?% IF config.TL_TOOLTIP %?> - <div id="infodiv" style="position:absolute; visibility:hidden; z-index:20; top:0px; left:0px;"></div> - <script language="JavaScript" type="text/javascript"> - <?% - FOREACH name = shows2.keys.nsort; - counter = 0; - FOREACH show = shows2.${name}; - %?> - maketip("VDR-<?% show.vdr_id %?>-<?% counter %?>", "<?% show.title %?>", "<%! Duration: !%> <?% date.format(show.start, '%H:%M') %?> - <?% date.format(show.stop, '%H:%M') %?> (<?% (show.stop - show.start) / 60 %?><%! min !%>)" ); - <?% - counter = counter + 1; - END; - END; - %?> - </script> -<?% END %?> - - <form action="<?% nowurl %?>" method="get" name="FormName"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> - <tr> - <td class="col_left"></td> - <td class="col_title"> - <h1><?% now %?> <%! o'clock !%></h1> - </td> - <td class="col_other"> - <%! What's on: !%> - <select name="Auswahl" class="submit" onChange="Go(this.form.Auswahl.options[this.form.Auswahl.options.selectedIndex].value)" style="width:100px" width="100"> - <option value="<?% nowurl %?>"><%! now !%></option> -<?% FOREACH timer = times %?> - <?% timer_o_dopp = timer | replace('\:', '') %?> - <option value="<?% nowurl %?>&time=<?% timer_o_dopp %?>" <?% "selected" IF now == timer %?>><?% timer %?></option> -<?% END %?> - </select> - | <%! at: !%> - <input type="text" name="time" size="5" value="<?% now %?>" /> - <%! o'clock !%> - <input type="hidden" name="aktion" value="prog_timeline" /> - </td> - <td class="col_right"></td> - </tr> - </table> - - - <div id="content"> - <!-- Vertikal ansicht TOP --> - <span id="timeline"><img src="bilder/spacer.gif" width="1" height="1" border="0" /></span> - - <!-- Zeitleiste: akt="<?% date.format(akt_sekunde, '%H:%M:%S') %?>" jetzt="<?% date.format(date.now, '%H:%M:%S') %?>" --> - <table width="<?% breite + seite + 60 %?>" border="0" cellspacing="0" cellpadding="0" class="bigtable list"> - <tr class="heading"> - <td class="col_left"></td> - <td colspan="3" width='<?% breite + seite %?>'><h2><%! Timeline: !%> <?% date.format(akt_sekunde, '%H:%M') %?> <%! o'clock !%> <%! to !%> <?% date.format(bis_sec, '%H:%M') %?> <%! o'clock !%></h2></td> - <td class="col_navi"><?% IF akt_sekunde <= date.now %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" /><?% ELSE %?><a href="<?% nowurl %?>&time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><?% END %?><a href="<?% nowurl %?>&time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="4"></td> - <td class="col_right"></td> - </tr> - <tr class="row_even"> - <td class="col_left"></td> - <td colspan="4"> - <table border="0" cellpadding="0" cellspacing="0" width="<?% seite + breite %?>" class="timestable"> - <tr> - <td><img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /></td> -<?% WHILE minute < bis %?> - <td colspan="6" class="<?% minute % 60 ? 'color1' : 'color2' %?>"> - <img src="bilder/spacer.gif" width="<?% einheit * 30 %?>" height="1" border="0" /><br /> - <?% zeit = akt_sekunde + (minute * 60) %?> - <span class="date_time"><?% date.format(zeit, '%H:%M') %?></span> - </td> - <?% minute = minute + 30 %?> -<?% END %?> - </tr> -<?% minute = 0 %?> - <tr> - <td><img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /></td> -<?% WHILE minute < bis %?> - <!-- TODO: unit for next "width" and "height"? --> - <td width="<?% einheit * 5 %?>" height="10" align="left" valign="bottom" class="<?% minute % 10 ? 'color1' : 'color2' %?>"> - <img src="bilder/spacer.gif" width="<?% einheit * 5 %?>" height="10" border="0" /> - </td> - <?% minute = minute + 5 %?> -<?% END %?> - </tr> - </table> - - <table border="0" cellpadding="0" cellspacing="0" width="<?% seite + breite %?>" class="prgname"> -<?% b = 0; - FOREACH name = shows.keys.nsort; - b = b + 1 %?> - <tr> - <!-- Sendername: "<?% shows.${name}.first.progname %?>" --> - <td width="<?% seite %?>" valign="top" class="prgname <?% b % 2 ? 'color2' : 'color1' %?>"> - <img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /> - <nobr><a href="<?% shows.${name}.first.proglink %?>" class="channel_name"><?% shows.${name}.first.progname %?></a></nobr> - </td> - <!-- Programm --> - <td colspan="<?% (bis / 5) %?>" class="<?% b % 2 ? 'color2' : 'color1' %?>"> - <nobr> -<?% - counter = 0; - old_stop_minute = -1; - FOREACH show = shows.${name}; - start_minute = (show.start - akt_sekunde) / 60 | format('%i'); - stop_minute = (show.stop - akt_sekunde) / 60 | format('%i'); - - IF start_minute < akt_minute; start_minute = 0; END; - IF stop_minute > 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="<?% old_stop_minute %?>" start="<?% start_minute %?>" stop="<?% stop_minute %?>" bis="<?% bis_minute %?>" --> -<?% IF (start_minute >= old_stop_minute) && (start_minute < bis_minute) %?> -<?% IF old_stop_minute + 1 < start_minute %?> -<?% diff = (start_minute - old_stop_minute - 1) * einheit %?> -<!-- Spacer --> - <table border="0" align="left" cellpadding="0" cellspacing="0" width="<?% diff %?>" class="prgtable"> - <tr> - <td width="1"> - <img src="bilder/spacer.gif" width="1" height="1" border="0" hspace="0" /><br/> - <nobr> - <img src="bilder/spacer.gif" width="1" height="8" border="0" hspace="0" /> - </nobr> - </td> - </tr> - </table> - <?% END %?> - <!-- <?% show.vdr_id %?>-<?% counter %?>: "<?% show.title %?>" --> - <table border="0" align="left" cellpadding="0" cellspacing="0" width="<?% laenge_pix %?>" class=<?% show.timer ? "timertable" : "prgtable" %?>> - <tr> - <td width="1" class="<?% td_class %?>" <?% IF config.TL_TOOLTIP %?>onMouseOver="tip('VDR-<?% show.vdr_id %?>-<?% counter %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>> - <img src="bilder/spacer.gif" width="1" height="1" border="0" hspace="0" /><br /> - <span class="event"> - <?% IF show.summary %?> - <a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&epg_id=<?% show.anchor %?>&vdr_id=<?% show.vdr_id %?>');"> - <?% show.title %?> - </a> - <?% ELSE %?> - <?% show.title %?> - <?% END %?> - </span> - </td> - </tr> - </table> - <?% - old_stop_minute = stop_minute; - END; - counter = counter + 1; - END %?> - </nobr> - </td> - </tr> -<?% END %?> - </table> - </td> - -<!-- Vertikal ansicht END --> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="4"></td> - <td class="col_right"></td> - </tr> - </table> - </div> - </form> -</body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+
+<head>
+ <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_timeline" />
+ <meta http-equiv="content-type" content="text/html;charset=<%! ISO-8859-1 !%>" />
+ <title>VDRAdmin-AM - <%! Timeline !%></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <tmpl_if usercss>
+ <link href="user.css" rel="stylesheet" media="screen" type="text/css" />
+ </tmpl_if>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+
+<?%-
+ USE date;
+ show_hours = config.ZEITRAHMEN || 1; # Zeitrahmen der angezeigt werden soll in Stunden
+ times = config.TIMES.split(',\s*');
+
+ # first_sec is the start time of the 24 hours interval in seconds since 1970
+ # last_sec is the end time of the 24 hours interval in seconds since 1970
+ first_sec = date.now + 1799 - show_hours * 3600
+ first_sec = first_sec - first_sec % 1800;
+ last_sec = first_sec + 86400;
+
+ # now_sec is the requested browser time in seconds since 1970
+ # start_sec is the start time of the table in seconds since 1970
+ # end_sec is the end time of the table in seconds since 1970
+ # end_min is the end time of the table in minutes since start of the table
+ # diff_sec is the offset from start_sec to now_sec
+ diff_sec = now_sec % 1800; # time since last 30 minutes interval
+ start_sec = now_sec - diff_sec;
+ end_min = 60 * show_hours;
+ end_sec = start_sec + (end_min * 60);
+
+ name_w = 100;
+ min5_h = 10;
+
+ # Calculate suitable width for events dependent on the time interval
+ # 1 hour = 60min: 300px -> 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;
+-%?>
+
+<!-- TimeLine: start_sec="<?% date.format(start_sec, '%H:%M:%S') %?>" now="<?% date.format(date.now, '%H:%M:%S') %?>" end_sec="<?% date.format(end_sec, '%H:%M:%S') %?>" -->
+ <style type="text/css">
+ table.prgname {
+ border-width:1px;
+ border-style:none;
+ border-spacing:0px;
+ padding:0px;
+ margin:0px;
+ text-align:left;
+ table-layout:fixed;
+ }
+ td.prgname {
+ margin: 0 2px;
+ overflow:hidden;
+ }
+
+ .prgtable, .timertable {
+ border-width: 1px 1px 0px 1px;
+ border-style: solid none none solid;
+ border-spacing:0px;
+ padding:0px;
+ margin:0px;
+ text-align:left;
+ table-layout:fixed;
+ overflow:hidden;
+ }
+ td.prgtable,
+ td.timertable {
+ padding: 0 2px;
+ overflow:hidden;
+ }
+
+ #bigtable { position:absolute; top:0; left: 0; z-index: 1; }
+ </style>
+
+ <script type="text/javascript" language="JavaScript">
+ function Go(x) {
+ if(x =="nothing") {
+ document.forms[0].reset();
+ document.forms[0].elements[0].blur();
+ return;
+ } else {
+ parent.frames[1].location.href = x;
+ document.forms[0].elements[0].blur();
+ }
+ }
+ </script>
+<?% IF config.TL_TOOLTIP %?>
+ <script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script>
+<?% END %?>
+</head>
+
+<body id="prog_timeline">
+<?% IF config.TL_TOOLTIP %?>
+ <div id="infodiv" style="position:absolute; visibility:hidden; z-index:20; top:0px; left:0px;"></div>
+ <script language="JavaScript" type="text/javascript">
+ <?%
+ FOREACH name = shows2.keys.nsort;
+ counter = 0;
+ FOREACH show = shows2.${name};
+ %?>
+ maketip("VDR-<?% show.vdr_id %?>-<?% counter %?>", "<?% show.title %?>", "<%! Duration: !%> <?% date.format(show.start, '%H:%M') %?> - <?% date.format(show.stop, '%H:%M') %?> (<?% (show.stop - show.start) / 60 %?> <%! min !%>)" );
+ <?%
+ counter = counter + 1;
+ END;
+ END;
+ %?>
+ </script>
+<?% END %?>
+
+ <form action="<?% nowurl %?>" method="get" name="FormName">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+ <tr>
+ <td class="col_title">
+ <h1><?% now %?> <%! o'clock !%></h1>
+ </td>
+ <td class="col_other">
+ <%! What's on: !%>
+ <select name="Auswahl" class="submit" onChange="Go(this.form.Auswahl.options[this.form.Auswahl.options.selectedIndex].value)" width="100">
+ <option value="<?% nowurl %?>"></option>
+<?% select_now = (now == date.format(date.now, '%H:%M')) %?>
+ <option value="<?% nowurl %?>" <?% "selected" IF select_now %?>><%! now !%></option>
+<?% FOREACH timer = times %?>
+ <?% timer_o_dopp = timer | replace('\:', '') %?>
+ <option value="<?% nowurl %?>&time=<?% timer_o_dopp %?>" <?% "selected" IF !select_now && (now == timer) %?>><?% timer %?></option>
+<?% END %?>
+ </select>
+ | <%! at: !%>
+ <input type="text" name="time" size="5" value="<?% now %?>" />
+ <%! o'clock !%>
+ <input type="hidden" name="aktion" value="prog_timeline" />
+ </td>
+ </tr>
+ </table>
+
+
+ <div id="content">
+<!-- TimeLine Table TOP -->
+ <table width="<?% event_w + name_w %?>" border="0" cellspacing="0" cellpadding="0" class="bigtable list">
+ <tr class="heading">
+ <td colspan="3">
+ <h2><?% date.format(start_sec, '%A, %H:%M') %?> <%! o'clock !%> <%! to !%> <?% date.format(end_sec, '%H:%M') %?> <%! o'clock !%></h2>
+ <br/>
+ </td>
+ <td class="col_navi">
+<?% IF start_sec < first_sec + 1800 %?>
+ <img src="bilder/pfeile_nachlinks_soft.png" border="0" />
+<?%
+ ELSE;
+ diff_sec = start_sec - end_min * 60;
+ IF (diff_sec < first_sec);
+ diff_sec = first_sec;
+ END;
+%?>
+ <a href="<?% nowurl %?>&time=<?% date.format(diff_sec, '%H:%M') %?>">
+ <img src="bilder/pfeile_nachlinks.png" border="0" />
+ </a>
+<?% END %?>
+<?% IF end_sec > last_sec - 1800 %?>
+ <img src="bilder/pfeile_nachrechts_soft.png" border="0" />
+<?%
+ ELSE;
+ diff_sec = end_sec;
+ IF (diff_sec > last_sec - end_min * 60 - 1800);
+ diff_sec = last_sec - end_min * 60;
+ END;
+%?>
+ <a href="<?% nowurl %?>&time=<?% date.format(diff_sec, '%H:%M') %?>">
+ <img src="bilder/pfeile_nachrechts.png" border="0" />
+ </a>
+<?% END %?>
+ </td>
+ </tr>
+ <tr id="row_timeline" class="row_even">
+ <td colspan="4">
+ <table border="0" cellpadding="0" cellspacing="0" width="<?% name_w + event_w %?>" class="timestable">
+ <tr>
+ <td><img src="bilder/spacer.gif" width="<?% name_w %?>" height="1" border="0" /></td>
+<?% minute = 0 %?>
+<?% WHILE minute < end_min %?>
+ <td colspan="6" class="<?% minute % 60 ? 'color1' : 'color2' %?>">
+ <img src="bilder/spacer.gif" width="<?% px_per_min * 30 %?>" height="1" border="0" /><br />
+ <?% zeit = start_sec + (minute * 60) %?>
+ <span class="date_time"><?% date.format(zeit, '%H:%M') %?></span>
+ </td>
+ <?% minute = minute + 30 %?>
+<?% END %?>
+ </tr>
+ <tr>
+ <td><img src="bilder/spacer.gif" width="<?% name_w %?>" height="1" border="0" /></td>
+<?% minute = 0 %?>
+<?% WHILE minute < end_min %?>
+ <td width="<?% px_per_min * 5 %?>" height="<?% min5_h %?>" class="<?% minute % 10 ? 'color1' : 'color2' %?>">
+ <img src="bilder/spacer.gif" width="<?% px_per_min * 5 %?>" height="1" border="0" /><br />
+ </td>
+ <?% minute = minute + 5 %?>
+<?% END %?>
+ </tr>
+ </table>
+
+ <table border="0" cellpadding="0" cellspacing="0" width="<?% name_w + event_w %?>" class="prgname">
+<?% b = 0;
+ FOREACH name = shows.keys.nsort;
+ b = b + 1 %?>
+ <tr>
+<!-- Channel: "<?% shows.${name}.first.progname %?>" -->
+ <td width="<?% name_w %?>" class="prgname <?% b % 2 ? 'color2' : 'color1' %?>">
+ <img src="bilder/spacer.gif" width="<?% name_w %?>" height="1" border="0" /><br />
+ <nobr><a href="<?% shows.${name}.first.proglink %?>" class="channel_name"><?% shows.${name}.first.progname %?></a></nobr>
+ </td>
+<!-- Events -->
+ <td class="<?% b % 2 ? 'color2' : 'color1' %?>">
+ <nobr>
+<?%
+ counter = 0;
+ old_stop_minute = 0;
+ FOREACH show = shows.${name};
+ start_minute = (show.start - start_sec) / 60 | format('%i');
+ stop_minute = (show.stop - start_sec) / 60 | format('%i');
+ IF (start_minute >= end_min); BREAK; END;
+%?>
+ <!-- <?% show.vdr_id %?>-<?% counter %?>: <?% date.format(show.start, '%H:%M:%S') %?>..<?% date.format(show.stop, '%H:%M:%S') %?> "<?% show.title %?>" -->
+ <!-- ---- old_stop =<?% old_stop_minute %?> end_min =<?% end_min %?> -->
+ <!-- ---- start =<?% start_minute %?> stop =<?% stop_minute %?> -->
+<?%
+ IF start_minute < 0; start_minute = 0; END;
+ IF stop_minute > 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;
+%?> <!-- ---- start =<?% start_minute %?> stop =<?% stop_minute %?> -->
+<?%
+ IF (start_minute >= old_stop_minute);
+ IF (start_minute > old_stop_minute + 1);
+ diff = (start_minute - old_stop_minute) * px_per_min;
+%?> <!-- ---- Time gap detected: fill in space -->
+ <table border="0" align="left" cellpadding="0" cellspacing="0" width="<?% diff %?>" class="prgtable">
+ <tr>
+ <td width="1" class="color_spacer">
+ <img src="bilder/spacer.gif" width="1" height="1" border="0" /><br/>
+ <nobr>
+ <img src="bilder/spacer.gif" width="1" height="8" border="0" />
+ </nobr>
+ </td>
+ </tr>
+ </table>
+<?% END
+%?> <!-- ---- Show event title: "<?% show.title %?>" -->
+ <table border="0" align="left" cellpadding="0" cellspacing="0" width="<?% px_w %?>" class="<?% show.timer ? "timertable" : "prgtable" %?>">
+ <tr>
+ <td width="1" class="<?% td_class %?>" <?% IF config.TL_TOOLTIP %?>onMouseOver="tip('VDR-<?% show.vdr_id %?>-<?% counter %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>>
+ <img src="bilder/spacer.gif" width="1" height="1" border="0" /><br />
+ <nobr>
+ <?% IF show.summary %?>
+ <a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&epg_id=<?% show.anchor %?>&vdr_id=<?% show.vdr_id %?>');">
+ <?% show.title %?>
+ </a>
+ <?% ELSE %?>
+ <?% show.title %?>
+ <?% END %?>
+ </nobr>
+ </td>
+ </tr>
+ </table>
+<?%
+ old_stop_minute = stop_minute;
+ ELSE
+%?> <!-- ---- Overlapped by previous event: ignored -->
+<?%
+ END;
+ counter = counter + 1;
+ END %?>
+ </nobr>
+ </td>
+ </tr>
+<?% END %?>
+ </table>
+ </td>
+
+ </tr>
+ </table>
+<!-- TimeLine Table BOTTOM -->
+
+<?% IF (date.now >= start_sec) && (date.now < end_sec) %?>
+ <?% diff = ((date.now - start_sec) / 60) | format('%i') %?>
+ <script type="text/javascript" language="JavaScript">
+ var tab = document.getElementById("row_timeline");
+ if (tab)
+ {
+ var y = tab.offsetTop;
+ var h = tab.offsetHeight;
+ var style = "position:absolute; "
+ + "top:" + y + "px; "
+ + "left:<?% name_w + (px_per_min * diff) + 1 %?>px; "
+ + "width:1px; "
+ + "height:" + h + "px; "
+ + "z-index:2; ";
+ if (document.all)
+ {
+ style = style + "filter:Alpha(opacity=50); ";
+ }
+
+ document.write('<span id="timeline" style="' + style + '">');
+ document.write(' <img src="bilder/spacer.gif" width="1" height="1" border="0" />');
+ document.write('</span>');
+ }
+ </script>
+<?% END %?>
+ </div>
+ </form>
+</body>
+</html>
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 @@ <form action="<tmpl_var url>" method="get" name="form"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"> <h1><%! Rename Recording !%></h1> </td> - <td class="col_right"></td> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> - <tr class="heading optional"> - <td class="col_left"</td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! Original Name of Recording: !%></h5></td> <td class="col_value"><tmpl_var title></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! New Name of Recording: !%></h5></td> <td class="col_value"><input type="text" name="nn" value="<tmpl_var title>" size="55" /></td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><tmpl_if subtitle><h5><%! Subtitle: !%></h5></tmpl_if></td> + <td class="col_label"><h5><%! Subtitle: !%></h5></td> <td class="col_value"><tmpl_if subtitle><tmpl_var subtitle></tmpl_if></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label" valign="top"><h5><%! Summary: !%></h5></td> <td class="col_value"><tmpl_var text></td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> </table> 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 @@ <body id="rec_list"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"><h1><%! Recordings !%></h1></td> <td colspan="2" class="col_other"> <tmpl_if disk_total> @@ -27,7 +26,6 @@ <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> @@ -41,7 +39,6 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list"> <!-- TODO: this breaks IE, but why? <colgroup> - <col class="col_left"/> <col class="col_date"/> <col class="col_time"/> <col class="col_name"/> @@ -51,10 +48,8 @@ <col class="col_stream"/> </tmpL_if> <col class="col_checkbox"/> - <col class="col_right"/> </colgroup>--> <tr class="heading"> - <td class="col_left"></td> <td class="col_date <tmpl_if sortbydate>selected</tmpl_if>"> <h2> <a href="<tmpl_var sortbydateurl>"><%! Date !%> @@ -94,20 +89,10 @@ <td class="col_stream"></td> </tmpl_if> <td class="col_checkbox"><input type="checkbox" name="SELALL" value="SELALL" onclick="AllMessages(this.form);" title="<%! Select all/none !%>" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td class="col_date <tmpl_if sortbydate>selected</tmpl_if>"></td> - <td class="col_time <tmpl_if sortbytime>selected</tmpl_if>"></td> - <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td> - <td colspan="<tmpl_if stream_rec_on>4<tmpl_else>3</tmpl_if>"></td> - <td class="col_right"></td> </tr> <tmpl_loop recloop> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"></td> <td class="col_date <tmpl_if sortbydate>selected</tmpl_if>"> <span class="date"><tmpl_var date></span> <tmpl_if isfolder><span class="total"><%! Total !%></span></tmpl_if> @@ -133,7 +118,7 @@ </td> <td class="col_edit"> <tmpl_unless isfolder> - <a href="<tmpl_var editurl><tmpl_var cur_sorting>"><img src="bilder/edit.png" alt="rename" title="<%! Rename !%>" border="0" /></a> + <a href="<tmpl_var editurl><tmpl_var cur_sorting><tmpl_var referer>"><img src="bilder/edit.png" alt="rename" title="<%! Rename !%>" border="0" /></a> </tmpl_unless> </td> <td class="col_delete"> @@ -151,18 +136,8 @@ <td class="col_checkbox"> <tmpl_unless isfolder><input type="checkbox" name="xxxx_<tmpl_var id>" /></tmpl_unless> </td> - <td class="col_right"></td> </tr> </tmpl_loop> - - <tr class="footer"> - <td class="col_left"></td> - <td class="col_date <tmpl_if sortbydate>selected</tmpl_if>"></td> - <td class="col_time <tmpl_if sortbytime>selected</tmpl_if>"></td> - <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td> - <td colspan="<tmpl_if stream_rec_on>4<tmpl_else>3</tmpl_if>"></td> - <td class="col_right"></td> - </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons"> 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 @@ <form action="<tmpl_var url>" method="get" name="FormName0"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"><h1><%! Timer !%></h1></td> <td class="col_other"> <input type="submit" class="submit" value="<%! New Timer !%>" name="new_timer"/> @@ -51,7 +50,6 @@ <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> </form> @@ -60,7 +58,6 @@ <form action="<tmpl_var url>" method="get" name="FormName1"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="list"> <tr class="heading"> - <td class="col_left"></td> <td><h2><tmpl_var title></h2></td> <td class="col_navi"> <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if> @@ -71,15 +68,8 @@ </select> <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if> </td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td colspan="2" align="center"> <table cellspacing="0" cellpadding="0" border="0"> <tr> @@ -189,12 +179,6 @@ </tr> </table> </td> - <td class="col_right"></td> - </tr> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> </tr> </table> <input type="hidden" name="aktion" value="timer_list" /> @@ -204,7 +188,6 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="list"> <!-- TODO: this breaks IE, but why? <colgroup> - <col class="col_left"/> <col class="col_active"/> <col class="col_channel"/> <col class="col_date"/> @@ -214,10 +197,8 @@ <col class="col_edit"/> <col class="col_delete"/> <col class="col_checkbox"/> - <col class="col_right"/> </colgroup>--> <tr class="heading"> - <td class="col_left"></td> <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"> <h2> <a href="<tmpl_var sortbyactiveurl>"><%! Active !%> @@ -287,23 +268,10 @@ <td class="col_edit"></td> <td class="col_delete"></td> <td class="col_checkbox"><input type="checkbox" name="SELALL" value="SELALL" onclick="AllMessages(this.form);" title="<%! Select all/none !%>" /></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td> - <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td> - <td class="col_date <tmpl_if sortbyday>selected</tmpl_if>"></td> - <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td> - <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td> - <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td> - <td colspan="3"></td> - <td class="col_right"></td> </tr> <tmpl_loop timer_loop> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"></td> <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"> <div> <a href="javascript:change('<%! Edit timer status? !%>','<tmpl_var toggleurl>&timer=<?% current %?>');"> @@ -360,21 +328,8 @@ <td class="col_checkbox"> <div><input type="checkbox" name="xxxx_<tmpl_var id>" /></div> </td> - <td class="col_right"></td> </tr> </tmpl_loop> - - <tr class="footer"> - <td class="col_left"></td> - <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td> - <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td> - <td class="col_date <tmpl_if sortbyday>selected</tmpl_if>"></td> - <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td> - <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td> - <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td> - <td colspan="3"></td> - <td class="col_right"></td> - </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons"> 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 @@ <form action="<tmpl_var url>" method="get" name="form"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"> <h1><tmpl_if newtimer><%! Create New Timer !%><tmpl_else><%! Edit Timer !%></tmpl_if></h1> </td> @@ -53,32 +52,18 @@ <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> - <tr class="heading optional"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! Timer Active: !%></h5></td> <td class="col_value"> <input type="radio" name="active" value="1" id="active_yes" <tmpl_if active>checked</tmpl_if> /><label for="active_yes"><%! Yes !%></label> <input type="radio" name="active" value="0" id="active_no" <tmpl_unless active>checked</tmpl_unless> /><label for="active_no"><%! No !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> <td class="col_label"><h5><%! AutoTimer Checking: !%></h5></td> <td class="col_value"> <input type="hidden" name="event_id" value="<tmpl_var event_id>"/> @@ -88,10 +73,8 @@ <input type="radio" name="autotimer" value="1" id="event_time" <tmpl_if expr="autotimer == 1">checked</tmpl_if> /><label for="event_time"><%! Time !%></label> <input type="radio" name="autotimer" value="0" id="event_off" <tmpl_if expr="autotimer == 0">checked</tmpl_if> /><label for="event_off"><%! off !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! Channel: !%></h5></td> <td class="col_value"> <select name="channel" class="submit"> @@ -100,11 +83,9 @@ </tmpl_loop> </select> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td valign="top" class="col_left"></td> - <td valign="top" class="col_label"><h5><%! Day Of Recording: !%></h5></td> + <td valign="top" class="col_label"><h5><%! Day Of Recording: !%></h5></td> <td class="col_value"> <input type="text" name="dor" value="<tmpl_var dor>" size="20" /> <br /> @@ -116,10 +97,8 @@ <input onclick="cTimer(6)" type="checkbox" name="D5" value="1" id="wday_sat" /><label for="wday_sat"><%! Saturday !%></label> <input onclick="cTimer(7)" type="checkbox" name="D6" value="1" id="wday_sun" /><label for="wday_sun"><%! Sunday !%></label> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label"><h5><%! Start Time: !%></h5></td> <td class="col_value"> <input type="text" name="starth" value="<tmpl_var starth>" size="2" maxlength="2" /> @@ -130,12 +109,10 @@ (<%! Buffer: !%> <tmpl_var bstart> <%! minutes !%>) </tmpl_if> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! End Time: !%></h5></td> - <td class="col_value"> + <td class="col_label"><h5><%! End Time: !%></h5></td> + <td class="col_value"> <input type="text" name="stoph" value="<tmpl_var stoph>" size="2" maxlength="2" /> <b> : </b> <input type="text" name="stopm" value="<tmpl_var stopm>" size="2" maxlength="2" /> @@ -144,51 +121,33 @@ (<%! Buffer: !%> <tmpl_var bstop> <%! minutes !%>) </tmpl_if> </td> - <td class="col_right"></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Use VPS: !%></h5></td> - <td class="col_value"><input type="checkbox" name="vps" value="1" <tmpl_if vps>checked</tmpl_if> /></td> - <td class="col_right"></td> + <td class="col_label"><h5><%! Use VPS: !%></h5></td> + <td class="col_value"><input type="checkbox" name="vps" value="1" <tmpl_if vps>checked</tmpl_if> /></td> </tr> <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Priority: !%></h5></td> - <td class="col_value"><input type="text" name="prio" value="<tmpl_var prio>" size="2" maxlength="2" /></td> - <td class="col_right"></td> + <td class="col_label"><h5><%! Priority: !%></h5></td> + <td class="col_value"><input type="text" name="prio" value="<tmpl_var prio>" size="2" maxlength="2" /></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Lifetime: !%></h5></td> - <td class="col_value"><input type="text" name="lft" value="<tmpl_var lft>" size="2" maxlength="2" /></td> - <td class="col_right"></td> + <td class="col_label"><h5><%! Lifetime: !%></h5></td> + <td class="col_value"><input type="text" name="lft" value="<tmpl_var lft>" size="2" maxlength="2" /></td> </tr> <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Title of Recording: !%></h5></td> - <td class="col_value"><input type="text" name="title" value="<tmpl_var title>" size="80" /></td> - <td class="col_right"></td> + <td class="col_label"><h5><%! Title of Recording: !%></h5></td> + <td class="col_value"><input type="text" name="title" value="<tmpl_var title>" size="80" /></td> </tr> <tr class="row_odd"> - <td class="col_left"></td> <td class="col_label" valign="top"><h5><%! Summary: !%></h5><h6>(<%! readonly !%>)</h6></td> <td class="col_value"><textarea name="summary" rows="6" cols="80" readonly="readonly"><tmpl_var summary></textarea></td> - <td class="col_right"></td> </tr> <tmpl_if pattern> <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><h5><%! Timer has been set by AutoTimer pattern: !%></h5></td> - <td class="col_value"><tmpl_var pattern></td> - <td class="col_right"></td> + <td class="col_label"><h5><%! Timer has been set by AutoTimer pattern: !%></h5></td> + <td class="col_value"><tmpl_var pattern></td> </tr> </tmpl_if> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> </table> <div id="buttons"> 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 @@ <body id="vdr_cmds"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> - <td class="col_left"></td> <td class="col_title"><h1><%! VDR Commands !%></h1></td> <tmpl_if name="help_url"> <td class="col_help"> <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> - <td class="col_right"></td> </tr> </table> <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> - <tr class="heading optional"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> - <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><%! Number of lines to show: !%></td> + <td class="col_label"><h5><%! Number of lines to show: !%></h5></td> <td class="col_value"> <select name="max_lines"> <option value="20" <tmpl_if expr="max_lines == 20">selected="selected"</tmpl_if>>20</option> @@ -49,21 +35,17 @@ <option value="-1" <tmpl_if expr="max_lines == -1">selected="selected"</tmpl_if>><%! unlimited !%></option> </select> </td> - <td class="col_right"></td> </tr> <tr class="row_even"> - <td class="col_left"></td> - <td class="col_label"><%! SVDRP commands: !%></td> + <td class="col_label"><h5><%! SVDRP commands: !%></h5></td> <td class="col_value"> <input type="text" name="svdrp_cmd" value="<tmpl_var svdrp_cmd>"/> <input type="submit" class="submit" name="run_svdrpcmd" value="<%! Run !%>" onclick="return confirm('<%! Really run this command? !%>')" /> </td> - <td class="col_right"></td> </tr> <tmpl_if commands> <tr class="row_odd"> - <td class="col_left"></td> - <td class="col_label"><%! Commands defined in commands.conf: !%></td> + <td class="col_label"><h5><%! Commands defined in commands.conf: !%></h5></td> <td class="col_value"> <select name="vdr_cmd" class="submit"> <tmpl_loop commands> @@ -72,15 +54,9 @@ </select> <input type="submit" class="submit" name="run_vdrcmd" value="<%! Run !%>" onclick="return confirm('<%! Really run this command? !%>')" /> </td> - <td class="col_right"></td> </tr> </tmpl_if> - <tr class="footer"> - <td class="col_left"></td> - <td colspan="2"></td> - <td class="col_right"></td> - </tr> </table> <input type="hidden" name="aktion" value="vdr_cmds"/> </form> @@ -88,28 +64,14 @@ <tmpl_if show_output> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> <tr class="heading"> - <td class="col_left"></td> <td><h2><%! Output !%></h2></td> - <td class="col_right"></td> - </tr> - <tr class="row_spacer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> </tr> <tmpl_loop show_output> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"></td> <td><pre><tmpl_var line escape="html"></pre></td> - <td class="col_right"></td> </tr> </tmpl_loop> - <tr class="footer"> - <td class="col_left"></td> - <td></td> - <td class="col_right"></td> - </tr> </table> </tmpl_if> </body> |