From 4f34db5afc0156174b5fd6e04b0fa0dfb26e930a Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sun, 14 Jan 2007 20:14:58 +0000 Subject: - Extended tooltip infrastructure. - Made recordings use tooltip infrastructure to display detailed info. - Updated style for this. --- pages/Makefile | 2 +- pages/pageelems.ecpp | 17 +++-------------- pages/recordings.ecpp | 6 +++--- pages/tooltip.ecpp | 47 +++++++++++++++++++++++++++++++++++++++++++++++ pages/tooltip_widget.ecpp | 4 ---- pages/whats_on.ecpp | 8 ++------ 6 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 pages/tooltip.ecpp delete mode 100644 pages/tooltip_widget.ecpp (limited to 'pages') diff --git a/pages/Makefile b/pages/Makefile index 6bf3286..38828ff 100644 --- a/pages/Makefile +++ b/pages/Makefile @@ -18,7 +18,7 @@ VDRDIR ?= ../../../.. OBJS = menu.o channels.o recordings.o schedule.o \ screenshot.o timers.o whats_on.o switch_channel.o \ keypress.o remote.o channels_widget.o edit_timer.o \ - error.o pageelems.o tooltip_widget.o + error.o pageelems.o tooltip.o ### Default rules: diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 07f0a1d..9c170a6 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -14,6 +14,7 @@ using namespace std; +<# <%def header_box> <%args> content[]; @@ -36,24 +37,12 @@ component; +#> <%def event_timer> <%args> tChannelID channelid; tEventID eventid; - border="0"/> -<%cpp> - - - -<%def tooltip_js> -<%args> -styleClass="domTTOverlib"; - - - - + border="0"/> diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 6ed8467..912e663 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -25,7 +25,7 @@ const std::string sPref("short_"); VDR-Live - <$ pageTitle $> -<& pageelems.tooltip_js &> +<& tooltip.javascript var=("domTT_oneOnly") value=("true") var=("domTT_styleClass") value=("domTTrecordings") &> <& pageelems.logo &> @@ -111,7 +111,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
<$ day $>
<$ FormatDateTime(tr("%b %d %y"), recItem->StartTime()) $>
<$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $>
-
><$ recItem->Name() $>
+
Id()) &><& tooltip.display domId=(lPref + recItem->Id()) &>><$ recItem->Name() $>
@@ -158,7 +158,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) { }>
-
<$ tr("Recording details") $>
+
<$ tr("Recording details") $><& tooltip.close domId=(lPref + recItem->Id()) &>
<$ (start) $>
diff --git a/pages/tooltip.ecpp b/pages/tooltip.ecpp new file mode 100644 index 0000000..470f5fb --- /dev/null +++ b/pages/tooltip.ecpp @@ -0,0 +1,47 @@ +<%def javascript> +<%args> +styleClass="domTTOverlib"; +var[]; +value[]; + + + + + + +<%def hint> +<%args> +text; + + onmouseover="domTT_activate(this, event, 'predefined', 'tipHint', 'content', '<$ text $>');" + + +<%def info> +<%args> +domId; + + onmouseover="domTT_activate(this, event, 'predefined', 'tipInfo', 'content', document.getElementById('<$ domId $>'));" + + +<%def display> +<%args> +domId; + + onclick="return makeFalse(domTT_activate(this, event, 'predefined', 'tipDisp', 'content', document.getElementById('<$ domId $>'), 'id', '<$ (domId + "_tip") $>'));" + + +<%def close> +<%args> +domId; + + ')"> + diff --git a/pages/tooltip_widget.ecpp b/pages/tooltip_widget.ecpp deleted file mode 100644 index 1b65950..0000000 --- a/pages/tooltip_widget.ecpp +++ /dev/null @@ -1,4 +0,0 @@ -<%args> -tooltip = ""; - - onmouseover="domTT_activate(this, event, 'content', '<$ tooltip $>', 'trail', true, 'delay', 0);" \ No newline at end of file diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 5eb5edb..50fb460 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -33,12 +33,8 @@ if (type == "now") { VDR-Live - <$ head $> - - - - + +<& tooltip.javascript &> <& pageelems.logo &> -- cgit v1.2.3