- Extended tooltip infrastructure.

- Made recordings use tooltip infrastructure to display detailed info. - Updated style for this.
author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> 2007-01-14 20:14:58 +0000
committer: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> 2007-01-14 20:14:58 +0000
commit: 4f34db5afc0156174b5fd6e04b0fa0dfb26e930a (patch)
tree: 956f3e25b3f017c65a716159405f20e15598cab0
parent: 92539715a3b8a963f52c6046c6030e3d233f08fd (diff)
download: vdr-plugin-live-4f34db5afc0156174b5fd6e04b0fa0dfb26e930a.tar.gz
vdr-plugin-live-4f34db5afc0156174b5fd6e04b0fa0dfb26e930a.tar.bz2
10 files changed, 77 insertions, 35 deletions
diff --git a/css/styles.css b/css/styles.css
index a47f8a4..f96b52d 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -393,18 +393,32 @@ div.recordings_data {
 	width: 66%;
 }
 
-.recordings_data div.re_shortdescr {
-        width: 50%;
-        height: 25%;
+/* ##############################
+   #  Recording style for tooltips
+   ##############################
+*/
+
+div.domTTrecordings {
+	border: none;
+        width: 75%;
 }
 
-.recordings_data div.re_longdescr {
+.domTTrecordings div.re_shortdescr {
         width: 66%;
-        height: 50%;
 }
 
-.recordings_data div.re_content {
+.domTTrecordings div.re_longdescr {
+        width: 75%;
+}
+
+.domTTrecordings div.re_content {
 	border: 1px solid black;
+        background: white;
+}
+
+.domTTrecordings div.boxheader div div a {
+	float: right;
+	margin-left: auto;
 }
 
 /*
diff --git a/images/Makefile b/images/Makefile
index 1f1545f..2202542 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -16,7 +16,7 @@ VDRDIR   ?= ../../../..
 
 OBJS	= logo.o record.o active.o inactive.o button_blue.o	\
 	  file.o folder_closed.o folder_open.o plus.o minus.o	\
-	  transparent.o	edit.o del.o play.o			\
+	  transparent.o	edit.o del.o play.o close.o		\
 	  bg_header_h.o bg_header_l.o bg_header_r.o		\
 	  bg_box_h.o  bg_box_l.o  bg_box_r.o			\
 	  movie.o menu_line_bg.o bg_line.o
diff --git a/images/bg_line.png b/images/bg_line.png
index 96ea2b6..4a5c9c9 100644
--- a/images/bg_line.png
+++ b/images/bg_line.png
diff --git a/images/close.png b/images/close.png
new file mode 100644
index 0000000..caeadcb
--- /dev/null
+++ b/images/close.png
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;
 <img src="logo.png" alt="VDR Live!" class="logo"/>
 </%def>
 
+<#
 <%def header_box>
 <%args>
 content[];
@@ -36,24 +37,12 @@ component;
 				</div>
 			</div>
 </%def>
+#>
 
 <%def event_timer>
 <%args>
 	tChannelID channelid;
 	tEventID eventid;
 </%args>
-	<a href="edit_timer.html?channelid=<$ *channelid.ToString() $>&eventid=<$ eventid $>"><img src="record.png" alt="" <& tooltip_widget tooltip=(tr("Record this")) &> border="0"/></a>
-<%cpp>
-
-</%cpp>
-</%def>
-<%def tooltip_js>
-<%args>
-styleClass="domTTOverlib";
-</%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">
-                        var domTT_styleClass = "<$ styleClass $>";
-    </script>
+	<a href="edit_timer.html?channelid=<$ *channelid.ToString() $>&eventid=<$ eventid $>"><img src="record.png" alt="" <& tooltip.hint text=(tr("Record this")) &> border="0"/></a>
 </%def>
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_");
 		<title>VDR-Live - <$ pageTitle $></title>
 		<link rel="stylesheet" type="text/css" href="styles.css" />
 		<script type="text/javascript" language="javascript" src="treeview.js"></script>
-<& pageelems.tooltip_js &>
+<& tooltip.javascript var=("domTT_oneOnly") value=("true") var=("domTT_styleClass") value=("domTTrecordings") &>
 	</head>
 	<body>
 		<& pageelems.logo &>
@@ -111,7 +111,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 			<div class="recording_day" style="width: <$ dayLen $>"><$ day $></div>
 			<div class="recording_date"><$ FormatDateTime(tr("%b %d %y"), recItem->StartTime()) $></div>
 			<div class="recording_time"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></div>
-			<div class="recording_name" <& tooltip_widget tooltip=("Test") &>><$ recItem->Name() $></div>
+			<div class="recording_name" <& tooltip.info domId=(sPref + recItem->Id()) &><& tooltip.display domId=(lPref + recItem->Id()) &>><$ recItem->Name() $></div>
 			<div class="recording_actions">
 				 <img src="play.png" alt="" />
 				 <img src="edit.png" alt="" />
@@ -158,7 +158,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 }>
 			<div class="re_longdescr" id="<$ (lPref + recItem->Id()) $>">
 				<div class="re_station">
-					<div class="boxheader"><div><div><$ tr("Recording details") $></div></div></div>
+					<div class="boxheader"><div><div><$ tr("Recording details") $><& tooltip.close domId=(lPref + recItem->Id()) &></div></div></div>
 				</div>
 				<div class="re_content">
 					<div class="info"><$ (start) $></div>
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[];
+</%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">
+	var domTT_styleClass = "<$ styleClass $>";
+%   int idx = 0;
+%   for (var_type::const_iterator it = var.begin(); it != var.end(); ++it, idx++) {
+	var <$ *it $> = "<$ (value[idx]) $>";
+%   }
+	domTT_addPredefined('tipHint', 'trail', true, 'delay', 0);
+	domTT_addPredefined('tipInfo', 'trail', true, 'delay', 0);
+	domTT_addPredefined('tipDisp', 'trail', false, 'delay', 0, 'type', 'sticky', 'caption', false, 'offsetX', -30, 'offsetY', -30, 'draggable', true);
+    </script>
+</%def>
+
+<%def hint>
+<%args>
+text;
+</%args>
+ onmouseover="domTT_activate(this, event, 'predefined', 'tipHint', 'content', '<$ text $>');"
+</%def>
+
+<%def info>
+<%args>
+domId;
+</%args>
+ onmouseover="domTT_activate(this, event, 'predefined', 'tipInfo', 'content', document.getElementById('<$ domId $>'));"
+</%def>
+
+<%def display>
+<%args>
+domId;
+</%args>
+ onclick="return makeFalse(domTT_activate(this, event, 'predefined', 'tipDisp', 'content', document.getElementById('<$ domId $>'), 'id', '<$ (domId + "_tip") $>'));"
+</%def>
+
+<%def close>
+<%args>
+domId;
+</%args>
+ <a href="#void" onclick="domTT_close('<$ (domId + "_tip") $>')"><img src="close.png" alt=""></a>
+</%def>
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 = "";
-</%args>
- 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") {
 <html>
 	<head>
 		<title>VDR-Live - <$ head $></title>
-		<link rel="stylesheet" type="text/css" href="/styles.css" />
-    <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">
-			var domTT_styleClass = 'domTTOverlib';
-    </script>
+		<link rel="stylesheet" type="text/css" href="styles.css" />
+<& tooltip.javascript &>
 	</head>
 	<body>
 		<& pageelems.logo &>
author	Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>	2007-01-14 20:14:58 +0000
committer	Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>	2007-01-14 20:14:58 +0000
commit	4f34db5afc0156174b5fd6e04b0fa0dfb26e930a (patch)
tree	956f3e25b3f017c65a716159405f20e15598cab0
parent	92539715a3b8a963f52c6046c6030e3d233f08fd (diff)
download	vdr-plugin-live-4f34db5afc0156174b5fd6e04b0fa0dfb26e930a.tar.gz vdr-plugin-live-4f34db5afc0156174b5fd6e04b0fa0dfb26e930a.tar.bz2