diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2006-10-27 12:00:31 +0200 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2006-10-27 12:00:31 +0200 |
| commit | 24b39843b935f8a37b2d9dc909a530b771a61c1f (patch) | |
| tree | 73869bd46144e37f32bdc6bff4f93453425f4951 /template/default | |
| parent | 86c56591df441fad78ac69d2f77196df05305758 (diff) | |
| download | vdradmin-am-3.5.0beta.tar.gz vdradmin-am-3.5.0beta.tar.bz2 | |
2006-10-27: 3.5.0betav3.5.0beta
- Added: script to convert existing AutoTimers to epgsearch (autotimer2searchtimer.pl).
- Added: Hack for MSIE to always show vertical scroller to prevent horizontal scroller (Submitted by Udo Richter).
- Added: Support for epgsearch plugin; AutoTimer now considered deprecated and unsupported.
- Minor bugfixes
Diffstat (limited to 'template/default')
31 files changed, 1159 insertions, 115 deletions
diff --git a/template/default/.#about.html.1.6 b/template/default/.#about.html.1.6 new file mode 100644 index 0000000..8e2d438 --- /dev/null +++ b/template/default/.#about.html.1.6 @@ -0,0 +1,116 @@ +<!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="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <title><?% gettext('About') %?></title> + <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> + <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> + <?% IF usercss %?> + <link href="user.css" rel="stylesheet" media="screen" type="text/css" /> + <?% END %?> +</head> + +<body id="about" onload="window.focus()"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><?% gettext('Authors') %?></h2></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('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> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Original author (VDRAdmin):') %?></h5></td> + <td class="col_value">Thomas Koch (<a href="http://www.linvdr.org" target="_blank">Homepage</a>)</td> + </tr> + </table> + + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><?% gettext('Translation Team') %?></h2></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Dutch:') %?></h5></td> + <td class="col_value">Roel Koelewijn</td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('English:') %?></h5></td> + <td class="col_value">Andreas Mair</td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Finnish:') %?></h5></td> + <td class="col_value">Rolf Ahrenberg</td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('French:') %?></h5></td> + <td class="col_value"><!-- <?% gettext('At the moment unmaintained, former translations by:') %?> -->Trois Six (also at vdrportal.de), map, lobotomise, bads, Mickaël Nival</td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('German:') %?></h5></td> + <td class="col_value">Andreas Mair</td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Spanish:') %?></h5></td> + <td class="col_value">Rüdiger Jung</td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Russian:') %?></h5></td> + <td class="col_value">Oleg Roitburd and Allrussian-forum translation team</td> + </tr> + </table> + + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><?% gettext('Informations') %?></h2></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('VDRAdmin-AM version:') %?></h5></td> + <td class="col_value"><?% myversion %?></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('VDR version:') %?></h5></td> + <td class="col_value"><?% vdrversion %?></td> + </tr> + <tr class="row_even"> + <td class="col_label" valign="top"><h5><?% gettext('Supported features in VDR:') %?></h5></td> + <td class="col_value"> + <?% IF features.EPGSEARCH %?> + <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> + <?% ELSE %?> + <img src="bilder/poempl_rot.png" alt="" align="middle" border="0"/> + <?% END %?> + <?% gettext('EPGSearch (<a href="http://people.freenet.de/cwieninger/html/vdr-epg-search.html" target="_blank">EPGSearch Plugin</a>)') %?><br /> + <?% IF features.STREAMDEV %?> + <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> + <?% ELSE %?> + <img src="bilder/poempl_rot.png" alt="" align="middle" border="0"/> + <?% END %?> + <?% gettext('LiveTV Streaming (<a href="http://www.vdr-wiki.de/wiki/index.php/Streamdev-plugin" target="_blank">Streamdev Plugin</a>)') %?><br /> + <?% IF features.REC_RENAME %?> + <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> + <?% ELSE %?> + <img src="bilder/poempl_rot.png" alt="" align="middle" border="0"/> + <?% END %?> + <?% gettext('Rename Recordings (<a href="http://www.saunalahti.fi/~rahrenbe/vdr/patches/" target="_blank">Liemikuutio Patch</a>)') %?><br /> + </td> + </tr> + </table> + + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> + <tr class="heading"> + <td><h2><?% gettext('Getting Help and Reporting Bugs') %?></h2></td> + </tr> + <tr class="row_even"> + <td> + <ul> + <li><?% gettext('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" alt="" />.') %?></li> + <li><?% gettext('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-<?% myversion %?>"</li> + <li><?% gettext('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> + </ul> + </td> + </tr> + </table> +</body> + +</html> diff --git a/template/default/.#navigation.html.1.4 b/template/default/.#navigation.html.1.4 new file mode 100644 index 0000000..3847057 --- /dev/null +++ b/template/default/.#navigation.html.1.4 @@ -0,0 +1,79 @@ +<!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="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <title>VDRAdmin-AM</title> + <link type="text/css" href="style.css" rel="stylesheet" media="screen" /> + <?% IF usercss %?> + <link type="text/css" href="user.css" rel="stylesheet" media="screen" /> + <?% END %?> + + <script type="text/javascript"> + <!-- + function rc_open() { + 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"); + } + // --> + </script> +</head> + +<body id="navigation"> + <div class="logo"> + <a href="./" target="_top"><img src="bilder/logo.png" alt="" height="50" width="150" border="0" /></a> + </div> + <div class="nav_bar"> + <div class="navi" id="prog_summary"> + <a href="vdradmin.pl?aktion=prog_summary" target="main"><?% gettext('What\'s On Now?') %?></a> + </div> + <div class="navi" id="prog_list2"> + <a href="vdradmin.pl?aktion=prog_list2" target="main"><?% gettext('Playing Today?') %?></a> + </div> + <div class="navi" id="prog_timeline"> + <a href="vdradmin.pl?aktion=prog_timeline" target="main"><?% gettext('Timeline') %?></a> + </div> + <div class="navi" id="prog_list"> + <a href="vdradmin.pl?aktion=prog_list" target="main"><?% gettext('Channels') %?></a> + </div> + <div class="navi" id="timer_list"> + <a href="vdradmin.pl?aktion=timer_list" target="main"><?% gettext('Timer') %?></a> + </div> +<?% IF features.AUTOTIMER %?> + <div class="navi" id="at_timer_list"> + <a href="vdradmin.pl?aktion=at_timer_list" target="main"><?% gettext('AutoTimer') %?></a> + </div> +<?% END %?> +<?% IF features.EPGSEARCH %?> + <div class="navi" id="epgsearch_list"> + <a href="vdradmin.pl?aktion=epgsearch_list" target="main"><?% gettext('EPG Search') %?></a> + </div> +<X?% END %?> + <div class="navi" id="rec_list"> + <a href="vdradmin.pl?aktion=rec_list" target="main"><?% gettext('Recordings') %?></a> + </div> + <div class="navi" id="rc"> + <a href="javascript:rc_open();"><?% gettext('Remote Control') %?></a> + </div> + <div class="navi" id="tv"> + <a href="vdradmin.pl?aktion=tv_show" target="main"><?% gettext('Watch TV') %?></a> + </div> + <div class="navi" id="commands"> + <a href="vdradmin.pl?aktion=vdr_cmds" target="main"><?% gettext('Commands') %?></a> + </div> + <div class="navi" id="config"> + <a href="vdradmin.pl?aktion=config" target="main"><?% gettext('Configuration') %?></a> + </div> + <div class="navi" id="about"> + <a href="vdradmin.pl?aktion=about" target="main"><?% gettext('About') %?> / <?% gettext('Help') %?></a> + </div> + + <form action="vdradmin.pl" method="get" name="FormName" target="main" class="search"> + <input type="text" name="search" /><br /> + <input type="submit" name="submit" value="<?% gettext('Search') %?>" / + <input type="hidden" name="aktion" value="prog_summary" /> + </form> + </div> +</body> +</html> diff --git a/template/default/about.html b/template/default/about.html index 7cb6dcd..9d94fcb 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> @@ -31,33 +31,37 @@ <td colspan="2"><h2><?% gettext('Translation Team') %?></h2></td> </tr> <tr class="row_even"> - <td class="col_label"><h5><?% gettext('Dutch:') %?></h5></td> - <td class="col_value">Roel Koelewijn</td> - </tr> - <tr class="row_even"> <td class="col_label"><h5><?% gettext('English:') %?></h5></td> <td class="col_value">Andreas Mair</td> </tr> <tr class="row_even"> - <td class="col_label"><h5><?% gettext('Finnish:') %?></h5></td> - <td class="col_value">Rolf Ahrenberg</td> + <td class="col_label"><h5><?% gettext('German:') %?></h5></td> + <td class="col_value">Andreas Mair</td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('French:') %?></h5></td> <td class="col_value"><!-- <?% gettext('At the moment unmaintained, former translations by:') %?> -->Trois Six (also at vdrportal.de), map, lobotomise, bads, Mickaël Nival</td> </tr> <tr class="row_even"> - <td class="col_label"><h5><?% gettext('German:') %?></h5></td> - <td class="col_value">Andreas Mair</td> - </tr> - <tr class="row_even"> <td class="col_label"><h5><?% gettext('Spanish:') %?></h5></td> <td class="col_value">Rüdiger Jung</td> </tr> <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Finnish:') %?></h5></td> + <td class="col_value">Rolf Ahrenberg</td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Dutch:') %?></h5></td> + <td class="col_value">Roel Koelewijn</td> + </tr> + <tr class="row_even"> <td class="col_label"><h5><?% gettext('Russian:') %?></h5></td> <td class="col_value">Oleg Roitburd and Allrussian-forum translation team</td> </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Czech:') %?></h5></td> + <td class="col_value">Karel Borkovec</td> + </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> @@ -75,6 +79,12 @@ <tr class="row_even"> <td class="col_label" valign="top"><h5><?% gettext('Supported features in VDR:') %?></h5></td> <td class="col_value"> + <?% IF features.EPGSEARCH %?> + <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> + <?% ELSE %?> + <img src="bilder/poempl_rot.png" alt="" align="middle" border="0"/> + <?% END %?> + <?% gettext('EPGSearch (<a href="http://people.freenet.de/cwieninger/html/vdr-epg-search.html" target="_blank">EPGSearch Plugin</a>)') %?><br /> <?% IF features.STREAMDEV %?> <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> <?% ELSE %?> diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index aa67c40..306ab74 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> @@ -138,7 +138,7 @@ <?% IF at.stop %?><?% at.stop %?><?% ELSE %?>-<?% END %?> </div> </td> - <td class="col_name <?% IF at.sortbypattern %?>selected<?% END %?>" <?% IF config.AT_TOOLTIP %?>onMouseOver="tip('VDR-<?% at.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>> + <td class="col_name <?% IF at.sortbypattern %?>selected<?% END %?>" <?% IF config.AT_TOOLTIP %?>onmouseover="tip('VDR-<?% at.id %?>'); return true;" onmouseout="untip(); return true;"<?% END %?>> <div> <a href="<?% at.modurl %?>" title="<?% gettext('Edit') %?>"><?% at.pattern %?></a> </div> @@ -168,7 +168,7 @@ <input type="submit" class="submit" name="at_force" value="<?% gettext('Force Update') %?>" /> </td> <td align="right"> - <input type="submit" class="submit" name="at_delete" value="<?% gettext('Delete Selected AutoTimers') %?>" onclick="return mdel_old('<?% gettext('Delete all selected timers?') %?>');" /> + <input type="submit" class="submit" name="at_delete" value="<?% gettext('Delete Selected AutoTimers') %?>" onclick="return mdel(this, '<?% gettext('Delete all selected timers?') %?>');" /> </td> </tr> </table> diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html index d30c3d5..6a8dfb0 100644 --- a/template/default/at_timer_new.html +++ b/template/default/at_timer_new.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> diff --git a/template/default/config.html b/template/default/config.html index 03f47db..bb25def 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> <title>VDRAdmin-AM - <?% gettext('Configuration') %?></title> @@ -426,7 +426,7 @@ </tr> <tr class="row_odd"> <td class="col_channels"> - <select name="all_channels" size="8" multiple class="channels"> + <select name="all_channels" size="8" multiple="multiple" class="channels"> <?% FOREACH chan = ALL_CHANNELS %?> <option value="<?% chan.vdr_id %?>"><?% chan.name | html %?></option> <?% END %?> @@ -437,7 +437,7 @@ <input type="submit" class="submit" name="submit" value="<<<<<" /> </td> <td class="col_wanted_channels"> - <select name="selected_channels" size="8" multiple class="channels"> + <select name="selected_channels" size="8" multiple="multiple" class="channels"> <?% FOREACH chan = SELECTED_CHANNELS %?> <option value="<?% chan.vdr_id %?>"><?% chan.name | html %?></option> <?% END %?> diff --git a/template/default/default/sauerei.gif b/template/default/default/sauerei.gif Binary files differdeleted file mode 100644 index f931774..0000000 --- a/template/default/default/sauerei.gif +++ /dev/null diff --git a/template/default/epgsearch_list.html b/template/default/epgsearch_list.html new file mode 100644 index 0000000..42a3ac7 --- /dev/null +++ b/template/default/epgsearch_list.html @@ -0,0 +1,260 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html id="scroller"> +<?% USE JavaScript, HTML %?> +<head> + <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> + <title>VDRAdmin-AM - <?% gettext('EPG search') %?></title> + <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> + <?% IF usercss %?> + <link href="user.css" rel="stylesheet" media="screen" type="text/css"/> + <?% END %?> + <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> + <?% IF config.AT_TOOLTIP %?> + <script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script> + <?% END %?> +</head> + +<body id="epgsearch_list"> +<?% UNLESS did_search %?> + <form action="<?% url %?>" method="get" name="FormName0"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> + <tr> + <td class="col_title"> + <h1><?% gettext('EPG Search') %?></h1> + </td> + <td class="col_other"> + <input type="submit" class="submit" name="new_search" value="<?% gettext('New Search') %?>" /> + <input type="hidden" name="aktion" value="epgsearch_edit" /> + </td> +<?% IF help_url %?> + <td class="col_help"> + <a href="javascript:open_help('<?% help_url %?>');"><img src="bilder/help.png" border="0" alt="help" title="<?% gettext('Help') %?>"/></a> + </td> +<?% END %?> + </tr> + </table> + </form> + + <form action="<?% url %?>" method="get" name="FormName"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list hilight"> + <tr class="heading"> + <td class="col_active <?% IF sortbyactive %?>selected<?% END %?>"> + <h2> + <a href="<?% sortbyactiveurl %?>"><?% gettext('Active') %?> + <?% IF sortbyactive %?> + <img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/> + <?% ELSE %?> + <img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/> + <?% END %?> + </a> + </h2> + </td> + <td class="col_action <?% IF sortbyaction %?>selected<?% END %?>"> + <h2> + <a href="<?% sortbyactionurl %?>"><?% gettext('Action') %?> + <?% IF sortbyaction %?> + <img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/> + <?% ELSE %?> + <img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/> + <?% END %?> + </a> + </h2> + </td> + <td class="col_channel <?% IF sortbychannel %?>selected<?% END %?>"> + <h2> + <?% gettext('Channel') %?> + <!-- + <a href="<?% sortbychannelurl %?>"><?% gettext('Channel') %?> + <?% IF sortbychannel %?> + <img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/> + <?% ELSE %?> + <img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/> + <?% END %?> + </a> + --> + </h2> + </td> + <td class="col_start <?% IF sortbystart %?>selected<?% END %?>"> + <h2> + <?% gettext('From') %?> + <!-- + <a href="<?% sortbystarturl %?>"><?% gettext('Start') %?> + <?% IF sortbystart %?> + <img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/> + <?% ELSE %?> + <img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/> + <?% END %?> + </a> + --> + </h2> + </td> + <td class="col_stop <?% IF sortbystop %?>selected<?% END %?>"> + <h2> + <?% gettext('To') %?> + <!-- + <a href="<?% sortbystopurl %?>"><?% gettext('Stop') %?> + <?% IF sortbystop %?> + <img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/> + <?% ELSE %?> + <img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/> + <?% END %?> + </a> + --> + </h2> + </td> + <td class="col_name <?% IF sortbypattern %?>selected<?% END %?>"> + <h2> + <a href="<?% sortbypatternurl %?>"><?% gettext('Search pattern') %?> + <?% IF sortbypattern %?> + <img src="bilder/sortiert_<?% desc %?>.gif" alt="" width="9" height="11" border="0"/> + <?% ELSE %?> + <img src="bilder/spacer.gif" alt="" width="9" height="11" border="0"/> + <?% END %?> + </a> + </h2> + </td> + <td class="col_buttons"></td> + <td class="col_checkbox"><input type="checkbox" name="SELALL" value="SELALL" onclick="AllMessages(this.form);" title="<?% gettext('Select all/none') %?>"/></td> + </tr> + +<?% FOREACH searches %?> + <tr class="<?% IF loop.count % 2 == 0 %?>row_even<?% ELSE %?>row_odd<?% END %?>"> + <td class="col_active <?% IF sortbyactive %?>selected<?% END %?>"> + <div> + <?% IF has_action %?> + <a href="<?% toggleurl %?>"><img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> <?% gettext('Yes') %?></a> + <?% ELSE %?> + <a href="<?% toggleurl %?>"><img src="bilder/poempl_grau.png" alt="" align="middle" border="0"/> <?% gettext('No') %?></a> + <?% END %?> + </div> + </td> + <td class="col_active <?% IF sortbyactive %?>selected<?% END %?>"> + <div><?% action_text %?></div> + </td> + <td class="col_channel <?% IF sortbychannel %?>selected<?% END %?>"> + <div> + <?% SWITCH use_channel %?> + <?% CASE 1 %?> + <?% channel_from_name %?><?% IF channel_from_name != channel_to_name %?> - <?% channel_to_name %?><?% END %?> + <?% CASE 2 %?> + <?% channels %?> + <?% CASE %?> + - + <?% END %?> + </div> + </td> + <td class="col_start <?% IF sortbystart %?>selected<?% END %?>"> + <div> + <?% IF time_start %?><?% time_start %?><?% ELSE %?>--:--<?% END %?> + </div> + </td> + <td class="col_stop <?% IF sortbystop %?>selected<?% END %?>"> + <div> + <?% IF time_stop %?><?% time_stop %?><?% ELSE %?>--:--<?% END %?> + </div> + </td> + <td class="col_name <?% IF sortbypattern %?>selected<?% END %?>"> + <div> + <a href="<?% modurl %?>" title="<?% gettext('Edit') %?>"><?% pattern | html %?></a> + </div> + </td> + <td class="col_buttons"> + <span class="action find"> + <a href="<?% findurl %?>"><img src="bilder/find.png" alt="find" border="0" title="<?% gettext('Find') %?>"/></a> + </span> + <span class="action edit"> + <a href="<?% modurl %?>"><img src="bilder/edit.png" alt="edit" border="0" title="<?% gettext('Edit') %?>"/></a> + </span> + <span class="action delete"> + <a href="javascript:del('<?% gettext('Delete timer?') %?>\n\n"<?% pattern | js %?>"', '<?% delurl %?>');"><img src="bilder/delete.png" alt="delete" border="0" title="<?% gettext('Delete') %?>"/></a> + </span> + </td> + <td class="col_checkbox"> + <div> + <input type="checkbox" name="xxxx_<?% id %?>"/> + </div> + </td> + </tr> +<?% END %?> + </table> + + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons"> + <tr> + <td align="left"> + <input type="submit" class="submit" name="favorites" value="<?% gettext('Show Favorites') %?>" /> + </td> + <td align="right"> + <input type="submit" class="submit" name="delete" value="<?% gettext('Delete Selected Searches') %?>" onclick="mdel(this, '<?% gettext('Delete all selected searches?') %?>');" /> + <input type="submit" class="submit" name="execute" value="<?% gettext('Execute Selected Searches') %?>" /> + </td> + </tr> + </table> + <input type="hidden" name="aktion" value="epgsearch_aktion"/> + + </form> +<?% END %?> + +<?% IF did_search %?> + <form action="<?% url %?>" method="get" name="FormName0"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> + <tr> + <td class="col_title"> + <h1><?% title %?></h1> + </td> + </tr> + </table> + </form> + + <?% IF matches.size() > 0 %?> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="list" id="content"> + <!-- + <tr class="heading"> + <td class="col_duration"><h2><?% gettext('Duration') %?></h2></td> + <td class="col_center"><h2><?% gettext('Title') %?></h2></td> + <td class="col_channel"><h2><?% gettext('Channel') %?></h2></td> + <td class="col_folder"><h2><?% gettext('Stored in') %?></h2></td> + </tr> + --> + <?% FOREACH matches; + IF olddate != date; + olddate = date; %?> + <tr class="newday"> + <td colspan="4"><span class="date_long"><?% date %?></span></td> + </tr> + <?% END %?> + <tr class="<?% IF loop.count % 2 == 0 %?>row_even<?% ELSE %?>row_odd<?% END %?>"> + <td class="col_duration"> + <span class="time_duration"><span class="time_start"><?% start %?></span> - <span class="time_stop"><?% stop %?></span></span> + </td> + <td class="col_center"> + <div class="epg_title"> + <?% IF infurl %?> + <a href="javascript:popup('<?% infurl %?>');" title="<?% gettext('More Information') %?>"> + <?% END %?> + <?% title %?> + <?% IF infurl %?> + </a> + <?% END %?> + </div> + <?% IF subtitle %?> + <div class="epg_subtitle"><?% subtitle %?></div> + <?% ELSE %?> + <div class="epg_subtitle"> </div> + <?% END %?> + </td> + <td class="col_channel"> + <div class="channel_name"><a href="<?% proglink %?>" title="<?% gettext('Channels') %?>"><?% channel %?></a></div> + </td> + <td class="col_folder"> + <?% folder %?> + </td> + </tr> + <?% END %?> + </table> + <?% ELSE %?> + <div class="warning"><?% gettext('No matches found!') %?></div> + <?% END %?> +<?% END %?> +</body> + +</html> diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html new file mode 100644 index 0000000..cfc917b --- /dev/null +++ b/template/default/epgsearch_new.html @@ -0,0 +1,571 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html id="scroller"> + +<head> + <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> + <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Define New Search') %?><?% ELSE %?><?% gettext('Edit Search') %?><?% END %?></title> + <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> + <?% IF usercss %?> + <link href="user.css" rel="stylesheet" media="screen" type="text/css"/> + <?% END %?> + <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> + <script type="text/javascript" language="JavaScript1.2"> + <!-- + function initGUI() + { + if (document.getElementById("hide_results")) + document.getElementById("hide_results").style.display = "block"; + changedSearchMode(document.getElementById("search_mode")); + changedUseChannel(document.getElementById("use_channel")); +<?% IF extepg.size() > 0 %?> + changedUseExtEpg(document.getElementById("use_extepg")); +<?% END %?> + changedUseTime(document.getElementById("use_time")); + changedUseDuration(document.getElementById("use_duration")); + changedUseDays(document.getElementById("use_days")); + changedUseBlacklists(document.getElementById("use_blacklists")); + changedAction(document.getElementById("select_action")); + changedHasAction(document.getElementById("has_action")); + changedAvoidRepeats(document.getElementById("avoid_repeats")); + } + + function changedSearchMode(mySelect) + { + document.getElementById("fuzzy_tolerance").style.display = (mySelect.options[mySelect.selectedIndex].value == 5 ? "block" : "none"); + } + + function changedUseChannel(mySelect) + { + switch (mySelect.options[mySelect.selectedIndex].value) + { + case "0": + case "3": + document.getElementById("channel_range").style.display = "none"; + document.getElementById("channel_group").style.display = "none"; + break; + + case "1": + document.getElementById("channel_range").style.display = "block"; + document.getElementById("channel_group").style.display = "none"; + break; + + case "2": + document.getElementById("channel_range").style.display = "none"; + document.getElementById("channel_group").style.display = "block"; + break; + } + } + + function changedUseExtEpg(myCheckbox) + { + document.getElementById("use_extepg_settings").style.display = (myCheckbox.checked ? "block" : "none"); + } + + function changedUseTime(myCheckbox) + { + document.getElementById("use_time_settings").style.display = (myCheckbox.checked ? "block" : "none"); + } + + function changedUseDuration(myCheckbox) + { + document.getElementById("use_duration_settings").style.display = (myCheckbox.checked ? "block" : "none"); + } + + function changedUseDays(myCheckbox) + { + document.getElementById("use_days_settings").style.display = (myCheckbox.checked ? "block" : "none"); + } + + function changedUseBlacklists(mySelect) + { + document.getElementById("select_blacklists").style.display = (mySelect.options[mySelect.selectedIndex].value == 1 ? "block" : "none"); + } + + function changedHasAction(myCheckbox) + { + if (myCheckbox.checked) + { + document.getElementById("set_action").style.display = "inline"; + changedAction(document.getElementById("select_action")); + } + else + { + document.getElementById("set_action").style.display = "none"; + document.getElementById("action_record_settings").style.display = "none"; + document.getElementById("action_switch_settings").style.display = "none"; + } + } + + function changedAction(mySelect) + { + switch (mySelect.options[mySelect.selectedIndex].value) + { + case "0": + document.getElementById("action_record_settings").style.display = "block"; + document.getElementById("action_switch_settings").style.display = "none"; + break; + + case "1": + document.getElementById("action_record_settings").style.display = "none"; + document.getElementById("action_switch_settings").style.display = "none"; + break; + + case "2": + document.getElementById("action_record_settings").style.display = "none"; + document.getElementById("action_switch_settings").style.display = "block"; + break; + } + } + + function changedAvoidRepeats(myCheckbox) + { + document.getElementById("avoid_repeats_settings").style.display = (myCheckbox.checked ? "block" : "none"); + } + + function checkSearchPattern() + { + if (document.getElementById("pattern").value.length > 3) + return true; + + if ( !document.getElementById("use_title").checked + && !document.getElementById("use_subtitle").checked + && !document.getElementById("use_descr").checked) + return true; + + return confirm('<?% gettext('Small search pattern.\nDo you really want to use it?') %?>'); + } + + function hideResults() + { + document.getElementById("results").style.display = "none"; + } + //--> + </script> +</head> + +<body id="epgsearch_new" onload="javascript:initGUI()"> + <form action="<?% url %?>" method="get" name="FormName"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> + <tr> + <td class="col_title"> + <h1><?% IF do_edit %?><?% gettext('Edit Search') %?><?% ELSE %?><?% gettext('Add New Search') %?><?% END %?></h1> + </td> +<?% IF help_url %?> + <td class="col_help"> + <a href="javascript:open_help('<?% help_url %?>');"><img src="bilder/help.png" border="0" alt="help" title="<?% gettext('Help') %?>"/></a> + </td> +<?% END %?> + </tr> + </table> + + <div id="content"> +<?% IF did_search %?> + <?% IF matches %?> + <div id="results"> + <input type="button" name="hide_results" value="<?% gettext('Hide results') %?>" onclick="javascript:hideResults()" id="hide_results" style="display:none;"/> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="list"> + <?% FOREACH matches; + IF olddate != date; + olddate = date; %?> + <tr class="newday"> + <td colspan="4"><span class="date_long"><?% date %?></span></td> + </tr> + <?% END %?> + <tr class="<?% IF loop.count % 2 == 0 %?>row_even<?% ELSE %?>row_odd<?% END %?>"> + <td class="col_duration"> + <span class="time_duration"><span class="time_start"><?% start %?></span> - <span class="time_stop"><?% stop %?></span></span> + </td> + <td class="col_center"> + <div class="epg_title"> + <?% IF infurl %?> + <a href="javascript:popup('<?% infurl %?>');" title="<?% gettext('More Information') %?>"> + <?% END %?> + <?% title %?> + <?% IF infurl %?> + </a> + <?% END %?> + </div> + <?% IF subtitle %?> + <div class="epg_subtitle"><?% subtitle %?></div> + <?% ELSE %?> + <div class="epg_subtitle"> </div> + <?% END %?> + </td> + <td class="col_channel"> + <div class="channel_name"><?% channel %?></div> + </td> + <td class="col_folder"> + <?% folder %?> + </td> + </tr> + <?% END %?> + </table> + <?% ELSE %?> + <div class="warning"><?% gettext('No matches found!') %?></div> + <?% END %?> + <br /> + </div> +<?% END %?> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="newday"> + <td colspan="2"><?% gettext('Settings') %?></td> + </tr> + <?% tr_class = "row_odd" %?> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label"><h5><?% gettext('Search Term:') %?></h5></td> + <td class="col_value"> + <input type="text" name="pattern" id="pattern" value="<?% epgsearch.pattern %?>" size="40" /> + </td> + </tr> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label" valign="top"><h5><?% gettext('Search Mode:') %?></h5></td> + <td class="col_value"> + <select onchange="javascript:changedSearchMode(this)" id="search_mode" name="mode"> + <option value="0" <?% IF epgsearch.mode == 0 %?>selected="selected"<?% END %?>><?% gettext('phrase') %?></option> + <option value="1" <?% IF epgsearch.mode == 1 %?>selected="selected"<?% END %?>><?% gettext('all words') %?></option> + <option value="2" <?% IF epgsearch.mode == 2 %?>selected="selected"<?% END %?>><?% gettext('at least one word') %?></option> + <option value="3" <?% IF epgsearch.mode == 3 %?>selected="selected"<?% END %?>><?% gettext('match exactly') %?></option> + <option value="4" <?% IF epgsearch.mode == 4 %?>selected="selected"<?% END %?>><?% gettext('regular expression') %?></option> + <option value="5" <?% IF epgsearch.mode == 5 %?>selected="selected"<?% END %?>><?% gettext('fuzzy') %?></option> + </select> + <div id="fuzzy_tolerance"> + <?% gettext('Tolerance for "fuzzy":') %?> + <input type="text" name="fuzzy_tolerance" size="2" value="<?% epgsearch.fuzzy_tolerance %?>" /> + </div> + </td> + </tr> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label"><h5><?% gettext('Match Case:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="matchcase" value="1" <?% IF epgsearch.matchcase %?>checked="checked"<?% END %?> /> + </td> + </tr> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label" valign="top"><h5><?% gettext('Search in:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="use_title" value="1" id="use_title" <?% IF epgsearch.use_title %?>checked="checked"<?% END %?> /><label for="use_title"><?% gettext('Title') %?></label> + <input type="checkbox" name="use_subtitle" value="1" id="use_subtitle" <?% IF epgsearch.use_subtitle %?>checked="checked"<?% END %?> /><label for="use_subtitle"><?% gettext('Subtitle') %?></label> + <input type="checkbox" name="use_descr" value="1" id="use_descr" <?% IF epgsearch.use_descr %?>checked="checked"<?% END %?> /><label for="use_descr"><?% gettext('Description') %?></label> + </td> + </tr> +<?% IF extepg.size() > 0 %?> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label" valign="top"><h5><?% gettext('Use extended EPG info:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="use_extepg" value="1" id="use_extepg" <?% IF epgsearch.use_extepg %?>checked="checked"<?% END %?> onclick="javascript:changedUseExtEpg(this)" /><br/> + <div id="use_extepg_settings"> + <?% FOREACH ext = extepg %?> + <table border="0" cellspacing="0" cellpadding="0"> + <tr> + <td><?% ext.title %?></td> + </tr> + <tr> + <td> + <input type="text" value="<?% ext.data_text %?>" size="10" name="extepg_<?% ext.id %?>_data_text"/> + </td> + </tr> + <tr> + <td> + <select size="3" multiple="multiple" style="<?% IF ext.data.size() == 0 %?>visibility:hidden;<?% END %?>" name="extepg_<?% ext.id %?>_data"> + <?% IF ext.data.size() > 0 %?> + <?% FOREACH v = ext.data %?> + <option value="<?% v.name | html %?>" <?% IF v.sel %?>selected="selected"<?% END %?>><?% v.name | html %?></option> + <?% END %?> + <?% ELSE %?> + <option/> + <?% END %?> + </select> + </td> + </tr> + </table> + <?% END %?> + </div> + </td> + </tr> +<?% END %?> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label" valign="top"><h5><?% gettext('Use Channel:') %?></h5></td> + <td class="col_value"> + <select onchange="javascript:changedUseChannel(this)" id="use_channel" name="use_channel"> + <option value="0" <?% IF epgsearch.use_channel == 0 %?>selected="selected"<?% END %?>><?% gettext('no') %?></option> + <option value="1" <?% IF epgsearch.use_channel == 1 %?>selected="selected"<?% END %?>><?% gettext('interval') %?></option> + <option value="2" <?% IF epgsearch.use_channel == 2 %?>selected="selected"<?% END %?>><?% gettext('channel group') %?></option> + <option value="3" <?% IF epgsearch.use_channel == 3 %?>selected="selected"<?% END %?>><?% gettext('only FTA') %?></option> + </select> + <div id="channel_range"> + <?% gettext('Range:') %?> + <select name="channel_from"> +<?% FOREACH channels %?> + <option value="<?% uniq_id %?>" <?% IF uniq_id == epgsearch.channel_from %?>selected="selected"<?% END %?>><?% name | html %?></option> +<?% END %?> + </select> + - + <select name="channel_to"> +<?% FOREACH channels %?> + <option value="<?% uniq_id %?>" <?% IF uniq_id == epgsearch.channel_to %?>selected="selected"<?% END %?>><?% name | html %?></option> +<?% END %?> + </select> + </div> + <div id="channel_group"> + <?% gettext('Channel Group:') %?> + <select name="channel_group"> + <?% FOREACH group = ch_groups %?> + <option value="<?% group.id %?>" <?% IF group.sel %?>selected="selected"<?% END %?>><?% group.name | html %?></option> + <?% END %?> + </select> + </div> + </td> + </tr> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label" valign="top"><h5><?% gettext('Use Time:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="use_time" value="1" <?% IF epgsearch.use_time %?>checked="checked"<?% END %?> onclick="javascript:changedUseTime(this)" id="use_time" /> + <div id="use_time_settings"> + <table border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="col_label"><h5><?% gettext('Start After:') %?></h5></td> + <td class="col_value"> + <input type="text" name="time_start" value="<?% epgsearch.time_start %?>" size="5" maxlength="5" /> + <?% gettext('o\'clock') %?> + </td> + </tr> + <tr> + <td class="col_label"><h5><?% gettext('Start Before:') %?></h5></td> + <td class="col_value"> + <input type="text" name="time_stop" value="<?% epgsearch.time_stop %?>" size="5" maxlength="5" /> + <?% gettext('o\'clock') %?> + </td> + </tr> + </table> + </div> + </td> + </tr> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label" valign="top"><h5><?% gettext('Use Duration:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="use_duration" value="1" <?% IF epgsearch.use_duration %?>checked="checked"<?% END %?> onclick="javascript:changedUseDuration(this)" id="use_duration" /> + <div id="use_duration_settings"> + <table border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="col_label"><h5><?% gettext('Min. Duration:') %?></h5></td> + <td class="col_value"> + <input type="text" name="min_duration" value="<?% epgsearch.min_duration %?>" size="5" maxlength="5" /> + (<?% gettext('hh:mm') %?>) + </td> + </tr> + <tr> + <td class="col_label"><h5><?% gettext('Max. Duration:') %?></h5></td> + <td class="col_value"> + <input type="text" name="max_duration" value="<?% epgsearch.max_duration %?>" size="5" maxlength="5" /> + (<?% gettext('hh:mm') %?>) + </td> + </tr> + </table> + </div> + </td> + </tr> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label" valign="top"><h5><?% gettext('Use Day of Week:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="use_days" value="1" id="use_days" <?% IF epgsearch.use_days %?>checked="checked"<?% END %?> onclick="javascript:changedUseDays(this)" /> + <div id="use_days_settings"> + <input type="checkbox" name="monday" value="1" id="monday" <?% IF epgsearch.monday %?>checked="checked"<?% END %?> /><label for="monday"><?% gettext('Monday') %?></label> + <input type="checkbox" name="tuesday" value="1" id="tuesday" <?% IF epgsearch.tuesday %?>checked="checked"<?% END %?> /><label for="tuesday"><?% gettext('Tuesday') %?></label> + <input type="checkbox" name="wednesday" value="1" id="wednesday" <?% IF epgsearch.wednesday %?>checked="checked"<?% END %?> /><label for="wednesday"><?% gettext('Wednesday') %?></label> + <input type="checkbox" name="thursday" value="1" id="thursday" <?% IF epgsearch.thursday %?>checked="checked"<?% END %?> /><label for="thursday"><?% gettext('Thursday') %?></label> + <input type="checkbox" name="friday" value="1" id="friday" <?% IF epgsearch.friday %?>checked="checked"<?% END %?> /><label for="friday"><?% gettext('Friday') %?></label> + <input type="checkbox" name="saturday" value="1" id="saturday" <?% IF epgsearch.saturday %?>checked="checked"<?% END %?> /><label for="saturday"><?% gettext('Saturday') %?></label> + <input type="checkbox" name="sunday" value="1" id="sunday" <?% IF epgsearch.sunday %?>checked="checked"<?% END %?> /><label for="sunday"><?% gettext('Sunday') %?></label> + </div> + </td> + </tr> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label" valign="top"><h5><?% gettext('Use Blacklists:') %?></h5></td> + <td class="col_value"> + <select onchange="javascript:changedUseBlacklists(this)" id="use_blacklists" name="use_blacklists"> + <option value="0" <?% IF epgsearch.use_blacklists == 0 %?> selected="selected"<?% END %?>><?% gettext('no') %?></option> + <option value="1" <?% IF epgsearch.use_blacklists == 1 %?> selected="selected"<?% END %?>><?% gettext('selection') %?></option> + <option value="2" <?% IF epgsearch.use_blacklists == 2 %?> selected="selected"<?% END %?>><?% gettext('all') %?></option> + </select> + <div id="select_blacklists"> + <select size="5" multiple="multiple" name="sel_blacklists"> + <?% FOREACH bl = blacklists %?> + <option value="<?% bl.id %?>" <?% IF bl.sel %?>selected="selected"<?% END %?>><?% bl.pattern | html %?></option> + <?% END %?> + </select> + </div> + </td> + </tr> +<?% IF epgs_settings.ShowFavoritesMenu %?> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label"><h5><?% gettext('Use in Favorites Menu:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="use_for_fav" value="1" <?% IF epgsearch.use_for_fav %?>checked="checked"<?% END %?> /> + </td> + </tr> +<?% END %?> + <tr class="<?% tr_class %?>"> + <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> + <td class="col_label"><h5><?% gettext('Use as Search Timer:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="has_action" value="1" <?% IF epgsearch.has_action %?>checked="checked"<?% END %?> onclick="javascript:changedHasAction(this)" id="has_action" /> + <span id="set_action"> + <select onchange="javascript:changedAction(this)" id="select_action" name="action"> + <option value="0" <?% IF epgsearch.action == 0 %?>selected="selected"<?% END %?>><?% gettext('record') %?></option> + <option value="1" <?% IF epgsearch.action == 1 %?>selected="selected"<?% END %?>><?% gettext('announce only') %?></option> + <option value="2" <?% IF epgsearch.action == 2 %?>selected="selected"<?% END %?>><?% gettext('switch only') %?></option> + </select> + </span> + </td> + </tr> + </table> + + <div id="action_record_settings"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><?% gettext('Settings for action "record"') %?></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><?% gettext('Series Recording:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="is_series" value="1" id="is_series" <?% IF epgsearch.is_series %?>checked="checked"<?% END %?> /> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Directory:') %?></h5></td> + <td class="col_value"> + <input type="text" name="directory" value="<?% epgsearch.directory %?>" size="40" /> + </td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><?% gettext('Delete Recordings After ... Days:') %?></h5></td> + <td class="col_value"> + <input type="text" name="delete_after" value="<?% epgsearch.delete_after %?>" size="3" /> + <h5><?% gettext('Keep ... Recordings:') %?></h5> + <input type="text" name="keep_recordings" value="<?% epgsearch.keep_recordings %?>" size="3" /> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Pause, when ... recordings exist:') %?></h5></td> + <td class="col_value"> + <input type="text" name="pause" value="<?% epgsearch.pause %?>" size="3" /> + </td> + </tr> + <tr class="row_odd"> + <td class="col_label" valign="top"><h5><?% gettext('Avoid Repeats:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="avoid_repeats" value="1" <?% IF epgsearch.avoid_repeats %?>checked="checked"<?% END %?> onclick="javascript:changedAvoidRepeats(this)" id="avoid_repeats" /> + <div id="avoid_repeats_settings"> + <table border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="col_label"><h5><?% gettext('Allowed Repeats:') %?></h5></td> + <td class="col_value"> + <input type="text" name="allowed_repeats" value="<?% epgsearch.allowed_repeats %?>" size="3" id="allowed_repeats"/> + <h5><?% gettext('Only Repeats Within ... Days:') %?></h5> + <input type="text" name="repeats_in_days" value="<?% epgsearch.repeats_in_days %?>" size="3" /> + </td> + </tr> + <tr> + <td class="col_label" valign="top"><h5><?% gettext('Compare:') %?></h5></td> + <td class="col_value"> + <div> + <input type="checkbox" name="comp_title" value="1" id="comp_title" <?% IF epgsearch.comp_title %?>checked="checked"<?% END %?> /><label for="comp_title"><?% gettext('Title') %?></label> + <input type="checkbox" name="comp_subtitle" value="1" id="comp_subtitle" <?% IF epgsearch.comp_subtitle %?>checked="checked"<?% END %?> /><label for="comp_subtitle"><?% gettext('Subtitle') %?></label> + <input type="checkbox" name="comp_descr" value="1" id="comp_descr" <?% IF epgsearch.comp_descr %?>checked="checked"<?% END %?> /><label for="comp_descr"><?% gettext('Description') %?></label> + </div> + <div> + <?% FOREACH ext = extepg %?> + <span> + <?% fullid = "comp_extepg_${ext.id}" %?> + <input type="checkbox" name="<?% fullid %?>" value="1" id="<?% fullid %?>" <?% IF epgsearch.$fullid %?>checked="checked"<?% END %?> /><label for="<?% fullid %?>"><?% ext.title %?></label> + </span> + <?% END %?> + </div> + </td> + </tr> + </table> + </div> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Priority:') %?></h5></td> + <td class="col_value"> + <input type="text" name="prio" value="<?% epgsearch.prio %?>" size="2" maxlength="2" /> + </td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><?% gettext('Lifetime:') %?></h5></td> + <td class="col_value"> + <input type="text" name="lft" value="<?% epgsearch.lft %?>" size="2" maxlength="2" /> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Time Margin at Start:') %?></h5></td> + <td class="col_value"> + <input type="text" name="bstart" value="<?% epgsearch.bstart %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?> + </td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><?% gettext('Time Margin at Stop:') %?></h5></td> + <td class="col_value"> + <input type="text" name="bstop" value="<?% epgsearch.bstop %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('VPS:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="use_vps" value="1" id="use_vps" <?% IF epgsearch.use_vps %?>checked="checked"<?% END %?> /> + </td> + </tr> + </table> + </div> + + <div id="action_switch_settings"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><?% gettext('Settings for action "switch only"') %?></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><?% gettext('Switch ... Minutes Before Start:') %?></h5></td> + <td class="col_value"> + <input type="text" name="switch_before" value="<?% epgsearch.switch_before %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?> + </td> + </tr> + </table> + </div> + </div> + + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons"> + <tr> + <!-- + <td align="left"> + <input type="submit" class="submit" name="template" value="<?% gettext('Save as template') %?>" /> + </td> + --> + <td align="right"> + <input type="submit" class="submit" name="save" value="<?% gettext('Save') %?>" onclick="return checkSearchPattern();" /> + <input type="submit" class="submit" name="single_test" value="<?% gettext('Run') %?>" onclick="return checkSearchPattern();" /> + <input type="submit" class="submit" name="exit" value="<?% gettext('Cancel') %?>" /> + </td> + </tr> + </table> + <input type="hidden" name="aktion" value="epgsearch_aktion" /> + <?% IF do_edit %?> + <input type="hidden" name="id" value="<?% epgsearch.id %?>" /> + <?% END %?> + <input type="hidden" name="unused" value="<?% epgsearch.unused %?>" /> + </form> +</body> + +</html> diff --git a/template/default/error.html b/template/default/error.html index 6e45956..f704759 100644 --- a/template/default/error.html +++ b/template/default/error.html @@ -13,9 +13,7 @@ <body id="error"> <div align="center"> - <img src="bilder/sauerei.gif" height="230" width="177" border="0" alt="" /> - <br/> - <h2><?% error %?></h2> + <div class="error"><?% error %?></div> </div> </body> diff --git a/template/default/help_at_timer_list.html b/template/default/help_at_timer_list.html index 129d286..ebbd880 100644 --- a/template/default/help_at_timer_list.html +++ b/template/default/help_at_timer_list.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> diff --git a/template/default/help_at_timer_new.html b/template/default/help_at_timer_new.html index 794c9d5..6e1d88c 100644 --- a/template/default/help_at_timer_new.html +++ b/template/default/help_at_timer_new.html @@ -5,7 +5,7 @@ * the HISTORY of macfly's patch --> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> @@ -42,7 +42,7 @@ <dt><?% gettext('Ends Before:') %?></dt> <dd><?% gettext('A broadcast must end before the time entered here to match. The first text field is for "hour", the second for "minute".') %?></dd> <dt><?% gettext('Override Start/Stop Margins:') %?></dt> - <dd><?% gettext('Set this option to "yes" if all timers programed by this AutoTimer should have individual start/stop margins and enter the values in the next two text boxes.') %?> + <dd><?% gettext('Set this option to "yes" if all timers programed by this AutoTimer should have individual start/stop margins and enter the values in the next two text boxes.') %?></dd> <dt><?% gettext('Time Margin at Start:') %?></dt> <dd><?% gettext('The number of minutes VDRAdmin-AM subtracts from the broadcasts start time found in the EPG.') %?></dd> <dt><?% gettext('Time Margin at Stop:') %?></dt> diff --git a/template/default/help_config.html b/template/default/help_config.html index 675935b..5bc6163 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -2,7 +2,7 @@ <!-- This help is partly taken from the VDR man page, Copyright (c) by Klaus Schmidinger --> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> @@ -108,7 +108,7 @@ <dt><?% gettext('Mail server:') %?></dt> <dd><?% gettext('The outgoing mail server.') %?></dd> <dt><?% gettext('SMTPAuth user:') %?></dt> - <dd><?% gettext('If you need to authenticate yourself at the outgoing mail server, you have to supply the username and the password below. Leaving this field empty will disable SMTPAuth.') %?> + <dd><?% gettext('If you need to authenticate yourself at the outgoing mail server, you have to supply the username and the password below. Leaving this field empty will disable SMTPAuth.') %?></dd> <dt><?% gettext('SMTPAuth password:') %?></dt> <dd><?% gettext('The password for the SMTPAuth user.') %?></dd> <dt><?% gettext('Tooltips:') %?></dt> diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html index ba8d0c7..b5fb008 100644 --- a/template/default/help_rec_list.html +++ b/template/default/help_rec_list.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html index 7d8e11c..08762da 100644 --- a/template/default/help_timer_list.html +++ b/template/default/help_timer_list.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> diff --git a/template/default/help_timer_new.html b/template/default/help_timer_new.html index c6c85cb..046eba9 100644 --- a/template/default/help_timer_new.html +++ b/template/default/help_timer_new.html @@ -2,7 +2,7 @@ <!-- This help is partly taken from the VDR man page, Copyright (c) by Klaus Schmidinger --> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> diff --git a/template/default/index.html b/template/default/index.html index a88f62b..30f0a72 100644 --- a/template/default/index.html +++ b/template/default/index.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> <html> <head> @@ -13,8 +13,8 @@ </head> <frameset border="0" cols="155,*" frameborder="no" framespacing="0"> - <frame name="nav" noresize src="navigation.html" /> - <frame name="main" noresize src="<?% loginpage %?>" /> + <frame name="nav" noresize="noresize" src="navigation.html" /> + <frame name="main" noresize="noresize" src="<?% loginpage %?>" /> <noframes> <body> diff --git a/template/default/library.js b/template/default/library.js index 67b36fb..bc4ccc0 100644 --- a/template/default/library.js +++ b/template/default/library.js @@ -15,15 +15,9 @@ function change(message, suffix) { if(check) window.location.href=suffix; } -function mdel_old(message) { +function mdel(but, message) { check=confirm(message); - if(check) document.FormName.submit(); -} - -function mdel(message) { - check=confirm(message); -// if(check) document.FormName.submit(); - return check; + if(check) but.form.submit(); } function callurl( url ) { diff --git a/template/default/navigation.html b/template/default/navigation.html index e6cd932..7ef88be 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -45,6 +45,11 @@ <a href="vdradmin.pl?aktion=at_timer_list" target="main"><?% gettext('AutoTimer') %?></a> </div> <?% END %?> +<?% IF features.EPGSEARCH %?> + <div class="navi" id="epgsearch_list"> + <a href="vdradmin.pl?aktion=epgsearch_list" target="main"><?% gettext('EPG Search') %?></a> + </div> +<?% END %?> <div class="navi" id="rec_list"> <a href="vdradmin.pl?aktion=rec_list" target="main"><?% gettext('Recordings') %?></a> </div> @@ -66,7 +71,7 @@ <form action="vdradmin.pl" method="get" name="FormName" target="main" class="search"> <input type="text" name="search" /><br /> - <input type="submit" name="submit" value="<?% gettext('Search') %?>" / + <input type="submit" name="submit" value="<?% gettext('Search') %?>" /> <input type="hidden" name="aktion" value="prog_summary" /> </form> </div> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index b8308fe..083b15f 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index 0a15582..fa36f7f 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> @@ -27,7 +27,7 @@ <td class="col_title"> <h1><?% title %?></h1> <?% gettext('starting at') %?> - <input type="text" size="5" maxlength="5" value="<?% now %?>" name="time"/> + <input type="text" size="5" maxlength="5" value="<?% now %?>" name="time"/> <?% gettext('o\'clock') %?> </td> <td class="col_navi"> @@ -36,7 +36,7 @@ <select name="days" size="1" onchange="window.open(this.options[this.selectedIndex].value,'main')"> <?% FOREACH d = days %?> <option value="<?% d.id %?>" <?% IF d.sel %?>selected="selected"<?% END %?>><?% d.name %?></option> <?% END %?> - </select> + </select> <?% IF nextdayurl %?><a href="<?% nextdayurl %?>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /><?% END %?> <?% END %?> </td> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index 5ace9b7..74031ed 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_summary" /> diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html index 2532023..e572a09 100644 --- a/template/default/prog_summary2.html +++ b/template/default/prog_summary2.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_summary" /> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index 2fc51b8..d48d6e5 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_timeline" /> @@ -83,7 +83,7 @@ { if (redraw_w != GetWindowW() || redraw_h != GetWindowH()) { - Go('<?% nowurl %?>&time=<?% date.format(now_sec, '%H:%M') %?>'); + Go('<?% nowurl %?>&time=<?% date.format(now_sec, '%H:%M') %?>'); } } @@ -132,7 +132,7 @@ <?% FOREACH show = shows2.${name}; %?> - events[<?% counter %?>] = AddEvent(<?% counter %?>, <?% show.vdr_id %?>, <?% show.anchor %?>, <?% show.start %?>, <?% show.stop %?>, "<?% show.title %?>", <?% show.timer %?>, <?% show.summary ? 1 : 0 %?>); + events[<?% counter %?>] = AddEvent(<?% counter %?>, <?% show.vdr_id %?>, <?% show.anchor %?>, <?% show.start %?>, <?% show.stop %?>, "<?% show.title | html %?>", <?% show.timer %?>, <?% show.summary ? 1 : 0 %?>); <?% counter = counter + 1; END; @@ -156,7 +156,7 @@ </td> <td class="col_other"> <?% gettext('What\'s on:') %?> - <select name="Auswahl" class="submit" onChange="Go(this.form.Auswahl.options[this.form.Auswahl.options.selectedIndex].value)" width="100"> + <select name="Auswahl" class="submit" onchange="Go(this.form.Auswahl.options[this.form.Auswahl.options.selectedIndex].value)"> <?% select_now = (now == date.format(date.now, '%H:%M')) %?> <script type="text/javascript" language="JavaScript1.2"> BuildOption("", 0, "-"); diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html index cf1e6ca..bb18671 100644 --- a/template/default/rec_edit.html +++ b/template/default/rec_edit.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> diff --git a/template/default/rec_list.html b/template/default/rec_list.html index eb657ca..ab4905c 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> @@ -93,15 +93,9 @@ </td> <td class="col_time <?% IF rec.sortbytime %?>selected<?% END %?>"> <span class="time"><?% rec.time %?></span> - <span class="new"> - <?% IF rec.isfolder %?> - <?% gettext('New') %?> - <?% ELSE %?> - <?% IF rec.new %?> - <?% gettext('New') %?> - <?% END %?> - <?% END %?> - </span> + <?% IF rec.isfolder || rec.new %?> + <span class="new"><?% gettext('New') %?></span> + <?% END %?> </td> <td class="col_name <?% IF rec.sortbyname %?>selected<?% END %?>"> <?% IF rec.isfolder %?> @@ -151,8 +145,9 @@ </td> <?% END %?> <td align="right"> - <input type="submit" class="submit" name="rec_delete" value="<?% gettext('Delete Selected Recordings') %?>" onclick="return mdel('<?% gettext('Delete all selected recordings?') %?>');" /> + <input type="submit" class="submit" name="rec_delete" value="<?% gettext('Delete Selected Recordings') %?>" onclick="return mdel(this, '<?% gettext('Delete all selected recordings?') %?>');" /> </td> + </tr> </table> <input type="hidden" name="aktion" value="rec_delete" /> </form> diff --git a/template/default/style.css b/template/default/style.css index 30ca69f..0bcc6ff 100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -1,5 +1,17 @@ +/* ugly MSIE6/7 hacks */ +/* always show vertical scroller to avoid horizontal scrolling on some pages */ +* html#scroller { + overflow-y: scroll; +} +/* avoid too small inputs/selects */ +*+html #epgsearch_new #use_extepg_settings table, +* html #epgsearch_new #use_extepg_settings table { + width: 30%; +} +/* END OF ugly MSIE hacks */ + * { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; + font-family: Bitstream Vera Sans, Verdana, Arial, Geneva, Helvetica, sans-serif; } #rc, @@ -45,6 +57,7 @@ select { img { border: 0; vertical-align: middle; + display: inline; } /* .submit { @@ -150,8 +163,8 @@ body.help .heading { display: table-row; } -.row_odd -.row_even, +.row_odd td, +.row_even td, .heading { height: 17px; } @@ -194,11 +207,6 @@ body.help .heading { white-space: nowrap; } -.row_odd, -.row_even { - height: 25px; -} - .col_channels { text-align: right; padding: 10px; @@ -249,6 +257,9 @@ body.help .heading { text-align: center; width: 20px; } +.heading .action { + background-color: white; +} /* Summary */ #prog_summary .group { @@ -310,6 +321,10 @@ body.help .heading { padding: 2px 2px; } +#action_record_settings, +#action_switch_settings { + margin-top: 1em; +} .newday { height: 17px; background-color: #6d96a9; @@ -331,12 +346,16 @@ body.help .heading { } #prog_list .col_buttons, #rec_list .col_buttons, +#epgsearch_list .col_buttons, #prog_summary2 .col_buttons { width: 120px; text-align: right; padding-right: 3px; white-space: nowrap; } +#prog_summary2 table.percent td { + height: 8px; +} #prog_summary2 table.percent { height: 8px; width: 80px; @@ -523,6 +542,7 @@ body.help .heading { margin-top: 0.6em; } #timer_list .blackline { + height: 1px; background-color: black; } #timer_list .color_ok { @@ -537,7 +557,7 @@ body.help .heading { #timer_list .color_inactive { background-color: #858585; } -#timer_list #prgtable { +#timer_list .prgtable { border-left-color: #000000; border-right-color: #000000; } @@ -560,6 +580,29 @@ body.help .heading { padding: 0px; } +#epgsearch_new #use_extepg_settings { + white-space: normal; + vertical-align: top; +} +#epgsearch_new #use_extepg_settings table { + padding: 0 5px 5px 0; + display: inline; + float: left; + vertical-align: top; + height: 100%; +} +#epgsearch_new #use_extepg_settings table select, +#epgsearch_new #use_extepg_settings table input { + width: 100%; +} +#epgsearch_new #avoid_repeats_settings div { + white-space: normal; +} +#epgsearch_new #avoid_repeats_settings span { + float: left; + padding-right: 1em; +} + #content { margin-top: 0.6em; } @@ -588,31 +631,6 @@ body.help .heading { #config .col_label { width: 50%; } -.tabs td { - padding: 0; - margin: 0; - background-color: transparent; - border-bottom: 2px solid #6d96a9; -} -.tab_selected a { - color: white; - margin: 1px 3px; -} -.tab_unselected a { - color: black; - margin: 1px 3px; -} -.tab_selected { - border-right: 1px solid #6d96a9; - background-color: #6d96a9; - color: white; - font-weight: bold; -} -.tab_unselected { - border-right: 1px solid #6d96a9; - background-color: white; - color: black; -} #about .col_label { width: 20%; } @@ -755,9 +773,6 @@ select.channels { #navigation input { width: 140px; } -#navigation #epgsearch_list a { - color: green; -} /* message boxes */ .warning h1 { diff --git a/template/default/timer_list.html b/template/default/timer_list.html index a251da8..a5147a4 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> @@ -13,7 +13,7 @@ <script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script> <?% END %?> <style type="text/css"> - #prgtable { border-left-width:1px; border-left-style:solid; border-right-width:1px; border-right-style:solid; } + .prgtable { border-left-width:1px; border-left-style:solid; border-right-width:1px; border-right-style:solid; } </style> </head> @@ -147,12 +147,12 @@ END; IF ende - pos < 2; %?> - <td class="<?% td_class %?>"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos %?>" height="20" border="0" alt="" /></span></td> + <td class="<?% td_class %?>"><span <?% IF config.TM_TT_TIMELINE %?>onmouseover="tip('VDR-<?% sendung.id %?>'); return true;" onmouseout="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos %?>" height="20" border="0" alt="" /></span></td> <?% ELSE; %?> - <td class="<?% td_class %?>" id="prgtable"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" alt="" /></span></td> + <td class="<?% td_class %?> prgtable"><span <?% IF config.TM_TT_TIMELINE %?>onmouseover="tip('VDR-<?% sendung.id %?>'); return true;" onmouseout="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" alt="" /></span></td> <?% END; @@ -311,7 +311,7 @@ <div><?% timer.stop %?></div> </td> <td class="col_name <?% IF timer.sortbyname %?>selected<?% END %?>"> - <div <?% IF config.TM_TT_LIST %?>onMouseOver="tip('VDR-<?% timer.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>> + <div <?% IF config.TM_TT_LIST %?>onmouseover="tip('VDR-<?% timer.id %?>'); return true;" onmouseout="untip(); return true;"<?% END %?>> <?% IF timer.recording %?><img align="middle" src="bilder/rec.gif" border="0" alt="" /> <?% END %?> <?% IF timer.infurl %?> <a href="javascript:popup('<?% timer.infurl %?>');"><?% timer.title %?></a> @@ -341,7 +341,7 @@ <?% gettext('selected timers') %?> </td> <td align="right"> - <input type="submit" class="submit" name="timer_delete" value="<?% gettext('Delete Selected Timers') %?>" onclick="return mdel('<?% gettext('Delete all selected timers?') %?>');" /> + <input type="submit" class="submit" name="timer_delete" value="<?% gettext('Delete Selected Timers') %?>" onclick="return mdel(this, '<?% gettext('Delete all selected timers?') %?>');" /> </td> </tr> </table> diff --git a/template/default/timer_new.html b/template/default/timer_new.html index e6b0cbe..3d200aa 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> diff --git a/template/default/tv.html b/template/default/tv.html index 5eb2dae..8b85826 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <title>VDRAdmin-AM - <?% gettext('TV') %?> (<?% host %?>)</title> @@ -67,7 +67,7 @@ </script> </head> -<body onLoad="window.focus();WebcamUpdate()" id="tv"> +<body onload="window.focus();WebcamUpdate()" id="tv"> <form action="<?% url %?>" method="get" name="liveform"> <?% UNLESS tv_only %?> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> @@ -75,7 +75,7 @@ <td class="col_title"><h1><?% gettext('TV') %?></h1></td> <td class="col_other"> <h5><?% gettext('Interval:') %?></h5> - <select name="Seconds" class="submit" onChange="v_changeInterval(this.options[this.selectedIndex].value)"> + <select name="Seconds" class="submit" onchange="v_changeInterval(this.options[this.selectedIndex].value)"> <option value="0"><?% gettext('off') %?></option> <option value="1" <?% IF interval == 1 %?>selected="selected"<?% END %?>> 1 <?% gettext('sec.') %?></option> <option value="2" <?% IF interval == 2 %?>selected="selected"<?% END %?>> 2 <?% gettext('sec.') %?></option> @@ -85,14 +85,14 @@ <option value="30" <?% IF interval == 30 %?>selected="selected"<?% END %?>>30 <?% gettext('sec.') %?></option> <option value="60" <?% IF interval == 60 %?>selected="selected"<?% END %?>>60 <?% gettext('sec.') %?></option> </select> - <input type="button" class="submit" name="livebild" value='<?% gettext('G') %?>' title="<?% gettext('Grab the picture!') %?>" onClick="WebcamUpdate()" /> + <input type="button" class="submit" name="livebild" value='<?% gettext('G') %?>' title="<?% gettext('Grab the picture!') %?>" onclick="WebcamUpdate()" /> <h5><?% gettext('Size:') %?></h5> - <select name="Size" class="submit" onChange="v_changeSize(this.options[this.selectedIndex].value)"> + <select name="Size" class="submit" onchange="v_changeSize(this.options[this.selectedIndex].value)"> <option value="full" <?% IF size == 'full' %?>selected="selected"<?% END %?>>1:1</option> <option value="half" <?% IF size == 'half' %?>selected="selected"<?% END %?>>1:2</option> <option value="quarter" <?% IF size == 'quarter' %?>selected="selected"<?% END %?>>1:4</option> </select> - <input type="button" class="submit" name="livebild" value='<?% gettext('G') %?>' title="<?% gettext('Grab the picture!') %?>" onClick="WebcamUpdate()" /> + <input type="button" class="submit" name="livebild" value='<?% gettext('G') %?>' title="<?% gettext('Grab the picture!') %?>" onclick="WebcamUpdate()" /> </td> <td align="right"><?% UNLESS new_win %?>[<a class="submit" href="javascript:tv_open();"><?% gettext('Open in separate window') %?></a>] <?% END %?></td> </tr> diff --git a/template/default/vdr_cmds.html b/template/default/vdr_cmds.html index edf6365..8038d9f 100644 --- a/template/default/vdr_cmds.html +++ b/template/default/vdr_cmds.html @@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html id="scroller"> <head> <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> @@ -62,7 +62,8 @@ </form> <?% IF show_output.size() > 0 %?> - <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> + <br /> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> <td><h2><?% gettext('Output') %?></h2></td> </tr> |
