diff options
author | Andreas Mair <amair.sob@googlemail.com> | 2006-11-24 12:38:59 +0100 |
---|---|---|
committer | Andreas Mair <amair.sob@googlemail.com> | 2006-11-24 12:38:59 +0100 |
commit | 4c529b51694d5d6cb2792891b10c162ecd13297b (patch) | |
tree | 8cfb16a3a089cf2c6aadaebde8a029786767620b /template/default | |
parent | 04ecd27f65634b2f73ad328db76d30142958c29b (diff) | |
download | vdradmin-am-4c529b51694d5d6cb2792891b10c162ecd13297b.tar.gz vdradmin-am-4c529b51694d5d6cb2792891b10c162ecd13297b.tar.bz2 |
2006-11-24: 3.5.1betav3.5.1beta
- Changed: Handling of critical/colliding timers on encrypted channels in timer_list (Requested lot's of time in vdr-portal.de).
- Fixed: Lost info on selected extepginfos if testing an epgsearch in epgsearch_new (Reported by marpiet).
- Fixed: Didn't select the right channel group in epgsearch_new (Reported by viking).
- Added: epgsearches can be based on epgsearch's templates.
Diffstat (limited to 'template/default')
-rw-r--r-- | template/default/.#about.html.1.6 | 116 | ||||
-rw-r--r-- | template/default/.#navigation.html.1.4 | 79 | ||||
-rw-r--r-- | template/default/epgsearch_list.html | 8 |
3 files changed, 8 insertions, 195 deletions
diff --git a/template/default/.#about.html.1.6 b/template/default/.#about.html.1.6 deleted file mode 100644 index 8e2d438..0000000 --- a/template/default/.#about.html.1.6 +++ /dev/null @@ -1,116 +0,0 @@ -<!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 deleted file mode 100644 index 3847057..0000000 --- a/template/default/.#navigation.html.1.4 +++ /dev/null @@ -1,79 +0,0 @@ -<!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/epgsearch_list.html b/template/default/epgsearch_list.html index 71bdb1d..372d25d 100644 --- a/template/default/epgsearch_list.html +++ b/template/default/epgsearch_list.html @@ -23,6 +23,14 @@ <h1><?% gettext('EPG Search') %?></h1> </td> <td class="col_other"> + <?% IF templates.size() > 0 %?> + <?% gettext('Use template') %?> + <select name="template"> + <?% FOREACH templ = templates %?> + <option value="<?% templ.id %?>" <?% IF templ.sel %?>selected="selected"<?% END %?>><?% templ.pattern %?></option> + <?% END %?> + </select> + <?% END %?> <input type="submit" class="submit" name="new_search" value="<?% gettext('New Search') %?>" /> <input type="hidden" name="aktion" value="epgsearch_edit" /> </td> |