- Changed default tooltip style class to domTThint

- Added tooltip style class domTTepg for epg infos like in recordings - Added new pageelement.epg_tt_box to create epg box tooltips. Used at moment in recordings. Planned also for whats_on and schedule. - Changed structure of event box in whats_on to same structure like epg box. This makes the styling comparable between the two boxes. - added bg_tools.png to with a vertical fadeing border to resemble the fading bottom of more line oriented pages.
author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> 2007-01-18 00:11:42 +0000
committer: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> 2007-01-18 00:11:42 +0000
commit: 850fe0ddff35d86a0a3c876ee518ecfb778767d5 (patch)
tree: ee17377c20c3f9f41f9e53b7c26de21afb0e91ee /pages
parent: b6ebbd4df6a6a588692bd0e5e1bbd1d920aad3e1 (diff)
download: vdr-plugin-live-850fe0ddff35d86a0a3c876ee518ecfb778767d5.tar.gz
vdr-plugin-live-850fe0ddff35d86a0a3c876ee518ecfb778767d5.tar.bz2
4 files changed, 52 insertions, 29 deletions
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 79d5d51..869f362 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -6,6 +6,7 @@
 using namespace std;
 
 </%pre>
+
 <%def doc_type>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 </%def>
@@ -59,3 +60,33 @@ component;
 </%args>
 	<a href="javascript:LiveSimpleAjaxRequest('play_recording.xml', 'recording', '<$ recordingid $>');"><img src="<$ image $>" alt="<$ alt $>" /></a>
 </%def>
+
+<%def epg_tt_box>
+<%args>
+	string boxId;
+	string caption;
+	string tools_comp;
+	string time;
+	string title;
+	string short_descr;
+	string long_descr;
+</%args>
+	<div class="epg_description" id="<$ (boxId) $>">
+		<div class="station">
+			<div class="boxheader"><div><div><$ (caption) $><& tooltip.close domId=(boxId) &></div></div></div>
+		</div>
+		<div class="epg_content">
+			<div class="epg_tools">
+		 		<& (tools_comp) &>
+			</div>
+		 	<div>
+				<div class="info"><$ (time) $></div>
+		 		<div class="title"><$ (title) $></div>
+				<div class="short"><$ (short_descr) $></div>
+				<div class="description">
+					<$ (long_descr) $>
+				</div>
+			</div>
+		</div>
+	</div>
+</%def>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 6139d1f..c9427c8 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -12,6 +12,7 @@ using namespace vdrlive;
 </%args>
 <%request scope="page">
 RecordingsTree recordingsTree(LiveRecordingsManager());
+RecordingsTree::RecordingsItemPtr currRecItem;
 </%request>
 <%include>page_init.eh</%include>
 <%cpp>
@@ -23,7 +24,7 @@ RecordingsTree recordingsTree(LiveRecordingsManager());
 		<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=("domTTrecordings") &>
+		<& tooltip.javascript var=("domTT_oneOnly") value=("true") var=("domTT_styleClass") value=("domTTepg") &>
 		<& pageelems.ajax_js &>
 	</head>
 	<body>
@@ -97,6 +98,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 	std::string folderimg("folder_closed.png");
 	std::string collapseimg("plus.png");
     if (!recItem->IsDir()) {
+		currRecItem = recItem;
 		std::string day(FormatDateTime("%a,", recItem->StartTime()));
 		std::string dayLen(lexical_cast<std::string, int>(day.length() - 1) + ".25em;");
 		reply.out() << std::string("\t\t\t")
@@ -149,6 +151,7 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 		callComp("recordings.recordings_data", request, reply, recItemParams);
 	}
 	else {
+		currRecItem = recItem;
 		const cRecordingInfo* info = recItem->RecInfo();
 		if (info) {
 			std::string start(FormatDateTime("%a,", recItem->StartTime()) + std::string(" ")
@@ -158,27 +161,14 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 			std::string shortDescr;				if (info->ShortText()) shortDescr = info->ShortText();
 			std::string longDescr;				if (info->Description()) longDescr = info->Description();
 }>
-			<div class="re_description" id="<$ (recItem->Id()) $>">
-				<div class="station">
-					<div class="boxheader"><div><div><$ recItem->Name() $><& tooltip.close domId=(recItem->Id()) &></div></div></div>
-				</div>
-				<div class="re_content">
-					<div class="re_tools">
-				 		<& pageelems.play_recording recordingid=(recItem->Id()) image="play.png" alt="" &>
-					</div>
-				 	<div>
-						<div class="info"><$ (start) $></div>
-				 		<div class="title"><$ (title) $></div>
-						<div class="short"><$ (shortDescr) $></div>
-						<div class="description">
-							<$ (longDescr) $>
-						</div>
-					</div>
-				</div>
-			</div>
+			<& pageelems.epg_tt_box boxId=(recItem->Id()) caption=(recItem->Name()) tools_comp=("recordings.rec_tools") time=(start) title=(title) short_descr=(shortDescr) long_descr=(longDescr) &>
 <{
 		}
 	}
 }
 }>
 </%def>
+
+<%def rec_tools>
+<& pageelems.play_recording recordingid=(currRecItem->Id()) image="play.png" alt="" &>
+</%def>
diff --git a/pages/tooltip.ecpp b/pages/tooltip.ecpp
index 1c012f3..edde0ec 100644
--- a/pages/tooltip.ecpp
+++ b/pages/tooltip.ecpp
@@ -1,6 +1,6 @@
 <%def javascript>
 <%args>
-styleClass="domTTOverlib";
+styleClass="domTThint";
 var[];
 value[];
 </%args>
@@ -12,7 +12,7 @@ value[];
 %   for (var_type::const_iterator it = var.begin(); it != var.end(); ++it, idx++) {
 	var <$ *it $> = "<$ (value[idx]) $>";
 %   }
-	domTT_addPredefined('tipHint', 'trail', true, 'delay', 0, 'styleClass', 'domTTOverlib');
+	domTT_addPredefined('tipHint', 'trail', true, 'delay', 0, 'styleClass', 'domTThint');
 	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>
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 50fb460..ffde366 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -68,16 +68,18 @@ if (type == "now") {
 				<div class="station">
 					<div><div><div><$ channel_name $></div></div></div>
 				</div>
-				<div class="tools">
-					<& pageelems.event_timer channelid=(channel_id) eventid=(event) &>
-				</div>
 				<div class="content">
-					<div class="info"><$ start $> - <$ end $></div>
-					<div class="title"><$ title $></div>
-					<div class="short"><$ short_description $></div>
-					<div class="description">
-						<$  description $>
+					<div class="tools">
+						<& pageelems.event_timer channelid=(channel_id) eventid=(event) &>
 					</div>
+				 	<div>
+						<div class="info"><$ start $> - <$ end $></div>
+						<div class="title"><$ title $></div>
+						<div class="short"><$ short_description $></div>
+						<div class="description">
+							<$  description $>
+						</div>
+				 	</div>
 				</div>
 			</div>
author	Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>	2007-01-18 00:11:42 +0000
committer	Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>	2007-01-18 00:11:42 +0000
commit	850fe0ddff35d86a0a3c876ee518ecfb778767d5 (patch)
tree	ee17377c20c3f9f41f9e53b7c26de21afb0e91ee /pages
parent	b6ebbd4df6a6a588692bd0e5e1bbd1d920aad3e1 (diff)
download	vdr-plugin-live-850fe0ddff35d86a0a3c876ee518ecfb778767d5.tar.gz vdr-plugin-live-850fe0ddff35d86a0a3c876ee518ecfb778767d5.tar.bz2