diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2007-01-21 21:23:02 +0000 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2007-01-21 21:23:02 +0000 |
| commit | 343dc0209469f71b3c654ae01b19bc5084c77e95 (patch) | |
| tree | 20f9768889e04f2366f2bcd2ce286019e1d6ed32 | |
| parent | 903e6b746db36238b48741bafcbfeb60e1a718c9 (diff) | |
| download | vdr-plugin-live-343dc0209469f71b3c654ae01b19bc5084c77e95.tar.gz vdr-plugin-live-343dc0209469f71b3c654ae01b19bc5084c77e95.tar.bz2 | |
- Draggable epg-evnts tooltips. They don't get closed automaticaly. It
is possible to have more of them open at one time. This makes it
possible to have tooltips also inside the epg-event boxes.
This is an experimental setting and is only a domTT configuration
option.
- Found and preliminary fixed a bug in domTT for sticky tooltips (like
the epg-event boxes) that don't have a domTT-caption (domTT option
caption set to false for design reasons). When they are set to
draggable domTT crashes. I added a fix to this, that makes the whole
box draggable with the mouse. Idealy one would like to have this
beheaviour only in the title bar. Will try to report this bug upstream
to domTT developer.
- Added some translations for new strings.
| -rw-r--r-- | i18n.cpp | 44 | ||||
| -rw-r--r-- | javascript/domTT.js | 7 | ||||
| -rw-r--r-- | pages/recordings.ecpp | 6 | ||||
| -rw-r--r-- | pages/remote.ecpp | 2 | ||||
| -rw-r--r-- | pages/tooltip.ecpp | 3 | ||||
| -rw-r--r-- | pages/whats_on.ecpp | 2 |
6 files changed, 57 insertions, 7 deletions
@@ -729,6 +729,50 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", //Czech }, + { "Switch to this channel.", // English + "Zu diesem Kanal umschalten.", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", //Czech + }, + { "play this recording.", // English + "Diese Aufnahme abspielen.", // Deutsch + "", // Slovenski + "", // Italiano + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", //Czech + }, /* { "", // English diff --git a/javascript/domTT.js b/javascript/domTT.js index 60ce446..8cadb68 100644 --- a/javascript/domTT.js +++ b/javascript/domTT.js @@ -1,4 +1,4 @@ -/** $Id: domTT.js,v 1.1 2007/01/04 22:29:18 thomas Exp $ */ +/** $Id: domTT.js,v 1.2 2007/01/21 21:23:02 tadi Exp $ */ // {{{ license /* @@ -589,6 +589,11 @@ function domTT_create(in_options) { if (in_options.get('position') == 'absolute' && domTT_dragEnabled && in_options.get('draggable')) { + // inserted by tadi: begin + if (typeof(captionRow) == 'undefined') { + captionRow = tipObj; + } + // inserted by tadi: end if (domLib_isIE) { captionRow.onselectstart = function() { return false; }; diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 2459944..1901b78 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -28,7 +28,7 @@ EpgEvents epgEvents; <title>VDR-Live - <$ pageTitle $></title> <link rel="stylesheet" type="text/css" href="styles.css" /> <script type="text/javascript" language="javascript" src="treeview.js"></script> - <& tooltip.javascript var=("domTT_oneOnly") value=("true") var=("domTT_styleClass") value=("domTTepg") &> + <& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &> <& pageelems.ajax_js &> </head> <body> @@ -130,7 +130,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { <div class="recording_time"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></div> <div class="recording_name" <& tooltip.hint text=(shortDescr) &><& tooltip.display domId=(recItem->Id()) &>><$ recItem->Name() $></div> <div class="recording_actions"> - <& pageelems.ajax_action_href action="play_recording" param=(recItem->Id()) image="play.png" alt="" &> + <& pageelems.ajax_action_href action="play_recording" param=(recItem->Id()) tip=(tr("play this recording.")) image="play.png" alt="" &> <img src="edit.png" alt="" /> <img src="del.png" alt="" /> </div> @@ -164,5 +164,5 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { <%args> string id; </%args> -<& pageelems.ajax_action_href action="play_recording" param=(id) image="play.png" alt="" &> +<& pageelems.ajax_action_href action="play_recording" param=(id) tip=(tr("play this recording.")) image="play.png" alt="" &> </%def> diff --git a/pages/remote.ecpp b/pages/remote.ecpp index 6f23d9a..4565680 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -7,7 +7,7 @@ using namespace vdrlive; </%pre> <%include>page_init.eh</%include> <%cpp> - pageTitle = tr("Remote control"); + pageTitle = tr("Remote Control"); </%cpp> <& pageelems.doc_type &> <html> diff --git a/pages/tooltip.ecpp b/pages/tooltip.ecpp index edde0ec..acdf567 100644 --- a/pages/tooltip.ecpp +++ b/pages/tooltip.ecpp @@ -6,6 +6,7 @@ value[]; </%args> <script type="text/javascript" language="javascript" src="domLib.js"></script> <script type="text/javascript" language="javascript" src="domTT.js"></script> + <script type="text/javascript" language="javascript" src="domTT_drag.js"></script> <script type="text/javascript" language="javascript"> var domTT_styleClass = "<$ styleClass $>"; % int idx = 0; @@ -36,7 +37,7 @@ domId; <%args> domId; </%args> - onclick="return makeFalse(domTT_activate(this, event, 'predefined', 'tipDisp', 'content', document.getElementById('<$ domId $>'), 'id', '<$ (domId + "_tip") $>'));" + onclick="domTT_close(domTT_lastOpened); return makeFalse(domTT_activate(this, event, 'predefined', 'tipDisp', 'content', document.getElementById('<$ domId $>'), 'id', '<$ (domId + "_tip") $>'));" </%def> <%def close> diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index bf5a639..78a6347 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -35,7 +35,7 @@ if (type == "now") { <head> <title>VDR-Live - <$ head $></title> <link rel="stylesheet" type="text/css" href="styles.css" /> - <& tooltip.javascript var=("domTT_oneOnly") value=("true") var=("domTT_styleClass") value=("domTTepg") &> + <& tooltip.javascript var=("domTT_styleClass") value=("domTTepg") &> <& pageelems.ajax_js &> </head> <body> |