diff options
Diffstat (limited to 'template/default')
26 files changed, 173 insertions, 111 deletions
diff --git a/template/default/about.html b/template/default/about.html index a101ae0..27af012 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -98,7 +98,7 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Italian:') %?></h5></td> - <td class="col_value">Gringo</td> + <td class="col_value">Diego Pierotto</td> </tr> </table> diff --git a/template/default/config.html b/template/default/config.html index f4659fa..f875f71 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -37,7 +37,7 @@ <td class="col_value"> <select class="submit" name="TEMPLATE"> <?% FOREACH template = TEMPLATELIST %?> - <option value="<?% template.name %?>" <?% IF template.aktemplate %?>selected="selected"<?% END %?>><?% template.name %?></option> + <option value="<?% template.name | html %?>" <?% IF template.aktemplate %?>selected="selected"<?% END %?>><?% template.name %?></option> <?% END %?> </select> </td> @@ -50,7 +50,7 @@ <td class="col_value"> <select class="submit" name="SKIN"> <?% FOREACH skin = SKINLIST %?> - <option value="<?% skin.name %?>" <?% IF skin.sel %?>selected="selected"<?% END %?>><?% skin.name %?></option> + <option value="<?% skin.name | html %?>" <?% IF skin.sel %?>selected="selected"<?% END %?>><?% skin.name %?></option> <?% END %?> </select> </td> @@ -70,12 +70,12 @@ <tr class="<?% tr_class %?>"> <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> <td class="col_label"><h5><?% gettext('Number of channels to use:') %?></h5></td> - <td class="col_value"><input type="text" name="EPG_PRUNE" value="<?% config.EPG_PRUNE %?>" size="5" maxlength="25" /></td> + <td class="col_value"><input type="text" name="EPG_PRUNE" value="<?% config.EPG_PRUNE | html %?>" size="5" maxlength="25" /></td> </tr> <tr class="<?% tr_class %?>"> <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> <td class="col_label"><h5><?% gettext('Local net (no login required):') %?></h5></td> - <td class="col_value"><input type="text" name="LOCAL_NET" value="<?% config.LOCAL_NET %?>" size="20" maxlength="50" /></td> + <td class="col_value"><input type="text" name="LOCAL_NET" value="<?% config.LOCAL_NET | html %?>" size="20" maxlength="50" /></td> </tr> <tr class="<?% tr_class %?>"> <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> @@ -88,7 +88,7 @@ <?% END %?> </select> <?% ELSE %?> - <input type="text" name="LANG" value="<?% config.LANG %?>" size="20" maxlength="50" /> + <input type="text" name="LANG" value="<?% config.LANG | html %?>" size="20" maxlength="50" /> <?% END %?> </td> </tr> @@ -108,19 +108,19 @@ </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Number of DVB cards:') %?></h5></td> - <td class="col_value"><input type="text" name="RECORDINGS" value="<?% config.RECORDINGS %?>" size="2" /></td> + <td class="col_value"><input type="text" name="RECORDINGS" value="<?% config.RECORDINGS | html %?>" size="2" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Path to recordings:') %?></h5></td> - <td class="col_value"><input type="text" name="VIDEODIR" value="<?% config.VIDEODIR %?>" size="20" maxlength="256" /></td> + <td class="col_value"><input type="text" name="VIDEODIR" value="<?% config.VIDEODIR | html %?>" size="20" maxlength="256" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Path to configuration files:') %?></h5></td> - <td class="col_value"><input type="text" name="VDRCONFDIR" value="<?% config.VDRCONFDIR %?>" size="20" maxlength="256" /></td> + <td class="col_value"><input type="text" name="VDRCONFDIR" value="<?% config.VDRCONFDIR | html %?>" size="20" maxlength="256" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Path to EPG images:') %?></h5></td> - <td class="col_value"><input type="text" name="EPGIMAGES" value="<?% config.EPGIMAGES %?>" size="20" maxlength="256" /></td> + <td class="col_value"><input type="text" name="EPGIMAGES" value="<?% config.EPGIMAGES | html %?>" size="20" maxlength="256" /></td> </tr> </table> @@ -130,11 +130,11 @@ </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Username:') %?></h5></td> - <td class="col_value"><input type="text" name="USERNAME" value="<?% config.USERNAME %?>" size="12" /></td> + <td class="col_value"><input type="text" name="USERNAME" value="<?% config.USERNAME | html %?>" size="12" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Password:') %?></h5></td> - <td class="col_value"><input type="password" name="PASSWORD" value="<?% config.PASSWORD %?>" size="12" /></td> + <td class="col_value"><input type="password" name="PASSWORD" value="<?% config.PASSWORD | html %?>" size="12" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Guest Account:') %?></h5></td> @@ -145,11 +145,11 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Guest Username:') %?></h5></td> - <td class="col_value"><input type="text" name="USERNAME_GUEST" value="<?% config.USERNAME_GUEST %?>" size="12" /></td> + <td class="col_value"><input type="text" name="USERNAME_GUEST" value="<?% config.USERNAME_GUEST | html %?>" size="12" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Guest Password:') %?></h5></td> - <td class="col_value"><input type="password" name="PASSWORD_GUEST" value="<?% config.PASSWORD_GUEST %?>" size="12" /></td> + <td class="col_value"><input type="password" name="PASSWORD_GUEST" value="<?% config.PASSWORD_GUEST | html %?>" size="12" /></td> </tr> </table> @@ -159,11 +159,11 @@ </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Hours:') %?></h5></td> - <td class="col_value"><input type="text" name="ZEITRAHMEN" value="<?% config.ZEITRAHMEN %?>" size="2" /></td> + <td class="col_value"><input type="text" name="ZEITRAHMEN" value="<?% config.ZEITRAHMEN | html %?>" size="2" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Times:') %?></h5></td> - <td class="col_value"><input type="text" name="TIMES" value="<?% config.TIMES %?>" size="20" /> <?% gettext('Also used for other EPG views!') %?></td> + <td class="col_value"><input type="text" name="TIMES" value="<?% config.TIMES | html %?>" size="20" /> <?% gettext('Also used for other EPG views!') %?></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Tooltips:') %?></h5></td> @@ -188,19 +188,19 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Priority:') %?></h5></td> - <td class="col_value"><input type="text" name="AT_PRIORITY" value="<?% config.AT_PRIORITY %?>" size="2" maxlength="2" /></td> + <td class="col_value"><input type="text" name="AT_PRIORITY" value="<?% config.AT_PRIORITY | html %?>" 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="AT_LIFETIME" value="<?% config.AT_LIFETIME %?>" size="2" maxlength="2" /></td> + <td class="col_value"><input type="text" name="AT_LIFETIME" value="<?% config.AT_LIFETIME | html %?>" 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="AT_MARGIN_BEGIN" value="<?% config.AT_MARGIN_BEGIN %?>" size="2" maxlength="2" /></td> + <td class="col_value"><input type="text" name="AT_MARGIN_BEGIN" value="<?% config.AT_MARGIN_BEGIN | html %?>" size="2" maxlength="2" /></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="AT_MARGIN_END" value="<?% config.AT_MARGIN_END %?>" size="2" maxlength="2" /></td> + <td class="col_value"><input type="text" name="AT_MARGIN_END" value="<?% config.AT_MARGIN_END | html %?>" size="2" maxlength="2" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Send email after programming timer:') %?></h5></td> @@ -211,23 +211,23 @@ </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Send email as:') %?></h5></td> - <td class="col_value"><input type="text" name="MAIL_FROM" value="<?% config.MAIL_FROM %?>" size="20" maxlength="100" /></td> + <td class="col_value"><input type="text" name="MAIL_FROM" value="<?% config.MAIL_FROM | html %?>" size="20" maxlength="100" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Send email to:') %?></h5></td> - <td class="col_value"><input type="text" name="MAIL_TO" value="<?% config.MAIL_TO %?>" size="20" maxlength="100" /></td> + <td class="col_value"><input type="text" name="MAIL_TO" value="<?% config.MAIL_TO | html %?>" size="20" maxlength="100" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Mail server:') %?></h5></td> - <td class="col_value"><input type="text" name="MAIL_SERVER" value="<?% config.MAIL_SERVER %?>" size="20" maxlength="100" /></td> + <td class="col_value"><input type="text" name="MAIL_SERVER" value="<?% config.MAIL_SERVER | html %?>" size="20" maxlength="100" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('SMTPAuth user:') %?></h5></td> - <td class="col_value"><input type="text" name="MAIL_AUTH_USER" value="<?% config.MAIL_AUTH_USER %?>" size="20" maxlength="100" /></td> + <td class="col_value"><input type="text" name="MAIL_AUTH_USER" value="<?% config.MAIL_AUTH_USER | html %?>" size="20" maxlength="100" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('SMTPAuth password:') %?></h5></td> - <td class="col_value"><input type="password" name="MAIL_AUTH_PASS" value="<?% config.MAIL_AUTH_PASS %?>" size="20" maxlength="100" /></td> + <td class="col_value"><input type="password" name="MAIL_AUTH_PASS" value="<?% config.MAIL_AUTH_PASS | html %?>" size="20" maxlength="100" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Tooltips:') %?></h5></td> @@ -245,19 +245,19 @@ </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Priority:') %?></h5></td> - <td class="col_value"><input type="text" name="TM_PRIORITY" value="<?% config.TM_PRIORITY %?>" size="2" maxlength="2" /></td> + <td class="col_value"><input type="text" name="TM_PRIORITY" value="<?% config.TM_PRIORITY | html %?>" size="2" maxlength="2" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Lifetime:') %?></h5></td> - <td class="col_value"><input type="text" name="TM_LIFETIME" value="<?% config.TM_LIFETIME %?>" size="2" maxlength="2" /></td> + <td class="col_value"><input type="text" name="TM_LIFETIME" value="<?% config.TM_LIFETIME | html %?>" size="2" maxlength="2" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Time Margin at Start:') %?></h5></td> - <td class="col_value"><input type="text" name="TM_MARGIN_BEGIN" value="<?% config.TM_MARGIN_BEGIN %?>" size="3" /> <?% gettext('minutes') %?></td> + <td class="col_value"><input type="text" name="TM_MARGIN_BEGIN" value="<?% config.TM_MARGIN_BEGIN | html %?>" size="3" /> <?% gettext('minutes') %?></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Time Margin at Stop:') %?></h5></td> - <td class="col_value"><input type="text" name="TM_MARGIN_END" value="<?% config.TM_MARGIN_END %?>" size="3" /> <?% gettext('minutes') %?></td> + <td class="col_value"><input type="text" name="TM_MARGIN_END" value="<?% config.TM_MARGIN_END | html %?>" size="3" /> <?% gettext('minutes') %?></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Tooltips in timeline:') %?></h5></td> @@ -289,7 +289,7 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('HTTP Port of Streamdev (also possible 3000/ts):') %?></h5></td> - <td class="col_value"><input type="text" name="ST_STREAMDEV_PORT" value="<?% config.ST_STREAMDEV_PORT %?>" size="10" /></td> + <td class="col_value"><input type="text" name="ST_STREAMDEV_PORT" value="<?% config.ST_STREAMDEV_PORT | html %?>" size="10" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Recordings Streaming:') %?></h5></td> @@ -300,23 +300,23 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Path to VDR Recordings on your workstation:') %?></h5></td> - <td class="col_value"><input type="text" name="ST_VIDEODIR" value="<?% config.ST_VIDEODIR %?>" size="20" maxlength="256" /></td> + <td class="col_value"><input type="text" name="ST_VIDEODIR" value="<?% config.ST_VIDEODIR | html %?>" size="20" maxlength="256" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('MIME type for live streaming:') %?></h5></td> - <td class="col_value"><input type="text" name="TV_MIMETYPE" value="<?% config.TV_MIMETYPE %?>" size="20" maxlength="256" /></td> + <td class="col_value"><input type="text" name="TV_MIMETYPE" value="<?% config.TV_MIMETYPE | html %?>" size="20" maxlength="256" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Suffix for live streaming:') %?></h5></td> - <td class="col_value"><input type="text" name="TV_EXT" value="<?% config.TV_EXT %?>" size="4" maxlength="256" /></td> + <td class="col_value"><input type="text" name="TV_EXT" value="<?% config.TV_EXT | html %?>" size="4" maxlength="256" /></td> </tr> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('MIME type for recordings streaming:') %?></h5></td> - <td class="col_value"><input type="text" name="REC_MIMETYPE" value="<?% config.REC_MIMETYPE %?>" size="20" maxlength="256" /></td> + <td class="col_value"><input type="text" name="REC_MIMETYPE" value="<?% config.REC_MIMETYPE | html %?>" size="20" maxlength="256" /></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Suffix for recordings streaming:') %?></h5></td> - <td class="col_value"><input type="text" name="REC_EXT" value="<?% config.REC_EXT %?>" size="4" maxlength="256" /></td> + <td class="col_value"><input type="text" name="REC_EXT" value="<?% config.REC_EXT | html %?>" size="4" maxlength="256" /></td> </tr> <!-- not (yet?) supported <tr class="row_odd"> @@ -324,7 +324,7 @@ <td class="col_value"> <select class="submit" name="STREAMTYPE"> <?% FOREACH streamtype = STREAMTYPELIST %?> - <option value="<?% streamtype.name %?>" <?% IF streamtype.sel %?>selected="selected"<?% END %?>><?% streamtype.name %?></option> + <option value="<?% streamtype.name | html %?>" <?% IF streamtype.sel %?>selected="selected"<?% END %?>><?% streamtype.name %?></option> <?% END %?> </select> </td> @@ -345,10 +345,10 @@ <input type="radio" name="SRCH1_ACTIVE" value="0" id="srch1_active_no" <?% UNLESS config.SRCH1_ACTIVE %?>checked="checked"<?% END %?> /><label for="srch1_active_no"><?% gettext('No') %?></label> <br /> <?% gettext('URL:') %?> - <input type="text" name="SRCH1_URL" value="<?% config.SRCH1_URL %?>" size="40" maxlength="256" /> + <input type="text" name="SRCH1_URL" value="<?% config.SRCH1_URL | html %?>" size="40" maxlength="256" /> <br /> <?% gettext('Title:') %?> - <input type="text" name="SRCH1_TITLE" value="<?% config.SRCH1_TITLE %?>" size="40" maxlength="256" /> + <input type="text" name="SRCH1_TITLE" value="<?% config.SRCH1_TITLE | html %?>" size="40" maxlength="256" /> </td> </tr> <tr class="row_even"> @@ -359,10 +359,10 @@ <input type="radio" name="SRCH2_ACTIVE" value="0" id="srch2_active_no" <?% UNLESS config.SRCH2_ACTIVE %?>checked="checked"<?% END %?> /><label for="srch2_active_no"><?% gettext('No') %?></label> <br /> <?% gettext('URL:') %?> - <input type="text" name="SRCH2_URL" value="<?% config.SRCH2_URL %?>" size="40" maxlength="256" /> + <input type="text" name="SRCH2_URL" value="<?% config.SRCH2_URL | html %?>" size="40" maxlength="256" /> <br /> <?% gettext('Title:') %?> - <input type="text" name="SRCH2_TITLE" value="<?% config.SRCH2_TITLE %?>" size="40" maxlength="256" /> + <input type="text" name="SRCH2_TITLE" value="<?% config.SRCH2_TITLE | html %?>" size="40" maxlength="256" /> </td> </tr> </table> @@ -380,7 +380,7 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Update EPG every:') %?></h5></td> - <td class="col_value"><input type="text" name="CACHE_TIMEOUT" value="<?% config.CACHE_TIMEOUT %?>" size="4" /> <?% gettext('minutes') %?></td> + <td class="col_value"><input type="text" name="CACHE_TIMEOUT" value="<?% config.CACHE_TIMEOUT | html %?>" size="4" /> <?% gettext('minutes') %?></td> </tr> </table> diff --git a/template/default/default/fern_41.jpg b/template/default/default/fern_41.jpg Binary files differnew file mode 100644 index 0000000..c81f23d --- /dev/null +++ b/template/default/default/fern_41.jpg diff --git a/template/default/default/fern_42.jpg b/template/default/default/fern_42.jpg Binary files differnew file mode 100644 index 0000000..5eb43aa --- /dev/null +++ b/template/default/default/fern_42.jpg diff --git a/template/default/default/fern_43.jpg b/template/default/default/fern_43.jpg Binary files differnew file mode 100644 index 0000000..c68a40d --- /dev/null +++ b/template/default/default/fern_43.jpg diff --git a/template/default/default/fern_44.jpg b/template/default/default/fern_44.jpg Binary files differnew file mode 100644 index 0000000..8d44785 --- /dev/null +++ b/template/default/default/fern_44.jpg diff --git a/template/default/default/fern_45.jpg b/template/default/default/fern_45.jpg Binary files differnew file mode 100644 index 0000000..254417d --- /dev/null +++ b/template/default/default/fern_45.jpg diff --git a/template/default/default/fern_46.jpg b/template/default/default/fern_46.jpg Binary files differnew file mode 100644 index 0000000..926cf6d --- /dev/null +++ b/template/default/default/fern_46.jpg diff --git a/template/default/default/fern_47.jpg b/template/default/default/fern_47.jpg Binary files differnew file mode 100644 index 0000000..f701293 --- /dev/null +++ b/template/default/default/fern_47.jpg diff --git a/template/default/default/fern_48.jpg b/template/default/default/fern_48.jpg Binary files differnew file mode 100644 index 0000000..410f3ac --- /dev/null +++ b/template/default/default/fern_48.jpg diff --git a/template/default/epgsearch_list.html b/template/default/epgsearch_list.html index 94841b2..1f154c4 100644 --- a/template/default/epgsearch_list.html +++ b/template/default/epgsearch_list.html @@ -32,6 +32,7 @@ </select> <?% END %?> <input type="submit" class="submit" name="new_search" value="<?% gettext('New Search') %?>" /> + <input type="submit" class="submit" name="edit_template" value="<?% gettext('Edit Template') %?>" /> <input type="hidden" name="aktion" value="epgsearch_edit" /> </td> <td class="col_help"> diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html index 9262529..0349e5f 100644 --- a/template/default/epgsearch_new.html +++ b/template/default/epgsearch_new.html @@ -6,7 +6,11 @@ <?% IF mode_blacklist %?> <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New Blacklist') %?><?% ELSE %?><?% gettext('Edit Blacklist') %?><?% END %?></title> <?% ELSE %?> - <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New Search') %?><?% ELSE %?><?% gettext('Edit Search') %?><?% END %?></title> + <?% IF mode_template %?> + <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New Template') %?><?% ELSE %?><?% gettext('Edit Template') %?><?% END %?></title> + <?% ELSE %?> + <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New Search') %?><?% ELSE %?><?% gettext('Edit Search') %?><?% END %?></title> + <?% END %?> <?% END %?> <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> <?% IF usercss %?> @@ -34,6 +38,7 @@ changedAvoidRepeats(document.getElementById("avoid_repeats")); changedAutoDelete(document.getElementById("select_autodelete")); <?% END %?> + document.getElementById("content").style.display = "block"; } function changedSearchMode(mySelect) @@ -181,7 +186,11 @@ <?% IF mode_blacklist %?> <h1><?% IF do_edit %?><?% gettext('Edit Blacklist') %?><?% ELSE %?><?% gettext('Add New Blacklist') %?><?% END %?></h1> <?% ELSE %?> + <?% IF mode_template %?> + <h1><?% gettext('Edit Template') %?></h1> + <?% ELSE %?> <h1><?% IF do_edit %?><?% gettext('Edit Search') %?><?% ELSE %?><?% gettext('Add New Search') %?><?% END %?></h1> + <?% END %?> <?% END %?> </td> <?% IF help_url %?> @@ -193,6 +202,11 @@ </table> <div id="content"> + <script type="text/javascript" language="JavaScript1.2"> + <!-- + document.getElementById("content").style.display = "none"; + //--> + </script> <?% IF did_search %?> <?% IF matches %?> <div id="results"> @@ -252,7 +266,11 @@ <?% tr_class = "row_odd" %?> <tr class="<?% tr_class %?>"> <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> +<?% IF mode_template %?> + <td class="col_label"><h5><?% gettext('Name:') %?></h5></td> +<?% ELSE %?> <td class="col_label"><h5><?% gettext('Search Term:') %?></h5></td> +<?% END %?> <td class="col_value"> <input type="text" name="pattern" id="pattern" value="<?% epgsearch.pattern | html %?>" size="40" /> </td> @@ -271,7 +289,7 @@ </select> <div id="fuzzy_tolerance"> <?% gettext('Tolerance for "fuzzy":') %?> - <input type="text" name="fuzzy_tolerance" size="2" value="<?% epgsearch.fuzzy_tolerance %?>" /> + <input type="text" name="fuzzy_tolerance" size="2" value="<?% epgsearch.fuzzy_tolerance | html %?>" /> </div> </td> </tr> @@ -308,7 +326,7 @@ </tr> <tr> <td> - <input type="text" value="<?% ext.data_text %?>" size="10" name="extepg_<?% ext.id %?>_data_text"/> + <input type="text" value="<?% ext.data_text | html %?>" size="10" name="extepg_<?% ext.id %?>_data_text"/> </td> </tr> <tr> @@ -374,14 +392,14 @@ <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" /> + <input type="text" name="time_start" value="<?% epgsearch.time_start | html %?>" 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" /> + <input type="text" name="time_stop" value="<?% epgsearch.time_stop | html %?>" size="5" maxlength="5" /> <?% gettext('o\'clock') %?> </td> </tr> @@ -399,14 +417,14 @@ <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" /> + <input type="text" name="min_duration" value="<?% epgsearch.min_duration | html %?>" 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" /> + <input type="text" name="max_duration" value="<?% epgsearch.max_duration | html %?>" size="5" maxlength="5" /> (<?% gettext('hh:mm') %?>) </td> </tr> @@ -475,9 +493,9 @@ </select> </span> <div id="set_action_timeframe"> - <?% gettext('First day:') %?> <input type="text" name="searchtimer_from" id="searchtimer_from" value="<?% epgsearch.searchtimer_from %?>" size="12"/> + <?% gettext('First day:') %?> <input type="text" name="searchtimer_from" id="searchtimer_from" value="<?% epgsearch.searchtimer_from | html %?>" size="12"/> - <?% gettext('Last day:') %?> <input type="text" name="searchtimer_until" id="searchtimer_until" value="<?% epgsearch.searchtimer_until %?>" size="12"/> + <?% gettext('Last day:') %?> <input type="text" name="searchtimer_until" id="searchtimer_until" value="<?% epgsearch.searchtimer_until | html %?>" size="12"/> </div> <div id="set_autodelete"> <?% gettext('Auto delete:') %?> @@ -487,10 +505,10 @@ <option value="2" <?% IF epgsearch.autodelete == 2 %?>selected="selected"<?% END %?>><?% gettext('count days') %?></option> </select> <div id="del_after_recs"> - <?% gettext('After ... recordings:') %?> <input type="text" name="del_after_recs" value="<?% epgsearch.del_after_recs %?>" size="5"/> + <?% gettext('After ... recordings:') %?> <input type="text" name="del_after_recs" value="<?% epgsearch.del_after_recs | html %?>" size="5"/> </div> <div id="del_after_days"> - <?% gettext('After ... days after first recording:') %?> <input type="text" name="del_after_days" value="<?% epgsearch.del_after_days %?>" size="5"/> + <?% gettext('After ... days after first recording:') %?> <input type="text" name="del_after_days" value="<?% epgsearch.del_after_days | html %?>" size="5"/> </div> </div> </td> @@ -513,21 +531,21 @@ <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" /> + <input type="text" name="directory" value="<?% epgsearch.directory | html %?>" 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" /> + <input type="text" name="delete_after" value="<?% epgsearch.delete_after | html %?>" size="3" /> <h5><?% gettext('Keep ... Recordings:') %?></h5> - <input type="text" name="keep_recordings" value="<?% epgsearch.keep_recordings %?>" size="3" /> + <input type="text" name="keep_recordings" value="<?% epgsearch.keep_recordings | html %?>" 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" /> + <input type="text" name="pause" value="<?% epgsearch.pause | html %?>" size="3" /> </td> </tr> <tr class="row_odd"> @@ -539,9 +557,9 @@ <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"/> + <input type="text" name="allowed_repeats" value="<?% epgsearch.allowed_repeats | html %?>" 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" /> + <input type="text" name="repeats_in_days" value="<?% epgsearch.repeats_in_days | html %?>" size="3" /> </td> </tr> <tr> @@ -569,25 +587,25 @@ <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" /> + <input type="text" name="prio" value="<?% epgsearch.prio | html %?>" 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" /> + <input type="text" name="lft" value="<?% epgsearch.lft | html %?>" 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="5" maxlength="5" /> <?% gettext('minutes') %?> + <input type="text" name="bstart" value="<?% epgsearch.bstart | html %?>" size="5" maxlength="5" /> <?% 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="5" maxlength="5" /> <?% gettext('minutes') %?> + <input type="text" name="bstop" value="<?% epgsearch.bstop | html %?>" size="5" maxlength="5" /> <?% gettext('minutes') %?> </td> </tr> <tr class="row_even"> @@ -607,7 +625,7 @@ <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') %?> + <input type="text" name="switch_before" value="<?% epgsearch.switch_before | html %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?> </td> </tr> </table> @@ -617,23 +635,37 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons"> <tr> - <!-- +<?% IF mode_template %?> <td align="left"> - <input type="submit" class="submit" name="template" value="<?% gettext('Save as template') %?>" /> + <input type="submit" class="submit" name="delete_template" value="<?% gettext('Delete template') %?>" onclick="return mdel(this, '<?% gettext('Delete this template?') %?>');" /> </td> - --> +<?% ELSE %?> + <?% UNLESS mode_blacklist %?> + <td align="left"> + <input type="submit" class="submit" name="save_template" value="<?% gettext('Save as template') %?>" onclick="return checkSearchPattern();" /> + </td> + <?% END %?> +<?% END %?> <td align="right"> +<?% IF mode_template %?> + <input type="submit" class="submit" name="save_template" value="<?% gettext('Save') %?>" onclick="return checkSearchPattern();" /> +<?% ELSE %?> <input type="submit" class="submit" name="save" value="<?% gettext('Save') %?>" onclick="return checkSearchPattern();" /> -<?% UNLESS mode_blacklist %?> + <?% UNLESS mode_blacklist %?> <input type="submit" class="submit" name="single_test" value="<?% gettext('Run') %?>" onclick="return checkSearchPattern();" /> + <?% END %?> <?% END %?> <input type="submit" class="submit" name="exit" value="<?% gettext('Cancel') %?>" /> </td> </tr> </table> - <?% IF do_edit %?> - <input type="hidden" name="id" value="<?% epgsearch.id %?>" /> - <?% END %?> +<?% IF mode_template %?> + <input type="hidden" name="template_id" value="<?% template_id %?>" /> +<?% ELSE %?> + <?% IF do_edit %?> + <input type="hidden" name="id" value="<?% epgsearch.id %?>" /> + <?% END %?> +<?% END %?> <?% IF mode_blacklist %?> <input type="hidden" name="aktion" value="epgsearch_bl_aktion" /> <input type="hidden" name="mode_blacklist" value="1" /> @@ -641,7 +673,7 @@ <input type="hidden" name="aktion" value="epgsearch_aktion" /> <input type="hidden" name="results_menu" value="<?% epgsearch.results_menu %?>" /> <?% END %?> - <input type="hidden" name="unused" value="<?% epgsearch.unused %?>" /> + <input type="hidden" name="unused" value="<?% epgsearch.unused | html %?>" /> </form> </body> diff --git a/template/default/help_config.html b/template/default/help_config.html index 179841c..f4a360c 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -148,7 +148,7 @@ <dt><?% gettext('Recordings Streaming:') %?></dt> <dd><?% gettext('Enable or disable streaming of recordings.<br />Well actually this is no real "streaming", but you have to setup your workstation so that it can access VDR\'s recordings. You can use for example Samba or NFS for this. VDRAdmin-AM simply generates a playlist that contains all parts of the recording and sends this to your browser. If your browser and media player are configured correctly you will see the recording on your workstation\'s display.') %?></dd> <dt><?% gettext('Path to VDR Recordings on your workstation:') %?></dt> - <dd><?% gettext('This is the path where your workstation can access VDR\'s recordings. This depends on your VDR and workstation setup, for example "\\vdr\videos" or "V:\" (on Windows) or "/mnt/videos" (on Linux).') %?></dd> + <dd><?% gettext('This is the path where your workstation can access VDR\'s recordings. This depends on your VDR and workstation setup, for example "\\\\vdr\\videos" or "V:\\" (on Windows) or "/mnt/videos" (on Linux).') %?></dd> <dt><?% gettext('MIME type for live streaming:') %?></dt> <dd><?% gettext('The MIME type to send when using live streaming. Defaults to "video/x-mpegurl".') %?></dd> <dt><?% gettext('Suffix for live streaming:') %?></dt> @@ -170,7 +170,7 @@ <dt>VideoDB: (<a href="http://videodb.sf.net">videodb.sf.net</a>)</dt> <dd> http://www.videodb.net/videodb/search.php?q=%TITLE%&engine=videodb&owner=Guest&fields%5B%5D=title<br /> - Please change the hostname to your local needs! + <?% gettext('Please change the hostname to your local needs!') %?> </dd> </dl> </div> diff --git a/template/default/library.js b/template/default/library.js index d7f65f3..29bbe42 100644 --- a/template/default/library.js +++ b/template/default/library.js @@ -26,11 +26,11 @@ function callurl( url ) { } function popup(URL, win_w, win_h) { - window.open(URL, '_new', 'width=' + win_w + ', height=' + win_h + ', scrollbars=yes, resizable=yes, toolbar=no, status=no'); + window.open(URL, '_blank', 'width=' + win_w + ', height=' + win_h + ', scrollbars=yes, resizable=yes, toolbar=no, status=no'); } function toolbar(URL) { - window.open(URL, '_new', 'width=200, height=50'); + window.open(URL, '_blank', 'width=200, height=50'); } function AllMessages(myform) diff --git a/template/default/navigation.html b/template/default/navigation.html index c85eb5b..bdf06b1 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -11,10 +11,7 @@ <script type="text/javascript"> <!-- function rc_open() { - window.open("./vdradmin.pl?aktion=rc_show&full_rc=1", "vdradminRC", "width=200, height=510, resizable=no, scrollbars=no, status=no, toolbar=no"); - } - function tv_open() { - window.open("./vdradmin.pl?aktion=tv_show&full_tv=1", "vdradminTV", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no"); + window.open("./vdradmin.pl?aktion=rc_show&full_rc=1", "vdradminRC", "width=350, height=525, resizable=no, scrollbars=no, status=no, toolbar=no, menubar=no, location=no"); } // --> </script> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index ab5ddec..3a235c8 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -59,7 +59,7 @@ <span class="channel_name"><?% bc.progname %?></span> <span class="date_long"><?% bc.longdate %?></span> </td> - <td class="col_navi"><?% IF bc.prev_channel %?><a href="<?% bc.prev_channel %?>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /><?% END %?><?% IF bc.next_channel %?><a href="<?% bc.next_channel %?>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /><?% END %?></td> + <td class="col_navi"><?% IF bc.prev_channel %?><a href="<?% bc.prev_channel %?>" title="<?% bc.prev_channel_name %?>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /><?% END %?><?% IF bc.next_channel %?><a href="<?% bc.next_channel %?>" title="<?% bc.next_channel_name %?>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /><?% END %?></td> </tr> <?% ELSE %?> <?% UNLESS bc.endd %?> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index 877d8b5..581b93c 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -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 | html %?>" name="time"/> <?% gettext('o\'clock') %?> </td> <td class="col_navi"> @@ -38,18 +38,18 @@ <?% END %?> </select> <?% IF days.size() > 0 %?> - <?% IF prevdayurl %?><a href="<?% prevdayurl %?>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /><?% END %?> + <?% IF prevdayurl %?><a href="<?% prevdayurl %?>" title="<?% prevdaytext %?>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /><?% END %?> <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> - <?% 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 %?> + <?% IF nextdayurl %?><a href="<?% nextdayurl %?>" title="<?% nextdaytext %?>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /><?% END %?> <?% END %?> </td> </tr> </table> <input type="hidden" name="aktion" value="prog_list2" /> - <input type="hidden" name="day" value="<?% day %?>" /> + <input type="hidden" name="day" value="<?% day | html %?>" /> </form> <div id="content"> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index 04bdace..fd60031 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -38,7 +38,7 @@ <option value="<?% time.id %?>" <?% IF time.sel %?>selected="selected"<?% END %?>><?% time.name %?></option> <?% END %?> </select> - <?% gettext('at') %?> <input type="text" name="time" size="5" value="<?% now %?>" /> <?% gettext('o\'clock') %?> + <?% gettext('at') %?> <input type="text" name="time" size="5" value="<?% now | html %?>" /> <?% gettext('o\'clock') %?> </td> <?% END %?> </tr> diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html index 1320d31..97e4824 100644 --- a/template/default/prog_summary2.html +++ b/template/default/prog_summary2.html @@ -38,7 +38,7 @@ <option value="<?% time.id %?>" <?% IF time.sel %?>selected="selected"<?% END %?>><?% time.name %?></option> <?% END %?> </select> - <?% gettext('at') %?> <input type="text" name="time" size="5" value="<?% now %?>" /> <?% gettext('o\'clock') %?> + <?% gettext('at') %?> <input type="text" name="time" size="5" value="<?% now | html %?>" /> <?% gettext('o\'clock') %?> </td> <?% END %?> </tr> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index dd5db20..fa09d26 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -177,7 +177,7 @@ </script> </select> <?% gettext('at:') %?> - <input type="text" name="time" size="5" value="<?% now %?>" /> + <input type="text" name="time" size="5" value="<?% now | html %?>" /> <?% gettext('o\'clock') %?> <input type="hidden" name="aktion" value="prog_timeline" /> <script type="text/javascript" language="JavaScript1.2"> diff --git a/template/default/rc.html b/template/default/rc.html index 652a879..4f24e15 100644 --- a/template/default/rc.html +++ b/template/default/rc.html @@ -27,11 +27,6 @@ <table width="200" height="510" border="0" cellspacing="0" cellpadding="0" class="rc"> <tr> <td></td> - <td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td> - <td></td> - </tr> - <tr> - <td></td> <td></td> <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td> </tr> @@ -106,17 +101,32 @@ <tr> <td></td> <td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td> - <td><img src="bilder/spacer.gif" name="switchimage" width="1" height="1" alt="" /> </td> + <td></td> </tr> <tr> - <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td> - <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=mute');"><img src="bilder/fern_mute.jpg" alt="" height="27" width="67" border="0" /></a></td> - <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=rec');"><img src="bilder/fern_41.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=stop');"><img src="bilder/fern_42.jpg" alt="" height="27" width="67" border="0" /></a></td> </tr> <tr> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=fastrew');"><img src="bilder/fern_43.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=play');"><img src="bilder/fern_44.jpg" alt="" height="27" width="66" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=fastfwd');"><img src="bilder/fern_45.jpg" alt="" height="27" width="67" border="0" /></a></td> + </tr> + <tr> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=prev');"><img src="bilder/fern_46.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=pause');"><img src="bilder/fern_47.jpg" alt="" height="27" width="66" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=next');"><img src="bilder/fern_48.jpg" alt="" height="27" width="67" border="0" /></a></td> + </tr> + <tr> <td></td> <td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td> - <td></td> + <td><img src="bilder/spacer.gif" name="switchimage" width="1" height="1" alt="" /> </td> + </tr> + <tr> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=mute');"><img src="bilder/fern_mute.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td> </tr> </table> <?% IF full_rc %?> diff --git a/template/default/timeline.js b/template/default/timeline.js index 4daf797..72a654b 100644 --- a/template/default/timeline.js +++ b/template/default/timeline.js @@ -224,7 +224,7 @@ function BuildHeader() {
diff_sec = tl.first_sec;
}
- W('<a href="' + tl.now_url + '&time=' + format_date('%H:%M', diff_sec) + '&frame=' + tl.first_sec + '">');
+ W('<a href="' + tl.now_url + '&time=' + format_date('%H:%M', diff_sec) + '&frame=' + tl.first_sec + '" title="' + format_date('%H:%M', diff_sec) + '">');
W('<img src="bilder/pfeile_nachlinks.png" border="0" />');
W('</a>');
}
@@ -235,7 +235,7 @@ function BuildHeader() else
{
var diff_sec = tl.end_sec;
- W('<a href="' + tl.now_url + '&time=' + format_date('%H:%M', diff_sec) + '&frame=' + tl.first_sec + '">');
+ W('<a href="' + tl.now_url + '&time=' + format_date('%H:%M', diff_sec) + '&frame=' + tl.first_sec + '" title="' + format_date('%H:%M', diff_sec) + '">');
W('<img src="bilder/pfeile_nachrechts.png" border="0" />');
W('</a>');
}
diff --git a/template/default/timer_list.html b/template/default/timer_list.html index c54e016..c1d7638 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -61,13 +61,13 @@ <tr class="heading"> <td><h2><?% title %?></h2></td> <td class="col_navi"> - <?% IF prevdayurl %?><a href="<?% prevdayurl %?>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /><?% END %?> + <?% IF prevdayurl %?><a href="<?% prevdayurl %?>" title="<?% prevdaytext %?>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /><?% END %?> <select name="vdr_id" class="submit" onchange="window.open('<?% url %?>?aktion=timer_list&timer=' + this.options[this.selectedIndex].value,'main')"> <?% FOREACH day = day_loop %?> - <option value="<?% day.sortfield %?>" <?% IF day.current %?>selected="selected"<?% END %?>><?% day.day %?></option> + <option value="<?% day.sortfield | html %?>" <?% IF day.current %?>selected="selected"<?% END %?>><?% day.day %?></option> <?% END %?> </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 %?> + <?% IF nextdayurl %?><a href="<?% nextdayurl %?>" title="<?% nextdaytext %?>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /><?% END %?> </td> </tr> <tr class="row_even"> diff --git a/template/default/timer_new.html b/template/default/timer_new.html index 37b86b1..76646cb 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -104,7 +104,7 @@ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> <td valign="top" class="col_label"><h5><?% gettext('Day Of Recording:') %?></h5></td> <td class="col_value"> - <input type="text" name="dor" value="<?% dor %?>" size="20" /> + <input type="text" name="dor" value="<?% dor | html %?>" size="20" /> <br /> <input onclick="cTimer(1)" type="checkbox" name="D0" value="1" id="wday_mon" /><label for="wday_mon"><?% gettext('Monday') %?></label> <input onclick="cTimer(2)" type="checkbox" name="D1" value="1" id="wday_tue" /><label for="wday_tue"><?% gettext('Tuesday') %?></label> @@ -119,9 +119,9 @@ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> <td class="col_label"><h5><?% gettext('Start Time:') %?></h5></td> <td class="col_value"> - <input type="text" name="starth" value="<?% starth %?>" size="2" maxlength="2" /> + <input type="text" name="starth" value="<?% starth | html %?>" size="2" maxlength="2" /> <b> : </b> - <input type="text" name="startm" value="<?% startm %?>" size="2" maxlength="2" /> + <input type="text" name="startm" value="<?% startm | html %?>" size="2" maxlength="2" /> <?% gettext('o\'clock') %?> <?% IF bstart %?> (<?% gettext('Buffer:') %?> <?% bstart %?> <?% gettext('minutes') %?>) @@ -132,9 +132,9 @@ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> <td class="col_label"><h5><?% gettext('End Time:') %?></h5></td> <td class="col_value"> - <input type="text" name="stoph" value="<?% stoph %?>" size="2" maxlength="2" /> + <input type="text" name="stoph" value="<?% stoph | html %?>" size="2" maxlength="2" /> <b> : </b> - <input type="text" name="stopm" value="<?% stopm %?>" size="2" maxlength="2" /> + <input type="text" name="stopm" value="<?% stopm | html %?>" size="2" maxlength="2" /> <?% gettext('o\'clock') %?> <?% IF bstop %?> (<?% gettext('Buffer:') %?> <?% bstop %?> <?% gettext('minutes') %?>) @@ -149,12 +149,12 @@ <tr class="<?% tr_class %?>"> <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> <td class="col_label"><h5><?% gettext('Priority:') %?></h5></td> - <td class="col_value"><input type="text" name="prio" value="<?% prio %?>" size="2" maxlength="2" /></td> + <td class="col_value"><input type="text" name="prio" value="<?% prio | html %?>" size="2" maxlength="2" /></td> </tr> <tr class="<?% tr_class %?>"> <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> <td class="col_label"><h5><?% gettext('Lifetime:') %?></h5></td> - <td class="col_value"><input type="text" name="lft" value="<?% lft %?>" size="2" maxlength="2" /></td> + <td class="col_value"><input type="text" name="lft" value="<?% lft | html %?>" size="2" maxlength="2" /></td> </tr> <tr class="<?% tr_class %?>"> <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?> diff --git a/template/default/tv.html b/template/default/tv.html index 9c02583..3a72379 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -68,7 +68,9 @@ } function tv_open() { - window.open("./vdradmin.pl?aktion=tv_show&new_win=1&full_tv=1", "vdradminTV", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no"); + width = (size == 'full' ? 780 : (size == 'half' ? 400 : 210)) + 350; + height = (size == 'full' ? 576 : 525) + 60; + window.open("./vdradmin.pl?aktion=tv_show&new_win=1&full_tv=1", "vdradminTV", "width=" + width + ", height=" + height + ", resizable=yes, scrollbars=no, status=no, toolbar=no, menubar=no, location=no"); } //--> </script> @@ -194,6 +196,26 @@ <td></td> </tr> <tr> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=rec');"><img src="bilder/fern_41.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=stop');"><img src="bilder/fern_42.jpg" alt="" height="27" width="67" border="0" /></a></td> + </tr> + <tr> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=fastrew');"><img src="bilder/fern_43.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=play');"><img src="bilder/fern_44.jpg" alt="" height="27" width="66" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=fastfwd');"><img src="bilder/fern_45.jpg" alt="" height="27" width="67" border="0" /></a></td> + </tr> + <tr> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=prev');"><img src="bilder/fern_46.jpg" alt="" height="27" width="67" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=pause');"><img src="bilder/fern_47.jpg" alt="" height="27" width="66" border="0" /></a></td> + <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=next');"><img src="bilder/fern_48.jpg" alt="" height="27" width="67" border="0" /></a></td> + </tr> + <tr> + <td></td> + <td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td> + <td></td> + </tr> + <tr> <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td> <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=mute');"><img src="bilder/fern_mute.jpg" alt="" height="27" width="67" border="0" /></a></td> <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td> diff --git a/template/default/vdr_cmds.html b/template/default/vdr_cmds.html index 1177103..e47da84 100644 --- a/template/default/vdr_cmds.html +++ b/template/default/vdr_cmds.html @@ -47,7 +47,7 @@ <tr class="row_odd"> <td class="col_label"><h5><?% gettext('SVDRP commands:') %?></h5></td> <td class="col_value"> - <input type="text" name="svdrp_cmd" value="<?% svdrp_cmd %?>"/> + <input type="text" name="svdrp_cmd" value="<?% svdrp_cmd | html %?>"/> <input type="submit" class="submit" name="run_svdrpcmd" value="<?% gettext('Run') %?>" onclick="return confirm('<?% gettext('Really run this command?') %?>')" /> </td> </tr> |
